February 2014 - tor-commits - lists.torproject.org

[tor-launcher/master] Bump version for the master branch.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit 24967451dcdf39f5437c7ca3cb4d3022b2463f86 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 27 18:48:05 2014 -0800 Bump version for the master branch. --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index f718b6b..d57db8f 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.4.4</em:version> + <em:version>0.2.5.0</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>https://127.0.0.1/</em:updateURL> <!--

1 0

[tor-launcher/master] Bug #10418: Provide "Use Default Bridges" option.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit f3804aad9dd71fd4eefe33cf46ff2bab0355da4a Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Feb 27 17:31:19 2014 -0500 Bug #10418: Provide "Use Default Bridges" option. To enable this feature, add one or more preference values like: extensions.torlauncher.default_bridge.TYPE.1 extensions.torlauncher.default_bridge.TYPE.2 Other new preferences: extensions.torlauncher.default_bridge_type (stores chosen type) extensions.torlauncher.default_bridge_recommended_type The text "(recommended)" is displayed next to the recommended type, and it is selected by default. The default bridges are reconfigured each time the browser starts up; if no default bridges of the configured type are available, an error message is displayed and the user is placed on the bridge settings panel within the network configuration wizard. --- src/chrome/content/network-settings-overlay.xul | 39 ++-- src/chrome/content/network-settings-wizard.xul | 30 ++- src/chrome/content/network-settings.js | 261 +++++++++++++++++++---- src/chrome/locale/en/network-settings.dtd | 10 +- src/chrome/locale/en/torlauncher.properties | 4 + src/chrome/skin/network-settings.css | 8 +- src/components/tl-process.js | 101 ++++++++- src/components/tl-protocol.js | 26 +++ src/defaults/preferences/prefs.js | 7 + src/modules/tl-util.jsm | 76 +++++++ 10 files changed, 481 insertions(+), 81 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index b7141f0..29c3bb3 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -1,6 +1,6 @@ <?xml version="1.0"?>  @@ -74,24 +74,32 @@ </groupbox> <groupbox id="bridgeSpecificSettings"> - <hbox> - <vbox flex="1"> + <hbox pack="end"> + <radiogroup id="bridgeTypeRadioGroup" flex="1" style="margin: 0px"> <hbox align="center"> - <button dlgtype="help" oncommand="onOpenHelp()" /> - <label value="&torsettings.useBridges.label;" control="bridgeList"/> + <radio id="bridgeRadioDefault" + label="&torsettings.useBridges.default;" selected="true" /> + <menulist id="defaultBridgeType" oncommand="onBridgeTypeChange()"> + <menupopup id="defaultBridgeType_menuPopup" /> + </menulist> + <spring/> </hbox> - <textbox id="bridgeList" multiline="true" rows="3" - placeholder="&torsettings.useBridges.placeholder;" /> - </vbox> - </hbox> + <vbox id="bridgeCustomEntry"> + <label style="margin-top:0px;" + value="&torsettings.useBridges.label;" control="bridgeList"/> + <textbox id="bridgeList" multiline="true" rows="3" + oninput="onCustomBridgesTextInput();" + placeholder="&torsettings.useBridges.placeholder;" /> + </vbox> </groupbox> <vbox id="bridgeHelpContent"> @@ -115,4 +123,3 @@ </vbox> </overlay> - diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index b1c5c82..a1d820e 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -27,7 +27,7 @@ src="chrome://torlauncher/content/network-settings.js"/> <wizardpage label=" " pageid="first" next="proxy" onextra2="onCopyLog();" - onpageshow="setTimeout(function() { showWizardNavButtons(false); }, 0);"> + onpageshow="setTimeout(function() { showWizardNavButtons(); }, 0);"> <hbox class="tbb-header"> <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> @@ -52,7 +52,7 @@ </wizardpage> <wizardpage label=" " pageid="proxy" next="firewall" onextra2="onCopyLog();" - onpageshow="showWizardNavButtons(true);" + onpageshow="showWizardNavButtons();" onpageadvanced="return onWizardProxyNext(this);"> <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> @@ -113,14 +113,34 @@ </vbox> </wizardpage> - <wizardpage label=" " pageid="bridges" onextra2="onCopyLog();" - onpageshow="showOrHideButton('finish', true, true)"> + <wizardpage pageid="bridges" onextra2="onCopyLog();" + onpageshow="onWizardUseBridgesRadioChange(this)"> + <vbox class="tbb-logo-box" align="start"> + <image class="tbb-logo" /> + </vbox> + <separator /> + <hbox> + <vbox flex="1"> + <label class="question">&torSettings.bridgeQuestion;</label> + <radiogroup id="useBridgesRadioGroup" + oncommand="onWizardUseBridgesRadioChange()"> + <radio id="bridgesRadioYes" label="&torSettings.yes;" /> + <radio id="bridgesRadioNo" label="&torSettings.no;" selected="true" /> + </radiogroup> + <description class="questionHelp">&torSettings.bridgeHelp; + </description> + </vbox> + </hbox> + </wizardpage> + + <wizardpage label=" " pageid="bridgeSettings" onextra2="onCopyLog();" + onpageshow="onWizardBridgeSettingsShow()"> <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> </vbox> <separator /> <vbox> - <label class="question">&torSettings.bridgeQuestion;</label> + <label class="question">&torSettings.bridgeSettingsPrompt;</label> <groupbox id="bridgeSpecificSettings" /> </vbox> </wizardpage> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 6446af2..de7259f 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -1,4 +1,4 @@ -// Copyright (c) 2013, The Tor Project, Inc. +// Copyright (c) 2014, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -15,6 +15,9 @@ XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherUtil", XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherLogger", "resource://torlauncher/modules/tl-logger.jsm"); +const kPrefDefaultBridgeRecommendedType = + "extensions.torlauncher.default_bridge_recommended_type"; +const kPrefDefaultBridgeType = "extensions.torlauncher.default_bridge_type"; const kSupportAddr = "help(a)rt.torproject.org"; @@ -26,6 +29,7 @@ const kTorLogHasWarnOrErrTopic = "TorLogHasWarnOrErr"; const kWizardProxyRadioGroup = "proxyRadioGroup"; const kWizardFirewallRadioGroup = "firewallRadioGroup"; +const kWizardUseBridgesRadioGroup = "useBridgesRadioGroup"; const kUseProxyCheckbox = "useProxy"; const kProxyTypeMenulist = "proxyType"; @@ -36,6 +40,8 @@ const kProxyPassword = "proxyPassword"; const kUseFirewallPortsCheckbox = "useFirewallPorts"; const kFirewallAllowedPorts = "firewallAllowedPorts"; const kUseBridgesCheckbox = "useBridges"; +const kDefaultBridgeTypeMenuList = "defaultBridgeType"; +const kCustomBridgesRadio = "bridgeRadioCustom"; const kBridgeList = "bridgeList"; const kTorConfKeyDisableNetwork = "DisableNetwork"; @@ -72,6 +78,11 @@ function initDialog() var cancelBtn = document.documentElement.getButton("cancel"); gIsInitialBootstrap = window.arguments[0]; + + var startAtPanel; + if (window.arguments.length > 1) + startAtPanel = window.arguments[1]; + if (gIsInitialBootstrap) { if (cancelBtn) @@ -142,6 +153,8 @@ function initDialog() } } + initDefaultBridgeTypeMenu(); + gObsService.addObserver(gObserver, kTorBootstrapErrorTopic, false); gObsService.addObserver(gObserver, kTorLogHasWarnOrErrTopic, false); gObsService.addObserver(gObserver, kTorProcessExitedTopic, false); @@ -156,8 +169,12 @@ function initDialog() } else { - showPanel("settings"); readTorSettings(); + + if (startAtPanel) + advanceToWizardPanel(startAtPanel); + else + showPanel(); } TorLauncherLogger.log(2, "initDialog done"); @@ -201,10 +218,55 @@ function onWizardFirewallNext(aWizPage) } -function showWizardNavButtons(aShow) +function onWizardUseBridgesRadioChange(aWizPage) +{ + var wizard = getWizard(); + if (!aWizPage) + aWizPage = wizard.currentPage; + if (aWizPage) + { + var useBridges = getElemValue("bridgesRadioYes", false); + aWizPage.next = (useBridges) ? "bridgeSettings" : ""; + wizard.setAttribute("lastpage", !useBridges); + wizard._wizardButtons.onPageChange(); + } +} + + +function onWizardBridgeSettingsShow() +{ + var wizard = getWizard(); + wizard.setAttribute("lastpage", true); + wizard._wizardButtons.onPageChange(); + var btn = document.documentElement.getButton("finish"); + if (btn) + btn.focus(); +} + + +function onCustomBridgesTextInput() +{ + var customBridges = document.getElementById(kCustomBridgesRadio); + if (customBridges) + customBridges.control.selectedItem = customBridges; +} + + +function onCustomBridges() +{ + var bridgeList = document.getElementById(kBridgeList); + if (bridgeList) + bridgeList.focus(); +} + + +function showWizardNavButtons() { - showOrHideButton("back", aShow, false); - showOrHideButton("next", aShow, false); + var curPage = getWizard().currentPage; + var isFirstPage = ("first" == curPage.pageid); + + showOrHideButton("back", !isFirstPage, false); + showOrHideButton("next", !isFirstPage && curPage.next, false); } @@ -222,7 +284,7 @@ var gObserver = { { gObsService.removeObserver(gObserver, kTorProcessReadyTopic); var haveWizard = (getWizard() != null); - showPanel(haveWizard ? "first" : "settings"); + showPanel(); if (haveWizard) { showOrHideButton("back", true, false); @@ -277,21 +339,47 @@ function readTorSettings() } +// If aPanelID is undefined, the first panel is displayed. function showPanel(aPanelID) { + var wizard = getWizard(); + if (!aPanelID) + aPanelID = (wizard) ? "first" : "settings"; + var deckElem = document.getElementById("deck"); if (deckElem) { deckElem.selectedPanel = document.getElementById(aPanelID); showOrHideButton("extra2", (aPanelID != "bridgeHelp"), false); } - else - getWizard().goTo(aPanelID); + else if (wizard.currentPage.pageid != aPanelID) + wizard.goTo(aPanelID); showOrHideButton("accept", (aPanelID == "settings"), true); } +// This function assumes that you are starting on the first page. +function advanceToWizardPanel(aPanelID) +{ + var wizard = getWizard(); + if (!wizard) + return; + + onWizardConfigure(); // Equivalent to pressing "Configure" + + const kMaxTries = 10; + for (var count = 0; + ((count < kMaxTries) && + (wizard.currentPage.pageid != aPanelID) && + wizard.canAdvance); + ++count) + { + wizard.advance(); + } +} + + function showStartingTorPanel(aTorExited) { if (aTorExited) @@ -672,17 +760,50 @@ function initFirewallSettings() // Returns true if successful. function initBridgeSettings() { - var reply = gProtocolSvc.TorGetConfBool(kTorConfKeyUseBridges, false); - if (!gProtocolSvc.TorCommandSucceeded(reply)) - return false; + var typeList = TorLauncherUtil.defaultBridgeTypes; + var canUseDefaultBridges = (typeList && (typeList.length > 0)); + var defaultType = TorLauncherUtil.getCharPref(kPrefDefaultBridgeType); + var useDefault = canUseDefaultBridges && !!defaultType; + + // If not configured to use a default set of bridges, get UseBridges setting + // from tor. + var useBridges = useDefault; + if (!useDefault) + { + var reply = gProtocolSvc.TorGetConfBool(kTorConfKeyUseBridges, false); + if (!gProtocolSvc.TorCommandSucceeded(reply)) + return false; - setElemValue(kUseBridgesCheckbox, reply.retVal); + useBridges = reply.retVal; - var bridgeReply = gProtocolSvc.TorGetConf(kTorConfKeyBridgeList); - if (!gProtocolSvc.TorCommandSucceeded(bridgeReply)) - return false; + // Get bridge list from tor. + var bridgeReply = gProtocolSvc.TorGetConf(kTorConfKeyBridgeList); + if (!gProtocolSvc.TorCommandSucceeded(bridgeReply)) + return false; - setBridgeListElemValue(bridgeReply.lineArray); + if (!setBridgeListElemValue(bridgeReply.lineArray)) + { + if (canUseDefaultBridges) + useDefault = true; // We have no custom values... back to default. + else + useBridges = false; // No custom or default bridges are available. + } + } + + setElemValue(kUseBridgesCheckbox, useBridges); + setYesNoRadioValue(kWizardUseBridgesRadioGroup, useBridges); + + if (!canUseDefaultBridges) + { + var radioGroup = document.getElementById("bridgeTypeRadioGroup"); + if (radioGroup) + radioGroup.setAttribute("hidden", true); + } + + var radioID = (useDefault) ? "bridgeRadioDefault" : "bridgeRadioCustom"; + var radio = document.getElementById(radioID); + if (radio) + radio.control.selectedItem = radio; return true; } @@ -713,7 +834,7 @@ function applySettings() function useSettings() { var settings = {}; - settings[kTorConfKeyDisableNetwork] = "0"; + settings[kTorConfKeyDisableNetwork] = false; this.setConfAndReportErrors(settings, null); gProtocolSvc.TorSendCommand("SAVECONF"); @@ -868,6 +989,42 @@ function getAndValidateFirewallSettings() } +function initDefaultBridgeTypeMenu() +{ + var menu = document.getElementById(kDefaultBridgeTypeMenuList); + if (!menu) + return; + + menu.removeAllItems(); + + var typeArray = TorLauncherUtil.defaultBridgeTypes; + if (!typeArray || typeArray.length == 0) + return; + + var recommendedType = TorLauncherUtil.getCharPref( + kPrefDefaultBridgeRecommendedType, null); + var selectedType = TorLauncherUtil.getCharPref(kPrefDefaultBridgeType, null); + if (!selectedType) + selectedType = recommendedType; + + for (var i=0; i < typeArray.length; i++) + { + var bridgeType = typeArray[i]; + + var menuItemLabel = bridgeType; + if (bridgeType == recommendedType) + { + const key = "recommended_bridge"; + menuItemLabel += " " + TorLauncherUtil.getLocalizedString(key); + } + + var mi = menu.appendItem(menuItemLabel, bridgeType); + if (bridgeType == selectedType) + menu.selectedItem = mi; + } +} + + // Returns true if settings were successfully applied. function applyBridgeSettings() { @@ -875,7 +1032,7 @@ function applyBridgeSettings() if (!settings) return false; - return this.setConfAndReportErrors(settings, "bridges"); + return this.setConfAndReportErrors(settings, "bridgeSettings"); } @@ -886,18 +1043,43 @@ function getAndValidateBridgeSettings() settings[kTorConfKeyUseBridges] = null; settings[kTorConfKeyBridgeList] = null; - var bridgeStr = getElemValue(kBridgeList, null); - var useBridges = (getWizard()) ? (bridgeStr && (0 != bridgeStr.length)) - : getElemValue(kUseBridgesCheckbox, false); + var useBridges = (getWizard()) ? getElemValue("bridgesRadioYes", false) + : getElemValue(kUseBridgesCheckbox, false); - var bridgeList = parseAndValidateBridges(bridgeStr); - if (useBridges && !bridgeList) + var defaultBridgeType; + var bridgeList; + if (useBridges) { - reportValidationError("error_bridges_missing"); - return null; + var useCustom = getElemValue(kCustomBridgesRadio, false); + if (useCustom) + { + var bridgeStr = getElemValue(kBridgeList, null); + bridgeList = parseAndValidateBridges(bridgeStr); + if (!bridgeList) + { + reportValidationError("error_bridges_missing"); + return null; + } + + setBridgeListElemValue(bridgeList); + } + else + { + defaultBridgeType = getElemValue(kDefaultBridgeTypeMenuList, null); + if (!defaultBridgeType) + { + reportValidationError("error_default_bridges_type_missing"); + return null; + } + } } - setBridgeListElemValue(bridgeList); + // Since it returns a filterd list of bridges, TorLauncherUtil.defaultBridges + // must be called after setting the kPrefDefaultBridgeType pref. + TorLauncherUtil.setCharPref(kPrefDefaultBridgeType, defaultBridgeType); + if (defaultBridgeType) + bridgeList = TorLauncherUtil.defaultBridges; + if (useBridges && bridgeList) { settings[kTorConfKeyUseBridges] = true; @@ -935,21 +1117,10 @@ function parseAndValidateBridges(aStr) // Returns true if successful. function setConfAndReportErrors(aSettingsObj, aShowOnErrorPanelID) { - var reply = gProtocolSvc.TorSetConf(aSettingsObj); - var didSucceed = gProtocolSvc.TorCommandSucceeded(reply); + var errObj = {}; + var didSucceed = gProtocolSvc.TorSetConfWithReply(aSettingsObj, errObj); if (!didSucceed) { - var details = ""; - if (reply && reply.lineArray) - { - for (var i = 0; i < reply.lineArray.length; ++i) - { - if (i > 0) - details += '\n'; - details += reply.lineArray[i]; - } - } - if (aShowOnErrorPanelID) { var wizardElem = getWizard(); @@ -967,7 +1138,7 @@ function setConfAndReportErrors(aSettingsObj, aShowOnErrorPanelID) } catch (e) {} } - showSaveSettingsAlert(details); + showSaveSettingsAlert(errObj.details); } return didSucceed; @@ -976,13 +1147,7 @@ function setConfAndReportErrors(aSettingsObj, aShowOnErrorPanelID) function showSaveSettingsAlert(aDetails) { - if (!aDetails) - aDetails = TorLauncherUtil.getLocalizedString("ensure_tor_is_running"); - - var s = TorLauncherUtil.getFormattedLocalizedString( - "failed_to_save_settings", [aDetails], 1); - TorLauncherUtil.showAlert(window, s); - + TorLauncherUtil.showSaveSettingsAlert(window, aDetails); showOrHideButton("extra2", true, false); gWizIsCopyLogBtnShowing = true; } @@ -1020,6 +1185,7 @@ function setElemValue(aID, aValue) } +// Returns true if one or more values were set. function setBridgeListElemValue(aBridgeArray) { // To be consistent with bridges.torproject.org, pre-pend "bridge" to @@ -1040,6 +1206,7 @@ function setBridgeListElemValue(aBridgeArray) } setElemValue(kBridgeList, bridgeList); + return (bridgeList.length > 0); } diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 899a543..dca8d53 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -22,7 +22,9 @@ <!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> <!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> <!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.  If not, just click Connect."> +<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> +<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">  @@ -44,13 +46,15 @@ <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> <!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> +<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type"> +<!ENTITY torsettings.useBridges.custom "Use Custom Bridges"> <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port"> +<!ENTITY torsettings.useBridges.placeholder "type address:port"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 3d5ee3f..38d314a 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -24,6 +24,10 @@ torlauncher.ensure_tor_is_running=Please ensure that Tor is running. torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. torlauncher.error_proxy_type_missing=You must select the proxy type. torlauncher.error_bridges_missing=You must specify one or more bridges. +torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges. +torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings. + +torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect torlauncher.quit=Quit diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index 4f39e5a..d34adcf 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -7,7 +7,7 @@ dialog { width: 45em; - height: 36em; + height: 39em; font: -moz-dialog; } @@ -29,7 +29,7 @@ wizard.os-windows { .wizard-page-box { padding: 0px; - margin: 20px; + margin: 14px 20px 18px 20px; } wizard .wizard-header { display: none; } @@ -92,6 +92,10 @@ button.firstAnswer { height: 70px; } +#bridgeCustomEntry { + margin-left: 30px; +} + #startingTor { min-height: 300px; } diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 48f0126..d927b06 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -35,6 +35,8 @@ TorProcessService.prototype = kTorLauncherExtPath: "tor-launcher(a)torproject.org", // This could vary. kPrefPromptAtStartup: "extensions.torlauncher.prompt_at_startup", + kPrefDefaultBridgeType: "extensions.torlauncher.default_bridge_type", + kInitialControlConnDelayMS: 25, kMaxControlConnRetryMS: 500, kControlConnTimeoutMS: 30000, // Wait at most 30 seconds for tor to start. @@ -44,6 +46,10 @@ TorProcessService.prototype = kStatusRunning: 2, kStatusExited: 3, // Exited or failed to start. + kDefaultBridgesStatus_NotInUse: 0, + kDefaultBridgesStatus_InUse: 1, + kDefaultBridgesStatus_BadConfig: 2, + // nsISupports implementation. QueryInterface: function(aIID) { @@ -157,6 +163,14 @@ TorProcessService.prototype = this.mProtocolSvc.TorRetrieveBootstrapStatus(); + if (this._defaultBridgesStatus == this.kDefaultBridgesStatus_InUse) + { + // We configure default bridges each time we start tor in case + // new default bridge preference values are available (e.g., due + // to a TBB update). + this._configureDefaultBridges(); + } + this.mObsSvc.notifyObservers(null, "TorProcessIsReady", null); } else if ((Date.now() - this.mTorProcessStartTime) @@ -326,7 +340,23 @@ TorProcessService.prototype = args.push("" + pid); } - if (TorLauncherUtil.shouldShowNetworkSettings) + // Start tor with networking disabled if first run or if the + // "Use Default Bridges of Type" option is turned on. Networking will + // be enabled after initial settings are chosen or after the default + // bridge settings have been configured. + var defaultBridgeType = + TorLauncherUtil.getCharPref(this.kPrefDefaultBridgeType); + var bridgeConfigIsBad = (this._defaultBridgesStatus == + this.kDefaultBridgesStatus_BadConfig); + if (bridgeConfigIsBad) + { + var key = "error_bridge_bad_default_type"; + var err = TorLauncherUtil.getFormattedLocalizedString(key, + [defaultBridgeType], 1); + TorLauncherUtil.showAlert(null, err); + } + + if (TorLauncherUtil.shouldShowNetworkSettings || defaultBridgeType) { args.push("DisableNetwork"); args.push("1"); @@ -361,10 +391,16 @@ TorProcessService.prototype = { this._monitorTorProcessStartup(); - if (TorLauncherUtil.shouldShowNetworkSettings) + var bridgeConfigIsBad = (this._defaultBridgesStatus == + this.kDefaultBridgesStatus_BadConfig); + if (TorLauncherUtil.shouldShowNetworkSettings || bridgeConfigIsBad) { if (this.mProtocolSvc) - this._openNetworkSettings(true); // Blocks until dialog is closed. + { + // Show network settings wizard. Blocks until dialog is closed. + var panelID = (bridgeConfigIsBad) ? "bridgeSettings" : undefined; + this._openNetworkSettings(true, panelID); + } } else { @@ -384,7 +420,7 @@ TorProcessService.prototype = var asSvc = Cc["@mozilla.org/toolkit/app-startup;1"] .getService(Ci.nsIAppStartup); var flags = asSvc.eAttemptQuit; - if (this.mRestartWithQuit) + if (this.mRestartWithQuit) flags |= asSvc.eRestart; asSvc.quit(flags); } @@ -454,8 +490,47 @@ TorProcessService.prototype = } }, // _processBootstrapStatus() + // Returns a kDefaultBridgesStatus value. + get _defaultBridgesStatus() + { + var defaultBridgeType = + TorLauncherUtil.getCharPref(this.kPrefDefaultBridgeType); + if (!defaultBridgeType) + return this.kDefaultBridgesStatus_NotInUse; + + var bridgeArray = TorLauncherUtil.defaultBridges; + if (!bridgeArray || (0 == bridgeArray.length)) + return this.kDefaultBridgesStatus_BadConfig; + + return this.kDefaultBridgesStatus_InUse; + }, + + _configureDefaultBridges: function() + { + var settings = {}; + var bridgeArray = TorLauncherUtil.defaultBridges; + var useBridges = (bridgeArray && (bridgeArray.length > 0)); + settings["UseBridges"] = useBridges; + settings["Bridge"] = bridgeArray; + var errObj = {}; + var didSucceed = this.mProtocolSvc.TorSetConfWithReply(settings, errObj); + + settings = {}; + settings["DisableNetwork"] = false; + if (!this.mProtocolSvc.TorSetConfWithReply(settings, + (didSucceed) ? errObj : null)) + { + didSucceed = false; + } + + if (didSucceed) + this.mProtocolSvc.TorSendCommand("SAVECONF"); + else + TorLauncherUtil.showSaveSettingsAlert(null, errObj.details); + }, + // Blocks until network settings dialog is closed. - _openNetworkSettings: function(aIsInitialBootstrap) + _openNetworkSettings: function(aIsInitialBootstrap, aStartAtWizardPanel) { const kSettingsURL = "chrome://torlauncher/content/network-settings.xul"; const kWizardURL = "chrome://torlauncher/content/network-settings-wizard.xul"; @@ -463,7 +538,8 @@ TorProcessService.prototype = var wwSvc = Cc["@mozilla.org/embedcomp/window-watcher;1"] .getService(Ci.nsIWindowWatcher); var winFeatures = "chrome,dialog=yes,modal,all"; - var argsArray = this._createOpenWindowArgsArray(aIsInitialBootstrap); + var argsArray = this._createOpenWindowArgsArray(aIsInitialBootstrap, + aStartAtWizardPanel); var url = (aIsInitialBootstrap) ? kWizardURL : kSettingsURL; wwSvc.openWindow(null, url, "_blank", winFeatures, argsArray); }, @@ -478,14 +554,23 @@ TorProcessService.prototype = wwSvc.openWindow(null, chromeURL, "_blank", winFeatures, argsArray); }, - _createOpenWindowArgsArray: function(aBool) + _createOpenWindowArgsArray: function(aArg1, aArg2) { var argsArray = Cc["@mozilla.org/array;1"] .createInstance(Ci.nsIMutableArray); var variant = Cc["@mozilla.org/variant;1"] .createInstance(Ci.nsIWritableVariant); - variant.setFromVariant(aBool); + variant.setFromVariant(aArg1); argsArray.appendElement(variant, false); + + if (aArg2) + { + variant = Cc["@mozilla.org/variant;1"] + .createInstance(Ci.nsIWritableVariant); + variant.setFromVariant(aArg2); + argsArray.appendElement(variant, false); + } + return argsArray; }, diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index e73f2e9..bcff6ab 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -249,6 +249,32 @@ TorProtocolService.prototype = return this.TorSendCommand("SETCONF", cmdArgs); }, // TorSetConf() + // Returns true if successful. + // Upon failure, aErrorObj.details will be set to a string. + TorSetConfWithReply: function(aSettingsObj, aErrorObj) + { + var reply = this.TorSetConf(aSettingsObj); + var didSucceed = this.TorCommandSucceeded(reply); + if (!didSucceed) + { + var details = ""; + if (reply && reply.lineArray) + { + for (var i = 0; i < reply.lineArray.length; ++i) + { + if (i > 0) + details += '\n'; + details += reply.lineArray[i]; + } + } + + if (aErrorObj) + aErrorObj.details = details; + } + + return didSucceed; + }, + // If successful, sends a "TorBootstrapStatus" notification. TorRetrieveBootstrapStatus: function() { diff --git a/src/defaults/preferences/prefs.js b/src/defaults/preferences/prefs.js index 2a4799d..34bf1a7 100644 --- a/src/defaults/preferences/prefs.js +++ b/src/defaults/preferences/prefs.js @@ -12,3 +12,10 @@ pref("extensions.torlauncher.prompt_at_startup", true); pref("extensions.torlauncher.tor_path", ""); pref("extensions.torlauncher.torrc_path", ""); pref("extensions.torlauncher.tordatadir_path", ""); + +// Recommended default bridge type (can be set per localized bundle). +// pref("extensions.torlauncher.default_bridge_recommended_type", "obfs3"); + +// Default bridges. +// pref("extensions.torlauncher.default_bridge.TYPE.1", "TYPE x.x.x.x:yy"); +// pref("extensions.torlauncher.default_bridge.TYPE.2", "TYPE x.x.x.x:yy"); diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 0c31aa5..1754545 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -61,6 +61,16 @@ let TorLauncherUtil = // Public } }, + showSaveSettingsAlert: function(aParentWindow, aDetails) + { + if (!aDetails) + aDetails = TorLauncherUtil.getLocalizedString("ensure_tor_is_running"); + + var s = TorLauncherUtil.getFormattedLocalizedString( + "failed_to_save_settings", [aDetails], 1); + this.showAlert(aParentWindow, s); + }, + // Localized Strings // "torlauncher." is prepended to aStringName. @@ -181,6 +191,14 @@ let TorLauncherUtil = // Public return rv; }, + setCharPref: function(aPrefName, aVal) + { + try + { + TLUtilInternal.mPrefsSvc.setCharPref(aPrefName, aVal ? aVal : ""); + } catch (e) {} + }, + get shouldStartAndOwnTor() { const kPrefStartTor = "extensions.torlauncher.start_tor"; @@ -228,6 +246,64 @@ let TorLauncherUtil = // Public return this.getBoolPref(kPrefOnlyConfigureTor, false); }, + + // Returns an array of strings or undefined if none are available. + get defaultBridgeTypes() + { + try + { + var prefBranch = Cc["@mozilla.org/preferences-service;1"] + .getService(Ci.nsIPrefService) + .getBranch("extensions.torlauncher.default_bridge."); + var childPrefs = prefBranch.getChildList("", []); + var typeArray = []; + for (var i = 0; i < childPrefs.length; ++i) + { + var s = childPrefs[i].replace(/\..*$/, ""); + if (-1 == typeArray.lastIndexOf(s)) + typeArray.push(s); + } + + return typeArray.sort(); + } catch(e) {}; + + return undefined; + }, + + // Returns an array of strings or undefined if none are available. + // The list is filtered by the default_bridge_type pref value. + get defaultBridges() + { + const kPrefName = "extensions.torlauncher.default_bridge_type"; + var filterType = this.getCharPref(kPrefName); + if (!filterType) + return undefined; + + try + { + var prefBranch = Cc["@mozilla.org/preferences-service;1"] + .getService(Ci.nsIPrefService) + .getBranch("extensions.torlauncher.default_bridge."); + var childPrefs = prefBranch.getChildList("", []); + var bridgeArray = []; + // The pref service seems to return the values in reverse order, so + // we compensate by traversing in reverse order. + for (var i = childPrefs.length - 1; i >= 0; --i) + { + var bridgeType = childPrefs[i].replace(/\..*$/, ""); + if (bridgeType == filterType) + { + var s = prefBranch.getCharPref(childPrefs[i]); + if (s) + bridgeArray.push(s); + } + } + + return bridgeArray; + } catch(e) {}; + + return undefined; + }, };

