lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 17:14:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

(mvc, model) add support for lists of networks/addresses in NetworkField, requirement for https://github.com/opnsense/core/issues/1226

Browse Source
This commit is contained in:
Ad Schellevis 2016-10-18 20:59:46 +02:00
parent f864511762
commit acb242efee
2 changed files with 66 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/NetworkField.php
View File

@ -52,6 +52,11 @@ class NetworkField extends BaseField
*/
protected $internalNetMaskRequired = false;
/**
* @var null when multiple values could be provided at once, specify the split character
*/
protected $internalFieldSeparator = null;
/**
* always lowercase / trim networks
* @param string $value
@ -74,6 +79,15 @@ class NetworkField extends BaseField
}
}
/**
* if multiple addresses / networks maybe provided at once, set separator.
* @param $value separator
*/
public function setFieldSeparator($value)
{
$this->internalFieldSeparator = $value;
}
/**
* retrieve field validators for this field type
* @return array returns Text/regex validator
@ -86,6 +100,7 @@ class NetworkField extends BaseField
// accept any as target
$validators[] = new NetworkValidator(array(
'message' => $this->internalValidationMessage,
'split' => $this->internalFieldSeparator,
'netMaskRequired' => $this->internalNetMaskRequired
));
}

96
src/opnsense/mvc/app/models/OPNsense/Base/Validators/NetworkValidator.php
View File

@ -57,63 +57,69 @@ class NetworkValidator extends Validator implements ValidatorInterface
public function validate(\Phalcon\Validation $validator, $attribute)
{
$result = true;
$value = $validator->getValue($attribute);
$msg = $this->getOption('message');
// parse filter options
$filterOpt = 0;
switch (strtolower($this->getOption('version'))) {
case "ipv4":
$filterOpt |= FILTER_FLAG_IPV4;
break;
case "ipv6":
$filterOpt |= FILTER_FLAG_IPV6;
break;
default:
$filterOpt |= FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6;
$fieldSplit = $this->getOption('split', null);
if ($fieldSplit == null) {
$values = array($validator->getValue($attribute));
} else {
$values = explode($fieldSplit, $validator->getValue($attribute));
}
foreach ($values as $value) {
// parse filter options
$filterOpt = 0;
switch (strtolower($this->getOption('version'))) {
case "ipv4":
$filterOpt |= FILTER_FLAG_IPV4;
break;
case "ipv6":
$filterOpt |= FILTER_FLAG_IPV6;
break;
default:
$filterOpt |= FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6;
}
if ($this->getOption('noReserved') === true) {
$filterOpt |= FILTER_FLAG_NO_RES_RANGE;
}
if ($this->getOption('noReserved') === true) {
$filterOpt |= FILTER_FLAG_NO_RES_RANGE;
}
if ($this->getOption('noPrivate') === true) {
$filterOpt |= FILTER_FLAG_NO_PRIV_RANGE;
}
if ($this->getOption('noPrivate') === true) {
$filterOpt |= FILTER_FLAG_NO_PRIV_RANGE;
}
// split network
if (strpos($value, "/") !== false) {
$parts = explode("/", $value);
if (count($parts) > 2 || !ctype_digit($parts[1])) {
// more parts then expected or second part is not numeric
$result = false;
} else {
$mask = $parts[1];
$value = $parts[0];
if (strpos($parts[0], ".")) {
// most likely ipv4 address, mask must be between 0..32
if ($mask < 0 || $mask > 32) {
$result = false;
}
// split network
if (strpos($value, "/") !== false) {
$parts = explode("/", $value);
if (count($parts) > 2 || !ctype_digit($parts[1])) {
// more parts then expected or second part is not numeric
$result = false;
} else {
// probably ipv6, mask must be between 0..128
if ($mask < 0 || $mask > 128) {
$result = false;
$mask = $parts[1];
$value = $parts[0];
if (strpos($parts[0], ".")) {
// most likely ipv4 address, mask must be between 0..32
if ($mask < 0 || $mask > 32) {
$result = false;
}
} else {
// probably ipv6, mask must be between 0..128
if ($mask < 0 || $mask > 128) {
$result = false;
}
}
}
} elseif ($this->getOption('netMaskRequired') === true) {
$result = false;
}
} elseif ($this->getOption('netMaskRequired') === true) {
$result = false;
}
if (filter_var($value, FILTER_VALIDATE_IP, $filterOpt) === false) {
$result = false;
}
if (filter_var($value, FILTER_VALIDATE_IP, $filterOpt) === false) {
$result = false;
}
if (!$result) {
// append validation message
$validator->appendMessage(new Message($msg, $attribute, 'NetworkValidator'));
if (!$result) {
// append validation message
$validator->appendMessage(new Message($msg, $attribute, 'NetworkValidator'));
}
}
return $result;