added support for more HTTP response headers

misc/checktor.js

@@ -0,0 +1,33 @@
+/*
+  Copyright 2015 - Hermes Center - GlobaLeaks project
+  Author <giovanni.pellerano@evilaliv3.org>
+
+  Javascript CheckTor library
+*/
+
+function redirectIfOnTor(url, test_url) {
+  // Test if the user is using Tor and in that case
+  // redirects the user to provided url
+  try {
+    if (typeof(test_url) === 'undefined') {
+      var test_url = 'https://antani.tor2web.org/checktor';
+    }
+    if (window.XMLHttpRequest) {
+      var xmlhttp = new XMLHttpRequest();
+
+      xmlhttp.onreadystatechange=function() {
+        if (xmlhttp.readyState==4 && xmlhttp.status==200) {
+          if (xmlhttp.getResponseHeader("x-check-tor")) {
+            window.location.href = url;
+          }
+        }
+      }
+
+      xmlhttp.open("GET", test_url, true);
+      xmlhttp.send();
+
+    }
+  } catch(err) {
+
+  }
+}

tor2web/t2w.py

@@ -1052,6 +1052,7 @@ def handleHeader(self, key, values):
         # some headers does not allow multiple occurrences
         # in case of multiple occurrences we evaluate only the first
         valueLower = values[0].lower()
+        proto = 'http://' if config.transport == 'HTTP' else 'https://'        
 
         if keyLower == 'transfer-encoding' and valueLower == 'chunked':
             return
@@ -1074,14 +1075,19 @@ def handleHeader(self, key, values):
             values = [re_sub(rexp['set-cookie_t2w'],
                              r'domain=\1\2.' + config.basehost + r'\3', x) for x in values]
 
-        if keyLower in 'location':
+        elif keyLower == 'location':
 
             if config.mode == 'TRANSLATION':
                 values = [re_sub(self.translation_rexp['from'], self.translation_rexp['to'], x) for x in values]
-
-            proto = 'http://' if config.transport == 'HTTP' else 'https://'
+
             values = [re_sub(rexp['t2w'], proto + r'\2.' + config.basehost, x) for x in values]
 
+        # especially for headers 'link' and 'x-pingback', but lets cut to the chase and do
+        # the regex for all non-exempted headers
+        else:
+            values = [ re_sub(rexp['t2w'], config.proto + r'\2.' + config.basehost, x) for x in values ]
+
+
         self.responseHeaders.setRawHeaders(key, values)
 
     def processResponseHeaders(self, headers):

tor2web/utils/mail.py

@@ -56,7 +56,11 @@ def sendmail(authenticationUsername, authenticationSecret, fromAddress, toAddres
     @param smtpPort: the smtp port
     """
     contextFactory = ClientContextFactory()
-    contextFactory.method = SSL.SSLv3_METHOD
+
+    # evilaliv3:
+    #   in order to understand and before change this settings please
+    #   read the comment inside tor2web.utils.ssl
+    contextFactory.method = SSL.SSLv23_METHOD
 
     resultDeferred = defer.Deferred()
 

tor2web/utils/ssl.py

@@ -126,7 +126,6 @@ def __init__(self, privateKeyFileName, certificateChainFileName, dhFileName, cip
         # This trick make openssl consider valid all TLS methods.
         self.sslmethod = SSL.SSLv23_METHOD
 
-
         self.dhFileName = dhFileName
         self.cipherList = cipherList