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

chg: [event:view] Show feed meta-information as popup

pull/9438/head
Sami Mokaddem 2023-12-05 14:10:00 +01:00
parent 1585740764
commit b79fb64f2f
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Model/Event.php
View File

@ -2079,7 +2079,7 @@ class Event extends AppModel
}
if (
$options['includeServerCorrelations'] &&
(!$isSiteAdmin && $user['org_id'] != Configure::read('MISP.host_org_id') && !Configure::read('MISP.show_correlation_for_all_users', false))
(!$isSiteAdmin && $user['org_id'] != Configure::read('MISP.host_org_id') && !Configure::read('MISP.show_server_correlations_for_all_users', false))
) {
$options['includeServerCorrelations'] = false; // not permission to see server correlations
}

2
app/Model/Feed.php
View File

@ -556,7 +556,7 @@ class Feed extends AppModel
}
$sources = $this->getCachedFeedsOrServers($user, $scope);
if (!$user['Role']['perm_site_admin'] && $user['org_id'] != Configure::read('MISP.host_org_id')) {
if ($scope == 'Server' && !$user['Role']['perm_site_admin'] && $user['org_id'] != Configure::read('MISP.host_org_id')) {
// Filter fields that shouldn't be visible to everyone
$allowedFieldsForAllUsers = array_flip(['id', 'name',]);
$sources = array_map(function($source) use($scope, $allowedFieldsForAllUsers) {

2
app/Model/Server.php
View File

@ -5956,7 +5956,7 @@ class Server extends AppModel
'type' => 'boolean',
'null' => true
),
'show_correlation_for_all_users' => array(
'show_server_correlations_for_all_users' => array(
'level' => 1,
'description' => __('This setting will reveal correlations from other remote servers visible to all users.'),
'value' => false,

3
app/View/Elements/Events/View/row_attribute.ctp
View File

@ -243,7 +243,8 @@
}
} else {
$liContents = sprintf(
'<span>%s</span>',
'<a href="#" data-toggle="popover" data-content="%s" data-trigger="hover">%s</a>',
h($popover),
h($feed['id'])
);
}