Issue 4028 - Add support for Edge extensions to buildtools

packagerChrome.py

 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-import sys
+import errno
+import io
+import json
 import os
 import re
-import json
+from StringIO import StringIO
 import struct
-import io
-from StringIO import StringIO
+import sys
+import collections
 
 from packager import (readMetadata, getDefaultFileName, getBuildVersion,

[Vasily Kuznetsov, 2016/06/13 12:57:31]

Removed unused imports.

                       getTemplate, Files)
 
 defaultLocale = 'en_US'
 
 
 def getIgnoredFiles(params):
     return {'store.description'}
 
 
 def getPackageFiles(params):
@@ skipping 111 matching lines @@
 
     return manifest.encode('utf-8')
 
 
 def createInfoModule(params):
     template = getTemplate('chromeInfo.js.tmpl')
     return template.render(params).encode('utf-8')
 
 
 def convertJS(params, files):
-    from jshydra.abp_rewrite import doRewrite
+    from jshydra.abp_rewrite import rewrite_js
+
+    output_files = collections.OrderedDict()
+    args = collections.defaultdict(list)
 
     for item in params['metadata'].items('convert_js'):
-        file, sources = item
-        baseDir = os.path.dirname(item.source)
-
-        # Make sure the file is inside an included directory
-        if '/' in file and not files.isIncluded(file):
-            continue
-
-        sourceFiles = sources.split()
-        args = []
-        try:
-            argsStart = sourceFiles.index('--arg')
-            args = sourceFiles[argsStart + 1:]
-            sourceFiles = sourceFiles[0:argsStart]
-        except ValueError:
-            pass
-
-        # Source files of the conversion shouldn't be part of the build
-        for sourceFile in sourceFiles:
-            if sourceFile in files:
-                del files[sourceFile]
-
-        sourceFiles = map(lambda f: os.path.abspath(os.path.join(baseDir, f)), sourceFiles)
-        files[file] = doRewrite(sourceFiles, args)
+        filename, arg = re.search(r'^(.*?)(?:\[(.*)\])?$', item[0]).groups()
+        if arg is None:
+            output_files[filename] = (item[1].split(), item.source)
+        else:
+            args[filename].append('{}={}'.format(arg, item[1]))
+
+    for filename, (input_files, origin) in output_files.iteritems():
+        if '/' in filename and not files.isIncluded(filename):
+            continue
+
+        base_dir = os.path.dirname(origin)
+        jshydra_args = ['--arg', ' '.join(args[filename])]
+
+        for input_filename in input_files:
+            jshydra_args.append(os.path.join(base_dir, input_filename))
+            files.pop(input_filename, None)
+
+        files[filename] = rewrite_js(jshydra_args)
 
 
 def toJson(data):
     return json.dumps(
         data, ensure_ascii=False, sort_keys=True,
         indent=2, separators=(',', ': ')
     ).encode('utf-8') + '\n'
 
 
 def importGeckoLocales(params, files):
@@ skipping 64 matching lines @@
                         # Remove access keys
                         value = sourceData[stringID]
                         match = re.search(r'^(.*?)\s*\(&.\)$', value)
                         if match:
                             value = match.group(1)
                         else:
                             index = value.find('&')
                             if index >= 0:
                                 value = value[0:index] + value[index + 1:]
                         data[key] = {'message': value}
-            except Exception, e:
+            except Exception as e:
                 print 'Warning: error importing locale data from %s: %s' % (sourceFile, e)
 
             files[targetFile] = toJson(data)
 
 
 def truncate(text, length_limit):
     if len(text) <= length_limit:
         return text
     return text[:length_limit - 1].rstrip() + u'\u2026'
 
@@ skipping 22 matching lines @@
         data = json.loads(files[filename])
         for name, info in defaults.iteritems():
             data.setdefault(name, info)
         for name, limit in limits.iteritems():
             if name in data:
                 data[name]['message'] = truncate(data[name]['message'], limit)
         files[filename] = toJson(data)
 
 
 def signBinary(zipdata, keyFile):
-    import M2Crypto
-    if not os.path.exists(keyFile):
-        M2Crypto.RSA.gen_key(1024, 65537, callback=lambda x: None).save_key(keyFile, cipher=None)
-    key = M2Crypto.EVP.load_key(keyFile)
-    key.sign_init()
-    key.sign_update(zipdata)
-    return key.final()
+    from Crypto.Hash import SHA
+    from Crypto.PublicKey import RSA
+    from Crypto.Signature import PKCS1_v1_5
+
+    try:
+        with open(keyFile, 'rb') as file:
+            key = RSA.importKey(file.read())
+    except IOError as e:
+        if e.errno != errno.ENOENT:
+            raise
+        key = RSA.generate(2048)
+        with open(keyFile, 'wb') as file:
+            file.write(key.exportKey('PEM'))
+
+    return PKCS1_v1_5.new(key).sign(SHA.new(zipdata))
 
 
 def getPublicKey(keyFile):
-    import M2Crypto
-    return M2Crypto.EVP.load_key(keyFile).as_der()
+    from Crypto.PublicKey import RSA
+    with open(keyFile, 'rb') as file:
+        return RSA.importKey(file.read()).publickey().exportKey('DER')
 
 
 def writePackage(outputFile, pubkey, signature, zipdata):
     if isinstance(outputFile, basestring):
         file = open(outputFile, 'wb')
     else:
         file = outputFile
     if pubkey != None and signature != None:
         file.write(struct.pack('<4sIII', 'Cr24', 2, len(pubkey), len(signature)))
         file.write(pubkey)
@@ skipping 55 matching lines @@
         files['qunit/index.html'] = createScriptPage(params, 'testIndex.html.tmpl',
                                                      ('general', 'testScripts'))
 
     zipdata = files.zipToString()
     signature = None
     pubkey = None
     if keyFile != None:
         signature = signBinary(zipdata, keyFile)
         pubkey = getPublicKey(keyFile)
     writePackage(outFile, pubkey, signature, zipdata)