Adjust app UUID in ids.json for reviewers (bug 1036495)

Author: Rob Hudson

lib/crypto/packaged.py

@@ -13,7 +13,6 @@
 from django_statsd.clients import statsd
 from signing_clients.apps import JarExtractor
 
-import amo
 from mkt.versions.models import Version
 
 
@@ -148,10 +147,20 @@ def sign(version_id, reviewer=False, resign=False, **kw):
         log.info('[Webapp:%s] Already signed app exists.' % app.id)
         return path
 
-    ids = json.dumps({
-        'id': app.guid,
-        'version': version_id
-    })
+    if reviewer:
+        # Reviewers get a unique 'id' so the reviewer installed app won't
+        # conflict with the public app, and also so multiple versions of the
+        # same app won't conflict with themselves.
+        ids = json.dumps({
+            'id': 'reviewer-{guid}-{version_id}'.format(guid=app.guid,
+                                                        version_id=version_id),
+            'version': version_id
+        })
+    else:
+        ids = json.dumps({
+            'id': app.guid,
+            'version': version_id
+        })
     with statsd.timer('services.sign.app'):
         try:
             sign_app(file_obj.file_path, path, ids, reviewer)

lib/crypto/tests.py

@@ -141,6 +141,23 @@ def test_resign_already_exists(self, sign_app):
         packaged.sign(self.version.pk, resign=True)
         assert sign_app.called
 
+    @mock.patch('lib.crypto.packaged.sign_app')
+    def test_sign_consumer(self, sign_app):
+        packaged.sign(self.version.pk)
+        assert sign_app.called
+        ids = json.loads(sign_app.call_args[0][2])
+        eq_(ids['id'], self.app.guid)
+        eq_(ids['version'], self.version.pk)
+
+    @mock.patch('lib.crypto.packaged.sign_app')
+    def test_sign_reviewer(self, sign_app):
+        packaged.sign(self.version.pk, reviewer=True)
+        assert sign_app.called
+        ids = json.loads(sign_app.call_args[0][2])
+        eq_(ids['id'], 'reviewer-{guid}-{version_id}'.format(
+            guid=self.app.guid, version_id=self.version.pk))
+        eq_(ids['version'], self.version.pk)
+
     @raises(ValueError)
     def test_server_active(self):
         with self.settings(SIGNED_APPS_SERVER_ACTIVE=True):