Issue 3122 - Add testpages.web.sitekey_frame URL handler

sitescripts/testpages/web/sitekey_frame.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2015 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
 
 import base64
 import M2Crypto
 import os
-import urllib
 
 from sitescripts.utils import get_config, get_template
-from sitescripts.web import url_handler
-
-# https://www.python.org/dev/peps/pep-0333/#url-reconstruction
-def request_path(environ):
-  path = urllib.quote(environ.get("SCRIPT_NAME", "") +
-                      environ.get("PATH_INFO", ""))
-  query_string = environ.get("QUERY_STRING", "")
-  if query_string:
-    path += "?" + urllib.quote(query_string)
-  return path
+from sitescripts.web import url_handler, request_path
 
 @url_handler("/sitekey-frame")
 def sitekey_frame(environ, start_response):
   template_path, template_file = os.path.split(
       get_config().get("testpages", "sitekeyFrameTemplate")
   )
   template = get_template(template_file, template_path=template_path)
 
   key = M2Crypto.EVP.load_key(get_config().get("testpages", "sitekeyPath"))
   key.sign_init()
-  key.sign_update(request_path(environ) + "\0")
-  key.sign_update(environ["HTTP_HOST"] + "\0")
-  key.sign_update(environ["HTTP_USER_AGENT"])
+  key.sign_update("\0".join((
+    request_path(environ), environ["HTTP_HOST"], environ["HTTP_USER_AGENT"]
+  )))
 
   public_key = base64.b64encode(key.as_der())
   signature = base64.b64encode(key.final())
 
   start_response("200 OK",
                  [("Content-Type", "text/html; charset=utf-8"),
                   ("X-Adblock-Key", "%s_%s" % (public_key, signature))])
   return [template.render({"public_key": public_key,
                            "signature": signature}).encode("utf-8")]