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

Merge branch '2.4' of https://github.com/MISP/MISP into 2.4

pull/2451/merge
iglocska 2017-08-31 16:45:01 +02:00
parent bb4f74bb1a 4ba21c5770
commit 52bf961dea
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/EventsController.php
View File

@ -901,7 +901,7 @@ class EventsController extends AppController {
$this->Event->recursive = -1;
$temp = $this->Event->find('first', array(
'recursive' => -1,
'conditons' => array('Event.uuid' => $id),
'conditions' => array('Event.uuid' => $id),
'fields' => array('Event.id', 'Event.uuid')
));
if ($temp == null) throw new NotFoundException('Invalid event');

2
app/Lib/Export/NidsSuricataExport.php
View File

@ -136,6 +136,7 @@ class NidsSuricataExport extends NidsExport {
$content = 'flow:to_server; app-layer-protocol:tls;';
}
# Domain: rule on https certificate subject
/*
else {
$suricata_protocol = 'tls';
$suricata_src_ip = '$EXTERNAL_NET';
@ -144,6 +145,7 @@ class NidsSuricataExport extends NidsExport {
$suricata_dst_port = 'any';
$content = 'tls_cert_subject; content:"' . $data['host'] . '"; nocase; pcre:"/' . $data['host'] . '$/";';
}
*/
break;
case "ssh":