michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 08:40:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add validation for CIDR too

Browse Source
This commit is contained in:
Ilia Ross
2025-01-19 19:30:22 +02:00
parent a2520b4396
commit 186e578802
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
firewalld/firewalld-lib.pl
View File

@@ -420,11 +420,23 @@ my $family = delete($opts{'family'}) || 'ipv4';
# Validate IP addresses, and update family if needed
foreach my $ip_key ('source address', 'destination address') {
if (my $ip = $opts{$ip_key}) {
$ip =~ s/\/\d+$//; # Remove CIDR
&check_ipaddress($ip) || &check_ip6address($ip) ||
&error("$text{'list_rule_iperr'} ($ip_key: $ip)");
$family = $ip =~ /:/ ? 'ipv6' : 'ipv4';
if (my $full_ip = $opts{$ip_key}) {
# Split IP and CIDR, if present
my ($ip_only, $cidr) = split(/\//, $full_ip);
# Validate the IP portion
&check_ipaddress($ip_only) || &check_ip6address($ip_only) ||
&error("$text{'list_rule_iperr'} : $ip_only");
# Decide family based on presence of ':' in IP portion
my $family = $ip_only =~ /:/ ? 'ipv6' : 'ipv4';
# If you still want to test or store the CIDR, do it here
if (defined($cidr)) {
# Make sure CIDR is numeric and within range
$cidr =~ /^\d+$/ && $cidr <= ($family eq 'ipv6' ? 128 : 32) ||
&error("$text{'list_rule_cidrerr'} : /$cidr");
}
}
}