return $res;
}
+# substitude action of rule according to action hash
+sub rule_substitude_action {
+ my ($rule, $actions) = @_;
+
+ if (my $action = $rule->{action}) {
+ $rule->{action} = $actions->{$action} if defined($actions->{$action});
+ }
+}
+
# generate a src or dst match
# $dir(ection) is either d or s
sub ipt_gen_src_or_dst_match {
return @iptcmds;
}
-sub ruleset_generate_match {
- my ($ruleset, $chain, $ipversion, $rule, $actions, $goto, $cluster_conf, $fw_conf) = @_;
-
- return if defined($rule->{enable}) && !$rule->{enable};
- return if $rule->{errors};
-
- return $rule->{match} if defined $rule->{match};
-
- die "unable to emit macro - internal error" if $rule->{macro}; # should not happen
-
- my $nbdport = defined($rule->{dport}) ? parse_port_name_number_or_range($rule->{dport}, 1) : 0;
- my $nbsport = defined($rule->{sport}) ? parse_port_name_number_or_range($rule->{sport}, 0) : 0;
-
- my @cmd = ();
-
- push @cmd, "-i $rule->{iface_in}" if $rule->{iface_in};
- push @cmd, "-o $rule->{iface_out}" if $rule->{iface_out};
-
- my $source = $rule->{source};
- my $dest = $rule->{dest};
-
- push @cmd, ipt_gen_src_or_dst_match($source, 's', $ipversion, $cluster_conf, $fw_conf) if $source;
- push @cmd, ipt_gen_src_or_dst_match($dest, 'd', $ipversion, $cluster_conf, $fw_conf) if $dest;
-
- if (my $proto = $rule->{proto}) {
- push @cmd, "-p $proto";
-
- my $multiport = 0;
- $multiport++ if $nbdport > 1;
- $multiport++ if $nbsport > 1;
-
- push @cmd, "--match multiport" if $multiport;
-
- die "multiport: option '--sports' cannot be used together with '--dports'\n"
- if ($multiport == 2) && ($rule->{dport} ne $rule->{sport});
-
- if ($rule->{dport}) {
- if ($proto eq 'icmp') {
- # Note: we use dport to store --icmp-type
- die "unknown icmp-type '$rule->{dport}'\n"
- if $rule->{dport} !~ /^\d+$/ && !defined($icmp_type_names->{$rule->{dport}});
- push @cmd, "-m icmp --icmp-type $rule->{dport}";
- } elsif ($proto eq 'icmpv6') {
- # Note: we use dport to store --icmpv6-type
- die "unknown icmpv6-type '$rule->{dport}'\n"
- if $rule->{dport} !~ /^\d+$/ && !defined($icmpv6_type_names->{$rule->{dport}});
- push @cmd, "-m icmpv6 --icmpv6-type $rule->{dport}";
- } elsif (!$PROTOCOLS_WITH_PORTS->{$proto}) {
- die "protocol $proto does not have ports\n";
- } else {
- if ($nbdport > 1) {
- if ($multiport == 2) {
- push @cmd, "--ports $rule->{dport}";
- } else {
- push @cmd, "--dports $rule->{dport}";
- }
- } else {
- push @cmd, "--dport $rule->{dport}";
- }
- }
- }
-
- if ($rule->{sport}) {
- die "protocol $proto does not have ports\n"
- if !$PROTOCOLS_WITH_PORTS->{$proto};
- if ($nbsport > 1) {
- push @cmd, "--sports $rule->{sport}" if $multiport != 2;
- } else {
- push @cmd, "--sport $rule->{sport}";
- }
- }
- } elsif ($rule->{dport} || $rule->{sport}) {
- die "destination port '$rule->{dport}', but no protocol specified\n" if $rule->{dport};
- die "source port '$rule->{sport}', but no protocol specified\n" if $rule->{sport};
- }
-
- push @cmd, "-m addrtype --dst-type $rule->{dsttype}" if $rule->{dsttype};
-
- return scalar(@cmd) ? join(' ', @cmd) : undef;
-}
-
-sub ruleset_generate_action {
- my ($ruleset, $chain, $ipversion, $rule, $actions, $goto, $cluster_conf, $fw_conf) = @_;
-
- return $rule->{target} if defined $rule->{target};
-
- my @cmd = ();
-
- if (my $action = $rule->{action}) {
- $action = $actions->{$action} if defined($actions->{$action});
- $goto = 1 if !defined($goto) && $action eq 'PVEFW-SET-ACCEPT-MARK';
- push @cmd, $goto ? "-g $action" : "-j $action";
- }
-
- return scalar(@cmd) ? join(' ', @cmd) : undef;
-}
-
sub ruleset_generate_rule {
- my ($ruleset, $chain, $ipversion, $rule, $actions, $goto, $cluster_conf, $fw_conf) = @_;
+ my ($ruleset, $chain, $ipversion, $rule, $cluster_conf, $fw_conf) = @_;
my $rules;
}
}
-sub ruleset_generate_rule_old {
- my ($ruleset, $chain, $ipversion, $rule, $actions, $goto, $cluster_conf, $fw_conf) = @_;
-
- my $rules;
-
- if ($rule->{macro}) {
- $rules = &$apply_macro($rule->{macro}, $rule, 0, $ipversion);
- } else {
- $rules = [ $rule ];
- }
-
- # update all or nothing
-
- # fixme: lots of temporary ugliness
- my @mstrs = ();
- my @astrs = ();
- my @logging = ();
- my @logmsg = ();
- foreach my $tmp (@$rules) {
- my $m = ruleset_generate_match($ruleset, $chain, $ipversion, $tmp, $actions, $goto, $cluster_conf, $fw_conf);
- my $a = ruleset_generate_action($ruleset, $chain, $ipversion, $tmp, $actions, $goto, $cluster_conf, $fw_conf);
- if (defined $m or defined $a) {
- push @mstrs, defined($m) ? $m : "";
- push @astrs, defined($a) ? $a : "";
- push @logging, $tmp->{log};
- push @logmsg, $tmp->{logmsg};
- }
- }
-
- for my $i (0 .. $#mstrs) {
- ruleset_addrule($ruleset, $chain, $mstrs[$i], $astrs[$i], $logging[$i], $logmsg[$i]);
- }
-}
-
-sub ruleset_generate_rule_insert {
- my ($ruleset, $chain, $ipversion, $rule, $actions, $goto) = @_;
-
- die "implement me" if $rule->{macro}; # not implemented, because not needed so far
-
- my $match = ruleset_generate_match($ruleset, $chain, $ipversion, $rule, $actions, $goto);
- my $action = ruleset_generate_action($ruleset, $chain, $ipversion, $rule, $actions, $goto);
- if (defined $match && defined $action) {
- ruleset_insertrule($ruleset, $chain, $match, $action);
- }
-}
-
sub ruleset_create_chain {
my ($ruleset, $chain) = @_;
if ($policy eq 'ACCEPT') {
- ruleset_generate_rule_old($ruleset, $chain, $ipversion, { action => 'ACCEPT' },
- { ACCEPT => $accept_action});
+ my $rule = { action => 'ACCEPT' };
+ rule_substitude_action($rule, { ACCEPT => $accept_action});
+ ruleset_generate_rule($ruleset, $chain, $ipversion, $rule);
} elsif ($policy eq 'DROP') {
next if $rule->{type} ne $lc_direction;
eval {
if ($direction eq 'OUT') {
- ruleset_generate_rule_old($ruleset, $chain, $ipversion, $rule,
- { ACCEPT => "PVEFW-SET-ACCEPT-MARK", REJECT => "PVEFW-reject" },
- undef, $cluster_conf, $vmfw_conf);
+ rule_substitude_action($rule, { ACCEPT => "PVEFW-SET-ACCEPT-MARK", REJECT => "PVEFW-reject" });
+ ruleset_generate_rule($ruleset, $chain, $ipversion, $rule, $cluster_conf, $vmfw_conf);
} else {
- ruleset_generate_rule_old($ruleset, $chain, $ipversion, $rule,
- { ACCEPT => $in_accept , REJECT => "PVEFW-reject" },
- undef, $cluster_conf, $vmfw_conf);
+ rule_substitude_action($rule, { ACCEPT => $in_accept , REJECT => "PVEFW-reject" });
+ ruleset_generate_rule($ruleset, $chain, $ipversion, $rule, $cluster_conf, $vmfw_conf);
}
};
warn $@ if $@;
if ($rule->{type} eq 'group') {
ruleset_add_group_rule($ruleset, $cluster_conf, $chain, $rule, 'IN', $accept_action, $ipversion);
} elsif ($rule->{type} eq 'in') {
- ruleset_generate_rule_old($ruleset, $chain, $ipversion, $rule,
- { ACCEPT => $accept_action, REJECT => "PVEFW-reject" },
- undef, $cluster_conf, $hostfw_conf);
+ rule_substitude_action($rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" });
+ ruleset_generate_rule($ruleset, $chain, $ipversion, $rule, $cluster_conf, $hostfw_conf);
}
};
warn $@ if $@;
if ($rule->{type} eq 'group') {
ruleset_add_group_rule($ruleset, $cluster_conf, $chain, $rule, 'OUT', $accept_action, $ipversion);
} elsif ($rule->{type} eq 'out') {
- ruleset_generate_rule_old($ruleset, $chain, $ipversion,
- $rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" },
- undef, $cluster_conf, $hostfw_conf);
+ rule_substitude_action($rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" });
+ ruleset_generate_rule($ruleset, $chain, $ipversion, $rule, $cluster_conf, $hostfw_conf);
}
};
warn $@ if $@;
foreach my $rule (@$rules) {
next if $rule->{type} ne 'in';
next if $rule->{ipversion} && $rule->{ipversion} ne $ipversion;
- ruleset_generate_rule_old($ruleset, $chain, $ipversion, $rule,
- { ACCEPT => "PVEFW-SET-ACCEPT-MARK", REJECT => "PVEFW-reject" },
- undef, $cluster_conf);
+ rule_substitude_action($rule, { ACCEPT => "PVEFW-SET-ACCEPT-MARK", REJECT => "PVEFW-reject" });
+ ruleset_generate_rule($ruleset, $chain, $ipversion, $rule, $cluster_conf);
}
$chain = "GROUP-${group}-OUT";
next if $rule->{ipversion} && $rule->{ipversion} ne $ipversion;
# we use PVEFW-SET-ACCEPT-MARK (Instead of ACCEPT) because we need to
# check also other tap rules later
- ruleset_generate_rule_old($ruleset, $chain, $ipversion, $rule,
- { ACCEPT => 'PVEFW-SET-ACCEPT-MARK', REJECT => "PVEFW-reject" },
- undef, $cluster_conf);
+ rule_substitude_action($rule, { ACCEPT => 'PVEFW-SET-ACCEPT-MARK', REJECT => "PVEFW-reject" });
+ ruleset_generate_rule($ruleset, $chain, $ipversion, $rule, $cluster_conf);
}
}
projects / pve-firewall.git / blobdiff