forked from mirrors/gecko-dev
		
	 e930b89c34
			
		
	
	
		e930b89c34
		
	
	
	
	
		
			
			***
Bug 1514594: Part 3a - Change ChromeUtils.import to return an exports object; not pollute global. r=mccr8
This changes the behavior of ChromeUtils.import() to return an exports object,
rather than a module global, in all cases except when `null` is passed as a
second argument, and changes the default behavior not to pollute the global
scope with the module's exports. Thus, the following code written for the old
model:
  ChromeUtils.import("resource://gre/modules/Services.jsm");
is approximately the same as the following, in the new model:
  var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
Since the two behaviors are mutually incompatible, this patch will land with a
scripted rewrite to update all existing callers to use the new model rather
than the old.
***
Bug 1514594: Part 3b - Mass rewrite all JS code to use the new ChromeUtils.import API. rs=Gijs
This was done using the followng script:
https://bitbucket.org/kmaglione/m-c-rewrites/src/tip/processors/cu-import-exports.jsm
***
Bug 1514594: Part 3c - Update ESLint plugin for ChromeUtils.import API changes. r=Standard8
Differential Revision: https://phabricator.services.mozilla.com/D16747
***
Bug 1514594: Part 3d - Remove/fix hundreds of duplicate imports from sync tests. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16748
***
Bug 1514594: Part 3e - Remove no-op ChromeUtils.import() calls. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16749
***
Bug 1514594: Part 3f.1 - Cleanup various test corner cases after mass rewrite. r=Gijs
***
Bug 1514594: Part 3f.2 - Cleanup various non-test corner cases after mass rewrite. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16750
--HG--
extra : rebase_source : 359574ee3064c90f33bf36c2ebe3159a24cc8895
extra : histedit_source : b93c8f42808b1599f9122d7842d2c0b3e656a594%2C64a3a4e3359dc889e2ab2b49461bab9e27fc10a7
		
	
			
		
			
				
	
	
		
			102 lines
		
	
	
	
		
			3 KiB
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
			
		
		
	
	
			102 lines
		
	
	
	
		
			3 KiB
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
| /* 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/. */
 | |
| 
 | |
| "use strict";
 | |
| 
 | |
| const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 | |
| 
 | |
| const PREF_LOGLEVEL = "browser.policies.loglevel";
 | |
| 
 | |
| XPCOMUtils.defineLazyGetter(this, "log", () => {
 | |
|   let { ConsoleAPI } = ChromeUtils.import("resource://gre/modules/Console.jsm");
 | |
|   return new ConsoleAPI({
 | |
|     prefix: "GPOParser.jsm",
 | |
|     // tip: set maxLogLevel to "debug" and use log.debug() to create detailed
 | |
|     // messages during development. See LOG_LEVELS in Console.jsm for details.
 | |
|     maxLogLevel: "error",
 | |
|     maxLogLevelPref: PREF_LOGLEVEL,
 | |
|   });
 | |
| });
 | |
| 
 | |
| var EXPORTED_SYMBOLS = ["WindowsGPOParser"];
 | |
| 
 | |
| var WindowsGPOParser = {
 | |
|   readPolicies(wrk, policies) {
 | |
|     let childWrk = wrk.openChild("Mozilla\\Firefox", wrk.ACCESS_READ);
 | |
|     if (!policies) {
 | |
|       policies = {};
 | |
|     }
 | |
|     try {
 | |
|       policies = registryToObject(childWrk, policies);
 | |
|     } catch (e) {
 | |
|       log.error(e);
 | |
|     } finally {
 | |
|       childWrk.close();
 | |
|     }
 | |
|     // Need an extra check here so we don't
 | |
|     // JSON.stringify if we aren't in debug mode
 | |
|     if (log._maxLogLevel == "debug") {
 | |
|       log.debug(JSON.stringify(policies, null, 2));
 | |
|     }
 | |
|     return policies;
 | |
|   },
 | |
| };
 | |
| 
 | |
| function registryToObject(wrk, policies) {
 | |
|   if (!policies) {
 | |
|     policies = {};
 | |
|   }
 | |
|   if (wrk.valueCount > 0) {
 | |
|     if (wrk.getValueName(0) == "1") {
 | |
|       // If the first item is 1, just assume it is an array
 | |
|       let array = [];
 | |
|       for (let i = 0; i < wrk.valueCount; i++) {
 | |
|         array.push(readRegistryValue(wrk, wrk.getValueName(i)));
 | |
|       }
 | |
|       // If it's an array, it shouldn't have any children
 | |
|       return array;
 | |
|     }
 | |
|     for (let i = 0; i < wrk.valueCount; i++) {
 | |
|       let name = wrk.getValueName(i);
 | |
|       let value = readRegistryValue(wrk, name);
 | |
|       policies[name] = value;
 | |
|     }
 | |
|   }
 | |
|   if (wrk.childCount > 0) {
 | |
|     if (wrk.getChildName(0) == "1") {
 | |
|       // If the first item is 1, it's an array of objects
 | |
|       let array = [];
 | |
|       for (let i = 0; i < wrk.childCount; i++) {
 | |
|         let name = wrk.getChildName(i);
 | |
|         let childWrk = wrk.openChild(name, wrk.ACCESS_READ);
 | |
|         array.push(registryToObject(childWrk));
 | |
|         childWrk.close();
 | |
|       }
 | |
|       // If it's an array, it shouldn't have any children
 | |
|       return array;
 | |
|     }
 | |
|     for (let i = 0; i < wrk.childCount; i++) {
 | |
|       let name = wrk.getChildName(i);
 | |
|       let childWrk = wrk.openChild(name, wrk.ACCESS_READ);
 | |
|       policies[name] = registryToObject(childWrk);
 | |
|       childWrk.close();
 | |
|     }
 | |
|   }
 | |
|   return policies;
 | |
| }
 | |
| 
 | |
| function readRegistryValue(wrk, value) {
 | |
|   switch (wrk.getValueType(value)) {
 | |
|     case wrk.TYPE_STRING:
 | |
|      return wrk.readStringValue(value);
 | |
|     case wrk.TYPE_BINARY:
 | |
|       return wrk.readBinaryValue(value);
 | |
|     case wrk.TYPE_INT:
 | |
|       return wrk.readIntValue(value);
 | |
|     case wrk.TYPE_INT64:
 | |
|       return wrk.readInt64Value(value);
 | |
|   }
 | |
|   // unknown type
 | |
|   return null;
 | |
| }
 |