X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Finitscripts%2Fsystem%2Ffirewall;h=49c6b7bf917cebc5d629a0dd3bd9f15dec542132;hb=0e7bfb1343d28069acfbaacb957cd199f8ead099;hp=b0890c71731b8c90747227b6cacc540c5485289e;hpb=a5a0c8a530aba6b234bf941c1fe927475524c894;p=ipfire-2.x.git

diff --git a/src/initscripts/system/firewall b/src/initscripts/system/firewall
index b0890c7173..49c6b7bf91 100644
--- a/src/initscripts/system/firewall
+++ b/src/initscripts/system/firewall
@@ -12,6 +12,13 @@ if [ -f /var/ipfire/red/device ]; then
 	DEVICE=`/bin/cat /var/ipfire/red/device 2> /dev/null | /usr/bin/tr -d '\012'`
 fi
 
+NAT_MASK="0x0f000000"
+
+IPS_REPEAT_MARK="0x80000000"
+IPS_REPEAT_MASK="0x80000000"
+IPS_BYPASS_MARK="0x40000000"
+IPS_BYPASS_MASK="0x40000000"
+
 function iptables() {
 	/sbin/iptables --wait "$@"
 }
@@ -32,6 +39,20 @@ iptables_init() {
 	iptables -P FORWARD DROP
 	iptables -P OUTPUT ACCEPT
 
+	# Enable TRACE logging to syslog
+	modprobe nf_log_ipv4
+	sysctl -q -w net.netfilter.nf_log.2=nf_log_ipv4
+
+	# IPS Bypass Chain which stores the BYPASS bit in connection tracking
+	iptables -N IPSBYPASS
+	iptables -A IPSBYPASS -j CONNMARK --save-mark --mask "$(( ~IPS_REPEAT_MASK & 0xffffffff ))"
+
+	# Jump into bypass chain when the BYPASS bit is set
+	for chain in INPUT FORWARD OUTPUT; do
+		iptables -A "${chain}" -m mark \
+			--mark "$(( IPS_REPEAT_MARK | IPS_BYPASS_MARK ))/$(( IPS_REPEAT_MASK | IPS_BYPASS_MASK ))" -j IPSBYPASS
+	done
+
 	# Empty LOG_DROP and LOG_REJECT chains
 	iptables -N LOG_DROP
 	iptables -A LOG_DROP   -m limit --limit 10/second -j LOG
@@ -89,78 +110,11 @@ iptables_init() {
 	# Connection tracking chains
 	iptables -N CONNTRACK
 	iptables -A CONNTRACK -m conntrack --ctstate ESTABLISHED -j ACCEPT
-	iptables -A CONNTRACK -m conntrack --ctstate INVALID -j DROP
+	iptables -A CONNTRACK -m conntrack --ctstate INVALID -j LOG_DROP
 	iptables -A CONNTRACK -p icmp -m conntrack --ctstate RELATED -j ACCEPT
-	iptables -t raw -N CONNTRACK
-	iptables -t raw -A PREROUTING -j CONNTRACK
 
-	# Conntrack helpers (https://home.regit.org/netfilter-en/secure-use-of-helpers/)
-
-	# GRE (always enabled)
-	modprobe nf_conntrack_proto_gre
-
-	# SIP
-	if [ "${CONNTRACK_SIP}" = "on" ]; then
-		modprobe nf_nat_sip
-		iptables -A CONNTRACK -m conntrack --ctstate RELATED \
-			-m helper --helper sip -j ACCEPT
-		for proto in udp tcp; do
-			iptables -t raw -A CONNTRACK -p "${proto}" --dport 5060 -j CT --helper sip
-		done
-	fi
-
-	# H.323
-	if [ "${CONNTRACK_H323}" = "on" ]; then
-		modprobe nf_nat_h323
-		iptables -A CONNTRACK -m conntrack --ctstate RELATED \
-			-m helper --helper h323 -j ACCEPT
-
-		# Gatekeeper RAS
-		iptables -t raw -A CONNTRACK -p udp --dport 1719 -j CT --helper RAS
-
-		# Q.931
-		iptables -t raw -A CONNTRACK -p tcp --dport 1720 -j CT --helper Q.931
-	fi
-
-	# FTP
-	if [ "${CONNTRACK_FTP}" = "on" ]; then
-		modprobe nf_nat_ftp
-		iptables -A CONNTRACK -m conntrack --ctstate RELATED \
-			-m helper --helper ftp -p tcp --dport 1024: -j ACCEPT
-		iptables -t raw -A CONNTRACK -p tcp --dport 21 -j CT --helper ftp
-	fi
-
-	# PPTP
-	if [ "${CONNTRACK_PPTP}" = "on" ]; then
-		modprobe nf_nat_pptp
-		iptables -A CONNTRACK -m conntrack --ctstate RELATED \
-			-m helper --helper pptp -j ACCEPT
-		iptables -t raw -A CONNTRACK -p tcp --dport 1723 -j CT --helper pptp
-	fi
-
-	# TFTP
-	if [ "${CONNTRACK_TFTP}" = "on" ]; then
-		modprobe nf_nat_tftp
-		iptables -A CONNTRACK -m conntrack --ctstate RELATED \
-			-m helper --helper tftp -j ACCEPT
-		iptables -t raw -A CONNTRACK -p udp --dport 69 -j CT --helper tftp
-	fi
-
-	# IRC
-	if [ "${CONNTRACK_IRC}" = "on" ]; then
-		modprobe nf_nat_irc
-		iptables -A CONNTRACK -m conntrack --ctstate RELATED \
-			-m helper --helper irc -j ACCEPT
-		iptables -t raw -A CONNTRACK -p tcp --dport 6667 -j CT --helper irc
-	fi
-
-	# Amanda
-	if [ "${CONNTRACK_AMANDA}" = "on" ]; then
-		modprobe nf_nat_amanda
-		iptables -A CONNTRACK -m conntrack --ctstate RELATED \
-			-m helper --helper amanda -j ACCEPT
-		iptables -t raw -A CONNTRACK -p tcp -j CT --helper amanda
-	fi
+	# Restore any connection marks
+	iptables -t mangle -A PREROUTING -j CONNMARK --restore-mark
 
 	# Fix for braindead ISPs
 	iptables -A FORWARD -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
@@ -182,7 +136,7 @@ iptables_init() {
 	iptables -A INPUT -j P2PBLOCK
 	iptables -A FORWARD -j P2PBLOCK
 	iptables -A OUTPUT -j P2PBLOCK
-	
+
 	# IPS (Guardian) chains
 	iptables -N GUARDIAN
 	iptables -A INPUT -j GUARDIAN
@@ -203,9 +157,10 @@ iptables_init() {
 	iptables -N IPS_INPUT
 	iptables -N IPS_FORWARD
 	iptables -N IPS_OUTPUT
-	iptables -A INPUT -j IPS_INPUT
-	iptables -A FORWARD -j IPS_FORWARD
-	iptables -A OUTPUT -j IPS_OUTPUT
+
+	for chain in INPUT FORWARD OUTPUT; do
+		iptables -A "${chain}" -m mark --mark "0x0/$(( IPS_REPEAT_MASK | IPS_BYPASS_MASK ))" -j "IPS_${chain}"
+	done
 
 	# OpenVPN transfer network translation
 	iptables -t nat -N OVPNNAT
@@ -272,10 +227,10 @@ iptables_init() {
 		iptables -A OUTPUT -o "${BLUE_DEV}" -j DHCPBLUEOUTPUT
 	fi
 
-	# GeoIP block
-	iptables -N GEOIPBLOCK
-	iptables -A INPUT -j GEOIPBLOCK
-	iptables -A FORWARD -j GEOIPBLOCK
+	# Location Block
+	iptables -N LOCATIONBLOCK
+	iptables -A INPUT -j LOCATIONBLOCK
+	iptables -A FORWARD -j LOCATIONBLOCK
 
 	# trafic from ipsecX/TUN/TAP interfaces, before "-i GREEN_DEV" accept everything
 	iptables -N IPSECINPUT
@@ -310,7 +265,7 @@ iptables_init() {
 	iptables -A INPUT -j TOR_INPUT
 	iptables -N TOR_OUTPUT
 	iptables -A OUTPUT -j TOR_OUTPUT
-	
+
 	# Jump into the actual firewall ruleset.
 	iptables -N INPUTFW
 	iptables -A INPUT -j INPUTFW
@@ -346,25 +301,19 @@ iptables_init() {
 
 	if [ -n "${GREEN_ADDRESS}" ]; then
 		iptables -t nat -A NAT_DESTINATION_FIX \
-			-m mark --mark 1 -j SNAT --to-source "${GREEN_ADDRESS}"
+			-m mark --mark "0x01000000/${NAT_MASK}" -j SNAT --to-source "${GREEN_ADDRESS}"
 	fi
 
 	if [ -n "${BLUE_ADDRESS}" ]; then
 		iptables -t nat -A NAT_DESTINATION_FIX \
-			-m mark --mark 2 -j SNAT --to-source "${BLUE_ADDRESS}"
+			-m mark --mark "0x02000000/${NAT_MASK}" -j SNAT --to-source "${BLUE_ADDRESS}"
 	fi
 
 	if [ -n "${ORANGE_ADDRESS}" ]; then
 		iptables -t nat -A NAT_DESTINATION_FIX \
-			-m mark --mark 3 -j SNAT --to-source "${ORANGE_ADDRESS}"
+			-m mark --mark "0x04000000/${NAT_MASK}" -j SNAT --to-source "${ORANGE_ADDRESS}"
 	fi
 
-	# upnp chain for our upnp daemon
-	iptables -t nat -N UPNPFW
-	iptables -t nat -A PREROUTING -j UPNPFW
-	iptables -N UPNPFW
-	iptables -A FORWARD -m conntrack --ctstate NEW -j UPNPFW
-
 	# RED chain, used for the red interface
 	iptables -N REDINPUT
 	iptables -A INPUT -j REDINPUT
@@ -441,8 +390,8 @@ iptables_red_up() {
 			iptables -A REDINPUT -p udp --source-port 67 --destination-port 68 -i $IFACE -j ACCEPT
 		fi
 
-		# Outgoing masquerading (don't masqerade IPsec (mark 50))
-		iptables -t nat -A REDNAT -m mark --mark 50 -o $IFACE -j RETURN
+		# Outgoing masquerading (don't masqerade IPsec)
+		iptables -t nat -A REDNAT -m policy --pol ipsec --dir=out -o "${IFACE}" -j RETURN
 
 		if [ "${IFACE}" = "${GREEN_DEV}" ]; then
 			iptables -t nat -A REDNAT -i "${GREEN_DEV}" -o "${IFACE}" -j RETURN