Issue 4339 - Replace M2Crypto by PyCrypto

packagerSafari.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 base64
 import ConfigParser
 import json
 import os
 import re
 from urlparse import urlparse
 
 from packager import readMetadata, getDefaultFileName, getBuildVersion, getTemplate, Files
 from packagerChrome import convertJS, importGeckoLocales, getIgnoredFiles, getPackageFiles, defaultLocale, createScriptPage
-
-PRIVATE_KEY_REGEXP = r'-+BEGIN PRIVATE KEY-+(.*?)-+END PRIVATE KEY-+'
-CERTIFICATE_REGEXP = r'-+BEGIN CERTIFICATE-+(.*?)-+END CERTIFICATE-+'
 
 
 def processFile(path, data, params):
     return data
 
 
 def createManifest(params, files):
     template = getTemplate('Info.plist.tmpl', autoEscape=True)
     metadata = params['metadata']
     catalog = json.loads(files['_locales/%s/messages.json' % defaultLocale])
@@ skipping 82 matching lines @@
             files[filename] = re.sub(
                 r'(<[^<>]*?\b(?:href|src)\s*=\s*["\']?)\/+',
                 r'\1' + '/'.join(['..'] * filename.count('/') + ['']),
                 content, re.S | re.I
             )
 
 
 def get_certificates_and_key(keyfile):
     from Crypto.PublicKey import RSA
 
-    certs = []
     with open(keyfile, 'r') as file:
         data = file.read()
-    match = re.search(PRIVATE_KEY_REGEXP, data, re.S)
-    if not match:
-        raise Exception('Cound not find private key in file')
-    key = RSA.importKey(match.group(0))
-
-    for match in re.finditer(CERTIFICATE_REGEXP, data, re.S):

[Sebastian Noack, 2016/08/17 12:19:24]

I think it might make sense to unify the logic here:

  for match in re.finditer(r'-+BEGIN (.*?)-+(.*?)-+END \1-+', data, re.S):
      what, content = match.groups()
      if what == 'CERTIFICATE':
          certs.append(base64.b64decode(content))
      if what == 'PRIVATE KEY':
          key = RSA.importKey(content)

[Wladimir Palant, 2016/08/17 14:10:03]

Done.

-        certs.append(base64.b64decode(match.group(1)))
-
-    return certs, key
+
+    certificates = []
+    key = None
+    for match in re.finditer(r'-+BEGIN (.*?)-+(.*?)-+END \1-+', data, re.S):
+        section = match.group(1)
+        if section == 'CERTIFICATE':
+            certificates.append(base64.b64decode(match.group(2)))
+        elif section == 'PRIVATE KEY':
+            key = RSA.importKey(match.group(0))
+    if not key:
+        raise Exception('Could not find private key in file')
+
+    return certificates, key
 
 
 def _get_sequence(data):
     from Crypto.Util import asn1
     sequence = asn1.DerSequence()
     sequence.decode(data)
     return sequence
 
 
 def get_developer_identifier(certs):
@@ skipping 147 matching lines @@
     fixAbsoluteUrls(files)
 
     dirname = metadata.get('general', 'basename') + '.safariextension'
     for filename in files.keys():
         files[os.path.join(dirname, filename)] = files.pop(filename)
 
     if not devenv and keyFile:
         createSignedXarArchive(outFile, files, certs, key)
     else:
         files.zip(outFile)