X-Git-Url: https://git.distorted.org.uk/~mdw/firewall/blobdiff_plain/d0409c909cb113596f5d0daed5be237a42878c8d..1b1012475aa2ffe55ac358220c15c970cb49df4a:/local.m4

diff --git a/local.m4 b/local.m4
index 6081132..f682680 100644
--- a/local.m4
+++ b/local.m4
@@ -110,11 +110,12 @@ m4_divert(-1)
 
 ## Define the available network classes.
 m4_divert(42)m4_dnl
-defnetclass scary	scary		trusted		    mcast
-defnetclass untrusted	scary untrusted trusted		    mcast
-defnetclass trusted	scary untrusted trusted safe noloop mcast
-defnetclass safe			trusted safe noloop mcast
-defnetclass noloop			trusted safe	    mcast
+defnetclass scary	scary		trusted		    vpnnat mcast
+defnetclass untrusted	scary untrusted trusted			   mcast
+defnetclass trusted	scary untrusted trusted safe noloop vpnnat mcast
+defnetclass safe			trusted safe noloop vpnnat mcast
+defnetclass noloop			trusted safe		   mcast
+defnetclass vpnnat	scary		trusted safe		   mcast
 
 defnetclass link
 defnetclass mcast
@@ -243,6 +244,7 @@ defnet hub virtual
 	via housebdry colobdry
 defnet sgo noloop
 	addr !172.29.198.0/23
+	addr !10.165.27.0/24
 	addr 10.0.0.0/8
 	addr 172.16.0.0/12
 	addr 192.168.0.0/16
@@ -274,13 +276,13 @@ defhost national
 	iface vpn-precision colohub
 
 ## Satellite networks.
-defnet binswood noloop
+defnet binswood vpnnat
 	addr 10.165.27.0/24
 	via colohub
 defhost mango
 	hosttype router
 	iface eth0 binswood default
-	iface vpn-precision colo
+	iface vpn-precision colo default
 
 m4_divert(80)m4_dnl
 ###--------------------------------------------------------------------------
@@ -354,6 +356,23 @@ case $forward in
     ;;
 esac
 
+m4_divert(82)m4_dnl
+###--------------------------------------------------------------------------
+### Check for source routing.
+
+clearchain check-srcroute
+
+run iptables -A check-srcroute -g forbidden \
+    -m ipv4options --any --flags lsrr,ssrr
+run ip6tables -A check-srcroute -g forbidden \
+    -m rt
+
+for c in INPUT FORWARD; do
+  for m in $from_scary $from_untrusted; do
+    run ip46tables -A $c -m mark --mark $m/$MASK_FROM -j check-srcroute
+  done
+done
+
 m4_divert(84)m4_dnl
 ###--------------------------------------------------------------------------
 ### Locally-bound packet inspection.
@@ -382,7 +401,7 @@ m4_divert(88)m4_dnl
 openports inbound
 
 ## Inspect inbound packets from untrusted sources.
-run ip46tables -A inbound -j forbidden
+run ip46tables -A inbound -g forbidden
 run ip46tables -A INPUT -m mark --mark $from_scary/$MASK_FROM -g inbound
 run ip46tables -A INPUT -m mark --mark $from_untrusted/$MASK_FROM -g inbound