my $pve_fw_lock_filename = "/var/lock/pvefw.lck";
-# todo: define more MACROS
# imported/converted from: /usr/share/shorewall/macro.*
my $pve_fw_macros = {
'Amanda' => [
my $pve_fw_parsed_macros;
my $pve_fw_preferred_macro_names = {};
+# iptables -p icmp -h
+my $icmp_type_names = {
+ any => 1,
+ 'echo-reply' => 1,
+ 'destination-unreachable' => 1,
+ 'network-unreachable' => 1,
+ 'host-unreachable' => 1,
+ 'protocol-unreachable' => 1,
+ 'port-unreachable' => 1,
+ 'fragmentation-needed' => 1,
+ 'source-route-failed' => 1,
+ 'network-unknown' => 1,
+ 'host-unknown' => 1,
+ 'network-prohibited' => 1,
+ 'host-prohibited' => 1,
+ 'TOS-network-unreachable' => 1,
+ 'TOS-host-unreachable' => 1,
+ 'communication-prohibited' => 1,
+ 'host-precedence-violation' => 1,
+ 'precedence-cutoff' => 1,
+ 'source-quench' => 1,
+ 'redirect' => 1,
+ 'network-redirect' => 1,
+ 'host-redirect' => 1,
+ 'TOS-network-redirect' => 1,
+ 'TOS-host-redirect' => 1,
+ 'echo-request' => 1,
+ 'router-advertisement' => 1,
+ 'router-solicitation' => 1,
+ 'time-exceeded' => 1,
+ 'ttl-zero-during-transit' => 1,
+ 'ttl-zero-during-reassembly' => 1,
+ 'parameter-problem' => 1,
+ 'ip-header-bad' => 1,
+ 'required-option-missing' => 1,
+ 'timestamp-request' => 1,
+ 'timestamp-reply' => 1,
+ 'address-mask-request' => 1,
+ 'address-mask-reply' => 1,
+};
+
sub get_firewall_macros {
return $pve_fw_parsed_macros if $pve_fw_parsed_macros;
-
+
$pve_fw_parsed_macros = {};
foreach my $k (keys %$pve_fw_macros) {
close($fh);
- $etc_services = $services;
-
+ $etc_services = $services;
+
return $etc_services;
}
foreach my $item (split(/,/, $str)) {
my $portlist = "";
my $oldpon = undef;
+ $nbports++;
foreach my $pon (split(':', $item, 2)) {
$pon = $services->{byname}->{$pon}->{port} if $services->{byname}->{$pon}->{port};
if ($pon =~ m/^\d+$/){
}else{
die "invalid port $services->{byname}->{$pon}\n" if !$services->{byname}->{$pon};
}
- $nbports++;
}
}
$cmd .= " -m iprange --dst-range" if $rule->{nbdest} && $rule->{nbdest} > 1;
$cmd .= " -d $rule->{dest}" if $rule->{dest};
$cmd .= " -p $rule->{proto}" if $rule->{proto};
- $cmd .= " --match multiport" if $rule->{nbdport} && $rule->{nbdport} > 1;
- $cmd .= " --dport $rule->{dport}" if $rule->{dport};
- $cmd .= " --match multiport" if $rule->{nbsport} && $rule->{nbsport} > 1;
- $cmd .= " --sport $rule->{sport}" if $rule->{sport};
+
+ if (($rule->{nbdport} && $rule->{nbdport} > 1) ||
+ ($rule->{nbsport} && $rule->{nbsport} > 1)) {
+ $cmd .= " --match multiport"
+ }
+
+ if ($rule->{dport}) {
+ if ($rule->{proto} && $rule->{proto} eq 'icmp') {
+ # Note: we use dport to store --icmp-type
+ die "unknown icmp-type\n" if !$icmp_type_names->{$rule->{dport}};
+ $cmd .= " -m icmp --icmp-type $rule->{dport}";
+ } else {
+ if ($rule->{nbdport} && $rule->{nbdport} > 1) {
+ $cmd .= " --dports $rule->{dport}";
+ } else {
+ $cmd .= " --dport $rule->{dport}";
+ }
+ }
+ }
+
+ if ($rule->{sport}) {
+ if ($rule->{nbsport} && $rule->{nbsport} > 1) {
+ $cmd .= " --sports $rule->{sport}";
+ } else {
+ $cmd .= " --sport $rule->{sport}";
+ }
+ }
+
+ $cmd .= " -m addrtype --dst-type $rule->{dsttype}" if $rule->{dsttype};
if (my $action = $rule->{action}) {
$goto = 1 if !defined($goto) && $action eq 'PVEFW-SET-ACCEPT-MARK';
ruleset_addrule($ruleset, $chain, "-j LOG --log-prefix \"kvmhost-OUT dropped: \" --log-level 4");
ruleset_addrule($ruleset, $chain, "-j DROP");
-
+
ruleset_addrule($ruleset, "PVEFW-OUTPUT", "-j PVEFW-HOST-OUT");
ruleset_addrule($ruleset, "PVEFW-INPUT", "-j PVEFW-HOST-IN");
}
my $rules = $group_rules->{$group};
die "no such security group '$group'\n" if !$rules;
-
+
my $chain = "GROUP-${group}-IN";
ruleset_create_chain($ruleset, $chain);
if ($rules->{out}) {
foreach my $rule (@{$rules->{out}}) {
- # we go the PVEFW-SET-ACCEPT-MARK Instead of ACCEPT) because we need to
- # check also other tap rules (and group rules can be set on any bridge,
+ # we go the PVEFW-SET-ACCEPT-MARK Instead of ACCEPT) because we need to
+ # check also other tap rules (and group rules can be set on any bridge,
# so we can't go to VMBRXX-IN)
$rule->{action} = 'PVEFW-SET-ACCEPT-MARK' if $rule->{action} eq 'ACCEPT';
ruleset_generate_rule($ruleset, $chain, $rule);
if ($need_iface) {
$iface = undef if $iface && $iface eq '-';
- die "unknown interface '$iface'\n"
+ die "unknown interface '$iface'\n"
if defined($iface) && !$valid_netdev_names->{$iface};
}
$proto = undef if $proto && $proto eq '-';
- die "unknown protokol '$proto'\n" if $proto &&
+ die "unknown protokol '$proto'\n" if $proto &&
!(defined($protocols->{byname}->{$proto}) ||
defined($protocols->{byid}->{$proto}));
$nbsource = parse_address_list($source) if $source;
$nbdest = parse_address_list($dest) if $dest;
-
+
my $rules = [];
my $param = {
}
foreach my $rule (@$rules) {
- $rule->{nbdport} = parse_port_name_number_or_range($rule->{dport})
+ $rule->{nbdport} = parse_port_name_number_or_range($rule->{dport})
if defined($rule->{dport});
- $rule->{nbsport} = parse_port_name_number_or_range($rule->{sport})
+ $rule->{nbsport} = parse_port_name_number_or_range($rule->{sport})
if defined($rule->{sport});
}
next if !$res->{$section}; # skip undefined section
if ($section eq 'options') {
- eval {
- my ($opt, $value) = parse_fw_option($line);
+ eval {
+ my ($opt, $value) = parse_fw_option($line);
$res->{options}->{$opt} = $value;
};
warn "$prefix: $@" if $@;
my $group;
my $res = { in => [], out => [] };
-
+
while (defined(my $line = <$fh>)) {
next if $line =~ m/^#/;
next if $line =~ m/^\s*$/;
sub compile {
my $vmdata = read_local_vm_config();
my $rules = read_vm_firewall_rules($vmdata);
-
+
my $group_rules = {};
my $filename = "/etc/pve/firewall/groups.fw";
if (my $fh = IO::File->new($filename, O_RDONLY)) {
enablehostfw($ruleset, $host_rules, $group_rules);
}
- # generate firewall rules for QEMU VMs
+ # generate firewall rules for QEMU VMs
foreach my $vmid (keys %{$vmdata->{qemu}}) {
my $conf = $vmdata->{qemu}->{$vmid};
my $vmfw_conf = $rules->{$vmid};
$statushash->{$chain}->{sig} = $sig;
print "delete $chain ($sig)\n" if $verbose;
}
- }
+ }
return $statushash;
}
iptables_restore_cmdlist($cmdlist);
- # test: re-read status and check if everything is up to date
+ # test: re-read status and check if everything is up to date
$statushash = get_ruleset_status($ruleset);
my $errors;