X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsnapshot_web.pp;h=7250b7d4816a8da20559a00837a15ade9661f91c;hb=29db532312e742f2ec5133b57893898223a89481;hp=8ffa4d87ac48eed1716102b1a0be7ed7431c6457;hpb=34a880cd0001091c7130d1e8e1388e63ce37139b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/snapshot_web.pp b/modules/roles/manifests/snapshot_web.pp
index 8ffa4d87a..7250b7d48 100644
--- a/modules/roles/manifests/snapshot_web.pp
+++ b/modules/roles/manifests/snapshot_web.pp
@@ -4,11 +4,37 @@ class roles::snapshot_web {
 
 	# snapshot abusers
 	#  61.69.254.110 - 20180705, mirroring with wget
-	#  18.185.157.46  - 20180821 large amount of requests way too fast
-	#  18.194.174.202 - 20180821 large amount of requests way too fast
+	# 20180821 large amount of requests way too fast from some amazon AWS instances
+	#  18.185.157.46
+	#  18.194.174.202
+	#  18.184.181.169
+	#  18.184.5.230
+	#  18.194.137.96
+	#  18.197.147.183
+	#  3.120.39.137
+	#  3.120.41.69
+	#  35.158.129.130
+	#  52.59.199.25
+	#  52.59.228.158
+	#  52.59.245.42
+	#  52.59.253.41
+	#  52.59.71.13
+	# 20180821 mirroring
+	#  99.137.191.34
+	# 20181110 crawler
+	#  51.15.215.91
+	# 20181222, excessive number of requests
+	#  208.91.68.213
+	# 198.11.128.0/18
+	# running jugdo against snapshot
+	#  159.226.95.0/24
+	#  84.204.194.0/24
+	#  211.13.205.0/24
+	# 20190512 tens of thousands of queries
+	#  63.32.0.0/14
 	@ferm::rule { 'dsa-snapshot-abusers':
-		prio  => "000",
-		rule  => "saddr (61.69.254.110 18.185.157.46 18.194.174.202) DROP",
+		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 208.91.68.213 198.11.128.0/18 159.226.95.0/24 84.204.194.0/24 211.13.205.0/24 63.32.0.0/14) DROP",
 	}
 
 	ensure_packages ( [
@@ -38,6 +64,14 @@ class roles::snapshot_web {
 		}
 	}
 
+	@ferm::rule { 'dsa-snapshot-connlimit':
+		domain => '(ip ip6)',
+		prio  => "005",
+		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
 	###############
 	@ferm::rule { 'dsa-nat-snapshot-varnish-v4':