December 2021 - tbb-commits - lists.torproject.org

[tor-browser/tor-browser-91.4.0esr-11.5-1] Bug 40645: Migrate Moat APIs to Moat.jsm module
by gk＠torproject.org 21 Dec '21

21 Dec '21

commit f4e457ffceac50530c102e8b2331910eea5a47dc Author: Richard Pospesel <richard(a)torproject.org> Date: Fri Oct 15 16:15:05 2021 +0200 Bug 40645: Migrate Moat APIs to Moat.jsm module --- browser/modules/Moat.jsm | 667 ++++++++++++++++++++++++++++++++++++++++++++++ browser/modules/moz.build | 1 + 2 files changed, 668 insertions(+) diff --git a/browser/modules/Moat.jsm b/browser/modules/Moat.jsm new file mode 100644 index 000000000000..b26eb32bdfb3 --- /dev/null +++ b/… [View More]browser/modules/Moat.jsm @@ -0,0 +1,667 @@ +"use strict"; + +var EXPORTED_SYMBOLS = ["MoatRPC"]; + +const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); + +const { Subprocess } = ChromeUtils.import( + "resource://gre/modules/Subprocess.jsm" +); + +const { TorLauncherUtil } = ChromeUtils.import( + "resource://torlauncher/modules/tl-util.jsm" +); + +const { TorProtocolService } = ChromeUtils.import( + "resource:///modules/TorProtocolService.jsm" +); + +const { TorSettings } = ChromeUtils.import( + "resource:///modules/TorSettings.jsm" +); + +const TorLauncherPrefs = Object.freeze({ + bridgedb_front: "extensions.torlauncher.bridgedb_front", + bridgedb_reflector: "extensions.torlauncher.bridgedb_reflector", + moat_service: "extensions.torlauncher.moat_service", +}); + +// Config keys used to query tor daemon properties +const TorConfigKeys = Object.freeze({ + clientTransportPlugin: "ClientTransportPlugin", +}); + +// +// Launches and controls the PT process lifetime +// +class MeekTransport { + constructor() { + this._inited = false; + this._meekClientProcess = null; + this._meekProxyType = null; + this._meekProxyAddress = null; + this._meekProxyPort = 0; + this._meekProxyUsername = null; + this._meekProxyPassword = null; + } + + // launches the meekprocess + async init() { + // ensure we haven't already init'd + if (this._inited) { + throw new Error("MeekTransport: Already initialized"); + } + + // cleanup function for killing orphaned pt process + let onException = () => {}; + try { + // figure out which pluggable transport to use + const supportedTransports = ["meek", "meek_lite"]; + let transportPlugins = await TorProtocolService.readStringArraySetting( + TorConfigKeys.clientTransportPlugin + ); + + let { meekTransport, meekClientPath, meekClientArgs } = (() => { + for (const line of transportPlugins) { + let tokens = line.split(" "); + if (tokens.length > 2 && tokens[1] == "exec") { + let transportArray = tokens[0].split(",").map(aStr => aStr.trim()); + let transport = transportArray.find(aTransport => + supportedTransports.includes(aTransport) + ); + + if (transport != undefined) { + return { + meekTransport: transport, + meekClientPath: tokens[2], + meekClientArgs: tokens.slice(3), + }; + } + } + } + + return { + meekTransport: null, + meekClientPath: null, + meekClientArgs: null, + }; + })(); + + // Convert meek client path to absolute path if necessary + let meekWorkDir = await TorLauncherUtil.getTorFile( + "pt-startup-dir", + false + ); + let re = TorLauncherUtil.isWindows ? /^[A-Za-z]:\\/ : /^\//; + if (!re.test(meekClientPath)) { + let meekPath = meekWorkDir.clone(); + meekPath.appendRelativePath(meekClientPath); + meekClientPath = meekPath.path; + } + + // Construct the per-connection arguments. + let meekClientEscapedArgs = ""; + const meekReflector = Services.prefs.getStringPref( + TorLauncherPrefs.bridgedb_reflector + ); + + // Escape aValue per section 3.5 of the PT specification: + // First the "<Key>=<Value>" formatted arguments MUST be escaped, + // such that all backslash, equal sign, and semicolon characters + // are escaped with a backslash. + let escapeArgValue = aValue => { + if (!aValue) { + return ""; + } + + let rv = aValue.replace(/\\/g, "\\\\"); + rv = rv.replace(/=/g, "\\="); + rv = rv.replace(/;/g, "\\;"); + return rv; + }; + + if (meekReflector) { + meekClientEscapedArgs += "url="; + meekClientEscapedArgs += escapeArgValue(meekReflector); + } + const meekFront = Services.prefs.getStringPref( + TorLauncherPrefs.bridgedb_front + ); + if (meekFront) { + if (meekClientEscapedArgs.length) { + meekClientEscapedArgs += ";"; + } + meekClientEscapedArgs += "front="; + meekClientEscapedArgs += escapeArgValue(meekFront); + } + + // Setup env and start meek process + let ptStateDir = TorLauncherUtil.getTorFile("tordatadir", false); + let meekHelperProfileDir = TorLauncherUtil.getTorFile( + "pt-profiles-dir", + true + ); + ptStateDir.append("pt_state"); // Match what tor uses. + meekHelperProfileDir.appendRelativePath("profile.moat-http-helper"); + + let envAdditions = { + TOR_PT_MANAGED_TRANSPORT_VER: "1", + TOR_PT_STATE_LOCATION: ptStateDir.path, + TOR_PT_EXIT_ON_STDIN_CLOSE: "1", + TOR_PT_CLIENT_TRANSPORTS: meekTransport, + TOR_BROWSER_MEEK_PROFILE: meekHelperProfileDir.path, + }; + if (TorSettings.proxy.enabled) { + envAdditions.TOR_PT_PROXY = TorSettings.proxy.uri; + } + + let opts = { + command: meekClientPath, + arguments: meekClientArgs, + workdir: meekWorkDir.path, + environmentAppend: true, + environment: envAdditions, + stderr: "pipe", + }; + + // Launch meek client + let meekClientProcess = await Subprocess.call(opts); + // kill our process if exception is thrown + onException = () => { + meekClientProcess.kill(); + }; + + // Callback chain for reading stderr + let stderrLogger = async () => { + if (this._meekClientProcess) { + let errString = await this._meekClientProcess.stderr.readString(); + console.log(`MeekTransport: stderr => ${errString}`); + await stderrLogger(); + } + }; + stderrLogger(); + + // Read pt's stdout until terminal (CMETHODS DONE) is reached + // returns array of lines for parsing + let getInitLines = async (stdout = "") => { + let string = await meekClientProcess.stdout.readString(); + stdout += string; + + // look for the final message + const CMETHODS_DONE = "CMETHODS DONE"; + let endIndex = stdout.lastIndexOf(CMETHODS_DONE); + if (endIndex != -1) { + endIndex += CMETHODS_DONE.length; + return stdout.substr(0, endIndex).split("\n"); + } + return getInitLines(stdout); + }; + + // read our lines from pt's stdout + let meekInitLines = await getInitLines(); + // tokenize our pt lines + let meekInitTokens = meekInitLines.map(line => { + let tokens = line.split(" "); + return { + keyword: tokens[0], + args: tokens.slice(1), + }; + }); + + let meekProxyType = null; + let meekProxyAddr = null; + let meekProxyPort = 0; + + // parse our pt tokens + for (const { keyword, args } of meekInitTokens) { + const argsJoined = args.join(" "); + let keywordError = false; + switch (keyword) { + case "VERSION": { + if (args.length != 1 || args[0] !== "1") { + keywordError = true; + } + break; + } + case "PROXY": { + if (args.length != 1 || args[0] !== "DONE") { + keywordError = true; + } + break; + } + case "CMETHOD": { + if (args.length != 3) { + keywordError = true; + break; + } + const transport = args[0]; + const proxyType = args[1]; + const addrPortString = args[2]; + const addrPort = addrPortString.split(":"); + + if (transport !== meekTransport) { + throw new Error( + `MeekTransport: Expected ${meekTransport} but found ${transport}` + ); + } + if (!["socks4", "socks4a", "socks5"].includes(proxyType)) { + throw new Error( + `MeekTransport: Invalid proxy type => ${proxyType}` + ); + } + if (addrPort.length != 2) { + throw new Error( + `MeekTransport: Invalid proxy address => ${addrPortString}` + ); + } + const addr = addrPort[0]; + const port = parseInt(addrPort[1]); + if (port < 1 || port > 65535) { + throw new Error(`MeekTransport: Invalid proxy port => ${port}`); + } + + // convert proxy type to strings used by protocol-proxy-servce + meekProxyType = proxyType === "socks5" ? "socks" : "socks4"; + meekProxyAddr = addr; + meekProxyPort = port; + + break; + } + // terminal + case "CMETHODS": { + if (args.length != 1 || args[0] !== "DONE") { + keywordError = true; + } + break; + } + // errors (all fall through): + case "VERSION-ERROR": + case "ENV-ERROR": + case "PROXY-ERROR": + case "CMETHOD-ERROR": + throw new Error(`MeekTransport: ${keyword} => '${argsJoined}'`); + } + if (keywordError) { + throw new Error( + `MeekTransport: Invalid ${keyword} keyword args => '${argsJoined}'` + ); + } + } + + this._meekClientProcess = meekClientProcess; + // register callback to cleanup on process exit + this._meekClientProcess.wait().then(exitObj => { + this._meekClientProcess = null; + this.uninit(); + }); + + this._meekProxyType = meekProxyType; + this._meekProxyAddress = meekProxyAddr; + this._meekProxyPort = meekProxyPort; + + // socks5 + if (meekProxyType === "socks") { + if (meekClientEscapedArgs.length <= 255) { + this._meekProxyUsername = meekClientEscapedArgs; + this._meekProxyPassword = "\x00"; + } else { + this._meekProxyUsername = meekClientEscapedArgs.substring(0, 255); + this._meekProxyPassword = meekClientEscapedArgs.substring(255); + } + // socks4 + } else { + this._meekProxyUsername = meekClientEscapedArgs; + this._meekProxyPassword = undefined; + } + + this._inited = true; + } catch (ex) { + onException(); + throw ex; + } + } + + async uninit() { + this._inited = false; + + await this._meekClientProcess?.kill(); + this._meekClientProcess = null; + this._meekProxyType = null; + this._meekProxyAddress = null; + this._meekProxyPort = 0; + this._meekProxyUsername = null; + this._meekProxyPassword = null; + } +} + +// +// Callback object with a cached promise for the returned Moat data +// +class MoatResponseListener { + constructor() { + this._response = ""; + // we need this promise here because await nsIHttpChannel::asyncOpen does + // not return only once the request is complete, it seems to return + // after it begins, so we have to get the result from this listener object. + // This promise is only resolved once onStopRequest is called + this._responsePromise = new Promise((resolve, reject) => { + this._resolve = resolve; + this._reject = reject; + }); + } + + // callers wait on this for final response + response() { + return this._responsePromise; + } + + // noop + onStartRequest(request) {} + + // resolve or reject our Promise + onStopRequest(request, status) { + try { + if (!Components.isSuccessCode(status)) { + const errorMessage = TorLauncherUtil.getLocalizedStringForError(status); + this._reject(new Error(errorMessage)); + } + if (request.responseStatus != 200) { + this._reject(new Error(request.responseStatusText)); + } + } catch (err) { + this._reject(err); + } + this._resolve(this._response); + } + + // read response data + onDataAvailable(request, stream, offset, length) { + const scriptableStream = Cc[ + "@mozilla.org/scriptableinputstream;1" + ].createInstance(Ci.nsIScriptableInputStream); + scriptableStream.init(stream); + this._response += scriptableStream.read(length); + } +} + +// constructs the json objects and sends the request over moat +class MoatRPC { + constructor() { + this._meekTransport = null; + this._inited = false; + } + + async init() { + if (this._inited) { + throw new Error("MoatRPC: Already initialized"); + } + + let meekTransport = new MeekTransport(); + await meekTransport.init(); + this._meekTransport = meekTransport; + this._inited = true; + } + + async uninit() { + await this._meekTransport?.uninit(); + this._meekTransport = null; + this._inited = false; + } + + async _makeRequest(procedure, args) { + if (!this._inited) { + throw new Error("MoatRPC: Not initialized"); + } + + const proxyType = this._meekTransport._meekProxyType; + const proxyAddress = this._meekTransport._meekProxyAddress; + const proxyPort = this._meekTransport._meekProxyPort; + const proxyUsername = this._meekTransport._meekProxyUsername; + const proxyPassword = this._meekTransport._meekProxyPassword; + + const proxyPS = Cc[ + "@mozilla.org/network/protocol-proxy-service;1" + ].getService(Ci.nsIProtocolProxyService); + const flags = Ci.nsIProxyInfo.TRANSPARENT_PROXY_RESOLVES_HOST; + const noTimeout = 0xffffffff; // UINT32_MAX + const proxyInfo = proxyPS.newProxyInfoWithAuth( + proxyType, + proxyAddress, + proxyPort, + proxyUsername, + proxyPassword, + undefined, + undefined, + flags, + noTimeout, + undefined + ); + + const procedureURIString = `${Services.prefs.getStringPref( + TorLauncherPrefs.moat_service + )}/${procedure}`; + + const procedureURI = Services.io.newURI(procedureURIString); + // There does not seem to be a way to directly create an nsILoadInfo from + // JavaScript, so we create a throw away non-proxied channel to get one. + const secFlags = Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_SEC_CONTEXT_IS_NULL; + const loadInfo = Services.io.newChannelFromURI( + procedureURI, + undefined, + Services.scriptSecurityManager.getSystemPrincipal(), + undefined, + secFlags, + Ci.nsIContentPolicy.TYPE_OTHER + ).loadInfo; + + const httpHandler = Services.io + .getProtocolHandler("http") + .QueryInterface(Ci.nsIHttpProtocolHandler); + const ch = httpHandler + .newProxiedChannel(procedureURI, proxyInfo, 0, undefined, loadInfo) + .QueryInterface(Ci.nsIHttpChannel); + + // remove all headers except for 'Host" + const headers = []; + ch.visitRequestHeaders({ + visitHeader: (key, val) => { + if (key !== "Host") { + headers.push(key); + } + }, + }); + headers.forEach(key => ch.setRequestHeader(key, "", false)); + + // Arrange for the POST data to be sent. + const argsJson = JSON.stringify(args); + + const inStream = Cc["@mozilla.org/io/string-input-stream;1"].createInstance( + Ci.nsIStringInputStream + ); + inStream.setData(argsJson, argsJson.length); + const upChannel = ch.QueryInterface(Ci.nsIUploadChannel); + const contentType = "application/vnd.api+json"; + upChannel.setUploadStream(inStream, contentType, argsJson.length); + ch.requestMethod = "POST"; + + // Make request + const listener = new MoatResponseListener(); + await ch.asyncOpen(listener, ch); + + // wait for response + const response = await listener.response(); + + // parse that JSON + const retval = JSON.parse(response); + return retval; + } + + // + // Moat APIs + // + + // Receive a CAPTCHA challenge, takes the following parameters: + // - transports: array of transport strings available to us eg: ["obfs4", "meek"] + // + // returns an object with the following fields: + // - transport: a transport string the moat server decides it will send you selected + // from the list of provided transports + // - image: a base64 encoded jpeg with the captcha to complete + // - challenge: a nonce/cookie string associated with this request + async fetch(transports) { + + if ( + // ensure this is an array + Array.isArray(transports) && + // ensure array has values + !!transports.length && + // ensure each value in the array is a string + transports.reduce((acc, cur) => acc && typeof cur === "string", true) + ) { + const args = { + data: [ + { + version: "0.1.0", + type: "client-transports", + supported: transports, + }, + ], + }; + const retval = await this._makeRequest("fetch", args); + if ("errors" in retval) { + const code = retval.errors[0].code; + const detail = retval.errors[0].detail; + throw new Error(`MoatRPC: ${detail} (${code})`); + } + + const transport = retval.data[0].transport; + const image = retval.data[0].image; + const challenge = retval.data[0].challenge; + + return { transport, image, challenge }; + } + throw new Error("MoatRPC: fetch() expects a non-empty array of strings"); + } + + // Submit an answer for a CAPTCHA challenge and get back bridges, takes the following + // parameters: + // - transport: the transport string associated with a previous fetch request + // - challenge: the nonce string associated with the fetch request + // - solution: solution to the CAPTCHA associated with the fetch request + // - qrcode: true|false whether we want to get back a qrcode containing the bridge strings + // + // returns an object with the following fields: + // - bridges: an array of bridge line strings + // - qrcode: base64 encoded jpeg of bridges if requested, otherwise null + // if the provided solution is incorrect, returns an empty object + async check(transport, challenge, solution, qrcode) { + const args = { + data: [ + { + id: "2", + version: "0.1.0", + type: "moat-solution", + transport, + challenge, + solution, + qrcode: qrcode ? "true" : "false", + }, + ], + }; + const retval = await this._makeRequest("check", args); + if ("errors" in retval) { + const code = retval.errors[0].code; + const detail = retval.errors[0].detail; + if (code == 419 && detail === "The CAPTCHA solution was incorrect.") { + return {}; + } + + throw new Error(`MoatRPC: ${detail} (${code})`); + } + + const bridges = retval.data[0].bridges; + const qrcodeImg = qrcode ? retval.data[0].qrcode : null; + + return { bridges, qrcode: qrcodeImg }; + } + + // Request tor settings for the user optionally based on their location (derived + // from their IP), takes the following parameters: + // - transports: optional, an array of transports available to the client; if empty (or not + // given) returns settings using all working transports known to the server + // - country: optional, an ISO 3166-1 alpha-2 country code to request settings for; + // if not provided the country is determined by the user's IP address + // + // returns an array of settings objects in roughly the same format as the _settings + // object on the TorSettings module. + // - If the server cannot determine the user's country (and no country code is provided), + // then null is returned + // - If the country has no associated settings, an empty object is returned + async circumvention_settings(transports, country) { + const args = { + transports: transports ? transports : [], + country: country, + }; + const retval = await this._makeRequest("circumvention/settings", args); + if ("errors" in retval) { + const code = retval.errors[0].code; + const detail = retval.errors[0].detail; + if (code == 406) { + console.log("MoatRPC::circumvention_settings(): Cannot automatically determine user's country-code"); + // cannot determine user's country + return null; + } + + throw new Error(`MoatRPC: ${detail} (${code})`); + } + + return retval; + } + + // Request a copy of the censorship circumvention map (as if cirumvention_settings were + // queried for all country codes) + // + // returns a map whose key is an ISO 3166-1 alpha-2 country code and those + // values are arrays of settings objects + async circumvention_map() { + const args = { }; + const retval = await this._makeRequest("circumvention/map", args); + if ("errors" in retval) { + const code = retval.errors[0].code; + const detail = retval.errors[0].detail; + throw new Error(`MoatRPC: ${detail} (${code})`); + } + + let map = new Map(); + for (const [country, config] of Object.entries(retval)) { + map.set(country, config); + } + + return map; + } + + // Request a copy of the builtin bridges, takes the following parameters: + // - transports: optional, an array of transports we would like the latest bridge strings + // for; if empty (or not given) returns all of them + // + // returns a map whose keys are pluggable transport types and whose values are arrays of + // bridge strings for that type + async circumvention_builtin(transports) { + const args = { + transports: transports ? transports : [], + }; + const retval = await this._makeRequest("circumvention/builtin", args); + if ("errors" in retval) { + const code = retval.errors[0].code; + const detail = retval.errors[0].detail; + throw new Error(`MoatRPC: ${detail} (${code})`); + } + + let map = new Map(); + for (const [transport, bridge_strings] of Object.entries(retval)) { + map.set(transport, bridge_strings); + } + + return map; + } +} diff --git a/browser/modules/moz.build b/browser/modules/moz.build index 8c001d4ac6ed..a06914ccf8d9 100644 --- a/browser/modules/moz.build +++ b/browser/modules/moz.build @@ -139,6 +139,7 @@ EXTRA_JS_MODULES += [ "FaviconLoader.jsm", "HomePage.jsm", "LaterRun.jsm", + 'Moat.jsm', "NewTabPagePreloading.jsm", "OpenInTabsUtils.jsm", "PageActions.jsm", [View Less]

1 0

[tor-browser/tor-browser-91.4.0esr-11.5-1] fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor
by gk＠torproject.org 21 Dec '21

21 Dec '21

commit 4cfbf6e5718da6e7186e391ebf42a62e08692d19 Author: Richard Pospesel <richard(a)torproject.org> Date: Fri Oct 15 16:16:32 2021 +0200 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor --- .../torpreferences/content/requestBridgeDialog.jsm | 27 +++-- .../components/torpreferences/content/torPane.js | 1 - browser/modules/BridgeDB.jsm | 119 ++++++--------------- 3 files changed, 51 insertions(+), 96 … [View More]deletions(-) diff --git a/browser/components/torpreferences/content/requestBridgeDialog.jsm b/browser/components/torpreferences/content/requestBridgeDialog.jsm index 807d46cdfb18..44ae11762def 100644 --- a/browser/components/torpreferences/content/requestBridgeDialog.jsm +++ b/browser/components/torpreferences/content/requestBridgeDialog.jsm @@ -16,7 +16,6 @@ class RequestBridgeDialog { this._incorrectCaptchaHbox = null; this._incorrectCaptchaLabel = null; this._bridges = []; - this._proxyURI = null; } static get selectors() { @@ -77,7 +76,7 @@ class RequestBridgeDialog { this._captchaImage = this._dialog.querySelector(selectors.captchaImage); // request captcha from bridge db - BridgeDB.requestNewCaptchaImage(this._proxyURI).then(uri => { + BridgeDB.requestNewCaptchaImage().then(uri => { this._setcaptchaImage(uri); }); @@ -160,17 +159,24 @@ class RequestBridgeDialog { BridgeDB.submitCaptchaGuess(captchaText) .then(aBridges => { - this._bridges = aBridges; - - this._submitButton.disabled = false; - // This was successful, but use cancelDialog() to close, since - // we intercept the `dialogaccept` event. - this._dialog.cancelDialog(); + if (aBridges) { + this._bridges = aBridges; + this._submitButton.disabled = false; + // This was successful, but use cancelDialog() to close, since + // we intercept the `dialogaccept` event. + this._dialog.cancelDialog(); + } else { + this._bridges = []; + this._setUIDisabled(false); + this._incorrectCaptchaHbox.style.visibility = "visible"; + } }) .catch(aError => { + // TODO: handle other errors properly here when we do the bridge settings re-design this._bridges = []; this._setUIDisabled(false); this._incorrectCaptchaHbox.style.visibility = "visible"; + console.log(eError); }); } @@ -182,13 +188,12 @@ class RequestBridgeDialog { this._captchaEntryTextbox.value = ""; this._incorrectCaptchaHbox.style.visibility = "hidden"; - BridgeDB.requestNewCaptchaImage(this._proxyURI).then(uri => { + BridgeDB.requestNewCaptchaImage().then(uri => { this._setcaptchaImage(uri); }); } - openDialog(gSubDialog, aProxyURI, aCloseCallback) { - this._proxyURI = aProxyURI; + openDialog(gSubDialog, aCloseCallback) { gSubDialog.open( "chrome://browser/content/torpreferences/requestBridgeDialog.xhtml", { diff --git a/browser/components/torpreferences/content/torPane.js b/browser/components/torpreferences/content/torPane.js index 2df71db9327e..58eec7ff74aa 100644 --- a/browser/components/torpreferences/content/torPane.js +++ b/browser/components/torpreferences/content/torPane.js @@ -686,7 +686,6 @@ const gTorPane = (function() { let requestBridgeDialog = new RequestBridgeDialog(); requestBridgeDialog.openDialog( gSubDialog, - TorSettings.proxy.uri, aBridges => { if (aBridges.length > 0) { let bridgeStrings = aBridges.join("\n"); diff --git a/browser/modules/BridgeDB.jsm b/browser/modules/BridgeDB.jsm index 9f76b4f05a69..50665710ebf4 100644 --- a/browser/modules/BridgeDB.jsm +++ b/browser/modules/BridgeDB.jsm @@ -2,109 +2,60 @@ var EXPORTED_SYMBOLS = ["BridgeDB"]; -const { TorLauncherBridgeDB } = ChromeUtils.import( - "resource://torlauncher/modules/tl-bridgedb.jsm" -); -const { TorProtocolService } = ChromeUtils.import( - "resource:///modules/TorProtocolService.jsm" -); -const { TorStrings } = ChromeUtils.import("resource:///modules/TorStrings.jsm"); +const { MoatRPC } = ChromeUtils.import("resource:///modules/Moat.jsm"); var BridgeDB = { - _moatRequestor: null, - _currentCaptchaInfo: null, + _moatRPC: null, + _challenge: null, + _image: null, _bridges: null, get currentCaptchaImage() { - if (this._currentCaptchaInfo) { - return this._currentCaptchaInfo.captchaImage; - } - return null; + return this._image; }, get currentBridges() { return this._bridges; }, - async submitCaptchaGuess(aCaptchaSolution) { - if (this._moatRequestor && this._currentCaptchaInfo) { - return this._moatRequestor - .finishFetch( - this._currentCaptchaInfo.transport, - this._currentCaptchaInfo.challenge, - aCaptchaSolution - ) - .then(aBridgeInfo => { - this._moatRequestor.close(); - this._moatRequestor = null; - this._currentCaptchaInfo = null; - this._bridges = aBridgeInfo.bridges; - // array of bridge strings - return this._bridges; - }); + async submitCaptchaGuess(solution) { + if (!this._moatRPC) { + this._moatRPC = new MoatRPC(); + await this._moatRPC.init(); } - return new Promise((aResponse, aReject) => { - aReject(new Error("Invalid _moatRequestor or _currentCaptchaInfo")); - }); - }, - - async requestNewCaptchaImage(aProxyURI) { - // close and clear out existing state on captcha request - this.close(); - - let transportPlugins = await TorProtocolService.readStringArraySetting( - TorStrings.configKeys.clientTransportPlugin + const response = await this._moatRPC.check( + "obfs4", + this._challenge, + solution, + false ); + this._bridges = response?.bridges; + return this._bridges; + }, - let meekClientPath; - let meekTransport; // We support both "meek" and "meek_lite". - let meekClientArgs; - // TODO: shouldn't this early out once meek settings are found? - for (const line of transportPlugins) { - // Parse each ClientTransportPlugin line and look for the meek or - // meek_lite transport. This code works a lot like the Tor daemon's - // parse_transport_line() function. - let tokens = line.split(" "); - if (tokens.length > 2 && tokens[1] == "exec") { - let transportArray = tokens[0].split(",").map(aStr => aStr.trim()); - let transport = transportArray.find( - aTransport => aTransport === "meek" - ); - if (!transport) { - transport = transportArray.find( - aTransport => aTransport === "meek_lite" - ); - } - if (transport) { - meekTransport = transport; - meekClientPath = tokens[2]; - meekClientArgs = tokens.slice(3); - } + async requestNewCaptchaImage() { + try { + if (!this._moatRPC) { + this._moatRPC = new MoatRPC(); + await this._moatRPC.init(); } - } - - this._moatRequestor = TorLauncherBridgeDB.createMoatRequestor(); - return this._moatRequestor - .init(aProxyURI, meekTransport, meekClientPath, meekClientArgs) - .then(() => { - // TODO: get this from TorLauncherUtil - let bridgeType = "obfs4"; - return this._moatRequestor.fetchBridges([bridgeType]); - }) - .then(aCaptchaInfo => { - // cache off the current captcha info as the challenge is needed for response - this._currentCaptchaInfo = aCaptchaInfo; - return aCaptchaInfo.captchaImage; - }); + const response = await this._moatRPC.fetch(["obfs4"]); + this._challenge = response.challenge; + this._image = + "data:image/jpeg;base64," + encodeURIComponent(response.image); + } catch (err) { + console.log(`error : ${err}`); + } + return this._image; }, close() { - if (this._moatRequestor) { - this._moatRequestor.close(); - this._moatRequestor = null; - } - this._currentCaptchaInfo = null; + this._moatRPC?.uninit(); + this._moatRPC = null; + this._challenge = null; + this._image = null; + this._bridges = null; }, }; [View Less]

1 0

[tor-browser/tor-browser-91.4.1esr-11.0-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by gk＠torproject.org 21 Dec '21

21 Dec '21

commit e1d611232382b50b408cba3307e9d3703c3fd514 Author: Richard Pospesel <richard(a)torproject.org> Date: Fri Dec 17 17:28:30 2021 +0100 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Closes: tor-browser#40756. --- browser/components/torpreferences/content/torPane.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/components/torpreferences/content/torPane.js b/browser/components/torpreferences/content/torPane.… [View More]

1 0

[tor-browser/tor-browser-91.4.0esr-11.5-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by gk＠torproject.org 21 Dec '21

21 Dec '21

commit 944c177453619d9919d24fcf811953cca0410a85 Author: Richard Pospesel <richard(a)torproject.org> Date: Fri Dec 17 17:28:30 2021 +0100 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser --- browser/components/torpreferences/content/torPane.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/components/torpreferences/content/torPane.js b/browser/components/torpreferences/content/torPane.js index 6905cbe473ac..2df71db9327e … [View More]

1 0

[tor-browser/tor-browser-91.4.0esr-11.5-1] Merge remote-tracking branch 'gitlab/merge-requests/238' into tor-browser-91.4.0esr-11.5-1
by gk＠torproject.org 21 Dec '21

21 Dec '21

commit b0d3be75b2ce99746433f30761d3f39fab7ba3fa Merge: 990ee0330a06 944c17745361 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 21 12:51:20 2021 +0000 Merge remote-tracking branch 'gitlab/merge-requests/238' into tor-browser-91.4.0esr-11.5-1 Closes: tor-browser#40756. browser/components/torpreferences/content/torPane.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor-browser-build/master] Fold in 11.0.3 changelog
by gk＠torproject.org 21 Dec '21

21 Dec '21

commit 6aaf06936e472c044c99d204244ef925827f8c15 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 21 12:01:24 2021 +0000 Fold in 11.0.3 changelog Additionally, we fix wrong/missing entries. --- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 30 +++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 014bfe3..ad477dd … [View More]100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,28 @@ +Tor Browser 11.0.3 - December 20 2021 + * Windows + OS X + Linux + * Update Firefox to 91.4.1esr + * Update Tor to 0.4.6.9 + * Update OpenSSL to 1.1.1m + * Bug 40393: Point to a forked version of pion/dtls with fingerprinting fix [tor-browser-build] + * Bug 40394: Bump version of Snowflake to 221f1c41 [tor-browser-build] + * Bug 40646: Revert tor-browser#40475 and inherit upstream fix [tor-browser] + * Bug 40705: "visit our website" link on about:tbupdate pointing to different locations [tor-browser] + * Bug 40736: Disable third-party cookies in Private Browsing Mode [tor-browser] + * Windows + * Bug 40389: Remove workaround for HTTPS-Everywhere WASM breakage [tor-browser-build] + * Bug 40698: Addon menus missing content in TB11 [tor-browser] + * Bug 40706: Fix issue in HTTPS-Everywhere WASM [tor-browser] + * Bug 40721: Tabs crashing on certain pages in TB11 on Win 10 [tor-browser] + * Bug 40742: Remove workaround for fixing --disable-maintenance-service build bustage [tor-browser] + * Linux + * Bug 40387: Fonts of the GUI do not render after update [tor-browser-build] + * Bug 40685: Monospace font in browser chrome [tor-browser] + * Build System + * Windows + OS X + Linux + * Bug 40403: Update Go to 1.16.12 [tor-browser-build] + * OS X + * Bug 40390: Remove workaround for macOS OpenSSL build breakage [tor-browser-build] + Tor Browser 11.5a1 - December 13 2021 * Windows + OS X + Linux * Update Firefox to 91.4.0esr @@ -26,6 +51,7 @@ Tor Browser 11.5a1 - December 13 2021 * Bug 40698: Addon menus missing content in TB11 [tor-browser] * Bug 40706: Fix issue in HTTPS-Everywhere WASM [tor-browser] * Bug 40721: Tabs crashing on certain pages in TB11 on Win 10 [tor-browser] + * Bug 40668: Document is freezing with file: scheme [tor-browser] * Linux * Bug 40318: Remove check for DISPLAY env var in start-tor-browser [tor-browser-build] * Bug 40387: Remove some fonts on Linux [tor-browser-build] @@ -43,11 +69,13 @@ Tor Browser 11.0.1 - November 14 2021 * Windows + OS X + Linux * Tor Launcher 0.2.32 * Bug 40059: YEC activist sign empty in about:tor on RTL locales [torbutton] - * Bug 40383: Workaround issue in https-e wasm [tor-browser-build] * Bug 40438: Add Blockchair as a search engine [tor-browser] * Bug 40689: Change Blockchair Search provider's HTTP method [tor-browser] * Bug 40690: Browser chrome breaks when private browsing mode is turned off [tor-browser] * Bug 40700: Switch Firefox recommendations off by default [tor-browser] + * Windows + * Bug 40383: Workaround issue in https-e wasm [tor-browser-build] + * Bug 40668: Document is freezing with file: scheme [tor-browser] Tor Browser 11.0 - November 8 2021 * Windows + OS X + Linux [View Less]

1 0

[tor-browser-build/maint-11.0] Revert "Bug 40387: Remove some fonts on Linux"
by gk＠torproject.org 21 Dec '21

21 Dec '21

commit bb28297acc4bd685cb12079f99edaee3a08cfca8 Author: Pier Angelo Vendrame <pierov(a)torproject.org> Date: Fri Dec 10 19:13:12 2021 +0100 Revert "Bug 40387: Remove some fonts on Linux" This reverts commit 2a89fc9e333646eaea46823cf6fc9533e89f61bf. We do not need it anymore, because we resolved tor-browser#40685, instead. Closes: tor-browser-build#40399. --- projects/fonts/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/fonts/config … [View More]

1 0

[tor-browser-build/master] Revert "Bug 40387: Remove some fonts on Linux"
by gk＠torproject.org 21 Dec '21

21 Dec '21

commit 267da5e6e201df4c65c1219e5a516c33ae7db94e Author: Pier Angelo Vendrame <pierov(a)torproject.org> Date: Fri Dec 10 19:13:12 2021 +0100 Revert "Bug 40387: Remove some fonts on Linux" This reverts commit 2a89fc9e333646eaea46823cf6fc9533e89f61bf. We do not need it anymore, because we resolved tor-browser#40685, instead. --- projects/fonts/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/fonts/config b/projects/fonts/config index 4e3719d..… [View More]

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gitlab/merge-requests/386'
by gk＠torproject.org 21 Dec '21

21 Dec '21

commit d1985459e02a60f1d2b1e3b07bf7b021a097a30e Merge: 2d332f3 267da5e Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 21 11:26:14 2021 +0000 Merge remote-tracking branch 'gitlab/merge-requests/386' projects/fonts/config | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tor-browser-build/maint-11.0] Bug 40408: Update keyring/torbrowser.gpg for new subkey
by gk＠torproject.org 21 Dec '21

21 Dec '21

commit ed937bb5d4c03a9c9adf821e21ee5372d16f463c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Dec 21 11:43:35 2021 +0100 Bug 40408: Update keyring/torbrowser.gpg for new subkey --- keyring/torbrowser.gpg | Bin 14048 -> 15733 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/torbrowser.gpg b/keyring/torbrowser.gpg index 31c3596..5cdcdf9 100644 Binary files a/keyring/torbrowser.gpg and b/keyring/torbrowser.gpg differ

1 0