1 0

[tor-browser-bundle/master] Add GMP to all version files.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit 44ae9c486d59692b1f7f72b2b8a8ae45506a579a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 27 18:37:06 2014 -0800 Add GMP to all version files. Otherwise fetch-inputs barfs. --- gitian/versions | 8 ++++++-- gitian/versions.alpha | 8 ++++++-- gitian/versions.nightly | 4 ++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/gitian/versions b/gitian/versions index b9b5835..f3dfe9d 100755 --- a/gitian/versions +++ b/gitian/versions @@ -12,13 +12,14 @@ NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 -PYPTLIB_TAG=pyptlib-0.0.4 -OBFSPROXY_TAG=obfsproxy-0.2.3 +PYPTLIB_TAG=pyptlib-0.0.5 +OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 GITIAN_TAG=tor-browser-builder-3.0-4 OPENSSL_VER=1.0.1f +GMP_VER=5.1.3 FIREFOX_LANG_VER=24.3.0esr BINUTILS_VER=2.22 GCC_VER=4.6.3 @@ -33,6 +34,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz +GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-fn+sm+fx.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -52,6 +54,7 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a +GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 @@ -67,6 +70,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} +GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 2172e63..0741b8f 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -12,13 +12,14 @@ NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 -PYPTLIB_TAG=pyptlib-0.0.4 -OBFSPROXY_TAG=obfsproxy-0.2.3 +PYPTLIB_TAG=pyptlib-0.0.5 +OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 GITIAN_TAG=tor-browser-builder-3.0-4 OPENSSL_VER=1.0.1f +GMP_VER=5.1.3 FIREFOX_LANG_VER=24.3.0esr BINUTILS_VER=2.22 GCC_VER=4.6.3 @@ -33,6 +34,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz +GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -52,6 +54,7 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a +GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 @@ -67,6 +70,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} +GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index e2ab7aa..5e6bc6f 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -19,6 +19,7 @@ FLASHPROXY_TAG=master GITIAN_TAG=tor-browser-builder-3.0-4 OPENSSL_VER=1.0.1f +GMP_VER=5.1.3 FIREFOX_LANG_VER=24.3.0esr BINUTILS_VER=2.22 GCC_VER=4.6.3 @@ -33,6 +34,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz +GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.14-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -52,6 +54,7 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a +GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 NOSCRIPT_HASH=c0c089f994c71a8e504fa26fed9fbbb16dbd7e49d4bef2cf9bc6a2159ae5f073 @@ -67,6 +70,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} +GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}

