upstream/opnsense-core
1
0
Fork 0
mirror of https://github.com/opnsense/core.git synced 2026-02-18 18:18:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Services: Dnsmasq DNS & DHCP: add IP address validations for some of the DHCPv4 and DHCPv6 options (#9790)

Browse source 
---------

Co-authored-by: Ad Schellevis <AdSchellevis@users.noreply.github.com>
Co-authored-by: Franco Fichtner <1915288+fichtner@users.noreply.github.com>
This commit is contained in:
Greelan 2026-02-16 23:14:15 +11:00 committed by GitHub
parent a0eee0cbd6
commit dfa65e1589
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/opnsense/mvc/app/models/OPNsense/Dnsmasq/Dnsmasq.php
View file

@ -385,20 +385,44 @@ class Dnsmasq extends BaseModel
if (
!$option->value->isEmpty() &&
!$option->option6->isEmpty()
in_array($option->option->getValue(), ['3','4','5','6','7','8','9','10','11'])
) {
$values = array_map('trim', $option->value->getValues());
$values = preg_split('/\s*,\s*/', trim($option->value->getValue()), -1, PREG_SPLIT_NO_EMPTY);
foreach ($values as $value) {
if (
Util::isIpv6Address(trim($value, '[]')) &&
!(str_starts_with($value, '[') && str_ends_with($value, ']'))
) {
if (!Util::isIpv4Address($value)) {
$messages->appendMessage(
new Message(
gettext("Only IPv4 addresses are allowed for the selected DHCP option."),
$key . ".value"
)
);
break;
}
}
}
if (
!$option->value->isEmpty() &&
in_array($option->option6->getValue(), ['22','23','31','34'])
) {
$values = preg_split('/\s*,\s*/', trim($option->value->getValue()), -1, PREG_SPLIT_NO_EMPTY);
foreach ($values as $value) {
if (!Util::isIpv6Address(trim($value, '[]'))) {
$messages->appendMessage(
new Message(
gettext("Only IPv6 addresses are allowed for the selected DHCPv6 option."),
$key . ".value"
)
);
break;
} elseif (!(str_starts_with($value, '[') && str_ends_with($value, ']'))) {
$messages->appendMessage(
new Message(
gettext("Each IPv6 address must be wrapped inside square brackets '[fe80::]'."),
$key . ".value"
)
);
break;
}
}
}