Issue 7290 - Fix signature production in sitekey_frame.py

sitescripts/testpages/web/sitekey_frame.py

 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-present 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
@@ skipping 10 matching lines @@
 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)
 
+    http_path = request_path(environ)
+    http_host = environ['HTTP_HOST']
+    http_ua = environ['HTTP_USER_AGENT']
+
     key = M2Crypto.EVP.load_key(get_config().get('testpages', 'sitekeyPath'))
     key.sign_init()
-    key.sign_update('\x00'.join((
-        request_path(environ),
-        environ['HTTP_HOST'],
-        environ['HTTP_USER_AGENT'],
-    )))
-
+    key.sign_update('\x00'.join([http_path, http_host, http_ua]))
     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')]
+    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,
+        'http_path': http_path,

[Vasily Kuznetsov, 2019/02/19 22:28:53]

I pass these variables to the template as well so that they can be used there in
case we decide to make debugging of this easier for the future.

+        'http_host': http_host,
+        'http_ua': http_ua,
+    }).encode('utf-8')]