X-Git-Url: https://git.distorted.org.uk/~mdw/firewall/blobdiff_plain/5c5fcd73fafcc6ff4f6c42c183d86a0688f09d14..994ac8d0782c89a636f47b02a2dc096c72ff58c5:/local.m4 diff --git a/local.m4 b/local.m4 index ab8249f..c16f94e 100644 --- a/local.m4 +++ b/local.m4 @@ -39,9 +39,9 @@ m4_divert(-1) ## block of RFC1918 private-use addresses allocated from the Cambridge G-RIN. ## The former are as follows. ## -## 62.49.204.144/28 -## House border network (dmz). We have all of these, but .145 -## is reserved for the router. +## 81.2.113.195, 81.187.238.128/28 +## House border network (dmz). We have all of these; the loose +## address is for the router. ## ## 212.13.18.64/28 ## Jump colocated network (jump). .65--68 are used by Jump @@ -54,6 +54,8 @@ m4_divert(-1) ## 172.29.198.0/24 Untrusted networks. ## .0/25 house wireless net ## .128/28 iodine (IP-over-DNS) network +## .144/28 hippotat (IP-over-HTTP) network +## .160/27 untrusted virtual network ## ## 172.29.199.0/24 Trusted networks. ## .0/25 house wired network @@ -68,15 +70,9 @@ m4_divert(-1) ## There are five blocks of publicly routable IPv6 addresses, though some of ## them aren't very interesting. The ranges are as follows. ## -## 2001:470:1f08:1b98::/64 -## Hurricane Electric tunnel network: only :1 (HE) and :2 -## (radius) are used. -## -## 2001:470:1f09:1b98::/64 -## House border network (dmz). -## -## 2001:470:9740::/48 -## Main house range. See below for allocation policy. +## 2001:8b0:c92::/48 +## Main house range (aaisp). See below for allocation policy. +## There is no explicit DMZ allocation (and no need for one). ## ## 2001:ba8:0:1d9::/64 ## Jump border network (jump): :1 is the router (supplied by @@ -89,6 +85,7 @@ m4_divert(-1) ## The /48s are split into /64s by appending a 16-bit network number. The ## top nibble of the network number classifies the network, as follows. ## +## axxx Virtual, untrusted ## 8xxx Untrusted ## 6xxx Virtual, safe ## 4xxx Safe @@ -105,6 +102,7 @@ m4_divert(-1) ## 0 No specific site: mobile VPN endpoints or anycast addresses. ## 1 House. ## 2 Jump colocation. +## fff Local border network. ## ## Usually site-0 networks are allocated from the Jump range to improve ## expected performance from/to external sites which don't engage in our @@ -112,10 +110,11 @@ m4_divert(-1) ## Define the available network classes. m4_divert(42)m4_dnl -defnetclass untrusted untrusted trusted mcast -defnetclass trusted untrusted trusted safe noloop mcast -defnetclass safe trusted safe noloop mcast -defnetclass noloop trusted safe mcast +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 link defnetclass mcast @@ -127,23 +126,22 @@ m4_divert(26)m4_dnl ## House networks. defnet dmz trusted - addr 62.49.204.144/28 2001:470:1f09:1b98::/64 + addr 81.2.113.195 81.187.238.128/28 2001:8b0:c92:fff::/64 via unsafe untrusted defnet unsafe trusted - addr 172.29.199.0/25 2001:470:9740:1::/64 + addr 172.29.199.0/25 2001:8b0:c92:1::/64 via househub defnet safe safe - addr 172.29.199.192/27 2001:470:9740:4001::/64 + addr 172.29.199.192/27 2001:8b0:c92:4001::/64 via househub defnet untrusted untrusted - addr 172.29.198.0/25 2001:470:9740:8001::/64 + addr 172.29.198.0/25 2001:8b0:c92:8001::/64 via househub defnet househub virtual via housebdry dmz unsafe safe untrusted defnet housebdry virtual via househub hub - noxit dmz ## House hosts. defhost radius @@ -163,6 +161,9 @@ defhost roadstar defhost jem iface eth0 dmz unsafe iface eth1 dmz unsafe +defhost universe + iface eth0 dmz unsafe + iface eth1 dmz unsafe defhost artist hosttype router iface eth0 dmz unsafe untrusted @@ -183,6 +184,10 @@ defhost ibanez defhost orange iface wlan0 untrusted iface vpn-radius unsafe +defhost groove + iface eth0 unsafe + iface wlan0 untrusted + iface vpn-radius unsafe defhost gibson hosttype client @@ -199,10 +204,12 @@ defnet colohub virtual via colobdry jump colo defnet colobdry virtual via colohub hub - noxit jump defnet iodine untrusted addr 172.29.198.128/28 via colohub +defnet hippotat untrusted + addr 172.29.198.144/28 + via colohub ## Colocated hosts. defhost fender @@ -215,6 +222,7 @@ defhost precision iface vpn-mango binswood iface vpn-radius housebdry vpn sgo iface vpn-chiark sgo + iface vpn-national upn iface vpn-+ vpn defhost telecaster iface eth0 jump colo @@ -222,13 +230,12 @@ defhost telecaster defhost stratocaster iface eth0 jump colo iface eth1 jump colo -defhost jaguar - iface eth0 jump defhost jazz hosttype router iface eth0 jump colo vpn iface eth1 jump colo vpn iface dns0 iodine + iface hippo-svc hippotat iface vpn-+ vpn ## Other networks. @@ -240,26 +247,36 @@ defnet sgo noloop addr 172.16.0.0/12 addr 192.168.0.0/16 via househub colohub -defnet vpn safe +defnet vpn trusted addr 172.29.199.128/27 2001:ba8:1d9:6000::/64 via househub colohub host crybaby 1 ::1:1 host terror 2 ::2:1 host orange 3 ::3:1 + host haze 4 ::4:1 + host groove 5 ::5:1 defnet anycast trusted addr 172.29.199.224/27 2001:ba8:1d9:0::/64 via dmz unsafe safe untrusted jump colo vpn -defnet default untrusted - addr 62.49.204.144/28 2001:470:1f09:1b98::/64 +defnet default scary + addr 81.2.113.195 81.187.238.128/28 2001:8b0:c92::/48 addr 212.13.198.64/28 2001:ba8:0:1d9::/64 addr 2001:ba8:1d9::/48 #temporary via dmz unsafe untrusted jump colo +defnet upn untrusted + addr 172.29.198.160/27 2001:ba8:1d9:a000::/64 + via colohub + host national 1 ::1:1 + +## Linode hosts. +defhost national + iface eth0 default + iface vpn-precision colohub ## Satellite networks. defnet binswood noloop addr 10.165.27.0/24 via colohub - defhost mango hosttype router iface eth0 binswood default @@ -357,16 +374,28 @@ run iptables -A inbound -j ACCEPT \ -p udp --source-port $port_bootpc --destination-port $port_bootps ## Allow incoming ping. This is the only ICMP left. -run ip46tables -A inbound -j ACCEPT -p icmp +run iptables -A inbound -j ACCEPT -p icmp +run ip6tables -A inbound -j ACCEPT -p icmpv6 m4_divert(88)m4_dnl ## Allow unusual things. 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 +## Allow responses from the scary outside world into the untrusted net, but +## don't let untrusted things run services. +case $forward in + 1) + run ip46tables -A FORWARD -j ACCEPT \ + -m mark --mark $(( $from_scary | $to_untrusted ))/$(( $MASK_FROM | $MASK_TO )) \ + -m state --state ESTABLISHED,RELATED + ;; +esac + ## Otherwise process as indicated by the mark. for i in $inchains; do run ip46tables -A $i -m mark ! --mark 0/$MASK_MASK -j ACCEPT