Issue 6552 - Support arbitrary manifest values

packagerChrome.py

 # 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 errno
 import glob
 import io
 import json
 import os
 import re
 import struct
 import subprocess
 import sys
 import random
 import posixpath
-import ConfigParser
 
 from packager import (readMetadata, getDefaultFileName, getBuildVersion,
                       getTemplate, get_extension, Files, get_app_id)
 
 defaultLocale = 'en_US'
 
 
 def getIgnoredFiles(params):
     return {'store.description'}
 
@@ skipping 72 matching lines @@
             # ... = icon-16.png icon-32.png icon-48.png
             icon = makeIcons(files, icons)
             popup = None
 
         templateData[opt] = {'icon': icon, 'popup': popup}
 
     if metadata.has_option('general', 'icons'):
         templateData['icons'] = makeIcons(files,
                                           metadata.get('general', 'icons').split())
 
-    if metadata.has_option('general', 'permissions'):
-        templateData['permissions'] = metadata.get('general', 'permissions').split()
-
-    if metadata.has_option('general', 'optionalPermissions'):
-        templateData['optionalPermissions'] = metadata.get(
-            'general', 'optionalPermissions').split()
-
     if metadata.has_option('general', 'backgroundScripts'):
         templateData['backgroundScripts'] = metadata.get(
             'general', 'backgroundScripts').split()
         if params['devenv']:
             templateData['backgroundScripts'].append('devenvPoller__.js')
-
-    if metadata.has_option('general', 'webAccessible') and metadata.get('general', 'webAccessible') != '':
-        templateData['webAccessible'] = metadata.get('general',
-                                                     'webAccessible').split()
-
-    for key in ['externallyConnectable_matches', 'externallyConnectable_ids']:
-        try:
-            values = metadata.get('general', key)
-            if values == '':
-                continue
-
-            sub_key = key.split('_', 1)[1]
-            templateData.setdefault('externallyConnectable', {})
-            templateData['externallyConnectable'][sub_key] = values.split()
-        except ConfigParser.NoOptionError:
-            continue
-
-    # We don't need to configure accept_ts_channel_id if nothing can connect
-    if 'externallyConnectable' in templateData.keys():
-        try:
-            key = 'accepts_tls_channel_id'
-            val = metadata.get('general', 'externallyConnectable_' + key)
-            templateData['externallyConnectable'][key] = val == 'true'
-        except ConfigParser.NoOptionError:
-            pass
 
     if metadata.has_section('contentScripts'):
         contentScripts = []
         for run_at, scripts in metadata.items('contentScripts'):
             if scripts == '':
                 continue
             contentScripts.append({
                 'matches': ['http://*/*', 'https://*/*'],
                 'js': scripts.split(),
                 'run_at': run_at,
                 'all_frames': True,
                 'match_about_blank': True,
             })
         templateData['contentScripts'] = contentScripts
     if params['type'] == 'gecko':
         templateData['app_id'] = get_app_id(params['releaseBuild'], metadata)
 
     manifest = template.render(templateData)
 
     # Normalize JSON structure
     licenseComment = re.compile(r'/\*.*?\*/', re.S)
     data = json.loads(re.sub(licenseComment, '', manifest, 1))
     if '_dummy' in data:
         del data['_dummy']
+
+    metadata.serialize_section_if_present('manifest', data)
     manifest = json.dumps(data, sort_keys=True, indent=2)
 
     return manifest.encode('utf-8')
 
 
 def toJson(data):
     return json.dumps(
         data, ensure_ascii=False, sort_keys=True,
         indent=2, separators=(',', ': ')
     ).encode('utf-8') + '\n'
@@ skipping 10 matching lines @@
     # Historically we didn't use relative paths when requiring modules, so in
     # order for webpack to know where to find them we need to pass in a list of
     # resolve paths. Going forward we should always use relative paths, once we
     # do that consistently this can be removed. See issues 5760, 5761 and 5762.
     resolve_paths = [os.path.join(base_extension_path, dir, 'lib')
                      for dir in ['', 'adblockpluscore', 'adblockplusui']]
 
     info_template = getTemplate(info_templates[params['type']])
     info_module = info_template.render(
         basename=params['metadata'].get('general', 'basename'),
-        version=params['metadata'].get('general', 'version')
+        version=params['version']
     ).encode('utf-8')
 
     configuration = {
         'bundles': [],
         'extension_path': base_extension_path,
         'info_module': info_module,
         'resolve_paths': resolve_paths,
     }
 
     for item in params['metadata'].items('bundles'):
@@ skipping 207 matching lines @@
     if devenv:
         add_devenv_requirements(files, metadata, params)
 
     zipdata = files.zipToString()
     signature = None
     pubkey = None
     if keyFile != None:
         signature = signBinary(zipdata, keyFile)
         pubkey = getPublicKey(keyFile)
     writePackage(outFile, pubkey, signature, zipdata)