[tor-commits] [ooni-probe/master] Fix Microsoft Azure meek endpoint, format (#746)

[art@xxxxxxxxxxxxxx]

commit 3063f04fa3ce9b187778b382c464bfd9fa71cf3e
Author: anadahz <anadahz@xxxxxxxxxxxxxxxxxxxxxxxx>
Date:   Fri Jun 16 11:24:07 2017 -0300

    Fix Microsoft Azure meek endpoint, format (#746)
    
    * Fix Microsoft Azure meek endpoint, format
    
    * Update default meek tor bridges
    
    Based on the tor Launcher preferences (default bridges):
    https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/Bundle-Data/PTConfigs/bridge_prefs.js
---
 ooni/nettests/blocking/meek_fronted_requests.py | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/ooni/nettests/blocking/meek_fronted_requests.py b/ooni/nettests/blocking/meek_fronted_requests.py
index f516f84e..aee9c7ce 100644
--- a/ooni/nettests/blocking/meek_fronted_requests.py
+++ b/ooni/nettests/blocking/meek_fronted_requests.py
@@ -8,12 +8,12 @@ from ooni.utils import log
 
 class UsageOptions(usage.Options):
     optParameters = [ ['expectedBody', 'B',
-                         'Iâ??m just a happy little web server.\n',
-                          'Expected body content from GET response.'],
+                       'Iâ??m just a happy little web server.\n',
+                       'Expected body content from GET response.'],
                       ['domainName', 'D', None,
-                        'Specify a single fronted domainName to test.'],
+                       'Specify a single fronted domainName to test.'],
                       ['hostHeader', 'H', None,
-                        'Specify "inside" Host Header to test.']
+                       'Specify "inside" Host Header to test.']
                     ]
 
 class meekTest(httpt.HTTPTest):
@@ -23,21 +23,21 @@ class meekTest(httpt.HTTPTest):
     and response with: "Iâ??m just a happy little web server.\n".
     The input file should be formatted as (one per line):
     "domainName:hostHeader"
-    ajax.aspnetcdn.com:az668014.vo.msecnd.net
+    ajax.aspnetcdn.com:meek.azureedge.net
     a0.awsstatic.com:d2zfqthxsdq309.cloudfront.net
 
     """
     name = "Meek fronted requests test"
     description = "This test examines whether the domains used by Meek "\
                   "(a type of Tor bridge) work in your network."
-    version = "0.1.0"
+    version = "0.2.0"
 
     usageOptions = UsageOptions
     inputFile = ['file', 'f', None,
-                  "File containing the domainName:hostHeader combinations to\
-                  be tested, one per line."]
-    inputs = [('ajax.aspnetcdn.com', 'az668014.vo.msecnd.net'),
-               ('a0.awsstatic.com', 'd2zfqthxsdq309.cloudfront.net')]
+                 'File containing the domainName:hostHeader combinations to \
+                  be tested, one per line.']
+    inputs = [('ajax.aspnetcdn.com', 'meek.azureedge.net'),
+              ('a0.awsstatic.com', 'd2cly7j4zqgua7.cloudfront.net')]
 
     requiresRoot = False
     requiresTor = False
@@ -76,4 +76,3 @@ class meekTest(httpt.HTTPTest):
         headers['Host'] = [self.header]
         return self.doRequest(self.domainName, method="GET", headers=headers,
                               body_processor=process_body)
-



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