X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsnapshot_web.pp;h=889fa9d6779818a7649529a53b1e765130e010e4;hb=3443e44bc5ddeb5191237f3c4111ee7e4acbc8de;hp=ba6c5d66a31dc6c389420579eb8e9e7068239b6b;hpb=7e6e4790d009132460603b75fe77cf3ce34a1ae3;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/snapshot_web.pp b/modules/roles/manifests/snapshot_web.pp
index ba6c5d66a..889fa9d67 100644
--- a/modules/roles/manifests/snapshot_web.pp
+++ b/modules/roles/manifests/snapshot_web.pp
@@ -23,9 +23,12 @@ class roles::snapshot_web {
 	#  99.137.191.34
 	# 20181110 crawler
 	#  51.15.215.91
+	# 20181222, excessive number of requests
+	#  208.91.68.213
+	# 198.11.128.0/18
 	@ferm::rule { 'dsa-snapshot-abusers':
 		prio  => "005",
-		rule  => "saddr (61.69.254.110 18.128.0.0/9 3.120.0.0/14 35.156.0.0/14 52.58.0.0/15 99.137.191.34 51.15.215.91) DROP",
+		rule  => "saddr (61.69.254.110 18.128.0.0/9 3.120.0.0/14 35.156.0.0/14 52.58.0.0/15 99.137.191.34 51.15.215.91 208.91.68.213 198.11.128.0/18) DROP",
 	}
 
 	ensure_packages ( [
@@ -58,7 +61,9 @@ class roles::snapshot_web {
 	@ferm::rule { 'dsa-snapshot-connlimit':
 		domain => '(ip ip6)',
 		prio  => "005",
-		rule  => "proto tcp mod state state (NEW) daddr (${ipv4addr} ${ipv6addr})  mod multiport destination-ports (80 443 6081) mod connlimit connlimit-above 3 DROP",
+		rule  => "proto tcp mod state state (NEW) interface ! lo daddr (${ipv4addr} ${ipv6addr})  mod multiport destination-ports (80 443) mod connlimit connlimit-above 3 DROP;
+		          proto tcp mod state state (NEW) interface ! lo                                                dport 6081                 mod connlimit connlimit-above 3 DROP
+		           ",
 	}
 
 	# varnish cache