mirror of https://github.com/MISP/MISP
chg: [sharingGroup:view] Usage of CRUD functions
Sami Mokaddem
parent
5d67855431
commit
e20051abc1
|
|
@ -309,6 +309,7 @@ class SharingGroupsController extends AppController
|
|||
|
||||
public function index()
|
||||
{
|
||||
// TODO: [3.x-MIGRATION] fixme, cannot paginate on virtual fields
|
||||
$customContextFilters = [
|
||||
[
|
||||
'label' => __('Active Sharing Groups'),
|
||||
|
|
@ -435,7 +436,6 @@ class SharingGroupsController extends AppController
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
public function view($id)
|
||||
{
|
||||
if ($this->request->is('head')) { // Just check if sharing group exists and user can access it
|
||||
|
|
@ -443,7 +443,7 @@ class SharingGroupsController extends AppController
|
|||
return new Response(['status' => $exists ? 200 : 404]);
|
||||
}
|
||||
if (!$this->SharingGroups->checkIfAuthorised($this->ACL->getUser()->toArray(), $id)) {
|
||||
throw new MethodNotAllowedException('Sharing group doesn\'t exist or you do not have permission to access it.');
|
||||
throw new MethodNotAllowedException(__('Sharing group doesn\'t exist or you do not have permission to access it.'));
|
||||
}
|
||||
|
||||
$contain = [
|
||||
|
|
@ -465,69 +465,54 @@ class SharingGroupsController extends AppController
|
|||
unset($contain['SharingGroupServers']);
|
||||
}
|
||||
|
||||
// TODO: Move to using entity instead of array
|
||||
$sg = $this->SharingGroups->find(
|
||||
'all',
|
||||
[
|
||||
'conditions' => Validation::uuid($id) ? ['SharingGroups.uuid' => $id] : ['SharingGroups.id' => $id],
|
||||
'contain' => $contain,
|
||||
]
|
||||
)->disableHydration()->first();
|
||||
|
||||
if (empty($sg)) {
|
||||
throw new NotFoundException('Sharing group doesn\'t exist or you do not have permission to access it.');
|
||||
}
|
||||
if (isset($sg['SharingGroupServer'])) {
|
||||
foreach ($sg['SharingGroupServer'] as $key => $sgs) {
|
||||
if ($sgs['server_id'] == 0) {
|
||||
$sg['SharingGroupServer'][$key]['Server'] = [
|
||||
'id' => "0",
|
||||
'name' => 'Local instance',
|
||||
'url' => empty(Configure::read('MISP.external_baseurl')) ? Configure::read('MISP.baseurl') : Configure::read('MISP.external_baseurl')
|
||||
];
|
||||
$afterFindHandler = function(SharingGroup $sg) {
|
||||
if (isset($sg->SharingGroupServer)) {
|
||||
foreach ($sg->SharingGroupServer as $key => $sgs) {
|
||||
if ($sgs['server_id'] == 0) {
|
||||
$sg->SharingGroupServer[$key]['Server'] = [
|
||||
'id' => "0",
|
||||
'name' => 'Local instance',
|
||||
'url' => empty(Configure::read('MISP.external_baseurl')) ? Configure::read('MISP.baseurl') : Configure::read('MISP.external_baseurl')
|
||||
];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (isset($sg['sync_user_id'])) {
|
||||
$UserTable = $this->fetchTable('Users');
|
||||
$syncUser = $UserTable->find(
|
||||
'all',
|
||||
[
|
||||
'conditions' => ['Users.id' => $sg['sync_user_id']],
|
||||
if (!empty($sg->sync_user_id)) {
|
||||
$UserTable = $this->fetchTable('Users');
|
||||
$syncUser = $UserTable->find()->where([
|
||||
'conditions' => ['Users.id' => $sg->sync_user_id],
|
||||
'recursive' => -1,
|
||||
'fields' => ['Users.id'],
|
||||
'contain' => ['Organisations' => [
|
||||
'fields' => ['Organisations.id', 'Organisations.name', 'Organisations.uuid'],
|
||||
]]
|
||||
]
|
||||
)->disableHydration()->first();
|
||||
if (empty($syncUser)) {
|
||||
$sg['sync_org_name'] = 'N/A';
|
||||
} else {
|
||||
$sg['sync_org_name'] = $syncUser['Organisation']['name'];
|
||||
$sg['sync_org'] = $syncUser['Organisation'];
|
||||
])->first();
|
||||
if (empty($syncUser)) {
|
||||
$sg['sync_org_name'] = __('N/A');
|
||||
} else {
|
||||
$sg['sync_org_name'] = $syncUser->Organisation->name;
|
||||
$sg['sync_org'] = $syncUser->Organisation;
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($this->ParamHandler->isRest()) {
|
||||
return $this->RestResponse->viewData($sg);
|
||||
}
|
||||
|
||||
$EventsTable = $this->fetchTable('Events');
|
||||
$conditions = $EventsTable->createEventConditions($this->ACL->getUser()->toArray());
|
||||
$conditions['AND']['sharing_group_id'] = $sg['id'];
|
||||
$sg['event_count'] = $EventsTable->find(
|
||||
'all',
|
||||
[
|
||||
'conditions' => $conditions,
|
||||
'recursive' => -1,
|
||||
'callbacks' => false,
|
||||
]
|
||||
)->count();
|
||||
$EventsTable = $this->fetchTable('Events');
|
||||
$conditions = $EventsTable->createEventConditions($this->ACL->getUser()->toArray());
|
||||
$conditions['AND']['sharing_group_id'] = $sg->id;
|
||||
$sg->event_count = $EventsTable->find()->where($conditions)->all()->count();
|
||||
return $sg;
|
||||
};
|
||||
|
||||
$this->set('mayModify', $this->SharingGroups->checkIfAuthorisedExtend($this->ACL->getUser()->toArray(), $sg['id']));
|
||||
$this->set('id', $sg['id']);
|
||||
$this->set('entity', $sg);
|
||||
$this->set('menuData', ['menuList' => 'globalActions', 'menuItem' => 'viewSG']);
|
||||
$conditions= [];
|
||||
$params = [
|
||||
'contain' => $contain,
|
||||
'conditions' => $conditions,
|
||||
'afterFind' => $afterFindHandler,
|
||||
];
|
||||
$this->CRUD->view($id, $params);
|
||||
$responsePayload = $this->CRUD->getResponsePayload();
|
||||
if (!empty($responsePayload)) {
|
||||
return $responsePayload;
|
||||
}
|
||||
}
|
||||
|
||||
private function __initialiseSGQuickEdit($id, $request)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use App\Model\Entity\SharingGroup;
|
||||
// debug($entity);
|
||||
|
||||
echo $this->element(
|
||||
'genericElements/SingleViews/single_view',
|
||||
|
|
@ -35,9 +36,8 @@ echo $this->element(
|
|||
],
|
||||
[
|
||||
'key' => __('Created by'),
|
||||
'element' => 'org',
|
||||
'path' => 'Organisation.name',
|
||||
'data_path' => 'Organisation'
|
||||
'type' => 'org',
|
||||
'path' => 'Organisation',
|
||||
],
|
||||
[
|
||||
'key' => __('Created'),
|
||||
|
|
@ -53,7 +53,7 @@ echo $this->element(
|
|||
],
|
||||
[
|
||||
'key' => __('Synced by'),
|
||||
'element' => 'org',
|
||||
'type' => 'org',
|
||||
'path' => 'sync_org.name',
|
||||
'data_path' => 'sync_org',
|
||||
'requirement' => isset($entity['sync_org'])
|
||||
|
|
@ -67,13 +67,13 @@ echo $this->element(
|
|||
'key' => __('Organisations'),
|
||||
'type' => 'custom',
|
||||
'requirement' => isset($entity['SharingGroupOrg']),
|
||||
'function' => function (array $sharingGroup) {
|
||||
'function' => function (SharingGroup $sharingGroup) {
|
||||
$table = $this->Bootstrap->table(
|
||||
['hover' => true, 'striped' => true, 'condensed' => true, 'variant' => 'secondary'],
|
||||
[
|
||||
'items' => $sharingGroup['SharingGroupOrg'],
|
||||
'items' => array_map(fn ($entity) => $entity->toArray(), $sharingGroup->SharingGroupOrg),
|
||||
'fields' => [
|
||||
[ 'label' => __('Name'), 'path' => 'Organisation.name',], // TODO: [3.x-MIGRATION] $this->OrgImg->getNameWithImg($sgo)
|
||||
[ 'label' => __('Name'), 'path' => 'Organisation', 'element' => 'org'], // TODO: [3.x-MIGRATION] $this->OrgImg->getNameWithImg($sgo)
|
||||
[ 'label' => __('Is local'), 'path' => 'Organisation.local', 'element' => 'boolean',],
|
||||
[ 'label' => __('Can extend'), 'path' => 'extend', 'element' => 'boolean',],
|
||||
],
|
||||
|
|
@ -85,13 +85,13 @@ echo $this->element(
|
|||
[
|
||||
'key' => __('Instances'),
|
||||
'type' => 'custom',
|
||||
'requirement' => isset($entity['SharingGroupServer']),
|
||||
'function' => function (array $sharingGroup) {
|
||||
if (empty($sharingGroup['roaming'])) {
|
||||
'requirement' => isset($entity->SharingGroupServer),
|
||||
'function' => function (SharingGroup $sharingGroup) {
|
||||
if (empty($sharingGroup->roaming)) {
|
||||
$cell = $this->Bootstrap->table(
|
||||
['hover' => true, 'striped' => true, 'condensed' => true, 'variant' => 'secondary'],
|
||||
[
|
||||
'items' => $sharingGroup['SharingGroupServer'],
|
||||
'items' => array_map(fn ($entity) => $entity->toArray(), $sharingGroup->SharingGroupServer),
|
||||
'fields' => [
|
||||
['label' => __('Name'), 'path' => 'Server.name',], // TODO: [3.x-MIGRATION] $this->OrgImg->getNameWithImg($sgo)
|
||||
['label' => __('URL'), 'path' => 'Server.url',],
|
||||
|
|
|
|||
Loading…
Reference in New Issue