1 0

[tor-browser-bundle/master] Bump Tor Browser version.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit fa3c928577a505978a8eba11904b6038cb4809fa Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 27 18:06:24 2014 -0800 Bump Tor Browser version. --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions b/gitian/versions index 21307e9..b9b5835 100755 --- a/gitian/versions +++ b/gitian/versions @@ -3,7 +3,7 @@ BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.3.0esr-3.5.2.1-build2 +TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 TOR_TAG=tor-0.2.4.20 TORLAUNCHER_TAG=0.2.4.4 TORBUTTON_TAG=1.6.6.0 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 0c34485..2172e63 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -3,7 +3,7 @@ BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.3.0esr-3.5.2.1-build2 +TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 TOR_TAG=tor-0.2.5.1-alpha TORLAUNCHER_TAG=0.2.4.4 TORBUTTON_TAG=1.6.6.0 diff --git a/gitian/versions.beta b/gitian/versions.beta index 97bf8ca..6ac5a34 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -4,7 +4,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.3.0esr-3.5.2.1-build2 +TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 TOR_TAG=tor-0.2.4.20 TORLAUNCHER_TAG=0.2.4.4 TORBUTTON_TAG=1.6.6.0

1 0

[tor-browser/tor-browser-24.3.0esr-2] fixup! Tor Browser's official .mozconfigs.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit bff9f4e61b654013dce9086b1d63cb91587d3857 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 27 15:43:18 2014 -0800 fixup! Tor Browser's official .mozconfigs. Bug #9896: Disable strip to allow debuginfo file creation. Also re-disable the updater. How did that get enabled... --- .mozconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.mozconfig b/.mozconfig index a71084b..e9a9432 100755 --- a/.mozconfig +++ b/.mozconfig @@ -9,10 +9,12 @@ mk_add_options BUILD_OFFICIAL=1 ac_add_options --enable-optimize #ac_add_options --disable-optimize ac_add_options --enable-official-branding -ac_add_options --enable-strip +ac_add_options --disable-strip +ac_add_options --disable-install-strip ac_add_options --disable-tests ac_add_options --disable-debug ac_add_options --disable-maintenance-service +ac_add_options --disable-updater ac_add_options --disable-crashreporter ac_add_options --disable-webrtc #ac_add_options --disable-ctypes

