Merge branch 'master' of /home/mdw/public-git/firewall

* 'master' of /home/mdw/public-git/firewall:
  vampire: Allow outside access to squid.
  vampire: Allow SMB from the untrusted network.

diff --git a/numbers.m4 b/numbers.m4
index 241e774..124ed80 100644 (file)
--- a/numbers.m4
+++ b/numbers.m4
@@ -35,7 +35,11 @@ defport bootpc 68
 defport finger 79
 defport http 80
 defport ident 113
+defport netbios_ns 137
+defport netbios_dgm 138
+defport netbios_ssn 139
 defport https 443
+defport microsoft_ds 445
 defport syslog 514                     # UDP only!
 defport submission 587
 defport rsync 873

diff --git a/vampire.m4 b/vampire.m4
index d25bf49..224374a 100644 (file)
--- a/vampire.m4
+++ b/vampire.m4
@@ -48,7 +48,7 @@ allowservices inbound tcp \
        ftp ftp_data \
        rsync \
        disorder mpd \
-       http https \
+       http https squid \
        git \
        tor_public tor_directory i2p
 allowservices inbound udp \
@@ -64,16 +64,21 @@ for p in tcp udp; do
          -p $p --destination-port $port_dns
 done
 
+## Allow smb and nmb to untrusted hosts.  This is a bit experimental.
+run iptables -A inbound -j ACCEPT \
+       -s 172.29.198.0/24 \
+       -p udp -m multiport --destination-ports \
+               $port_netbios_ns,$port_netbios_dgm
+run iptables -A inbound -j ACCEPT \
+       -s 172.29.198.0/24 \
+       -p tcp -m multiport --destination-ports \
+               $port_netbios_ssn,$port_microsoft_ds
+
 ## Provide syslog for evolution.
 run iptables -A inbound -j ACCEPT \
        -s 172.29.198.2 \
        -p udp --destination-port $port_syslog
 
-## Provide a web cache to local untrusted hosts.
-run iptables -A inbound -j ACCEPT \
-       -s 172.29.198.0/24 \
-       -p tcp --destination-port $port_squid
-
 ## Watch outgoing Tor usage.
 run iptables -A OUTPUT -m multiport \
        -p tcp --source-ports $port_tor_public,$port_tor_directory