MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'develop' of github.com:MISP/MISP into develop

pull/8673/head
Sami Mokaddem 2022-10-17 11:31:48 +02:00
parent aa92116a45 cf25698a5f
commit e41a9d2bb7
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
11 changed files with 109 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/AppController.php
View File

@ -35,7 +35,7 @@ class AppController extends Controller
public $helpers = array('OrgImg', 'FontAwesome', 'UserName');
private $__queryVersion = '145';
private $__queryVersion = '146';
public $pyMispVersion = '2.4.162';
public $phpmin = '7.2';
public $phprec = '7.4';

26
app/Controller/Component/RestResponseComponent.php
View File

@ -488,6 +488,7 @@ class RestResponseComponent extends Component
* @param mixed $data
* @return CakeResponse
* @throws Exception
* @deprecated Use failResponse instead
*/
public function saveFailResponse($controller, $action, $id, $validationErrors, $format = false, $data = null)
{
@ -514,6 +515,18 @@ class RestResponseComponent extends Component
return $this->__sendResponse($response, 403, $format);
}
/**
* @param int|null $id
* @param array|string $validationErrors
* @param mixed $additionalData
* @return CakeResponse|CakeResponseFile
* @throws Exception
*/
public function failResponse($id = null, $validationErrors = null, $additionalData = null)
{
return $this->saveFailResponse($this->Controller->name, $this->Controller->action, $id, $validationErrors, 'json', $additionalData);
}
/**
* @param string $controller
* @param string $action
@ -523,6 +536,7 @@ class RestResponseComponent extends Component
* @param mixed $data
* @return CakeResponse
* @throws Exception
* @deprecated Use successResponse instead
*/
public function saveSuccessResponse($controller, $action, $id = false, $format = false, $message = false, $data = null)
{
@ -546,6 +560,18 @@ class RestResponseComponent extends Component
return $this->__sendResponse($response, 200, $format);
}
/**
* @param int|null $id
* @param string|null $message
* @param mixed $additionalData
* @return CakeResponse|CakeResponseFile
* @throws Exception
*/
public function successResponse($id = null, $message = null, $additionalData = null)
{
return $this->saveSuccessResponse($this->Controller->name, $this->Controller->action, $id, 'json', $message, $additionalData);
}
/**
* @param mixed $response
* @param int $code

29
app/Controller/TagsController.php
View File

@ -1064,36 +1064,47 @@ class TagsController extends AppController
return $this->RestResponse->viewData($tags, $this->response->type());
}
public function modifyTagRelationship($scope, $id) {
public function modifyTagRelationship($scope, $id)
{
$validScopes = ['event', 'attribute'];
if (!in_array($scope, $validScopes)) {
if (!in_array($scope, $validScopes, true)) {
throw new InvalidArgumentException(__('Invalid scope. Valid options: %s', implode(', ', $validScopes)));
}
$model_name = Inflector::classify($scope) . 'Tag';
$tagConnector = $this->Tag->$model_name->find('first', [
'conditions' => [$model_name . '.id' => $id],
'recursive' => -1,
'contain' => 'Tag'
'contain' => ['Tag'],
]);
if (empty($tagConnector)) {
throw new NotFoundException(__('Tag not found.'));
}
$event = $this->Tag->EventTag->Event->fetchSimpleEvent($this->Auth->user(), $tagConnector[$model_name]['event_id']);
if (empty($event)) {
throw new NotFoundException(__('Event not found.'));
}
if (!$this->__canModifyTag($event, $tagConnector[$model_name]['local'])) {
throw new ForbiddenException(__('You dont have permission to modify this tag.'));
}
if ($this->request->is('post')) {
if (isset($this->request->data['Tag']['relationship_type'])) {
$tagConnector[$model_name]['relationship_type'] = $this->request->data['Tag']['relationship_type'];
} else {
$tagConnector[$model_name]['relationship_type'] = '';
}
$result = $this->Tag->$model_name->save($tagConnector);
$result = $this->Tag->$model_name->save($tagConnector, true, ['relationship_type']);
if ($result) {
$message = __('Relationship updated.');
if ($this->_isRest()) {
if ($this->_isRest() || $this->request->is('ajax')) {
return $this->RestResponse->successResponse($id, $message, ["{$scope}_id" => $tagConnector[$model_name]["{$scope}_id"]]);
} else {
$this->Flash->success($message);
$this->redirect($this->referer());
}
} else {
$message = __('Relationship could not be updated.');
if ($this->_isRest()) {
if ($this->_isRest() || $this->request->is('ajax')) {
return $this->RestResponse->failResponse($id, $this->Tag->$model_name->validationErrors);
} else {
$this->Flash->error($message);
$this->redirect($this->referer());
@ -1110,6 +1121,7 @@ class TagsController extends AppController
$relationships['custom'] = 'custom';
$relationships[null] = 'Unspecified';
ksort($relationships);
$this->set('title', __('Modify Tag Relationship'));
$this->set(
'description',
@ -1124,6 +1136,7 @@ class TagsController extends AppController
$this->set('options', $relationships);
$this->set('default', $tagConnector[$model_name]['relationship_type']);
$this->set('model', 'Tag');
$this->set('onsubmit', 'modifyTagRelationship()');
$this->set('field', 'relationship_type');
$this->layout = false;
$this->render('/genericTemplates/select');

15
app/Model/Event.php
View File

@ -5992,7 +5992,15 @@ class Event extends AppModel
return $attributes_added;
}
public function massageTags($user, $data, $dataType = 'Event', $excludeGalaxy = false, $cullGalaxyTags = false)
/**
* @param array $user
* @param array $data
* @param string $dataType
* @param bool $excludeGalaxy
* @param bool $cullGalaxyTags
* @return array
*/
public function massageTags(array $user, array $data, $dataType = 'Event', $excludeGalaxy = false, $cullGalaxyTags = false)
{
$data['Galaxy'] = array();
@ -6012,14 +6020,15 @@ class Event extends AppModel
$cluster = $this->GalaxyCluster->getCluster($dataTag['Tag']['name'], $user);
if ($cluster) {
$found = false;
$cluster['GalaxyCluster']['local'] = isset($dataTag['local']) ? $dataTag['local'] : false;
$cluster['GalaxyCluster']['local'] = $dataTag['local'] ?? false;
$cluster['GalaxyCluster'][strtolower($dataType) . '_tag_id'] = $dataTag['id'];
foreach ($data['Galaxy'] as $j => $galaxy) {
if ($galaxy['id'] == $cluster['GalaxyCluster']['Galaxy']['id']) {
$found = true;
$temp = $cluster;
unset($temp['GalaxyCluster']['Galaxy']);
$data['Galaxy'][$j]['GalaxyCluster'][] = $temp['GalaxyCluster'];
continue;
break;
}
}
if (!$found) {

8
app/View/Elements/ajaxTags.ctp
View File

@ -89,14 +89,12 @@
$span_relationship = '';
if ($full || ($fullLocal && $tag['Tag']['local'])) {
$span_relationship = sprintf(
'<span class="%s" title="%s" role="%s" tabindex="%s" aria-label="%s" onclick="%s"><i class="fas fa-project-diagram"></i></span>',
'black-white tag useCursorPointer noPrint',
'<a class="%s" title="%s" role="button" tabindex="0" aria-label="%s" href="%s"><i class="fas fa-project-diagram"></i></a>',
'black-white tag noPrint modal-open',
__('Modify Tag Relationship'),
"button",
"0",
__('Modify relationship for tag %s', h($tag['Tag']['name'])),
sprintf(
'openGenericModal(\'%s/tags/modifyTagRelationship/%s/%s\');',
'%s/tags/modifyTagRelationship/%s/%s',
$baseurl,
h($scope),
h($tag['id'])

9
app/View/Tags/modify_tag_relationship.ctp
View File

@ -12,16 +12,9 @@
<?= $this->Form->postLink(
h($actionName),
$this->request->here(),
['class' => 'btn btn-primary button-execute']
['class' => 'btn btn-primary']
)
?>
<button type="button" class="btn btn-secondary cancel-button" data-dismiss="modal"><?= __('Cancel') ?></button>
</div>
</div>
<script type="text/javascript">
$(document).keydown(function(e) {
if(e.which === 13 && e.ctrlKey) {
$('.button-execute').click();
}
});
</script>

9
app/View/genericTemplates/confirm.ctp
View File

@ -12,16 +12,9 @@
<?= $this->Form->postLink(
h($actionName),
$this->request->here(),
['class' => 'btn btn-primary button-execute']
['class' => 'btn btn-primary']
)
?>
<button type="button" class="btn btn-secondary cancel-button" data-dismiss="modal"><?= __('Cancel') ?></button>
</div>
</div>
<script type="text/javascript">
$(document).keydown(function(e) {
if(e.which === 13 && e.ctrlKey) {
$('.button-execute').click();
}
});
</script>

11
app/View/genericTemplates/delete.ctp
View File

@ -23,17 +23,10 @@ $title = Inflector::singularize(Inflector::humanize(Inflector::underscore($this-
<?= $this->Form->postLink(
'Delete',
$this->request->here(),
['class' => 'btn btn-primary button-execute']
['class' => 'btn btn-primary']
)
?>
<button type="button" class="btn btn-secondary cancel-button" data-dismiss="modal"><?= __('Cancel') ?></button>
</div>
<?php endif; ?>
</div>
<script type="text/javascript">
$(document).keydown(function(e) {
if (e.which === 13 && e.ctrlKey) {
$('.button-execute').click();
}
});
</script>
</div>

17
app/View/genericTemplates/select.ctp
View File

@ -5,27 +5,20 @@
</button>
<h3 id="genericModalLabel"><?= h($title) ?></h3>
</div>
<?= $this->Form->create($model, ['onsubmit' => $onsubmit ?? null, 'style' => 'margin:0']) ?>
<div class="modal-body modal-body-long">
<p><?= h($description) ?></p>
<?php
$randomNumber = rand();
echo $this->Form->create($model, ['id' => $randomNumber . 'Form']);
echo $this->Form->input('relationship_type', [
'type' => 'select',
'options' => $options
'options' => $options,
'default' => $default ?? null,
]);
echo $this->Form->end();
?>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary button-execute" onclick="$('#<?= $randomNumber . 'Form' ?>').submit();"><?= __('Submit') ?></button>
<button type="submit" class="btn btn-primary"><?= __('Submit') ?></button>
<button type="button" class="btn btn-secondary cancel-button" data-dismiss="modal"><?= __('Cancel') ?></button>
</div>
<?= $this->Form->end() ?>
</div>
<script type="text/javascript">
$(document).keydown(function(e) {
if(e.which === 13 && e.ctrlKey) {
$('.button-execute').click();
}
});
</script>

4
app/webroot/css/main.css
View File

@ -867,6 +867,10 @@ a.proposal_link_red:hover {
color:white;
}
a.black-white:hover {
color: white;
}
.tagFirstHalf {
display: inline-block;
padding: 2px 4px;

37
app/webroot/js/misp.js
View File

@ -799,6 +799,35 @@ function refreshTagCollectionRow(tag_collection_id) {
});
}
function modifyTagRelationship() {
event.preventDefault();
var $form = $(event.target);
var action = $form.attr("action");
$.ajax({
type: "post",
url: action,
data: $form.serialize(),
error: xhrFailCallback,
success: function (data) {
if (data.saved) {
$('#genericModal').modal('hide');
if ("attribute_id" in data.data) {
var attribute_id = data.data.attribute_id;
loadAttributeTags(attribute_id);
loadGalaxies(attribute_id, 'attribute');
} else {
var event_id = data.data.event_id;
loadEventTags(event_id);
loadGalaxies(event_id, 'event');
}
}
}
});
return false;
}
function handleAjaxEditResponse($td, data, type, id, field) {
var responseArray = data;
if (type === 'Attribute') {
@ -1084,9 +1113,9 @@ function getSelectedTaxonomyNames() {
function loadEventTags(id) {
$.ajax({
dataType:"html",
dataType: "html",
cache: false,
success:function (data) {
success: function (data) {
$(".eventTagContainer").html(data);
},
url: baseurl + "/tags/showEventTag/" + id,
@ -4849,8 +4878,8 @@ $(document.body).on('keyup', '#quickFilterField', function(e) {
}
});
// Send textarea form on CMD+ENTER or CTRL+ENTER
$(document.body).on('keydown', 'textarea', function(e) {
// Send textarea or select form on CMD+ENTER or CTRL+ENTER
$(document.body).on('keydown', 'textarea, select', function(e) {
if (e.keyCode === 13 && (e.metaKey || e.ctrlKey)) { // CMD+ENTER or CTRL+ENTER key
if (e.target.form) {
$(e.target.form).submit();