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

Merge branch 'develop'

pull/712/head v2.3.151
iglocska 2015-11-03 17:07:19 +01:00
parent 70eb812060 8f1363df37
commit c3ebc18afa
5 changed files with 46 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.json
View File

@ -1 +1 @@
{"major":2, "minor":3, "hotfix":149}
{"major":2, "minor":3, "hotfix":151}

44
app/Controller/ShadowAttributesController.php
View File

@ -938,23 +938,41 @@ class ShadowAttributesController extends AppController {
return true;
}
public function index() {
$conditions = null;
public function index($eventId = false) {
$conditions = array();
if (!$this->_isSiteAdmin()) {
$conditions = array('Event.org =' => $this->Auth->user('org'));
}
if ($eventId && is_numeric($eventId)) $conditions['ShadowAttribute.event_id'] = $eventId;
$conditions[] = array('deleted' => 0);
$this->paginate = array(
'conditions' => $conditions,
'fields' => array('id', 'org', 'old_id', 'deleted', 'value', 'category', 'type'),
'contain' => array(
'Event' => array(
'fields' => array('id', 'org', 'info', 'orgc'),
),
),
'recursive' => 1
);
$this->set('shadowAttributes', $this->paginate());
if ($this->_isRest()) {
$temp = $this->ShadowAttribute->find('all', array(
'conditions' => $conditions,
'fields' => array('ShadowAttribute.id', 'ShadowAttribute.old_id', 'ShadowAttribute.event_id', 'ShadowAttribute.type', 'ShadowAttribute.category', 'ShadowAttribute.uuid', 'ShadowAttribute.to_ids', 'ShadowAttribute.value', 'ShadowAttribute.comment', 'ShadowAttribute.org'),
'contain' => array(
'Event' => array(
'fields' => array('id', 'org'),
),
),
));
if (empty($temp)) throw new MethodNotAllowedException('No proposals found or invalid event.');
$proposals = array();
foreach ($temp as $proposal) $proposals[] = $proposal['ShadowAttribute'];
$this->set('ShadowAttribute', $proposals);
$this->set('_serialize', array('ShadowAttribute'));
} else {
$this->paginate = array(
'conditions' => $conditions,
'fields' => array('id', 'org', 'old_id', 'deleted', 'value', 'category', 'type'),
'contain' => array(
'Event' => array(
'fields' => array('id', 'org', 'info', 'orgc'),
),
),
'recursive' => 1
);
$this->set('shadowAttributes', $this->paginate());
}
}
private function _getEventData($event_id) {

14
app/View/Events/automation.ctp
View File

@ -386,6 +386,20 @@ The event ID is optional. MISP will accept either a JSON or an XML object posted
<td>N/A</td>
<td>ShadowAttribute object</td>
</tr>
<tr>
<td style="width:45px;">GET</td>
<td style="width:250px;">/shadow_attributes/index</td>
<td>View all proposal of my org's events</td>
<td>N/A</td>
<td>ShadowAttribute objects</td>
</tr>
<tr>
<td style="width:45px;">GET</td>
<td style="width:250px;">/shadow_attributes/index/[event_id]</td>
<td>View all proposals of an event</td>
<td>N/A</td>
<td>ShadowAttribute objects</td>
</tr>
<tr>
<td style="width:45px;">POST</td>
<td style="width:250px;">/shadow_attributes/add/[event_id]</td>

1
app/webroot/.gitignore vendored
View File

@ -1 +0,0 @@
/webgrind

1
app/webroot/js/.gitignore vendored
View File

@ -1 +0,0 @@
/ext-all-debug.js