[pve-devel] [PATCH] add ips feature v6
Alexandre Derumier
aderumier at odiso.com
Fri Mar 21 06:07:20 CET 2014
This add ips (like suricata) support through nfqueues.
The main idea is to replace -j ACCEPT with -J NFQUEUE , to pass packets to ips
it's using --queue-bypass (only available in 3.10 kernel), so it's suricata daemon is down,
packets are not dropped.
tap-out chain,
-------------
we goto PVEFW-SET-ACCEPT-MARK is always use when connection is already established
-m conntrack --ctstate RELATED,ESTABLISHED -g PVEFW-SET-ACCEPT-MARK
tap-in chain
---------------
I replace -j ACCEPT by -j NFQUEUE when ips is enabled
and
-m conntrack --ctstate RELATED,ESTABLISHED -j NFQUEUE
group-in rules now use also mark
---------------------------------
-A tap110i0-IN -j GROUP-group1-IN
-A GROUP-group1-IN -j MARK --set-xmark 0x0/0xffffffff
-A GROUP-group1-IN -p icmp -g PVEFW-SET-ACCEPT-MARK
-A tap110i0-IN -m mark --mark 0x1 -j ACCEPT|NFQUEUE
this create a new chain PVEFW-Accept (not used anymore, but could be use for optimisation for ESTABLISHED connection)
---------------------------------------------------------------------------------------------------------------------
-A PVEFW-Accept -o vmbr14 -m physdev --physdev-is-out -j vmbr14-IPS
-A vmbr14-IPS -m physdev --physdev-out tap110i0 --physdev-is-bridged -j NFQUEUE --queue-num 0 --queue-bypass
-A PVEFW-Accept -o vmbr1 -m physdev --physdev-is-out -j vmbr1-IPS
-A vmbr1-IPS -m physdev --physdev-out tap123i0 --physdev-is-bridged -j NFQUEUE --queue-num 0 --queue-bypass
-A PVEFW-Accept -j ACCEPT
vmid.fw
-------
ips: 1
ips_queues: 0:3
1 or more queues can be defined (if we want cpu loadbalancing, or dedicated queue for a specific vm).
If not defined, default queue 0 is used.
Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
---
example/100.fw | 7 +++++
src/PVE/Firewall.pm | 84 +++++++++++++++++++++++++++++++++++++++++++--------
2 files changed, 79 insertions(+), 12 deletions(-)
diff --git a/example/100.fw b/example/100.fw
index 94f178d..1a3a7b7 100644
--- a/example/100.fw
+++ b/example/100.fw
@@ -28,6 +28,13 @@ tcpflags: 1
# enable DHCP
dhcp: 1
+# enable ips
+ips: 1
+
+# specify nfqueue queues (optionnal)
+#ips_queues: 0
+ips_queues: 0:3
+
[RULES]
diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm
index 4454e94..8e054a9 100644
--- a/src/PVE/Firewall.pm
+++ b/src/PVE/Firewall.pm
@@ -451,6 +451,9 @@ my $pve_std_chains = {
# Drop DNS replies
{ action => 'DROP', proto => 'udp', sport => 53 },
],
+ 'PVEFW-Accept' => [
+ { action => 'ACCEPT' },
+ ],
'PVEFW-tcpflags' => [
# same as shorewall tcpflags action.
# Packets arriving on this interface are checked for som illegal combinations of TCP flags
@@ -700,7 +703,7 @@ sub iptables_get_chains {
return 1 if $name =~ m/^venet0-\d+-(:?IN|OUT)$/;
- return 1 if $name =~ m/^vmbr\d+-(:?FW|IN|OUT)$/;
+ return 1 if $name =~ m/^vmbr\d+-(:?FW|IN|OUT|IPS)$/;
return 1 if $name =~ m/^GROUP-(:?[^\s\-]+)-(:?IN|OUT)$/;
return undef;
@@ -963,6 +966,7 @@ sub ruleset_create_vm_chain {
my ($ruleset, $chain, $options, $macaddr, $direction) = @_;
ruleset_create_chain($ruleset, $chain);
+ my $accept = generate_nfqueue($options);
if (!(defined($options->{nosmurfs}) && $options->{nosmurfs} == 0)) {
ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate INVALID,NEW -j PVEFW-smurfs");
@@ -972,7 +976,7 @@ sub ruleset_create_vm_chain {
if ($direction eq 'OUT') {
ruleset_addrule($ruleset, $chain, "-p udp -m udp --sport 68 --dport 67 -g PVEFW-SET-ACCEPT-MARK");
} else {
- ruleset_addrule($ruleset, $chain, "-p udp -m udp --sport 67 --dport 68 -j ACCEPT");
+ ruleset_addrule($ruleset, $chain, "-p udp -m udp --sport 67 --dport 68 -j $accept");
}
}
@@ -981,18 +985,24 @@ sub ruleset_create_vm_chain {
}
ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate INVALID -j DROP");
- ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT");
+ if($direction eq 'OUT'){
+ ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate RELATED,ESTABLISHED -g PVEFW-SET-ACCEPT-MARK");
+ }else{
+ ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate RELATED,ESTABLISHED -j $accept");
+ }
if ($direction eq 'OUT') {
if (defined($macaddr) && !(defined($options->{macfilter}) && $options->{macfilter} == 0)) {
ruleset_addrule($ruleset, $chain, "-m mac ! --mac-source $macaddr -j DROP");
}
ruleset_addrule($ruleset, $chain, "-j MARK --set-mark 0"); # clear mark
}
+
+
}
sub ruleset_generate_vm_rules {
- my ($ruleset, $rules, $groups_conf, $chain, $netid, $direction) = @_;
+ my ($ruleset, $rules, $groups_conf, $chain, $netid, $direction, $options) = @_;
my $lc_direction = lc($direction);
@@ -1005,18 +1015,60 @@ sub ruleset_generate_vm_rules {
generate_group_rules($ruleset, $groups_conf, $rule->{action});
}
ruleset_addrule($ruleset, $chain, "-j $group_chain");
- ruleset_addrule($ruleset, $chain, "-m mark --mark 1 -j RETURN")
- if $direction eq 'OUT';
+ if ($direction eq 'OUT'){
+ ruleset_addrule($ruleset, $chain, "-m mark --mark 1 -j RETURN");
+ }else{
+ my $accept = generate_nfqueue($options);
+ ruleset_addrule($ruleset, $chain, "-m mark --mark 1 -j $accept");
+ }
+
} else {
next if $rule->{type} ne $lc_direction;
if ($direction eq 'OUT') {
ruleset_generate_rule($ruleset, $chain, $rule,
{ ACCEPT => "PVEFW-SET-ACCEPT-MARK", REJECT => "PVEFW-reject" });
} else {
- ruleset_generate_rule($ruleset, $chain, $rule, { REJECT => "PVEFW-reject" });
+ my $accept = generate_nfqueue($options);
+ ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept , REJECT => "PVEFW-reject" });
+ }
+ }
+ }
+}
+
+sub ruleset_generate_vm_ipsrules {
+ my ($ruleset, $options, $direction, $iface, $bridge) = @_;
+
+ if ($options->{ips} && $direction eq 'IN') {
+ my $nfqueue = generate_nfqueue($options);
+
+ if (!ruleset_chain_exist($ruleset, "$bridge-IPS")) {
+ ruleset_create_chain($ruleset, "$bridge-IPS");
+ ruleset_insertrule($ruleset, "PVEFW-Accept", "-o $bridge -m physdev --physdev-is-out -j $bridge-IPS");
+ }
+
+ ruleset_addrule($ruleset, "$bridge-IPS", "-m physdev --physdev-out $iface --physdev-is-bridged -j $nfqueue");
+ }
+}
+
+sub generate_nfqueue {
+ my ($options) = @_;
+
+ my $action = "";
+ if($options->{ips}){
+ $action = "NFQUEUE";
+ if($options->{ips_queues} && $options->{ips_queues} =~ m/^(\d+)(:(\d+))?$/) {
+ if(defined($3) && defined($1)) {
+ $action .= " --queue-balance $1:$3";
+ }elsif (defined($1)) {
+ $action .= " --queue-num $1";
}
}
+ $action .= " --queue-bypass";
+ }else{
+ $action = "ACCEPT";
}
+
+ return $action;
}
sub generate_venet_rules_direction {
@@ -1046,7 +1098,8 @@ sub generate_venet_rules_direction {
$policy = $options->{policy_in} || 'DROP'; # allow nothing by default
}
- my $accept_action = $direction eq 'OUT' ? "PVEFW-SET-ACCEPT-MARK" : "ACCEPT";
+ my $accept = generate_nfqueue($options);
+ my $accept_action = $direction eq 'OUT' ? "PVEFW-SET-ACCEPT-MARK" : $accept;
ruleset_add_chain_policy($ruleset, $chain, $vmid, $policy, $loglevel, $accept_action);
# plug into FORWARD, INPUT and OUTPUT chain
@@ -1087,7 +1140,9 @@ sub generate_tap_rules_direction {
ruleset_create_vm_chain($ruleset, $tapchain, $options, $macaddr, $direction);
- ruleset_generate_vm_rules($ruleset, $rules, $groups_conf, $tapchain, $netid, $direction);
+ ruleset_generate_vm_rules($ruleset, $rules, $groups_conf, $tapchain, $netid, $direction, $options);
+
+ ruleset_generate_vm_ipsrules($ruleset, $options, $direction, $iface, $bridge);
# implement policy
my $policy;
@@ -1098,7 +1153,8 @@ sub generate_tap_rules_direction {
$policy = $options->{policy_in} || 'DROP'; # allow nothing by default
}
- my $accept_action = $direction eq 'OUT' ? "PVEFW-SET-ACCEPT-MARK" : "ACCEPT";
+ my $accept = generate_nfqueue($options);
+ my $accept_action = $direction eq 'OUT' ? "PVEFW-SET-ACCEPT-MARK" : $accept;
ruleset_add_chain_policy($ruleset, $tapchain, $vmid, $policy, $loglevel, $accept_action);
# plug the tap chain to bridge chain
@@ -1182,10 +1238,11 @@ sub generate_group_rules {
my $chain = "GROUP-${group}-IN";
ruleset_create_chain($ruleset, $chain);
+ ruleset_addrule($ruleset, $chain, "-j MARK --set-mark 0"); # clear mark
foreach my $rule (@$rules) {
next if $rule->{type} ne 'in';
- ruleset_generate_rule($ruleset, $chain, $rule, { REJECT => "PVEFW-reject" });
+ ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => "PVEFW-SET-ACCEPT-MARK", REJECT => "PVEFW-reject" });
}
$chain = "GROUP-${group}-OUT";
@@ -1353,7 +1410,7 @@ sub parse_vmfw_option {
my $loglevels = "emerg|alert|crit|err|warning|notice|info|debug|nolog";
- if ($line =~ m/^(enable|dhcp|macfilter|nosmurfs|tcpflags):\s*(0|1)\s*$/i) {
+ if ($line =~ m/^(enable|dhcp|macfilter|nosmurfs|tcpflags|ips):\s*(0|1)\s*$/i) {
$opt = lc($1);
$value = int($2);
} elsif ($line =~ m/^(log_level_in|log_level_out):\s*(($loglevels)\s*)?$/i) {
@@ -1362,6 +1419,9 @@ sub parse_vmfw_option {
} elsif ($line =~ m/^(policy_(in|out)):\s*(ACCEPT|DROP|REJECT)\s*$/i) {
$opt = lc($1);
$value = uc($3);
+ } elsif ($line =~ m/^(ips_queues):\s*((\d+)(:(\d+))?)\s*$/i) {
+ $opt = lc($1);
+ $value = $2;
} else {
chomp $line;
die "can't parse option '$line'\n"
--
1.7.10.4
More information about the pve-devel
mailing list