Issue 399 - Added support for Safari to updateDownloadLinks

sitescripts/extensions/bin/createNightlies.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2014 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/>.
 
 """
 
 Nightly builds generation script
 ================================
 
   This script generates nightly builds of extensions, together
   with changelogs and documentation.
 
 """
 
 import sys, os, os.path, codecs, subprocess, ConfigParser, traceback, json, hashlib
-import tempfile, re, shutil, urlparse, pipes, time, urllib2, struct
+import tempfile, shutil, urlparse, pipes, time, urllib2, struct
 from datetime import datetime
 from urllib import urlencode
 from xml.dom.minidom import parse as parseXml
 from sitescripts.utils import get_config, setupStderr, get_template
-from sitescripts.extensions.utils import compareVersions, Configuration
+from sitescripts.extensions.utils import compareVersions, Configuration, getSafariCertificateID
 
 MAX_BUILDS = 50
 
 
 class NightlyBuild(object):
   """
     Performs the build process for an extension,
     generating changelogs and documentation.
   """
 
@@ skipping 124 matching lines @@
     self.version = packager.getBuildVersion(self.tempdir, metadata, False, self.revision)
     self.basename = metadata.get("general", "basename")
     if self.config.experimental:
       self.basename += '-experimental'
 
     self.compat = []
     if metadata.has_section('compat') and metadata.has_option('compat', 'chrome'):
       self.compat.append({'id': 'chrome', 'minVersion': metadata.get('compat', 'chrome')})
 
   def readSafariMetadata(self):
-    # get the certificate ID from the developer certificate's common name
-    import M2Crypto
-    bio = M2Crypto.BIO.openfile(self.config.keyFile)
-    try:
-      while not hasattr(self, 'certificateID'):
-        try:
-          cert = M2Crypto.X509.load_cert_bio(bio)
-        except M2Crypto.X509.X509Error:
-          raise Exception('No safari developer certificate found in chain')
-
-        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:
-            self.certificateID = m.group(1)
-            break
-    finally:
-      bio.close()
-
-    # read metadata file
     import buildtools.packagerSafari as packager
     metadata = packager.readMetadata(self.tempdir, self.config.type)
+
+    self.certificateID = getSafariCertificateID(self.config.keyFile)
     self.version = packager.getBuildVersion(self.tempdir, metadata, False, self.revision)
     self.shortVersion = metadata.get("general", "version")
     self.basename = metadata.get("general", "basename")
 
   def writeUpdateManifest(self):
     """
       Writes update.rdf file for the current build
     """
     baseDir = os.path.join(self.config.nightliesDirectory, self.basename)
     if not os.path.exists(baseDir):
@@ skipping 298 matching lines @@
     except Exception, ex:
       print >>sys.stderr, "The build for %s failed:" % repo
       traceback.print_exc()
 
   file = open(nightlyConfigFile, 'wb')
   nightlyConfig.write(file)
 
 
 if __name__ == '__main__':
   main()