my $rule_format = "%-15s %-30s %-30s %-15s %-15s %-15s\n";
-sub iptables {
- my ($cmd) = @_;
-
- run_command("/sbin/iptables $cmd", outfunc => sub {}, errfunc => sub {});
-}
-
sub iptables_restore_cmdlist {
my ($cmdlist) = @_;
sub ipset_chain_digest {
my ($rules) = @_;
+
my $digest = Digest::SHA->new('sha1');
foreach my $rule (sort @$rules) { # note: sorted
$digest->add($rule);
return $res;
}
-sub iptables_chain_exist {
- my ($chain) = @_;
-
- eval{
- iptables("-n --list $chain");
- };
- return undef if $@;
-
- return 1;
-}
-
-sub iptables_rule_exist {
- my ($rule) = @_;
-
- eval{
- iptables("-C $rule");
- };
- return undef if $@;
-
- return 1;
-}
-
sub ruleset_generate_cmdstr {
my ($ruleset, $chain, $rule, $actions, $goto) = @_;
next;
}
- if ($line =~ m/^\[ipgroup\s+(\S+)\]\s*$/i) {
- $section = 'ipset';
- $group = lc($1);
- $res->{$section}->{$group}->{type} = 'hash:ip family inet hashsize 1024 maxelem 65536 ';
- next;
- }
-
if ($line =~ m/^\[netgroup\s+(\S+)\]\s*$/i) {
$section = 'ipset';
$group = lc($1);
- $res->{$section}->{$group}->{type} = 'hash:net family inet hashsize 1024 maxelem 65536 ';
next;
}
push @{$res->{$section}->{$group}}, $rule;
} elsif ($section eq 'ipset') {
chomp $line;
- my $ip;
- if (!Net::IP->new($line)) {
+ $line =~ m/^(\!)?(\s)?((\d+)\.(\d+)\.(\d+)\.(\d+)(\/(\d+))?)/;
+ my $nomatch = $1;
+ my $ip = $3;
+
+ if(!$ip){
+ warn "$prefix: $line is not an valid ip address";
+ next;
+ }
+ if (!Net::IP->new($ip)) {
warn "$prefix: $line is not an valid ip address";
next;
}
- push @{$res->{$section}->{$group}->{ip}}, $line;
+ $ip .= " nomatch" if $nomatch;
+
+ push @{$res->{$section}->{$group}}, $ip;
}
}
$res->{digest} = $digest->b64digest;
-
return $res;
}
sub generate_ipset {
my ($ipset_ruleset, $name, $options) = @_;
- push @{$ipset_ruleset->{$name}}, "create $name $options->{type}";
+ my $hashsize = @{$options};
+ if ($hashsize <= 64){
+ $hashsize = 64;
+ }else{
+ $hashsize = round_powerof2($hashsize);
+ }
- foreach my $ip (@{$options->{ip}}) {
+ push @{$ipset_ruleset->{$name}}, "create $name hash:net family inet hashsize $hashsize maxelem $hashsize ";
+
+ foreach my $ip (@{$options}) {
push @{$ipset_ruleset->{$name}}, "add $name $ip";
}
+
+}
+
+sub round_powerof2 {
+ my ($int) = @_;
+
+ $int--;
+ $int |= $int >> $_ foreach (1,2,4,8,16);
+ return ++$int;
}
+
sub save_pvefw_status {
my ($status) = @_;
}
sub get_ruleset_status {
- my ($ruleset, $verbose, $ipset) = @_;
-
- my $active_chains = undef;
- if($ipset){
- $active_chains = ipset_get_chains();
- }else{
- $active_chains = iptables_get_chains();
- }
+ my ($ruleset, $active_chains, $digest_fn, $verbose) = @_;
my $statushash = {};
foreach my $chain (sort keys %$ruleset) {
- my $sig;
- if ($ipset) {
- $sig = ipset_chain_digest($ruleset->{$chain});
- } else {
- $sig = iptables_chain_digest($ruleset->{$chain});
- }
+ my $sig = &$digest_fn($ruleset->{$chain});
$statushash->{$chain}->{sig} = $sig;
print "delete $chain ($sig)\n" if $verbose;
}
}
-
+
return $statushash;
}
my ($ruleset, $verbose) = @_;
my $cmdlist = "*filter\n"; # we pass this to iptables-restore;
-
- my $statushash = get_ruleset_status($ruleset, $verbose);
+
+ my ($active_chains, $hooks) = iptables_get_chains();
+ my $statushash = get_ruleset_status($ruleset, $active_chains, \&iptables_chain_digest, $verbose);
# create missing chains first
foreach my $chain (sort keys %$ruleset) {
$cmdlist .= ":$chain - [0:0]\n";
}
- my $rule = "INPUT -j PVEFW-INPUT";
- if (!PVE::Firewall::iptables_rule_exist($rule)) {
- $cmdlist .= "-A $rule\n";
- }
- $rule = "OUTPUT -j PVEFW-OUTPUT";
- if (!PVE::Firewall::iptables_rule_exist($rule)) {
- $cmdlist .= "-A $rule\n";
- }
-
- $rule = "FORWARD -j PVEFW-FORWARD";
- if (!PVE::Firewall::iptables_rule_exist($rule)) {
- $cmdlist .= "-A $rule\n";
+ foreach my $h (qw(INPUT OUTPUT FORWARD)) {
+ if (!$hooks->{$h}) {
+ $cmdlist .= "-A $h -j PVEFW-$h\n";
+ }
}
foreach my $chain (sort keys %$ruleset) {
}
my $changes = $cmdlist ne "*filter\n" ? 1 : 0;
-
+
$cmdlist .= "COMMIT\n";
return wantarray ? ($cmdlist, $changes) : $cmdlist;
}
sub get_ipset_cmdlist {
- my ($ruleset, $verbose) = @_;
+ my ($ruleset, $delete, $verbose) = @_;
my $cmdlist = "";
- my $statushash = get_ruleset_status($ruleset, $verbose, 1);
+ my $active_chains = ipset_get_chains();
+ my $statushash = get_ruleset_status($ruleset, $active_chains, \&ipset_chain_digest, $verbose);
- foreach my $chain (sort keys %$ruleset) {
- my $stat = $statushash->{$chain};
- die "internal error" if !$stat;
+ if(!$delete){
- if ($stat->{action} eq 'create') {
- foreach my $cmd (@{$ruleset->{$chain}}) {
+ foreach my $chain (sort keys %$ruleset) {
+ my $stat = $statushash->{$chain};
+ die "internal error" if !$stat;
+
+ if ($stat->{action} eq 'create') {
+ foreach my $cmd (@{$ruleset->{$chain}}) {
$cmdlist .= "$cmd\n";
+ }
}
- }
- if ($stat->{action} eq 'update') {
- my $chain_swap = $chain."_swap";
-
- foreach my $cmd (@{$ruleset->{$chain}}) {
- $cmd =~ s/$chain/$chain_swap/;
- $cmdlist .= "$cmd\n";
+ if ($stat->{action} eq 'update') {
+ my $chain_swap = $chain."_swap";
+ foreach my $cmd (@{$ruleset->{$chain}}) {
+ $cmd =~ s/$chain/$chain_swap/;
+ $cmdlist .= "$cmd\n";
+ }
+ $cmdlist .= "swap $chain_swap $chain\n";
+ $cmdlist .= "flush $chain_swap\n";
+ $cmdlist .= "destroy $chain_swap\n";
}
- $cmdlist .= "swap $chain_swap $chain\n";
- $cmdlist .= "flush $chain_swap\n";
- $cmdlist .= "destroy $chain_swap\n";
- }
- }
+ }
- foreach my $chain (keys %$statushash) {
- next if $statushash->{$chain}->{action} ne 'delete';
+ }else{
+
+ foreach my $chain (keys %$statushash) {
+ next if $statushash->{$chain}->{action} ne 'delete';
- $cmdlist .= "flush $chain\n";
- $cmdlist .= "destroy $chain\n";
+ $cmdlist .= "flush $chain\n";
+ $cmdlist .= "destroy $chain\n";
+ }
}
my $changes = $cmdlist ? 1 : 0;
update_nf_conntrack_max($hostfw_conf);
- my $ipsetcmdlist = get_ipset_cmdlist($ipset_ruleset, $verbose);
+ my $ipset_create_cmdlist = get_ipset_cmdlist($ipset_ruleset, undef, $verbose);
+
+ my $ipset_delete_cmdlist = get_ipset_cmdlist($ipset_ruleset, 1, $verbose);
my $cmdlist = get_ruleset_cmdlist($ruleset, $verbose);
- print $ipsetcmdlist if $verbose;
+ print $ipset_create_cmdlist if $verbose;
+
+ print $ipset_delete_cmdlist if $verbose;
print $cmdlist if $verbose;
- ipset_restore_cmdlist($ipsetcmdlist);
+ ipset_restore_cmdlist($ipset_create_cmdlist);
iptables_restore_cmdlist($cmdlist);
+ ipset_restore_cmdlist($ipset_delete_cmdlist);
+
# test: re-read status and check if everything is up to date
- my $statushash = get_ruleset_status($ruleset);
+ my $active_chains = iptables_get_chains();
+ my $statushash = get_ruleset_status($ruleset, $active_chains, \&iptables_chain_digest, $verbose);
my $errors;
foreach my $chain (sort keys %$ruleset) {
projects / pve-firewall.git / blobdiff