Issue 2796 - Added DeveloperIdentifier to Info.plist for Safari 9

packagerSafari.py

 # coding: utf-8
 
 # 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 os
 import re
 import json
 import ConfigParser
@@ skipping 96 matching lines @@
 
 def fixAbsoluteUrls(files):
   for filename, content in files.iteritems():
     if os.path.splitext(filename)[1].lower() == '.html':
       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):

[kzar, 2015/07/16 15:39:53]

Nit: Use camel case to match the other function names?

[Sebastian Noack, 2015/07/16 15:50:48]

I think we should move to PEP-8 for new code.

[kzar, 2015/07/16 15:56:35]

From PEP-8:

"A style guide is about consistency. Consistency with this style guide is
important. Consistency within a project is more important. Consistency within
one module or function is most important"

[Wladimir Palant, 2015/07/16 19:16:23]

I agree with Sebastian - we are never going to take the code and replace all
function names, we can only change the gradually whenever we change something.
It will be slightly inconsistent but IMHO that's a minor issue in this case.

[kzar, 2015/07/17 08:51:18]

Acknowledged.

   import M2Crypto
 
   certs = []
   bio = M2Crypto.BIO.openfile(keyfile)
 
   try:
     key = M2Crypto.RSA.load_key_bio(bio)
     bio.reset()
     while True:
       try:
         certs.append(M2Crypto.X509.load_cert_bio(bio))
       except M2Crypto.X509.X509Error:
         break
   finally:
     bio.close()
 
   return certs, key
 
 def get_developer_identifier(certs):
   for cert in certs:
     subject = cert.get_subject()
     for entry in subject.get_entries_by_nid(subject.nid['CN']):
       m = re.match(r'Safari Developer: \((.*?)\)', entry.get_data().as_text())
       if m:
         return m.group(1)
 
-  raise Exception('No safari developer certificate found in chain')

[kzar, 2015/07/16 15:39:53]

Nit: Capitalise Safari?

[Sebastian Noack, 2015/07/16 15:50:48]

This code where merely copied from sitescripts. But yeah, I agree.

+  raise Exception('No Safari developer certificate found in chain')
 
 def createSignedXarArchive(outFile, files, certs, key):
   import subprocess
   import tempfile
   import shutil
   import M2Crypto
 
   # write files to temporary directory and create a xar archive
   dirname = tempfile.mkdtemp()
   try:
@@ skipping 10 matching lines @@
 
     subprocess.check_output(
       ['xar', '-czf', os.path.abspath(outFile), '--distribution'] + os.listdir(dirname),
       cwd=dirname
     )
   finally:
     shutil.rmtree(dirname)
 
   certificate_filenames = []
   try:
-    # write each certificate in DER format to a seperate
+    # write each certificate in DER format to a separate
     # temporary file, that they can be passed to xar
     for cert in certs:
       fd, filename = tempfile.mkstemp()
       try:
         certificate_filenames.append(filename)
         os.write(fd, cert.as_der())
       finally:
         os.close(fd)
 
     # add certificates and placeholder signature
@@ skipping 83 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)