my $pve_fw_lock_filename = "/var/lock/pvefw.lck";
-my $macros;
+# todo: define more MACROS
+# imported/converted from: /usr/share/shorewall/macro.*
+my $pve_fw_macros = {
+ 'Amanda' => [
+ { action => 'PARAM', proto => 'udp', dport => '10080' },
+ { action => 'PARAM', proto => 'tcp', dport => '10080' },
+ ],
+ 'Auth' => [
+ { action => 'PARAM', proto => 'tcp', dport => '113' },
+ ],
+ 'BGP' => [
+ { action => 'PARAM', proto => 'tcp', dport => '179' },
+ ],
+ 'BitTorrent' => [
+ { action => 'PARAM', proto => 'tcp', dport => '6881:6889' },
+ { action => 'PARAM', proto => 'udp', dport => '6881' },
+ ],
+ 'BitTorrent32' => [
+ { action => 'PARAM', proto => 'tcp', dport => '6881:6999' },
+ { action => 'PARAM', proto => 'udp', dport => '6881' },
+ ],
+ 'CVS' => [
+ { action => 'PARAM', proto => 'tcp', dport => '2401' },
+ ],
+ 'Citrix' => [
+ { action => 'PARAM', proto => 'tcp', dport => '1494' },
+ { action => 'PARAM', proto => 'udp', dport => '1604' },
+ { action => 'PARAM', proto => 'tcp', dport => '2598' },
+ ],
+ 'DAAP' => [
+ { action => 'PARAM', proto => 'tcp', dport => '3689' },
+ { action => 'PARAM', proto => 'udp', dport => '3689' },
+ ],
+ 'DCC' => [
+ { action => 'PARAM', proto => 'tcp', dport => '6277' },
+ ],
+ 'DHCPfwd' => [
+ { action => 'PARAM', proto => 'udp', dport => '67:68', sport => '67:68' },
+ { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '67:68', sport => '67:68' },
+ ],
+ 'DNS' => [
+ { action => 'PARAM', proto => 'udp', dport => '53' },
+ { action => 'PARAM', proto => 'tcp', dport => '53' },
+ ],
+ 'Distcc' => [
+ { action => 'PARAM', proto => 'tcp', dport => '3632' },
+ ],
+ 'Edonkey' => [
+ { action => 'PARAM', proto => 'tcp', dport => '4662' },
+ { action => 'PARAM', proto => 'udp', dport => '4665' },
+ ],
+ 'FTP' => [
+ { action => 'PARAM', proto => 'tcp', dport => '21' },
+ ],
+ 'Finger' => [
+ { action => 'PARAM', proto => 'tcp', dport => '79' },
+ ],
+ 'GNUnet' => [
+ { action => 'PARAM', proto => 'tcp', dport => '2086' },
+ { action => 'PARAM', proto => 'udp', dport => '2086' },
+ { action => 'PARAM', proto => 'tcp', dport => '1080' },
+ { action => 'PARAM', proto => 'udp', dport => '1080' },
+ ],
+ 'GRE' => [
+ { action => 'PARAM', proto => '47' },
+ { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => '47' },
+ ],
+ 'Git' => [
+ { action => 'PARAM', proto => 'tcp', dport => '9418' },
+ ],
+ 'Gnutella' => [
+ { action => 'PARAM', proto => 'tcp', dport => '6346' },
+ { action => 'PARAM', proto => 'udp', dport => '6346' },
+ ],
+ 'HKP' => [
+ { action => 'PARAM', proto => 'tcp', dport => '11371' },
+ ],
+ 'HTTP' => [
+ { action => 'PARAM', proto => 'tcp', dport => '80' },
+ ],
+ 'HTTPS' => [
+ { action => 'PARAM', proto => 'tcp', dport => '443' },
+ ],
+ 'ICPV2' => [
+ { action => 'PARAM', proto => 'udp', dport => '3130' },
+ ],
+ 'ICQ' => [
+ { action => 'PARAM', proto => 'tcp', dport => '5190' },
+ ],
+ 'IMAP' => [
+ { action => 'PARAM', proto => 'tcp', dport => '143' },
+ ],
+ 'IMAPS' => [
+ { action => 'PARAM', proto => 'tcp', dport => '993' },
+ ],
+ 'IPIP' => [
+ { action => 'PARAM', proto => '94' },
+ { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => '94' },
+ ],
+ 'IPP' => [
+ { action => 'PARAM', proto => 'tcp', dport => '631' },
+ ],
+ 'IPPbrd' => [
+ { action => 'PARAM', proto => 'udp', dport => '631' },
+ ],
+ 'IPPserver' => [
+ { action => 'PARAM', source => 'SOURCE', dest => 'DEST', proto => 'tcp', dport => '631' },
+ { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '631' },
+ ],
+ 'IPsec' => [
+ { action => 'PARAM', proto => 'udp', dport => '500', sport => '500' },
+ { action => 'PARAM', proto => '50' },
+ { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '500', sport => '500' },
+ { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => '50' },
+ ],
+ 'IPsecah' => [
+ { action => 'PARAM', proto => 'udp', dport => '500', sport => '500' },
+ { action => 'PARAM', proto => '51' },
+ { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '500', sport => '500' },
+ { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => '51' },
+ ],
+ 'IPsecnat' => [
+ { action => 'PARAM', proto => 'udp', dport => '500' },
+ { action => 'PARAM', proto => 'udp', dport => '4500' },
+ { action => 'PARAM', proto => '50' },
+ { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '500' },
+ { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '4500' },
+ { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => '50' },
+ ],
+ 'IRC' => [
+ { action => 'PARAM', proto => 'tcp', dport => '6667' },
+ ],
+ 'JabberPlain' => [
+ { action => 'PARAM', proto => 'tcp', dport => '5222' },
+ ],
+ 'JabberSecure' => [
+ { action => 'PARAM', proto => 'tcp', dport => '5223' },
+ ],
+ 'Jabberd' => [
+ { action => 'PARAM', proto => 'tcp', dport => '5269' },
+ ],
+ 'Jetdirect' => [
+ { action => 'PARAM', proto => 'tcp', dport => '9100' },
+ ],
+ 'L2TP' => [
+ { action => 'PARAM', proto => 'udp', dport => '1701' },
+ { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '1701' },
+ ],
+ 'LDAP' => [
+ { action => 'PARAM', proto => 'tcp', dport => '389' },
+ ],
+ 'LDAPS' => [
+ { action => 'PARAM', proto => 'tcp', dport => '636' },
+ ],
+ 'MSNP' => [
+ { action => 'PARAM', proto => 'tcp', dport => '1863' },
+ ],
+ 'MSSQL' => [
+ { action => 'PARAM', proto => 'tcp', dport => '1433' },
+ ],
+ 'Mail' => [
+ { action => 'PARAM', proto => 'tcp', dport => '25' },
+ { action => 'PARAM', proto => 'tcp', dport => '465' },
+ { action => 'PARAM', proto => 'tcp', dport => '587' },
+ ],
+ 'Munin' => [
+ { action => 'PARAM', proto => 'tcp', dport => '4949' },
+ ],
+ 'MySQL' => [
+ { action => 'PARAM', proto => 'tcp', dport => '3306' },
+ ],
+ 'NNTP' => [
+ { action => 'PARAM', proto => 'tcp', dport => '119' },
+ ],
+ 'NNTPS' => [
+ { action => 'PARAM', proto => 'tcp', dport => '563' },
+ ],
+ 'NTP' => [
+ { action => 'PARAM', proto => 'udp', dport => '123' },
+ ],
+ 'NTPbi' => [
+ { action => 'PARAM', proto => 'udp', dport => '123' },
+ { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '123' },
+ ],
+ 'NTPbrd' => [
+ { action => 'PARAM', proto => 'udp', dport => '123' },
+ { action => 'PARAM', proto => 'udp', dport => '1024:65535', sport => '123' },
+ ],
+ 'OSPF' => [
+ { action => 'PARAM', proto => '89' },
+ ],
+ 'OpenVPN' => [
+ { action => 'PARAM', proto => 'udp', dport => '1194' },
+ ],
+ 'PCA' => [
+ { action => 'PARAM', proto => 'udp', dport => '5632' },
+ { action => 'PARAM', proto => 'tcp', dport => '5631' },
+ ],
+ 'POP3' => [
+ { action => 'PARAM', proto => 'tcp', dport => '110' },
+ ],
+ 'POP3S' => [
+ { action => 'PARAM', proto => 'tcp', dport => '995' },
+ ],
+ 'PPtP' => [
+ { action => 'PARAM', proto => '47' },
+ { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => '47' },
+ { action => 'PARAM', proto => 'tcp', dport => '1723' },
+ ],
+ 'Ping' => [
+ { action => 'PARAM', proto => 'icmp', dport => '8' },
+ ],
+ 'PostgreSQL' => [
+ { action => 'PARAM', proto => 'tcp', dport => '5432' },
+ ],
+ 'Printer' => [
+ { action => 'PARAM', proto => 'tcp', dport => '515' },
+ ],
+ 'RDP' => [
+ { action => 'PARAM', proto => 'tcp', dport => '3389' },
+ ],
+ 'RIPbi' => [
+ { action => 'PARAM', proto => 'udp', dport => '520' },
+ { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '520' },
+ ],
+ 'RNDC' => [
+ { action => 'PARAM', proto => 'tcp', dport => '953' },
+ ],
+ 'Razor' => [
+ { action => 'ACCEPT', proto => 'tcp', dport => '2703' },
+ ],
+ 'Rdate' => [
+ { action => 'PARAM', proto => 'tcp', dport => '37' },
+ ],
+ 'Rsync' => [
+ { action => 'PARAM', proto => 'tcp', dport => '873' },
+ ],
+ 'SANE' => [
+ { action => 'PARAM', proto => 'tcp', dport => '6566' },
+ ],
+ 'SMB' => [
+ { action => 'PARAM', proto => 'udp', dport => '135,445' },
+ { action => 'PARAM', proto => 'udp', dport => '137:139' },
+ { action => 'PARAM', proto => 'udp', dport => '1024:65535', sport => '137' },
+ { action => 'PARAM', proto => 'tcp', dport => '135,139,445' },
+ ],
+ 'SMBBI' => [
+ { action => 'PARAM', proto => 'udp', dport => '135,445' },
+ { action => 'PARAM', proto => 'udp', dport => '137:139' },
+ { action => 'PARAM', proto => 'udp', dport => '1024:65535', sport => '137' },
+ { action => 'PARAM', proto => 'tcp', dport => '135,139,445' },
+ { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '135,445' },
+ { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '137:139' },
+ { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '1024:65535', sport => '137' },
+ { action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'tcp', dport => '135,139,445' },
+ ],
+ 'SMBswat' => [
+ { action => 'PARAM', proto => 'tcp', dport => '901' },
+ ],
+ 'SMTP' => [
+ { action => 'PARAM', proto => 'tcp', dport => '25' },
+ ],
+ 'SMTPS' => [
+ { action => 'PARAM', proto => 'tcp', dport => '465' },
+ ],
+ 'SNMP' => [
+ { action => 'PARAM', proto => 'udp', dport => '161:162' },
+ { action => 'PARAM', proto => 'tcp', dport => '161' },
+ ],
+ 'SPAMD' => [
+ { action => 'PARAM', proto => 'tcp', dport => '783' },
+ ],
+ 'SSH' => [
+ { action => 'PARAM', proto => 'tcp', dport => '22' },
+ ],
+ 'SVN' => [
+ { action => 'PARAM', proto => 'tcp', dport => '3690' },
+ ],
+ 'SixXS' => [
+ { action => 'PARAM', proto => 'tcp', dport => '3874' },
+ { action => 'PARAM', proto => 'udp', dport => '3740' },
+ { action => 'PARAM', proto => '41' },
+ { action => 'PARAM', proto => 'udp', dport => '5072,8374' },
+ ],
+ 'Squid' => [
+ { action => 'PARAM', proto => 'tcp', dport => '3128' },
+ ],
+ 'Submission' => [
+ { action => 'PARAM', proto => 'tcp', dport => '587' },
+ ],
+ 'Syslog' => [
+ { action => 'PARAM', proto => 'udp', dport => '514' },
+ { action => 'PARAM', proto => 'tcp', dport => '514' },
+ ],
+ 'TFTP' => [
+ { action => 'PARAM', proto => 'udp', dport => '69' },
+ ],
+ 'Telnet' => [
+ { action => 'PARAM', proto => 'tcp', dport => '23' },
+ ],
+ 'Telnets' => [
+ { action => 'PARAM', proto => 'tcp', dport => '992' },
+ ],
+ 'Time' => [
+ { action => 'PARAM', proto => 'tcp', dport => '37' },
+ ],
+ 'Trcrt' => [
+ { action => 'PARAM', proto => 'udp', dport => '33434:33524' },
+ { action => 'PARAM', proto => 'icmp', dport => '8' },
+ ],
+ 'VNC' => [
+ { action => 'PARAM', proto => 'tcp', dport => '5900:5909' },
+ ],
+ 'VNCL' => [
+ { action => 'PARAM', proto => 'tcp', dport => '5500' },
+ ],
+ 'Web' => [
+ { action => 'PARAM', proto => 'tcp', dport => '80' },
+ { action => 'PARAM', proto => 'tcp', dport => '443' },
+ ],
+ 'Webcache' => [
+ { action => 'PARAM', proto => 'tcp', dport => '8080' },
+ ],
+ 'Webmin' => [
+ { action => 'PARAM', proto => 'tcp', dport => '10000' },
+ ],
+ 'Whois' => [
+ { action => 'PARAM', proto => 'tcp', dport => '43' },
+ ],
+};
+
+my $pve_fw_parsed_macros;
+my $pve_fw_preferred_macro_names = {};
-# todo: implement some kind of MACROS, like shorewall /usr/share/shorewall/macro.*
sub get_firewall_macros {
- return $macros if $macros;
+ return $pve_fw_parsed_macros if $pve_fw_parsed_macros;
+
+ $pve_fw_parsed_macros = {};
- #foreach my $path (</usr/share/shorewall/macro.*>) {
- # if ($path =~ m|/macro\.(\S+)$|) {
- # $macros->{$1} = 1;
- # }
- #}
+ foreach my $k (keys %$pve_fw_macros) {
+ my $name = lc($k);
- $macros = {}; # fixme: implemet me
+ my $macro = $pve_fw_macros->{$k};
+ $pve_fw_preferred_macro_names->{$name} = $k;
+ $pve_fw_parsed_macros->{$name} = $macro;
+ }
- return $macros;
+ return $pve_fw_parsed_macros;
}
my $etc_services;
my $portlist = "";
foreach my $pon (split(':', $item, 2)) {
if ($pon =~ m/^\d+$/){
- die "invalid port '$pon'\n" if $pon < 0 && $pon > 65536;
+ die "invalid port '$pon'\n" if $pon < 0 && $pon > 65535;
}else{
die "invalid port $services->{byname}->{$pon}\n" if !$services->{byname}->{$pon};
}
$cmd .= " -m iprange --src-range" if $rule->{nbsource} && $rule->{nbsource} > 1;
$cmd .= " -s $rule->{source}" if $rule->{source};
$cmd .= " -m iprange --dst-range" if $rule->{nbdest} && $rule->{nbdest} > 1;
- $cmd .= " -d $rule->{dest}" if $rule->{destination};
+ $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};
generate_group_rules($ruleset, $group_rules, $2);
}
ruleset_generate_rule($ruleset, $tapchain, $rule);
- my $accept_action = $direction eq 'OUT' ? "-g $bridge-IN" : '-j ACCEPT';
- ruleset_addrule($ruleset, $tapchain, "-m mark --mark 1 $accept_action");
+ ruleset_addrule($ruleset, $tapchain, "-m mark --mark 1 -g $bridge-IN")
+ if $direction eq 'OUT';
} else {
$rule->{action} = "$bridge-IN" if $rule->{action} eq 'ACCEPT' && $direction eq 'OUT';
ruleset_generate_rule($ruleset, $tapchain, $rule);
die "incomplete rule\n" if !$action;
- my $service;
+ my $macro;
+ my $macro_name;
+
if ($action =~ m/^(ACCEPT|DROP|REJECT)$/) {
# OK
} elsif ($allow_groups && $action =~ m/^GROUP-(:?\S+)$/) {
# OK
} elsif ($action =~ m/^(\S+)\((ACCEPT|DROP|REJECT)\)$/) {
- ($service, $action) = ($1, $2);
- if (!$macros->{$service}) {
- die "unknown service '$service'\n";
- }
+ ($macro_name, $action) = ($1, $2);
+ my $lc_macro_name = lc($macro_name);
+ my $preferred_name = $pve_fw_preferred_macro_names->{$lc_macro_name};
+ $macro_name = $preferred_name if $preferred_name;
+ $macro = $macros->{$lc_macro_name};
+ die "unknown macro '$macro_name'\n" if !$macro;
} else {
die "unknown action '$action'\n";
}
$dport = undef if $dport && $dport eq '-';
$sport = undef if $sport && $sport eq '-';
- my $nbdport = undef;
- my $nbsport = undef;
my $nbsource = undef;
my $nbdest = undef;
$nbsource = parse_address_list($source) if $source;
$nbdest = parse_address_list($dest) if $dest;
- $nbdport = parse_port_name_number_or_range($dport) if $dport;
- $nbsport = parse_port_name_number_or_range($sport) if $sport;
+
+ my $rules = [];
- return {
+ my $param = {
action => $action,
- service => $service,
iface => $iface,
source => $source,
dest => $dest,
proto => $proto,
dport => $dport,
sport => $sport,
- nbdport => $nbdport,
- nbsport => $nbsport,
};
+
+ if ($macro) {
+ foreach my $templ (@$macro) {
+ my $rule = {};
+ foreach my $k (keys %$templ) {
+ my $v = $templ->{$k};
+ if ($v eq 'PARAM') {
+ $v = $param->{$k};
+ } elsif ($v eq 'DEST') {
+ $v = $param->{dest};
+ } elsif ($v eq 'SOURCE') {
+ $v = $param->{source};
+ }
+
+ die "missing parameter '$k' in macro '$macro_name'\n" if !defined($v);
+ $rule->{$k} = $v;
+ }
+ push @$rules, $rule;
+ }
+ } else {
+ push @$rules, $param;
+ }
+
+ foreach my $rule (@$rules) {
+ $rule->{nbdport} = parse_port_name_number_or_range($rule->{dport})
+ if defined($rule->{dport});
+ $rule->{nbsport} = parse_port_name_number_or_range($rule->{sport})
+ if defined($rule->{sport});
+ }
+
+ return $rules;
}
sub parse_vm_fw_rules {
next if $line =~ m/^#/;
next if $line =~ m/^\s*$/;
+ my $linenr = $fh->input_line_number();
+ my $prefix = "$filename (line $linenr)";
+
if ($line =~ m/^\[(in|out)\]\s*$/i) {
$section = lc($1);
next;
}
if (!$section) {
- warn "$filename (line $.): skip line - no section";
+ warn "$prefix: skip line - no section";
next;
}
- my $rule;
- eval { $rule = parse_fw_rule($line, 1, 1); };
+ my $rules;
+ eval { $rules = parse_fw_rule($line, 1, 1); };
if (my $err = $@) {
- warn "$filename (line $.): $err";
+ warn "$prefix: $err";
next;
}
- push @{$res->{$section}}, $rule;
+ push @{$res->{$section}}, @$rules;
}
return $res;
next if $line =~ m/^#/;
next if $line =~ m/^\s*$/;
+ my $linenr = $fh->input_line_number();
+ my $prefix = "$filename (line $linenr)";
+
if ($line =~ m/^\[(in|out)\]\s*$/i) {
$section = lc($1);
next;
}
if (!$section) {
- warn "$filename (line $.): skip line - no section";
+ warn "$prefix: skip line - no section";
next;
}
- my $rule;
- eval { $rule = parse_fw_rule($line, 1, 1); };
+ my $rules;
+ eval { $rules = parse_fw_rule($line, 1, 1); };
if (my $err = $@) {
- warn "$filename (line $.): $err";
+ warn "$prefix: $err";
next;
}
- push @{$res->{$section}}, $rule;
+ push @{$res->{$section}}, @$rules;
}
return $res;
next if $line =~ m/^#/;
next if $line =~ m/^\s*$/;
+ my $linenr = $fh->input_line_number();
+ my $prefix = "$filename (line $linenr)";
+
if ($line =~ m/^\[(in|out):(\S+)\]\s*$/i) {
$section = lc($1);
$group = lc($2);
next;
}
if (!$section || !$group) {
- warn "$filename (line $.): skip line - no section";
+ warn "$prefix: skip line - no section";
next;
}
- my $rule;
- eval { $rule = parse_fw_rule($line, 0, 0); };
+ my $rules;
+ eval { $rules = parse_fw_rule($line, 0, 0); };
if (my $err = $@) {
- warn "$filename (line $.): $err";
+ warn "$prefix: $err";
next;
}
- push @{$res->{$group}->{$section}}, $rule;
+ push @{$res->{$group}->{$section}}, @$rules;
}
return $res;
projects / pve-firewall.git / blobdiff