1 0

[tor-browser/tor-browser-24.3.0esr-2] fixup! Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit 57cf06d283e268b328a7287afc9e4216400808c7 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 27 15:46:40 2014 -0800 fixup! Tor Browser's Firefox preference overrides. Bug #10237: Disable the media cache to prevent disk leaks. Bug #10703: Force the default charset to avoid locale fingerprinting. --- browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 93725ee..7e2efc9 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -30,6 +30,7 @@ pref("signon.rememberSignons", false); pref("browser.formfill.enable", false); pref("signon.autofillForms", false); pref("browser.sessionstore.privacy_level", 2); +pref("media.cache_size", 0); // Misc privacy: Remote pref("browser.send_pings", false); @@ -70,6 +71,7 @@ pref("general.useragent.vendorSub", ""); pref("dom.enable_performance", false); pref("plugin.expose_full_path", false); pref("browser.zoom.siteSpecific", false); +pref("intl.charset.default", "windows-1252"); // pref("intl.accept_languages", "en-us, en"); // Set by Torbutton // pref("intl.accept_charsets", "iso-8859-1,*,utf-8"); // Set by Torbutton // pref("intl.charsetmenu.browser.cache", "UTF-8"); // Set by Torbutton

1 0

[tor-browser-bundle/master] Bug #10472: Pass arguments to the browser from Linux startup script.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit b712a8c8e9374e13e913f42aa105af76ae06ddf2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 27 16:34:40 2014 -0800 Bug #10472: Pass arguments to the browser from Linux startup script. Patch by gacar. --- RelativeLink/RelativeLink.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/RelativeLink/RelativeLink.sh b/RelativeLink/RelativeLink.sh index 4a10c58..9bab08c 100755 --- a/RelativeLink/RelativeLink.sh +++ b/RelativeLink/RelativeLink.sh @@ -118,10 +118,12 @@ fi debug=0 usage_message="usage: $0 [--debug]" -if [ "$#" -eq 1 -a $ "x$1" = "x--debug" -o "x$1" = "x-debug" $ ]; then +# !!! We may have more than one argument, changed -eq to -ge in if & elif clauses below +if [ "$#" -ge 1 -a $ "x$1" = "x--debug" -o "x$1" = "x-debug" $ ]; then debug=1 + shift # pop the debug argument printf "\nDebug enabled.\n\n" -elif [ "$#" -eq 1 -a $ "x$1" = "x--help" -o "x$1" = "x-help" $ ]; then +elif [ "$#" -ge 1 -a $ "x$1" = "x--help" -o "x$1" = "x-help" $ ]; then echo "$usage_message" exit 0 fi @@ -216,7 +218,9 @@ printf "\nLaunching Tor Browser Bundle for Linux in ${HOME}\n" cd "${HOME}" # XXX Someday we should pass whatever command-line arguments we got # (probably filenames or URLs) to Firefox. -./Browser/firefox -no-remote -profile Data/Browser/profile.default +# !!! Dash above comment! Now we pass command-line arguments we got (except --debug) to Firefox. +# !!! Use at your own risk! +./Browser/firefox -no-remote -profile Data/Browser/profile.default ${@} exitcode="$?" if [ "$exitcode" -ne 0 ]; then complain "Tor Browser exited abnormally. Exit code: $exitcode"

