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

new: [refanging] Attributes automatically refanged in beforeValidate, fixes #4442

pull/4448/head
iglocska 2019-04-09 14:53:39 +02:00
parent 90fc9f26c2
commit a3381b8196
2 changed files with 75 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
app/Lib/Tools/ComplexTypeTool.php
View File

@ -3,20 +3,77 @@
class ComplexTypeTool class ComplexTypeTool
{ {
private $__refangRegexTable = array( private $__refangRegexTable = array(
'/^hxxp/i' => 'http', array(
'/^meow/i' => 'http', 'from' => '/^hxxp/i',
'/^h\[tt\]p/i' => 'http', 'to' => 'http',
'/\[\.\]/' => '.', 'types' => array('link', 'url')
'/\[dot\]/' => '.', ),
'/\(dot\)/' => '.', array(
'/\\\\\./' => '.', 'from' => '/^meow/i',
'/\.+/' => '.', 'to' => 'http',
'/\[hxxp:\/\/\]/' => 'http://', 'types' => array('link', 'url')
'/\\\/' => '', ),
'/[\@]/' => '@', array(
'/\[:\]/' => ':' 'from' => '/^h\[tt\]p/i',
'to' => 'http',
'types' => array('link', 'url')
),
array(
'from' => '/\[\.\]/',
'to' => '.',
'types' => array('link', 'url', 'ip-dst', 'ip-src', 'domain|ip', 'domain', 'hostname')
),
array(
'from' => '/\[dot\]/',
'to' => '.',
'types' => array('link', 'url', 'ip-dst', 'ip-src', 'domain|ip', 'domain', 'hostname')
),
array(
'from' => '/\(dot\)/',
'to' => '.',
'types' => array('link', 'url', 'ip-dst', 'ip-src', 'domain|ip', 'domain', 'hostname')
),
array(
'from' => '/\\\\\./',
'to' => '.',
'types' => array('link', 'url', 'ip-dst', 'ip-src', 'domain|ip', 'domain', 'hostname')
),
array(
'from' => '/\.+/',
'to' => '.',
'types' => array('link', 'url', 'ip-dst', 'ip-src', 'domain|ip', 'domain', 'hostname')
),
array(
'from' => '/\[hxxp:\/\/\]/',
'to' => 'http://',
'types' => array('link', 'url')
),
array(
'from' => '/\\\/',
'to' => ''
),
array(
'from' => '/[\@]/',
'to' => '@',
'types' => array('email-src', 'email-dst')
),
array(
'from' => '/\[:\]/',
'to' => ':',
'types' => array('url', 'link')
)
); );
public function refangValue($value, $type)
{
foreach ($this->__refangRegexTable as $regex) {
if (!isset($regex['type']) || in_array($type, $regex['types'])) {
$value = preg_replace($regex['from'], $regex['to'], $value);
}
}
return $value;
}
private $__tlds = array(); private $__tlds = array();
public function setTLDs($tlds = array()) public function setTLDs($tlds = array())
@ -329,8 +386,8 @@ class ComplexTypeTool
private function __refangInput($input) private function __refangInput($input)
{ {
$input['refanged'] = $input['raw']; $input['refanged'] = $input['raw'];
foreach ($this->__refangRegexTable as $regex => $replacement) { foreach ($this->__refangRegexTable as $regex) {
$input['refanged'] = preg_replace($regex, $replacement, $input['refanged']); $input['refanged'] = preg_replace($regex['from'], $regex['to'], $input['refanged']);
} }
$input['refanged'] = rtrim($input['refanged'], "."); $input['refanged'] = rtrim($input['refanged'], ".");
$input['refanged'] = preg_replace_callback( $input['refanged'] = preg_replace_callback(

4
app/Model/Attribute.php
View File

@ -774,6 +774,10 @@ class Attribute extends AppModel
if (is_array($this->data['Attribute']['value'])) { if (is_array($this->data['Attribute']['value'])) {
return false; return false;
} }
App::uses('ComplexTypeTool', 'Tools');
$this->complexTypeTool = new ComplexTypeTool();
$this->data['Attribute']['value'] = $this->complexTypeTool->refangValue($this->data['Attribute']['value'], $this->data['Attribute']['type']);
if (!empty($this->data['Attribute']['object_id']) && empty($this->data['Attribute']['object_relation'])) { if (!empty($this->data['Attribute']['object_id']) && empty($this->data['Attribute']['object_relation'])) {
return false; return false;