Merge pull request #557 from magopian/1164390-dont-sign-if-file-missing

Don't try to sign if file is missing (bug 1164390)

apps/versions/tests.py

@@ -457,6 +457,7 @@ def test_sign_files(self, sign_mock):
         # Don't sign for anything else than an extension.
         for addon_type in no_sign_types:
             self.version.addon.update(type=addon_type)
+            self.version.sign_files()
             assert not sign_mock.called, (
                 'lib.crypto.packaged.sign_file called for addon type {0}'
                 .format(addon_type))
@@ -465,6 +466,21 @@ def test_sign_files(self, sign_mock):
         self.version.sign_files()
         assert sign_mock.called
 
+    @mock.patch('lib.crypto.packaged.call_signing')
+    @mock.patch('lib.crypto.packaged.get_endpoint')
+    def test_sign_version_missing_files(self, get_endpoint, call_signing_mock):
+        """If one of the files is missing the others should still be signed."""
+        get_endpoint.return_value = 'endpoint'  # Fake an endpoint.
+        self.version.addon.update(type=amo.ADDON_EXTENSION)
+        # Current file doesn't have a file on disk. We create a file with one.
+        good_file = amo.tests.file_factory(version=self.version)
+        with amo.tests.copy_file('apps/files/fixtures/files/jetpack.xpi',
+                                 good_file.file_path):
+            self.version.sign_files()
+        # 'sign_file' got called twice, but only one was signed.
+        call_signing_mock.assert_called_once_with(
+            good_file.file_path, 'endpoint', good_file.version.addon.guid)
+
     def test_get_url_path(self):
         eq_(self.version.get_url_path(),
             '/en-US/firefox/addon/a3615/versions/2.1.072')

lib/crypto/packaged.py

@@ -83,6 +83,11 @@ def sign_file(file_obj):
             file_obj.pk))
         return
 
+    # No file? No signature.
+    if not os.path.exists(file_obj.file_path):
+        log.info(u'File {0} doesn\'t exist on disk'.format(file_obj.file_path))
+        return
+
     # Don't sign hotfixes.
     if file_obj.version.addon.guid in settings.HOTFIX_ADDON_GUIDS:
         log.info(u'Not signing file {0}: addon is a hotfix'.format(

lib/crypto/tests.py

@@ -126,6 +126,17 @@ def test_sign_file_non_ascii_filename(self):
         assert self.file_.hash
         assert packaged.is_signed(self.file_.file_path)
 
+    def test_no_sign_missing_file(self):
+        os.unlink(self.file_.file_path)
+        assert not self.file_.is_signed
+        assert not self.file_.cert_serial_num
+        assert not self.file_.hash
+        packaged.sign_file(self.file_)
+        assert not self.file_.is_signed
+        assert not self.file_.cert_serial_num
+        assert not self.file_.hash
+        assert not packaged.is_signed(self.file_.file_path)
+
     def test_no_sign_hotfix_addons(self):
         """Don't sign hotfix addons."""
         for hotfix_guid in settings.HOTFIX_ADDON_GUIDS: