Updated to write ids.json to packaged apps on upload (bug 814131)

apps/files/models.py

@@ -496,6 +496,33 @@ def watermark(self, user):
 
         return dest
 
+    def inject_ids(self):
+        """
+        For packaged webapps, adds a META-INF/ids.json file with a JSON
+        document like the following:
+            {"app_id": "6106d3b3-881a-4ddf-9dec-6b2bf8ff8341",
+             "version_id": 42}
+        """
+        app = self.version.addon
+        if not (app.type == amo.ADDON_WEBAPP and app.is_packaged):
+            return
+
+        filename = 'META-INF/ids.json'
+        ids = {
+            'app_id': app.guid,
+            'version_id': self.version_id,
+        }
+        zf = SafeUnzip(self.file_path, mode='a')
+        zf.is_valid()
+
+        # Check if there's already a META-INF/ids.json.
+        if filename in [zi.filename for zi in zf.zip.filelist]:
+            zf.zip.close()
+            return
+
+        zf.zip.writestr('META-INF/ids.json', json.dumps(ids))
+        zf.zip.close()
+
 
 @receiver(models.signals.post_save, sender=File,
           dispatch_uid='cache_localpicker')

apps/versions/models.py

@@ -90,7 +90,9 @@ def from_upload(cls, upload, addon, platforms, send_signal=True):
             platforms = cls._make_safe_platform_files(platforms)
 
         for platform in platforms:
-            File.from_upload(upload, v, platform, parse_data=data)
+            f = File.from_upload(upload, v, platform, parse_data=data)
+            if addon.type == amo.ADDON_WEBAPP and addon.is_packaged:
+                f.inject_ids()
 
         v.disable_old_files()
         # After the upload has been copied to all platforms, remove the upload.

mkt/developers/tests/test_views_versions.py

@@ -1,3 +1,6 @@
+import json
+import zipfile
+
 import mock
 from nose.tools import eq_
 from pyquery import PyQuery as pq
@@ -192,6 +195,19 @@ def test_blocklist_on_new_version(self):
         assert EscalationQueue.objects.filter(addon=self.app).exists(), (
             'App not in escalation queue')
 
+    def test_new_version_gets_ids_file(self):
+        self.app.current_version.update(version='0.9',
+                                        created=self.days_ago(1))
+        self._post(302)
+        file_ = self.app.versions.latest().files.latest()
+        filename = 'META-INF/ids.json'
+        zf = zipfile.ZipFile(file_.file_path)
+        assert filename in [zi.filename for zi in zf.filelist], (
+            'Expected %s in zip archive but not found.' % filename)
+        ids = json.loads(zf.read(filename))
+        eq_(ids['app_id'], self.app.guid)
+        eq_(ids['version_id'], file_.version_id)
+
 
 class TestEditVersion(amo.tests.TestCase):
     fixtures = ['base/users']

mkt/submit/tests/test_views.py

@@ -3,6 +3,7 @@
 import json
 import os
 import shutil
+import zipfile
 
 from django.conf import settings
 from django.core.files.storage import default_storage as storage
@@ -461,6 +462,17 @@ def test_packaged_app_not_unique_by_domain(self, _verify):
         assert not _verify.called, ('`verify_app_domain` should not be called'
                                     ' for packaged apps.')
 
+    def test_packaged_app_has_ids_file(self):
+        app = self.post_addon(data={'packaged': True, 'free': ['free-os']})
+        file_ = app.versions.latest().files.latest()
+        filename = 'META-INF/ids.json'
+        zf = zipfile.ZipFile(file_.file_path)
+        assert filename in [zi.filename for zi in zf.filelist], (
+            'Expected %s in zip archive but not found.' % filename)
+        ids = json.loads(zf.read(filename))
+        eq_(ids['app_id'], app.guid)
+        eq_(ids['version_id'], file_.version_id)
+
 
 class TestDetails(TestSubmit):
     fixtures = ['base/apps', 'base/users', 'webapps/337141-steamcube']