Skip to content

Commit 95c7daf

Browse files
rjd22jaapmarcus
authored andcommitted
Add separate netmask validation
1 parent ade1e2d commit 95c7daf

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

func/main.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -814,6 +814,14 @@ is_ip46_format_valid() {
814814
fi
815815
}
816816

817+
is_netmask_format_valid() {
818+
object_name=${2-netmask}
819+
valid=$($HESTIA_PHP -r '$netmask="$argv[1]"; echo (preg_match("/^(128|192|224|240|248|252|254|255)\.(0|128|192|224|240|248|252|254|255)\.(0|128|192|224|240|248|252|254|255)\.(0|128|192|224|240|248|252|254|255)/", $netmask) ? 0 : 1);' $1);
820+
if [ "$valid" -ne 0 ]; then
821+
check_result "$E_INVALID" "invalid $object_name :: $1"
822+
fi
823+
}
824+
817825
# Proxy extention format validator
818826
is_extention_format_valid() {
819827
exclude="[!|#|$|^|&|(|)|+|=|{|}|:|@|<|>|?|/|\|\"|'|;|%|\`| ]"
@@ -1215,7 +1223,7 @@ is_format_valid() {
12151223
month) is_cron_format_valid "$arg" $arg_name ;;
12161224
name) is_name_format_valid "$arg" "name" ;;
12171225
nat_ip) is_ip_format_valid "$arg" ;;
1218-
netmask) is_ip_format_valid "$arg" 'netmask' ;;
1226+
netmask) is_netmask_format_valid "$arg" 'netmask' ;;
12191227
newid) is_int_format_valid "$arg" 'id' ;;
12201228
ns1) is_domain_format_valid "$arg" 'ns1' ;;
12211229
ns2) is_domain_format_valid "$arg" 'ns2' ;;

0 commit comments

Comments
 (0)