1 0

[tor-browser/tor-browser-24.3.0esr-1] fixup! Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 27 Feb '14

27 Feb '14

commit 8ba9d8e371ce794f49cdd06128c6889c15563b17 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 27 15:46:40 2014 -0800 fixup! Tor Browser's Firefox preference overrides. Bug #10237: Disable the media cache to prevent disk leaks. Bug #10703: Force the default charset to avoid locale fingerprinting. --- browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 93725ee..7e2efc9 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -30,6 +30,7 @@ pref("signon.rememberSignons", false); pref("browser.formfill.enable", false); pref("signon.autofillForms", false); pref("browser.sessionstore.privacy_level", 2); +pref("media.cache_size", 0); // Misc privacy: Remote pref("browser.send_pings", false); @@ -70,6 +71,7 @@ pref("general.useragent.vendorSub", ""); pref("dom.enable_performance", false); pref("plugin.expose_full_path", false); pref("browser.zoom.siteSpecific", false); +pref("intl.charset.default", "windows-1252"); // pref("intl.accept_languages", "en-us, en"); // Set by Torbutton // pref("intl.accept_charsets", "iso-8859-1,*,utf-8"); // Set by Torbutton // pref("intl.charsetmenu.browser.cache", "UTF-8"); // Set by Torbutton

