Skip to content

GitLab

Commit 3cc621ed authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Add domU firewall support in both bridge and routed mode.

parent ecea5c3b
Hide whitespace changes
Inline Side-by-side
clientside/tmcc/linux/xen/emulab-cnet.pl
View file @ 3cc621ed
......@@ -145,6 +145,7 @@ my ($jail_network,$jail_netmask) = findVirtControlNet();
my $fs_jailip = "172.17.253.254";
# Each container gets a tmcc proxy running on another port.
# If this changes, look at firewall handling in libvnode_xen.
my $local_tmcd_port = $TMCD_PORT + $vmid;
# Need this too.
......@@ -184,7 +185,7 @@ sub Online()
"-m physdev --physdev-in $vif --physdev-is-bridged ".
"--physdev-out $outer_controlif -j DROP")
== 0 or return -1;
#
# We turn on antispoofing. In bridge mode, vif-bridge adds a rule
# to allow outgoing traffic. But vif-route does this wrong, so we
......@@ -192,14 +193,70 @@ sub Online()
# incoming packets go throught the FORWARD table, which is set to
# DROP for antispoofing.
#
# Everything goes through the per vnode INCOMING/OUTGOING tables
# which are set up in libvnode_xen. If firewalling is not on, then
# these chains just accept everything.
#
if ($VIFROUTING) {
DoIPtables("-A FORWARD -i $vif -s $vnode_ip ".
" -m mac --mac-source $vnode_mac -j ACCEPT")
" -m mac --mac-source $vnode_mac -j OUTGOING_${vnode_id}")
== 0 or return -1;
DoIPtables("-A FORWARD -o $vif -d $vnode_ip -j INCOMING_${vnode_id}")
== 0 or return -1;
DoIPtables("-A FORWARD -o $vif -d $vnode_ip -j ACCEPT")
#
# Another wrinkle. We have to think about packets coming from
# the container and addressed to the physical host. Send them
# through OUTGOING chain for filtering, rather then adding
# another chain. We make sure there are appropriate rules in
# the OUTGOING chain to protect the host.
#
DoIPtables("-A INPUT -i $vif -s $vnode_ip ".
" -m mac --mac-source $vnode_mac -j OUTGOING_${vnode_id}")
== 0 or return -1;
#
# This rule effectively says that if the packet was not filtered
# by the INCOMING chain during forwarding, it must be okay to
# output to the container; we do not want it to go through the
# dom0 rules.
#
DoIPtables("-A OUTPUT -o $vif -j ACCEPT")
== 0 or return -1;
}
else {
#
# Bridge mode. vif-bridge stuck some rules in that we do not
# want, so insert some new rules ahead of them to capture the
# packets we want to filter. But we still have to allow the
# DHCP request packets through.
#
DoIPtables("-I FORWARD -m physdev --physdev-is-bridged ".
" --physdev-in $vif -s $vnode_ip -j OUTGOING_${vnode_id}")
== 0 or return -1;
DoIPtables("-I FORWARD -m physdev --physdev-is-bridged ".
" --physdev-out $vif -j INCOMING_${vnode_id}")
== 0 or return -1;
#
# Another wrinkle. We have to think about packets coming from
# the container and addressed to the physical host. Send them
# through OUTGOING chain for filtering, rather then adding
# another chain. We make sure there are appropriate rules in
# the OUTGOING chain to protect the host.
#
# XXX: We cannot use the input interface or bridge options, cause
# if the vnode_ip is unroutable, the packet appears to come from
# eth0, according to iptables logging. WTF!
#
DoIPtables("-A INPUT -s $vnode_ip ".
" -j OUTGOING_${vnode_id}")
== 0 or return -1;
DoIPtables("-A OUTPUT -d $vnode_id -j ACCEPT")
== 0 or return -1;
}
# Start a tmcc proxy (handles both TCP and UDP)
my $tmccpid = fork();
if ($tmccpid) {
......@@ -356,8 +413,22 @@ sub Offline()
# See above.
if ($VIFROUTING) {
DoIPtables("-D FORWARD -i $vif -s $vnode_ip ".
" -m mac --mac-source $vnode_mac -j ACCEPT");
DoIPtables("-D FORWARD -o $vif -d $vnode_ip -j ACCEPT");
" -m mac --mac-source $vnode_mac -j OUTGOING_${vnode_id}");
DoIPtables("-D FORWARD -o $vif -d $vnode_ip -j INCOMING_${vnode_id}");
DoIPtables("-D INPUT -i $vif -s $vnode_ip ".
" -m mac --mac-source $vnode_mac -j OUTGOING_${vnode_id}");
DoIPtables("-D OUTPUT -o $vif -j ACCEPT");
}
else {
DoIPtables("-D FORWARD -m physdev --physdev-is-bridged ".
" --physdev-in $vif -s $vnode_ip -j OUTGOING_${vnode_id}");
DoIPtables("-D FORWARD -m physdev --physdev-is-bridged ".
" --physdev-out $vif -j INCOMING_${vnode_id}");
DoIPtables("-D INPUT -s $vnode_ip ".
" -j OUTGOING_${vnode_id}");
DoIPtables("-D OUTPUT -d $vnode_id -j ACCEPT");
}
# tmcc
......
clientside/tmcc/linux/xen/libvnode_xen.pm
View file @ 3cc621ed
......@@ -216,6 +216,8 @@ my $ISREMOTENODE = REMOTEDED();
my $BRIDGENAME = "xenbr0";
my $VIFROUTING = ((-e "$ETCDIR/xenvifrouting") ? 1 : 0);
my $TMCD_PORT = 7777;
#
# Information about the running Xen hypervisor
#
......@@ -1213,17 +1215,27 @@ sub vnodePreConfig($$$$$){
# a temp hack to get a new ntp.conf into all containers on next
# reboot. Will remove later.
#
# No one uses FreeBSD, just mount as linux.
# Make sure its a Linux partition. If not, ignore it.
#
$fixups = 1;
$vninfo->{'os'} = "Linux";
my $devname = "$VGNAME/${vnode_id}p2";
my $devname = "$VGNAME/${vnode_id}";
$devname =~ s/\-/\-\-/g;
$devname =~ s/\//\-/g;
$private->{'rootpartition'} = "/dev/mapper/$devname";
# Must be a package. Ick.
my $devfile = "/dev/mapper/$devname";
print STDERR "$devfile\n";
return 0
if (! -e $private->{'rootpartition'});
if (! -e $devfile);
my $stype = `sfdisk $devfile -c 2`;
chomp($stype);
return 0
if ($? || $stype == 0);
print STDERR "stype $stype\n";
$fixups = 1;
$vninfo->{'os'} = "Linux";
$private->{'rootpartition'} = "${devfile}p2";
}
#
......@@ -1292,11 +1304,11 @@ sub vnodePreConfig($$$$$){
goto bad
if ($?);
}
# XXX this should no longer be needed, but just in case
# XXX We need this for libsetup to know it is in a XENVM.
if (! -e "$vnoderoot/var/emulab/boot/vmname" ) {
mysystem2("echo '$vnode_id' > $vnoderoot/var/emulab/boot/vmname");
goto bad
if ($?);
if (0 && $?);
}
# change the devices in fstab
my $ldisk = ($xeninfo{xen_major} >= 4 ? "xvd" : "sd");
......@@ -1305,8 +1317,44 @@ sub vnodePreConfig($$$$$){
" $vnoderoot/etc/fstab");
goto bad
if ($?);
# enable the correct device for console
if (-f "$vnoderoot/etc/inittab") {
mysystem2("sed -i.bak -e 's/xvc0/console/' ".
" $vnoderoot/etc/inittab");
}
if (-f "$vnoderoot/etc/init/ttyS0.conf") {
mysystem2("sed -i.bak -e 's/ttyS0/hvc0/' ".
" $vnoderoot/etc/init/ttyS0.conf");
}
}
else {
# XXX We need this for libsetup to know it is in a XENVM.
# Note that the FreeBSD images put /var on another partition
# and it would be difficult to get that mounted. So stick it
# in /etc/emulab, and arrange for rc.local to move it into
# place.
if (! -e "$vnoderoot/etc/emulab/vmname" ) {
mysystem2("echo '$vnode_id' > $vnoderoot/etc/emulab/vmname");
goto bad
if ($?);
}
if (! -e "$vnoderoot/etc/rc.local" ) {
mysystem2("echo '#!/bin/sh' > $vnoderoot/etc/rc.local");
goto bad
if ($?);
}
open(RCL, ">>$vnoderoot/etc/rc.local")
or goto bad;
print RCL "\n";
print RCL "if [ -e \"/etc/emulab/vmname\" ]; then\n";
print RCL " /bin/mv -f /etc/emulab/vmname /var/emulab/boot\n";
print RCL "fi\n\n";
close(RCL);
mysystem2("/bin/chmod +x $vnoderoot/etc/rc.local");
goto bad
if ($?);
if (-e "$vnoderoot/etc/dumpdates") {
mysystem2("sed -i -e 's;^/dev/[ad][da][04]s1;/dev/da0s1;' ".
" $vnoderoot/etc/dumpdates");
......@@ -1355,6 +1403,7 @@ sub vnodePreConfigControlNetwork($$$$$$$$$$$$)
my $isroutable = isRoutable($ip);
my $fmac = fixupMac($mac);
my (undef,$ctrlip) = findControlNet();
# Note physical host control net IF is really a bridge
my ($cbridge) = ($ISREMOTENODE ? ($BRIDGENAME) : findControlNet());
my $cscript = "$VMDIR/$vnode_id/cnet-$mac";
......@@ -1374,6 +1423,83 @@ sub vnodePreConfigControlNetwork($$$$$$$$$$$$)
'mac' => $fmac};
createControlNetworkScript($vmid, $stuff, $cscript);
#
# Set up the chains. We always create them, and if there is no
# firewall, they default to accept. This makes things easier in
# the control network script (emulab-cnet.pl).
#
# Do not worry if these fail; we will catch it below when we add
# the rules. Or I could look to see if the chains already exist,
# but why bother.
#
DoIPtables("-N INCOMING_${vnode_id}");
DoIPtables("-F INCOMING_${vnode_id}");
DoIPtables("-N OUTGOING_${vnode_id}");
DoIPtables("-F OUTGOING_${vnode_id}");
# Match existing dynamic rules as early as possible.
DoIPtables("-A INCOMING_${vnode_id} -m conntrack ".
" --ctstate RELATED,ESTABLISHED -j ACCEPT");
DoIPtables("-A OUTGOING_${vnode_id} -m conntrack ".
" --ctstate RELATED,ESTABLISHED -j ACCEPT");
if ($vnconfig->{'fwconfig'}->{'fwinfo'}->{'TYPE'} eq "none") {
DoIPtables("-A INCOMING_${vnode_id} -j ACCEPT") == 0
or return -1;
DoIPtables("-A OUTGOING_${vnode_id} -j ACCEPT") == 0
or return -1;
}
else {
my @rules = ();
if (0) {
push(@rules, "-A INCOMING_${vnode_id} -j LOG ".
" --log-prefix 'IIN ${vnode_id}: ' --log-level 5");
push(@rules, "-A OUTGOING_${vnode_id} -j LOG ".
" --log-prefix 'OOUT ${vnode_id}: ' --log-level 5");
}
#
# These rules allows the container to talk to the TMCC proxy.
# If you change this port, change emulab-cnet.pl too.
#
my $local_tmcd_port = $TMCD_PORT + $vmid;
push(@rules,
"-A OUTGOING_${vnode_id} -p tcp ".
"-d $ctrlip --dport $local_tmcd_port ".
"-m conntrack --ctstate NEW -j ACCEPT");
push(@rules,
"-A OUTGOING_${vnode_id} -p udp ".
"-d $ctrlip --dport $local_tmcd_port ".
"-m conntrack --ctstate NEW -j ACCEPT");
#
# Need to do some substitution first.
#
foreach my $rule (@{ $vnconfig->{'fwconfig'}->{'fwrules'} }) {
my $rulestr = $rule->{'RULE'};
$rulestr =~ s/\s+me\s+/ $ctrlip /g;
$rulestr =~ s/\s+INSIDE\s+/ OUTGOING_${vnode_id} /g;
$rulestr =~ s/\s+OUTSIDE\s+/ INCOMING_${vnode_id} /g;
$rulestr =~ s/^iptables //;
push(@rules, $rulestr);
}
#
# For debugging, we want to log any packets that get to the bottom,
# since they are going to get dropped.
#
if (0) {
push(@rules, "-A INCOMING_${vnode_id} -j LOG ".
" --log-prefix 'IN ${vnode_id}: ' --log-level 5");
push(@rules, "-A OUTGOING_${vnode_id} -j LOG ".
" --log-prefix 'OUT ${vnode_id}: ' --log-level 5");
}
DoIPtables(@rules) == 0
or return -1;
}
# Create a DHCP entry
$vninfo->{'dhcp'} = {};
$vninfo->{'dhcp'}->{'name'} = $vnode_id;
......@@ -1581,7 +1707,7 @@ sub vnodePreConfigExpNetwork($$$$)
my $veth = "greth.${vmid}.${unit}";
my $gre = "gre$vmid.$unit";
my $br = "br$vmid.$unit";
if (! -d "/sys/class/net/$br/bridge") {
if (! -e "/sys/class/net/$br/flags") {
mysystem2("$OVSCTL add-br $br");
if ($?) {
TBScriptUnlock();
......@@ -1754,7 +1880,7 @@ sub vnodeBoot($$$$)
#
print "Container did not start, halting for retry ...\n";
vnodeHalt($vnode_id, $vmid, $vnconfig, $private);
print "Container halted, waiting for it do disappear ...\n";
print "Container halted, waiting for it to disappear ...\n";
$countdown = 10;
while ($countdown >= 0) {
sleep(5);
......@@ -1849,6 +1975,12 @@ sub vnodeDestroy($$$$)
return -1
if (vnodeTearDown($vnode_id, $vmid, $vnconfig, $private));
# Kill the chains.
DoIPtables("-F INCOMING_${vnode_id}");
DoIPtables("-X INCOMING_${vnode_id}");
DoIPtables("-F OUTGOING_${vnode_id}");
DoIPtables("-X OUTGOING_${vnode_id}");
# DHCP entry...
if (exists($vninfo->{'dhcp'})) {
my $mac = $vninfo->{'dhcp'}->{'mac'};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment