X-Git-Url: https://git.distorted.org.uk/~mdw/firewall/blobdiff_plain/78c56de162e7d1248eeaf10061c23dec184fe0e7..4f8c198960217f631e0fcb20e8615fc93c3d1da2:/vampire.m4

diff --git a/vampire.m4 b/vampire.m4
index 450bdff..e016358 100644
--- a/vampire.m4
+++ b/vampire.m4
@@ -1,4 +1,4 @@
-### -*-m4-*-
+### -*-sh-*-
 ###
 ### Firewall configuration for vampire
 ###
@@ -22,59 +22,61 @@
 ### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 ###--------------------------------------------------------------------------
-### Network interfaces.
-
-m4_divert(44)m4_dnl
-## Interface definitions.
-if_untrusted=eth0.1
-if_trusted=eth0.0
-if_vpn=vpn-+
-if_its_mz=eth0.0
-if_its_pi=eth0.0
-
-m4_divert(-1)
-###--------------------------------------------------------------------------
 ### vampire-specific rules.
 
-m4_divert(82)m4_dnl
+m4_divert(86)m4_dnl
 ## Externally visible services.
 allowservices inbound tcp \
 	finger ident \
-	dns \
 	ssh \
-	smtp \
+	smtp submission \
 	gnutella_svc \
 	ftp ftp_data \
 	rsync \
-	http https \
-	git	
-allowservices inbound tcp \
-	tor_public tor_directory
+	imaps \
+	disorder mpd \
+	http https squid \
+	git \
+	tor_public tor_directory i2p
 allowservices inbound udp \
-	dns \
 	tripe \
-	gnutella_svc
+	gnutella_svc \
+	i2p
+
+## Extend some services to local untrusted hosts.
+clearchain inbound-untrusted
+run iptables -A inbound -j inbound-untrusted -s $net_inet_untrusted
+run ip6tables -A inbound -j inbound-untrusted -s $net_inet6_untrusted
 
-## Provide DNS resolution to local untrusted hosts.
-for p in tcp udp; do
-  run iptables -A inbound -j ACCEPT \
-	  -s 172.29.198.0/24 \
-	  -p $p --destination-port $port_dns
-done
+allowservices inbound-untrusted tcp \
+	dns \
+	lpd \
+	netbios_ssn microsoft_ds
+allowservices inbound-untrusted udp \
+	dns \
+	tftp
 
 ## 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
 
 ## Other interesting things.
 dnsresolver inbound
-ntpclient inbound 158.152.1.76 158.152.1.204 194.159.253.2
+dnsserver inbound
+ntpclient inbound $ntp_servers
+
+## Provide NTP service to untrusted clients.
+iptables -A inbound -p udp -j ACCEPT \
+	--source-port 123 --destination-port 123 \
+	-s 172.29.198.0/23
+ip6tables -A inbound -p udp -j ACCEPT \
+	--source-port 123 --destination-port 123 \
+	-s 2001:470:9740::/48
 
 m4_divert(-1)
 ###----- That's all, folks --------------------------------------------------