1 0

[tor-browser/tor-browser-24.3.0esr-1] fixup! Tor Browser's official .mozconfigs.
by mikeperry＠torproject.org 27 Feb '14

27 Feb '14

commit 82964ade9250fee290710080c04b0786d818e834 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 27 15:43:18 2014 -0800 fixup! Tor Browser's official .mozconfigs. Bug #9896: Disable strip to allow debuginfo file creation. Also re-disable the updater. How did that get enabled... --- .mozconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.mozconfig b/.mozconfig index a71084b..e9a9432 100755 --- a/.mozconfig +++ b/.mozconfig @@ -9,10 +9,12 @@ mk_add_options BUILD_OFFICIAL=1 ac_add_options --enable-optimize #ac_add_options --disable-optimize ac_add_options --enable-official-branding -ac_add_options --enable-strip +ac_add_options --disable-strip +ac_add_options --disable-install-strip ac_add_options --disable-tests ac_add_options --disable-debug ac_add_options --disable-maintenance-service +ac_add_options --disable-updater ac_add_options --disable-crashreporter ac_add_options --disable-webrtc #ac_add_options --disable-ctypes

1 0

[torbutton/master] Bug 9901: Fix freeze due to content type sniffing
by mikeperry＠torproject.org 27 Feb '14

