local.m4: Update external NTP servers.

[firewall] / local.m4

diff --git a/local.m4 b/local.m4
index 5dfb3a0..760391a 100644 (file)
--- a/local.m4
+++ b/local.m4
@@ -27,7 +27,7 @@
 m4_divert(6)m4_dnl
 ## Default NTP servers.
 defconf(ntp_servers,
-       "158.152.1.76 158.152.1.204 194.159.253.2 195.173.57.232")
+       "81.187.26.174 90.155.23.205 2001:8b0:0:23::205 185.73.44.6 2001:ba8:0:2c06::")
 
 m4_divert(-1)
 ###--------------------------------------------------------------------------
@@ -54,6 +54,7 @@ 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.
@@ -109,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
@@ -190,7 +192,7 @@ defhost groove
 
 defhost gibson
        hosttype client
-       iface eth0.5 unsafe
+       iface eth0 unsafe
 
 ## Colocated networks.
 defnet jump trusted
@@ -206,6 +208,9 @@ defnet colobdry virtual
 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
@@ -231,6 +236,7 @@ defhost jazz
        iface eth0 jump colo vpn
        iface eth1 jump colo vpn
        iface dns0 iodine
+       iface hippo-svc hippotat
        iface vpn-+ vpn
 
 ## Other networks.
@@ -238,11 +244,12 @@ 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
        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
@@ -250,6 +257,7 @@ defnet vpn safe
        host orange 3 ::3:1
        host haze 4 ::4:1
        host groove 5 ::5:1
+       host spirit 9 ::9:1
 defnet anycast trusted
        addr 172.29.199.224/27 2001:ba8:1d9:0::/64
        via dmz unsafe safe untrusted jump colo vpn
@@ -269,13 +277,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
 ###--------------------------------------------------------------------------
@@ -349,6 +357,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.
@@ -377,7 +402,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