[tor-commits] [ooni-probe/master] Detect when the control response contains a blockpage from cloudflare

[art@xxxxxxxxxxxxxx]

commit 210ec234e1d60be752b44e1b2136b69659de6eec
Author: Arturo Filastò <arturo@xxxxxxxxxxx>
Date:   Sun Apr 24 21:31:52 2016 +0200

    Detect when the control response contains a blockpage from cloudflare
---
 ooni/nettests/blocking/http_requests.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/ooni/nettests/blocking/http_requests.py b/ooni/nettests/blocking/http_requests.py
index abc7efc..24d95cc 100644
--- a/ooni/nettests/blocking/http_requests.py
+++ b/ooni/nettests/blocking/http_requests.py
@@ -35,10 +35,10 @@ class HTTPRequestsTest(httpt.HTTPTest):
     lengths match.
     """
     name = "HTTP Requests"
-    description = "Performs a HTTP GET request over Tor and one over the " \
-                  "local network and compares the two results."
+    description = ("Performs a HTTP GET request over Tor and one over the "
+                  "local network and compares the two results.")
     author = "Arturo Filastò"
-    version = "0.2.4"
+    version = "0.2.5"
 
     usageOptions = UsageOptions
 
@@ -78,6 +78,7 @@ class HTTPRequestsTest(httpt.HTTPTest):
         self.report['factor'] = float(self.factor)
         self.report['headers_diff'] = None
         self.report['headers_match'] = None
+        self.report['control_cloudflare'] = None
 
         self.headers = {'User-Agent': [random.choice(userAgents)]}
 
@@ -145,6 +146,11 @@ class HTTPRequestsTest(httpt.HTTPTest):
         if experiment and control:
             if hasattr(experiment, 'body') and hasattr(control, 'body') \
                     and experiment.body and control.body:
+                self.report['control_cloudflare'] = False
+                if 'Attention Required! | CloudFlare' in control.body:
+                    log.msg("The control body contains a blockpage from "
+                            "cloudflare. This will skew our results.")
+                    self.report['control_cloudflare'] = True
                 self.compare_body_lengths(len(control.body),
                                           len(experiment.body))
             if hasattr(experiment, 'headers') and hasattr(control, 'headers') \



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits