mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-22 09:45:41 +00:00
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
126 lines
4.0 KiB
JavaScript
126 lines
4.0 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/. */
|
|
|
|
/**
|
|
* This module implements client-side key stretching for use in Firefox
|
|
* Accounts account creation and login.
|
|
*
|
|
* See https://github.com/mozilla/fxa-auth-server/wiki/onepw-protocol
|
|
*/
|
|
|
|
"use strict";
|
|
|
|
var EXPORTED_SYMBOLS = ["Credentials"];
|
|
|
|
const {Log} = ChromeUtils.import("resource://gre/modules/Log.jsm");
|
|
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
|
const {CryptoUtils} = ChromeUtils.import("resource://services-crypto/utils.js");
|
|
const {CommonUtils} = ChromeUtils.import("resource://services-common/utils.js");
|
|
|
|
const PROTOCOL_VERSION = "identity.mozilla.com/picl/v1/";
|
|
const PBKDF2_ROUNDS = 1000;
|
|
const STRETCHED_PW_LENGTH_BYTES = 32;
|
|
const HKDF_SALT = CommonUtils.hexToBytes("00");
|
|
const HKDF_LENGTH = 32;
|
|
|
|
// loglevel preference should be one of: "FATAL", "ERROR", "WARN", "INFO",
|
|
// "CONFIG", "DEBUG", "TRACE" or "ALL". We will be logging error messages by
|
|
// default.
|
|
const PREF_LOG_LEVEL = "identity.fxaccounts.loglevel";
|
|
try {
|
|
this.LOG_LEVEL =
|
|
Services.prefs.getPrefType(PREF_LOG_LEVEL) == Ci.nsIPrefBranch.PREF_STRING
|
|
&& Services.prefs.getCharPref(PREF_LOG_LEVEL);
|
|
} catch (e) {
|
|
this.LOG_LEVEL = Log.Level.Error;
|
|
}
|
|
|
|
var log = Log.repository.getLogger("Identity.FxAccounts");
|
|
log.level = LOG_LEVEL;
|
|
log.addAppender(new Log.ConsoleAppender(new Log.BasicFormatter()));
|
|
|
|
var Credentials = Object.freeze({
|
|
/**
|
|
* Make constants accessible to tests
|
|
*/
|
|
constants: {
|
|
PROTOCOL_VERSION,
|
|
PBKDF2_ROUNDS,
|
|
STRETCHED_PW_LENGTH_BYTES,
|
|
HKDF_SALT,
|
|
HKDF_LENGTH,
|
|
},
|
|
|
|
/**
|
|
* KW function from https://github.com/mozilla/fxa-auth-server/wiki/onepw-protocol
|
|
*
|
|
* keyWord derivation for use as a salt.
|
|
*
|
|
*
|
|
* @param {String} context String for use in generating salt
|
|
*
|
|
* @return {bitArray} the salt
|
|
*
|
|
* Note that PROTOCOL_VERSION does not refer in any way to the version of the
|
|
* Firefox Accounts API.
|
|
*/
|
|
keyWord(context) {
|
|
return CommonUtils.stringToBytes(PROTOCOL_VERSION + context);
|
|
},
|
|
|
|
/**
|
|
* KWE function from https://github.com/mozilla/fxa-auth-server/wiki/onepw-protocol
|
|
*
|
|
* keyWord extended with a name and an email.
|
|
*
|
|
* @param {String} name The name of the salt
|
|
* @param {String} email The email of the user.
|
|
*
|
|
* @return {bitArray} the salt combination with the namespace
|
|
*
|
|
* Note that PROTOCOL_VERSION does not refer in any way to the version of the
|
|
* Firefox Accounts API.
|
|
*/
|
|
keyWordExtended(name, email) {
|
|
return CommonUtils.stringToBytes(PROTOCOL_VERSION + name + ":" + email);
|
|
},
|
|
|
|
setup(emailInput, passwordInput, options = {}) {
|
|
return new Promise(resolve => {
|
|
log.debug("setup credentials for " + emailInput);
|
|
|
|
let hkdfSalt = options.hkdfSalt || HKDF_SALT;
|
|
let hkdfLength = options.hkdfLength || HKDF_LENGTH;
|
|
let stretchedPWLength = options.stretchedPassLength || STRETCHED_PW_LENGTH_BYTES;
|
|
let pbkdf2Rounds = options.pbkdf2Rounds || PBKDF2_ROUNDS;
|
|
|
|
let result = {};
|
|
|
|
let password = CommonUtils.encodeUTF8(passwordInput);
|
|
let salt = this.keyWordExtended("quickStretch", emailInput);
|
|
|
|
let runnable = async () => {
|
|
let start = Date.now();
|
|
let quickStretchedPW = await CryptoUtils.pbkdf2Generate(
|
|
password, salt, pbkdf2Rounds, stretchedPWLength);
|
|
|
|
result.quickStretchedPW = quickStretchedPW;
|
|
|
|
result.authPW =
|
|
await CryptoUtils.hkdfLegacy(quickStretchedPW, hkdfSalt, this.keyWord("authPW"), hkdfLength);
|
|
|
|
result.unwrapBKey =
|
|
await CryptoUtils.hkdfLegacy(quickStretchedPW, hkdfSalt, this.keyWord("unwrapBkey"), hkdfLength);
|
|
|
|
log.debug("Credentials set up after " + (Date.now() - start) + " ms");
|
|
resolve(result);
|
|
};
|
|
|
|
Services.tm.dispatchToMainThread(runnable);
|
|
log.debug("Dispatched thread for credentials setup crypto work");
|
|
});
|
|
},
|
|
});
|
|
|