lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 08:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

wizard: restrict to validating IPv4; closes #6681

Browse Source 
The system wizard is IPv4 only but doesn't use the correct
function.  It's debatable if we need to restrict DNS servers
but if all of this is only IPv4 we should stick to it in a
consistsent way.
This commit is contained in:
Franco Fichtner 2023-07-25 09:13:45 +02:00
parent e5538188a2
commit c9bd89752b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/wizard/system.xml
View File

@ -146,10 +146,10 @@ if (empty($_POST['hostname']) || !is_hostname($_POST['hostname'])) {
if (empty($_POST['domain']) || !is_domain($_POST['domain'])) {
$input_errors[] = gettext('Domain is invalid.');
}
if (!empty($_POST['primarydnsserver']) && !is_ipaddr($_POST['primarydnsserver'])) {
if (!empty($_POST['primarydnsserver']) && !is_ipaddrv4($_POST['primarydnsserver'])) {
$input_errors[] = gettext('Primary DNS server is invalid.');
}
if (!empty($_POST['secondarydnsserver']) && !is_ipaddr($_POST['secondarydnsserver'])) {
if (!empty($_POST['secondarydnsserver']) && !is_ipaddrv4($_POST['secondarydnsserver'])) {
$input_errors[] = gettext('Second DNS server is invalid.');
}
if (!empty($input_errors)) {
@ -436,7 +436,7 @@ if (!empty($_POST['macaddress']) && !is_macaddr($_POST['macaddress'])) {
$input_errors[] = gettext('Invalid MAC address.');
}
if (!empty($_POST['ipaddress']) && ($_POST['selectedtype'] == "Static")) {
if (!is_ipaddr($_POST['ipaddress'])) {
if (!is_ipaddrv4($_POST['ipaddress'])) {
$input_errors[] = gettext('Invalid WAN IP address.');
}
if ($_POST['subnetmask'] < 31 &&
@ -448,10 +448,10 @@ if (!empty($_POST['ipaddress']) && ($_POST['selectedtype'] == "Static")) {
if (!empty($_POST['dhcphostname']) && !is_hostname($_POST['dhcphostname'])) {
$input_errors[] = gettext('Invalid DHCP hostname.');
}
if (!empty($_POST['pptplocalipaddress']) && !is_ipaddr($_POST['pptplocalipaddress'])) {
if (!empty($_POST['pptplocalipaddress']) && !is_ipaddrv4($_POST['pptplocalipaddress'])) {
$input_errors[] = gettext('Invalid PPTP Local IP address.');
}
if (!empty($_POST['pptpremoteipaddress']) && !is_ipaddr($_POST['pptpremoteipaddress'])) {
if (!empty($_POST['pptpremoteipaddress']) && !is_ipaddrv4($_POST['pptpremoteipaddress'])) {
$input_errors[] = gettext('Invalid PPTP Remote IP address.');
}
if (!empty($input_errors)) {
@ -529,7 +529,7 @@ if ($_POST['selectedtype'] != "Static") {
</fields>
<stepsubmitphpaction><![CDATA[
if (!empty(trim($_POST['lanipaddress']))) {
if (!is_ipaddr($_POST['lanipaddress'])) {
if (!is_ipaddrv4($_POST['lanipaddress'])) {
$input_errors[] = gettext('Invalid LAN IP address.');
}