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

Audit log 

Search logs and paging now works as expected (conform search
attributes).
pull/63/head
noud 2012-10-31 08:16:37 +01:00
parent 49cf9400aa
commit 582dbb0f7b
3 changed files with 64 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Config/routes.php
View File

@ -32,7 +32,7 @@
Router::connect('/users/admin_index/*', array('controller' => 'users', 'action' => 'index', 'admin' => true));
Router::connect('/groups/admin_index/*', array('controller' => 'groups', 'action' => 'index', 'admin' => true));
Router::connect('/logs/admin_index/*', array('controller' => 'logs', 'action' => 'index', 'admin' => true));
Router::connect('/logs/admin_search/*', array('controller' => 'logs', 'action' => 'index', 'admin' => true));
Router::connect('/logs/admin_search/*', array('controller' => 'logs', 'action' => 'search', 'admin' => true));
// Activate REST
Router::mapResources(array('events'));

2
app/Controller/AttributesController.php
View File

@ -551,6 +551,8 @@ class AttributesController extends AppController {
}
$this->Attribute->recursive = 0;
$this->paginate = array(
'limit' => 60,
'maxLimit' => 9999, // LATER we will bump here on a problem once we have more than 9999 attributes?
'conditions' => $conditions
);

100
app/Controller/LogsController.php
View File

@ -8,7 +8,7 @@ App::uses('AppController', 'Controller');
class LogsController extends AppController {
public $components = array('Security', 'RequestHandler');
// public $components = array('Security');
public $paginate = array(
'limit' => 60,
'order' => array(
@ -64,48 +64,70 @@ class LogsController extends AppController {
}
public function admin_search() {
$fullAddress = array('/admin/logs/search', '/logs/admin_search');
$this->set('actionDefinitions', $this->Log->actionDefinitions);
if (in_array($this->request->here, $fullAddress)) {
if ($this->request->is('post')) {
$email = $this->request->data['Log']['email'];
$org = $this->request->data['Log']['org'];
$action = $this->request->data['Log']['action'];
$title = $this->request->data['Log']['title'];
$change = $this->request->data['Log']['change'];
$this->set('actionDefinitions', $this->Log->actionDefinitions);
// search the db
$conditions = array();
if($email) {
$conditions['Log.email LIKE'] = '%'.$email.'%';
}
if($org) {
$conditions['Log.org LIKE'] = '%'.$org.'%';
}
if($action != 'ALL') {
$conditions['Log.action ='] = $action;
}
if($title) {
$conditions['Log.title LIKE'] = '%'.$title.'%';
}
if($change) {
$conditions['Log.change LIKE'] = '%'.$change.'%';
}
$this->Log->recursive = 0;
$this->paginate = array(
'conditions' => $conditions
);
$this->set('logs', $this->paginate());
// reset the paginate_conditions
$this->Session->write('paginate_conditions_log', array());
// set the same view as the index page
$this->render('index');
} else {
// no search keyword is given, show the search form
if ($this->request->is('post') && in_array($this->request->here, $fullAddress)) {
$email = $this->request->data['Log']['email'];
$org = $this->request->data['Log']['org'];
$action = $this->request->data['Log']['action'];
$title = $this->request->data['Log']['title'];
$change = $this->request->data['Log']['change'];
// combobox for actions
$actions = array('' => array('ALL' => 'ALL'), 'actions' => array());
$actions['actions'] = array_merge($actions['actions'], $this->_arrayToValuesIndexArray($this->Log->validate['action']['rule'][1]));
$this->set('actions',$actions);
}
// search the db
$conditions = array();
if ($email) {
$conditions['Log.email LIKE'] = '%'.$email.'%';
}
if ($org) {
$conditions['Log.org LIKE'] = '%'.$org.'%';
}
if ($action != 'ALL') {
$conditions['Log.action ='] = $action;
}
if ($title) {
$conditions['Log.title LIKE'] = '%'.$title.'%';
}
if ($change) {
$conditions['Log.change LIKE'] = '%'.$change.'%';
}
$this->Log->recursive = 0;
$this->paginate = array(
'limit' => 60,
'maxLimit' => 9999, // LATER we will bump here on a problem once we have more than 9999 logs(?)
'conditions' => $conditions
);
$this->set('logs', $this->paginate());
// and store into session
$this->Session->write('paginate_conditions_log', $this->paginate);
// set the same view as the index page
$this->render('admin_index');
} else {
// no search keyword is given, show the search form
// combobox for actions
$actions = array('' => array('ALL' => 'ALL'), 'actions' => array());
$actions['actions'] = array_merge($actions['actions'], $this->_arrayToValuesIndexArray($this->Log->validate['action']['rule'][1]));
$this->set('actions',$actions);
}
} else {
$this->set('actionDefinitions', $this->Log->actionDefinitions);
$this->Log->recursive = 0;
// re-get pagination
$this->paginate = $this->Session->read('paginate_conditions_log');
$this->set('logs', $this->paginate());
// set the same view as the index page
$this->render('admin_index');
}
}
}