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

chg: [internal] Move IPv6 compression to one method

pull/7893/head
Jakub Onderka 2021-10-28 11:06:30 +02:00
parent 4a95ff7fc6
commit 0bde71130c
2 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
app/Lib/Tools/AttributeValidationTool.php
View File

@ -90,10 +90,7 @@ class AttributeValidationTool
$parts[0] = $punyCode;
}
}
if (filter_var($parts[1], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
// convert IPv6 address to compressed format
$parts[1] = inet_ntop(inet_pton($parts[1]));
}
$parts[1] = self::compressIpv6($parts[1]);
return "$parts[0]|$parts[1]";
case 'filename|md5':
case 'filename|sha1':
@ -148,11 +145,7 @@ class AttributeValidationTool
break;
case 'ip-src':
case 'ip-dst':
if (filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
// convert IPv6 address to compressed format
$value = inet_ntop(inet_pton($value));
}
break;
return self::compressIpv6($value);
case 'ip-dst|port':
case 'ip-src|port':
if (substr_count($value, ':') >= 2) { // (ipv6|port) - tokenize ip and port
@ -181,10 +174,7 @@ class AttributeValidationTool
} else {
return $value;
}
if (filter_var($parts[0], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
// convert IPv6 address to compressed format
$parts[0] = inet_ntop(inet_pton($parts[0]));
}
$parts[0] = self::compressIpv6($parts[0]);
return $parts[0] . '|' . $parts[1];
case 'mac-address':
case 'mac-eui-64':
@ -377,15 +367,9 @@ class AttributeValidationTool
}
return true;
case 'mac-address':
if (preg_match('/^([a-fA-F0-9]{2}[:]?){6}$/', $value)) {
return true;
}
break;
return preg_match('/^([a-fA-F0-9]{2}[:]?){6}$/', $value) === 1;
case 'mac-eui-64':
if (preg_match('/^([a-fA-F0-9]{2}[:]?){8}$/', $value)) {
return true;
}
break;
return preg_match('/^([a-fA-F0-9]{2}[:]?){8}$/', $value) === 1;
case 'hostname':
case 'domain':
if (self::isDomainValid($value)) {
@ -573,15 +557,9 @@ class AttributeValidationTool
case 'btc':
case 'dash':
case 'xmr':
if (preg_match('/^[a-zA-Z0-9]+$/', $value)) {
return true;
}
break;
return preg_match('/^[a-zA-Z0-9]+$/', $value) === 1;
case 'vhash':
if (preg_match('/^.+$/', $value)) {
return true;
}
break;
return preg_match('/^.+$/', $value) === 1;
case 'bin':
case 'cc-number':
case 'bank-account-nr':
@ -602,7 +580,7 @@ class AttributeValidationTool
}
return __('AS number have to be integers between 1 and 4294967295');
}
return false;
throw new InvalidArgumentException("Unknown type $type.");
}
/**
@ -676,6 +654,19 @@ class AttributeValidationTool
$value = str_replace(':', '', $value);
return self::isHashValid('md5', $value);
}
/**
* @param string $value
* @return string
*/
private static function compressIpv6($value)
{
if (filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
// convert IPv6 address to compressed format
return inet_ntop(inet_pton($value));
}
return $value;
}
/**
* Temporary solution for utf8 columns until we migrate to utf8mb4.

7
app/Test/AttributeValidationToolTest.php
View File

@ -64,6 +64,13 @@ class AttributeValidationToolTest extends TestCase
]);
}
public function testCompressIpv6(): void
{
$this->assertEquals('1234:fd2:5621:1:89::4500', AttributeValidationTool::modifyBeforeValidation('ip-src', '1234:0fd2:5621:0001:0089:0000:0000:4500'));
$this->assertEquals('example.com|1234:fd2:5621:1:89::4500', AttributeValidationTool::modifyBeforeValidation('domain|ip', 'example.com|1234:0fd2:5621:0001:0089:0000:0000:4500'));
$this->assertEquals('1234:fd2:5621:1:89::4500|80', AttributeValidationTool::modifyBeforeValidation('ip-src|port', '1234:0fd2:5621:0001:0089:0000:0000:4500|80'));
}
private function shouldBeValid($type, array $values)
{
foreach ($values as $value) {