27 Feb '14

commit d7cb80eac503791f9026b7ce21bcaedd72d6181c Author: Georg Koppen <gk(a)torproject.org> Date: Wed Feb 12 12:54:08 2014 +0100 Bug 9901: Fix freeze due to content type sniffing The external application blocker code suppresses error messages that are triggered by the JS -> C++ bridge. The downside is that content type sniffing leads to browser freezes. This patch overrides Firefox methods in order to gain the former while avoiding the latter. --- src/chrome/content/torbutton.js | 100 ++++++++++++++++++++++++++++++++ src/components/external-app-blocker.js | 24 ++------ 2 files changed, 106 insertions(+), 18 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 1f8e82c..f2fcb77 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -6,6 +6,13 @@ // TODO: Double-check there are no strange exploits to defeat: // http://kb.mozillazine.org/Links_to_local_pages_don%27t_work +XPCOMUtils.defineLazyModuleGetter(this, "HUDService", + "resource:///modules/HUDService.jsm"); +XPCOMUtils.defineLazyModuleGetter(this, "ConsoleServiceListener", + "resource://gre/modules/devtools/WebConsoleUtils.jsm"); +XPCOMUtils.defineLazyModuleGetter(this, "WebConsoleUtils", + "resource://gre/modules/devtools/WebConsoleUtils.jsm"); + const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; const k_tb_tor_check_failed_topic = "Torbutton:TorCheckFailed"; @@ -2514,12 +2521,104 @@ function torbutton_is_windowed(wind) { return true; } +// This is the console observer used for getting unwanted error messages +// resulting from JS -> C++ transition filtered out. +var consoleObserver = { + + obs : null, + + register: function() { + this.obs = Cc["@mozilla.org/observer-service;1"]. + getService(Ci.nsIObserverService); + this.obs.addObserver(this, "web-console-created", false); + }, + + unregister: function() { + if (this.obs) { + this.obs.removeObserver(this, "web-console-created"); + } + }, + + observe: function(subject, topic, data) { + if (topic === "web-console-created") { + var id = subject.QueryInterface(Ci.nsISupportsString).toString(); + var con = HUDService.getHudReferenceById(subject); + con.ui.reportPageErrorOld = con.ui.reportPageError; + // Filtering the messages by making them hidden adding the + // "hidden-message" class. If the message does not need to get filtered + // the original method is executed without any modifications. + con.ui.reportPageError = + function WCF_reportPageError(aCategory, aScriptError) { + var message = aScriptError.errorMessage; + if (message && message.indexOf("NS_ERROR_NOT_AVAILABLE") > -1 && + message.indexOf("external-app-blocker.js") > -1) { + return this.reportPageErrorOld(aCategory, aScriptError).classList. + add("hidden-message"); + } else { + return this.reportPageErrorOld(aCategory, aScriptError); + } + } + } + } +}; + +// Ideally, we only need to patch/override one method to avoid errors showing up +// in the browser console. Alas, that is not as easy given the presence of +// cached messages and the Web Console which we need to consider as well while +// overriding Devtool methods. Thus, we patch the code path that is called when +// the browser console is already open AND additionally the one when cached +// messages are displayed. +function handleConsole() { + consoleObserver.register(); + try { + // Filtering using the "web-console-created" notification is not enough as + // the cached messages are already loaded when it is fired. Therefore, + // change |getCachedMessages()| slighty to fit the needs at hand. + // The original code is https://mxr.mozilla.org/mozilla-esr24/source/ + // toolkit/devtools/webconsole/WebConsoleUtils.jsm#998 ff. and distributed + // under the MPL 2.0 license. + ConsoleServiceListener.prototype.getCachedMessages = + function CSL_getCachedMessages(aIncludePrivate = false) { + var innerWindowID = this.window ? WebConsoleUtils. + getInnerWindowId(this.window) : null; + var errors = Services.console.getMessageArray() || []; + + return errors.filter((aError) => { + if (aError instanceof Ci.nsIScriptError) { + var message = aError.message; + if (message && message.indexOf("NS_ERROR_NOT_AVAILABLE") > -1 && + message.indexOf("external-app-blocker.js") > -1) { + return false; + } + if (!aIncludePrivate && aError.isFromPrivateWindow) { + return false; + } + if (innerWindowID && + (aError.innerWindowID != innerWindowID || + !this.isCategoryAllowed(aError.category))) { + return false; + } + } + else if (innerWindowID) { + // If this is not an nsIScriptError and we need to do window-based + // filtering we skip this message. + return false; + } + + return true; + }); + }; + } catch (e) {} +} + // Bug 1506 P3: This is needed pretty much only for the version check // and the window resizing. See comments for individual functions for // details function torbutton_new_window(event) { torbutton_log(3, "New window"); + // Working around #9901, sigh... + handleConsole(); var browser = getBrowser(); if(!browser) { @@ -2558,6 +2657,7 @@ function torbutton_new_window(event) function torbutton_close_window(event) { torbutton_window_pref_observer.unregister(); torbutton_tor_check_observer.unregister(); + consoleObserver.unregister(); // TODO: This is a real ghetto hack.. When the original window // closes, we need to find another window to handle observing diff --git a/src/components/external-app-blocker.js b/src/components/external-app-blocker.js index 1996179..057f4ae 100644 --- a/src/components/external-app-blocker.js +++ b/src/components/external-app-blocker.js @@ -122,24 +122,12 @@ ExternalWrapper.prototype = var call; if(params.length) call = "("+params.join().replace(/(?:)/g,function(){return "p"+(++x)})+")"; else call = "()"; - if(method == "getTypeFromFile" || method == "getTypeFromExtension" || method == "getTypeFromURI") { - // XXX: Due to https://developer.mozilla.org/en/Exception_logging_in_JavaScript - // this is necessary to prevent error console noise on the return to C++ code. - // It is not technically correct, but as far as I can tell, returning null - // here should be equivalent to throwing an error for the codepaths invovled - var fun = "(function "+call+"{"+ - "if (arguments.length < "+wrapped[method].length+")"+ - " throw Components.results.NS_ERROR_XPC_NOT_ENOUGH_ARGS;"+ - "try { return wrapped."+method+".apply(wrapped, arguments); }"+ - "catch(e) { if(e.result == Components.results.NS_ERROR_NOT_AVAILABLE) return null; else throw e;} })"; - newObj[method] = eval(fun); - } else { - var fun = "(function "+call+"{"+ - "if (arguments.length < "+wrapped[method].length+")"+ - " throw Components.results.NS_ERROR_XPC_NOT_ENOUGH_ARGS;"+ - "return wrapped."+method+".apply(wrapped, arguments);})"; - newObj[method] = eval(fun); - } + + var fun = "(function "+call+"{"+ + "if (arguments.length < "+wrapped[method].length+")"+ + " throw Components.results.NS_ERROR_XPC_NOT_ENOUGH_ARGS;"+ + "return wrapped."+method+".apply(wrapped, arguments);})"; + newObj[method] = eval(fun); } else { newObj.__defineGetter__(method, function() { return wrapped[method]; }); newObj.__defineSetter__(method, function(val) { wrapped[method] = val; });

1 0