commit e9f6699df43358ea98b8b5f34883e325b392b6f2 Author: Arturo Filastò <arturo@filasto.net> Date: Wed Oct 12 17:57:20 2016 +0200 Update CIDR list for whatsapp test * Bump versions of the tests --- ooni/nettests/blocking/facebook_messenger.py | 2 +- ooni/nettests/blocking/whatsapp.py | 22 +++++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/ooni/nettests/blocking/facebook_messenger.py b/ooni/nettests/blocking/facebook_messenger.py index 37c6bac..bf95126 100644 --- a/ooni/nettests/blocking/facebook_messenger.py +++ b/ooni/nettests/blocking/facebook_messenger.py @@ -46,7 +46,7 @@ class FacebookMessengerTest(httpt.HTTPTest, dnst.DNSTest): description = ("This test checks to see if the servers used by Facebook " "messenger are reachable") author = "Arturo Filastò" - version = "0.1.0" + version = "0.2.0" requiresRoot = False requiresTor = False diff --git a/ooni/nettests/blocking/whatsapp.py b/ooni/nettests/blocking/whatsapp.py index 2f12414..55f9c02 100644 --- a/ooni/nettests/blocking/whatsapp.py +++ b/ooni/nettests/blocking/whatsapp.py @@ -15,7 +15,7 @@ from ooni.errors import failureToString from ooni.templates import httpt, dnst -# These are taken from https://www.whatsapp.com/cidr.txt +# These were retrieved from https://www.whatsapp.com/cidr.txt on 2016-10-12 WHATSAPP_IPV4 = """\ 31.13.64.51/32 31.13.65.49/32 @@ -32,7 +32,6 @@ WHATSAPP_IPV4 = """\ 31.13.76.81/32 31.13.77.49/32 31.13.78.53/32 -31.13.79.195/32 31.13.80.53/32 31.13.81.53/32 31.13.82.51/32 @@ -57,6 +56,7 @@ WHATSAPP_IPV4 = """\ 50.23.90.128/27 50.97.57.128/27 75.126.39.32/27 +108.168.171.224/27 108.168.174.0/27 108.168.176.192/26 108.168.177.0/27 @@ -65,7 +65,9 @@ WHATSAPP_IPV4 = """\ 108.168.255.224/32 108.168.255.227/32 157.240.0.53/32 +157.240.2.53/32 157.240.3.53/32 +157.240.7.54/32 158.85.0.96/27 158.85.5.192/27 158.85.46.128/27 @@ -101,9 +103,12 @@ WHATSAPP_IPV4 = """\ 169.45.238.32/27 169.45.248.96/27 169.45.248.160/27 +169.46.52.224/27 +169.47.5.192/26 169.53.29.128/27 169.53.48.32/27 169.53.71.224/27 +169.53.81.64/27 169.53.250.128/26 169.53.252.64/27 169.53.255.64/27 @@ -114,8 +119,10 @@ WHATSAPP_IPV4 = """\ 169.54.193.160/27 169.54.210.0/27 169.54.222.128/27 +169.55.67.224/27 169.55.69.128/26 169.55.74.32/27 +169.55.75.96/27 169.55.126.64/26 169.55.210.96/27 169.55.235.160/27 @@ -123,6 +130,8 @@ WHATSAPP_IPV4 = """\ 173.192.219.128/27 173.192.222.160/27 173.192.231.32/27 +173.192.234.96/27 +173.193.198.96/27 173.193.205.0/27 173.193.230.96/27 173.193.230.128/27 @@ -133,7 +142,6 @@ WHATSAPP_IPV4 = """\ 174.36.251.192/27 174.37.199.192/27 174.37.217.64/27 -174.37.231.64/27 174.37.243.64/27 174.37.251.0/27 179.60.192.51/32 @@ -163,9 +171,11 @@ WHATSAPP_IPV6 = """\ 2607:f0d0:1b04:bc::/64 2607:f0d0:1b06::/64 2607:f0d0:1b06:4::/64 +2607:f0d0:1e01:b1::/64 2607:f0d0:2102:229::/64 2607:f0d0:2601:37::/64 2607:f0d0:3003:1bc::/64 +2607:f0d0:3003:1cd::/64 2607:f0d0:3004:136::/64 2607:f0d0:3004:174::/64 2607:f0d0:3005:183::/64 @@ -173,6 +183,7 @@ WHATSAPP_IPV6 = """\ 2607:f0d0:3006:84::/64 2607:f0d0:3006:af::/64 2607:f0d0:3801:38::/64 +2607:f0d0:3801:14b::/64 2607:f0d0:3802:48::/64 2a03:2880:f200:c5:face:b00c::167/128 2a03:2880:f200:1c5:face:b00c::167/128 @@ -211,7 +222,8 @@ WHATSAPP_IPV6 = """\ 2a03:2880:f222:c5:face:b00c::167/128 2a03:2880:f223:c5:face:b00c::167/128 2a03:2880:f225:c4:face:b00c::167/128 -2a03:2880:f226:c6:face:b00c::167/128""" +2a03:2880:f226:c6:face:b00c::167/128 +2a03:2880:f227:c5:face:b00c::167/128""" class DidNotConnect(Exception): pass @@ -252,7 +264,7 @@ class WhatsappTest(httpt.HTTPTest, dnst.DNSTest): description = ("This test checks to see if the servers used by whatsapp " "messenger are reachable") author = "Arturo Filastò" - version = "0.2.0" + version = "0.3.0" requiresRoot = False requiresTor = False