August 2014 - tbb-commits - lists.torproject.org

[tor-browser/tor-browser-24.7.0esr-3.x-1] Bug #12974: Disable NTLM and Negotiate HTTP Auth
by mikeperry＠torproject.org 28 Aug '14

28 Aug '14

commit 9f4106c53e432599c084d38b7509692ccf42c5e3 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 27 15:19:10 2014 -0700 Bug #12974: Disable NTLM and Negotiate HTTP Auth This is technically an embargoed Mozilla bug, so I probably shouldn't provide too many details. Suffice to say that NTLM and Negotiate auth are bad for Tor users, and I doubt very many (or any of them) actually need it. The Mozilla bug is https://bugzilla.mozilla.org/show_bug.cgi?id=1046421 --- extensions/auth/nsHttpNegotiateAuth.cpp | 4 ++++ netwerk/protocol/http/nsHttpNTLMAuth.cpp | 3 +++ 2 files changed, 7 insertions(+) diff --git a/extensions/auth/nsHttpNegotiateAuth.cpp b/extensions/auth/nsHttpNegotiateAuth.cpp index 5248730..3e5580d 100644 --- a/extensions/auth/nsHttpNegotiateAuth.cpp +++ b/extensions/auth/nsHttpNegotiateAuth.cpp @@ -85,6 +85,10 @@ nsHttpNegotiateAuth::ChallengeReceived(nsIHttpAuthenticableChannel *authChannel, nsIAuthModule *module = (nsIAuthModule *) *continuationState; *identityInvalid = false; + + /* Always fail Negotiate auth for Tor Browser. We don't need it. */ + return NS_ERROR_ABORT; + if (module) return NS_OK; diff --git a/netwerk/protocol/http/nsHttpNTLMAuth.cpp b/netwerk/protocol/http/nsHttpNTLMAuth.cpp index d25c1de..6882803 100644 --- a/netwerk/protocol/http/nsHttpNTLMAuth.cpp +++ b/netwerk/protocol/http/nsHttpNTLMAuth.cpp @@ -239,6 +239,9 @@ nsHttpNTLMAuth::ChallengeReceived(nsIHttpAuthenticableChannel *channel, *identityInvalid = false; + /* Always fail Negotiate auth for Tor Browser. We don't need it. */ + return NS_ERROR_ABORT; + // Start a new auth sequence if the challenge is exactly "NTLM". // If native NTLM auth apis are available and enabled through prefs, // try to use them.

1 0

[tor-launcher/master] Bug 12444 fixup: use "Tor" instead of "tor" in feedback message.
by brade＠torproject.org 27 Aug '14

27 Aug '14

commit 4510c8e6057c17424313afe3077a5f7be4bc1085 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Aug 26 10:40:11 2014 -0400 Bug 12444 fixup: use "Tor" instead of "tor" in feedback message. --- src/chrome/locale/en/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 20f6db2..02be756 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -37,7 +37,7 @@ torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S -torlauncher.copiedNLogMessages=Copy complete. %S tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection

1 0

[tor-launcher/master] Bug 11405: Remove firewall prompt from wizard.
by brade＠torproject.org 27 Aug '14

27 Aug '14

commit 11467241203a65e71de97d91a24b15ffa5b976da Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Aug 26 10:25:11 2014 -0400 Bug 11405: Remove firewall prompt from wizard. If the user sets a proxy but doesn't set a bridge, set ReachableAddresses to include only ports 80 and 443. --- src/chrome/content/network-settings-wizard.xul | 36 +-------- src/chrome/content/network-settings.js | 101 ++++++++++++++++-------- src/chrome/locale/en/network-settings.dtd | 7 +- 3 files changed, 72 insertions(+), 72 deletions(-) diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index 6682fdd..04251f9 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -54,7 +54,7 @@ </vbox> </wizardpage> - <wizardpage label=" " pageid="proxy" next="firewall" onextra2="onCopyLog();" + <wizardpage label=" " pageid="proxy" next="bridges" onextra2="onCopyLog();" onpageshow="showWizardNavButtons(true);" onpageadvanced="return onWizardProxyNext(this);"> <vbox class="tbb-logo-box" align="start"> @@ -74,7 +74,7 @@ </hbox> </wizardpage> - <wizardpage pageid="proxyYES" next="firewall" onextra2="onCopyLog();" + <wizardpage pageid="proxyYES" next="bridges" onextra2="onCopyLog();" onpageadvanced="return (getAndValidateProxySettings() != null)"> <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> @@ -84,38 +84,6 @@ <groupbox id="proxySpecificSettings" /> </wizardpage> - <wizardpage pageid="firewall" next="bridges" onextra2="onCopyLog();" - onpageshow="showOrHideButton('next', true, true)" - onpageadvanced="return onWizardFirewallNext(this);"> - <vbox class="tbb-logo-box" align="start"> - <image class="tbb-logo" /> - </vbox> - <separator /> - <hbox> - <vbox flex="1"> - <label class="question">&torSettings.firewallQuestion;</label> - <radiogroup id="firewallRadioGroup"> - <radio id="firewallRadioYes" label="&torSettings.yes;" /> - <radio id="firewallRadioNo" label="&torSettings.no;" selected="true" /> - </radiogroup> - <description class="questionHelp">&torSettings.firewallHelp; - </description> - </vbox> - </hbox> - </wizardpage> - - <wizardpage pageid="firewallYES" next="bridges" onextra2="onCopyLog();" - onpageadvanced="return (getAndValidateFirewallSettings() != null)"> - <vbox class="tbb-logo-box" align="start"> - <image class="tbb-logo" /> - </vbox> - <separator /> - <vbox> - <label class="instructions">&torSettings.enterFirewall;</label> - <groupbox id="firewallSpecificSettings" /> - </vbox> - </wizardpage> - <wizardpage pageid="bridges" onextra2="onCopyLog();" onpageshow="onWizardUseBridgesRadioChange(this)"> <vbox class="tbb-logo-box" align="start"> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 518d16d..908e711 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -29,7 +29,6 @@ const kTorBootstrapErrorTopic = "TorBootstrapError"; const kTorLogHasWarnOrErrTopic = "TorLogHasWarnOrErr"; const kWizardProxyRadioGroup = "proxyRadioGroup"; -const kWizardFirewallRadioGroup = "firewallRadioGroup"; const kWizardUseBridgesRadioGroup = "useBridgesRadioGroup"; const kUseProxyCheckbox = "useProxy"; @@ -251,19 +250,7 @@ function onWizardProxyNext(aWizPage) if (aWizPage) { var hasProxy = getElemValue("proxyRadioYes", false); - aWizPage.next = (hasProxy) ? "proxyYES" : "firewall"; - } - - return true; -} - - -function onWizardFirewallNext(aWizPage) -{ - if (aWizPage) - { - var hasFirewall = getElemValue("firewallRadioYes", false); - aWizPage.next = (hasFirewall) ? "firewallYES" : "bridges"; + aWizPage.next = (hasProxy) ? "proxyYES" : "bridges"; } return true; @@ -877,6 +864,9 @@ function initProxySettings() // Returns true if successful. function initFirewallSettings() { + if (getWizard()) + return true; // The wizard does not directly expose firewall settings. + var allowedPorts; var reply = gProtocolSvc.TorGetConfStr(kTorConfKeyReachableAddresses, null); if (!gProtocolSvc.TorCommandSucceeded(reply)) @@ -899,7 +889,6 @@ function initFirewallSettings() } var haveFirewall = (allowedPorts != undefined); - setYesNoRadioValue(kWizardFirewallRadioGroup, haveFirewall); setElemValue(kUseFirewallPortsCheckbox, haveFirewall); if (allowedPorts) setElemValue(kFirewallAllowedPorts, allowedPorts); @@ -991,7 +980,7 @@ function useSettings() { var settings = {}; settings[kTorConfKeyDisableNetwork] = false; - this.setConfAndReportErrors(settings, null); + setConfAndReportErrors(settings, null); gProtocolSvc.TorSendCommand("SAVECONF"); gTorProcessService.TorClearBootstrapError(); @@ -1026,7 +1015,7 @@ function applyProxySettings() if (!settings) return false; - return this.setConfAndReportErrors(settings, "proxyYES"); + return setConfAndReportErrors(settings, "proxyYES"); } @@ -1044,9 +1033,7 @@ function getAndValidateProxySettings() settings[kTorConfKeyHTTPSProxyAuthenticator] = null; var proxyType, proxyAddrPort, proxyUsername, proxyPassword; - var useProxy = (getWizard()) ? getYesNoRadioValue(kWizardProxyRadioGroup) - : getElemValue(kUseProxyCheckbox, false); - if (useProxy) + if (isProxyConfigured()) { proxyAddrPort = createColonStr(getElemValue(kProxyAddr, null), getElemValue(kProxyPort, null)); @@ -1089,7 +1076,14 @@ function getAndValidateProxySettings() } return settings; -} // applyProxySettings +} // getAndValidateProxySettings + + +function isProxyConfigured() +{ + return (getWizard()) ? getYesNoRadioValue(kWizardProxyRadioGroup) + : getElemValue(kUseProxyCheckbox, false); +} function reportValidationError(aStrKey) @@ -1101,15 +1095,17 @@ function reportValidationError(aStrKey) // Returns true if settings were successfully applied. function applyFirewallSettings() { - var settings = getAndValidateFirewallSettings(); + var settings = (getWizard()) ? getAutoFirewallSettings() + : getAndValidateFirewallSettings(); if (!settings) return false; - return this.setConfAndReportErrors(settings, "firewallYES"); + return setConfAndReportErrors(settings, null); } // Return a settings object if successful and null if not. +// Not used for the wizard. function getAndValidateFirewallSettings() { // TODO: validate user-entered data. See Vidalia's NetworkPage::save() @@ -1117,14 +1113,47 @@ function getAndValidateFirewallSettings() var settings = {}; settings[kTorConfKeyReachableAddresses] = null; - var useFirewallPorts = (getWizard()) - ? getYesNoRadioValue(kWizardFirewallRadioGroup) - : getElemValue(kUseFirewallPortsCheckbox, false); - var allowedPorts = getElemValue(kFirewallAllowedPorts, null); - if (useFirewallPorts && allowedPorts) + var allowedPorts = null; + if (getElemValue(kUseFirewallPortsCheckbox, false)) + allowedPorts = getElemValue(kFirewallAllowedPorts, null); + + return constructFirewallSettings(allowedPorts); +} + + +// Return a settings object if successful and null if not. +// Only used for the wizard. +function getAutoFirewallSettings() +{ + // In the wizard, we automatically set firewall ports (ReachableAddresses) to + // 80 and 443 if and only if the user has configured a proxy but no bridges. + // Rationale (from ticket #11405): + // - Many proxies restrict which ports they will proxy for, so we want to + // use a small set of ports in that case. + // + // - In most other situations, tor will quickly find a bridge or guard on + // port 443, so there is no need to limit which port may be used. + // + // - People whose set of reachable ports are really esoteric will need to + // be very patient or they will need to edit torrc manually... but that + // is OK since we expect that situation to be very rare. + var allowedPorts = null; + if (isProxyConfigured() && !isBridgeConfigured()) + allowedPorts = "80,443"; + + return constructFirewallSettings(allowedPorts); +} + + +function constructFirewallSettings(aAllowedPorts) +{ + var settings = {}; + settings[kTorConfKeyReachableAddresses] = null; + + if (aAllowedPorts) { var portsConfStr; - var portsArray = allowedPorts.split(','); + var portsArray = aAllowedPorts.split(','); for (var i = 0; i < portsArray.length; ++i) { var s = portsArray[i].trim(); @@ -1188,7 +1217,7 @@ function applyBridgeSettings() if (!settings) return false; - return this.setConfAndReportErrors(settings, "bridgeSettings"); + return setConfAndReportErrors(settings, "bridgeSettings"); } @@ -1199,9 +1228,7 @@ function getAndValidateBridgeSettings() settings[kTorConfKeyUseBridges] = null; settings[kTorConfKeyBridgeList] = null; - var useBridges = (getWizard()) ? getElemValue("bridgesRadioYes", false) - : getElemValue(kUseBridgesCheckbox, false); - + var useBridges = isBridgeConfigured(); var defaultBridgeType; var bridgeList; if (useBridges) @@ -1246,6 +1273,13 @@ function getAndValidateBridgeSettings() } +function isBridgeConfigured() +{ + return (getWizard()) ? getElemValue("bridgesRadioYes", false) + : getElemValue(kUseBridgesCheckbox, false); +} + + // Returns an array or null. function parseAndValidateBridges(aStr) { @@ -1271,6 +1305,7 @@ function parseAndValidateBridges(aStr) // Returns true if successful. +// aShowOnErrorPanelID is only used when displaying the wizard. function setConfAndReportErrors(aSettingsObj, aShowOnErrorPanelID) { var errObj = {}; diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index aa54f3e..3661088 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torSettings.no "No"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> +<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> +<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> <!ENTITY torSettings.connectPrompt3 "This will work in most situations."> @@ -19,9 +19,6 @@  <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> <!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!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 "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 provided set of bridges or you may obtain and enter a custom set of bridges.">

1 0

[tor-browser-bundle/master] Bug 12920: Don't apply patch for #11200 to master.
by gk＠torproject.org 25 Aug '14

25 Aug '14

commit 8a552ff03c226c3d1f5fa3ae0b4950cc03c0f678 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 25 15:28:14 2014 +0000 Bug 12920: Don't apply patch for #11200 to master. On the tor master branch #11200 is already fixed. Applying the patch again breaks the nightly builds. --- gitian/descriptors/linux/gitian-tor.yml | 5 ++++- gitian/descriptors/mac/gitian-tor.yml | 5 ++++- gitian/descriptors/windows/gitian-tor.yml | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index c741cf2..277a8e4 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -81,9 +81,12 @@ script: | git am ~/build/bug9665.patch git am ~/build/bug11200.patch git am ~/build/bug8402.patch - else + elif [ ${TOR_TAG::9} == "tor-0.2.5" ]; + then git am ~/build/bug8402-master.patch git am ~/build/bug11200-hang-0.2.5.patch + else + git am ~/build/bug8402-master.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index e708ef8..7a75287 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -78,9 +78,12 @@ script: | git am ~/build/bug9665.patch git am ~/build/bug11200.patch git am ~/build/bug8402.patch - else + elif [ ${TOR_TAG::9} == "tor-0.2.5" ]; + then git am ~/build/bug8402-master.patch git am ~/build/bug11200-hang-0.2.5.patch + else + git am ~/build/bug8402-master.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index f1b9d7d..bc70839 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -78,9 +78,12 @@ script: | git am ~/build/bug9665.patch git am ~/build/bug11200.patch git am ~/build/bug8402.patch - else + elif [ ${TOR_TAG::9} == "tor-0.2.5" ]; + then git am ~/build/bug8402-master.patch git am ~/build/bug11200-hang-0.2.5.patch + else + git am ~/build/bug8402-master.patch fi fi mkdir -p $OUTDIR/src

1 0

[tor-browser-bundle/master] Bumping OpenSSL without its hash does not fly.
by gk＠torproject.org 23 Aug '14

23 Aug '14

commit b7d6214618b62f59bc943b6c62e4b65d84e31342 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 22 20:34:09 2014 +0000 Bumping OpenSSL without its hash does not fly. --- gitian/versions.nightly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index c65cf22..f2ef57c 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -72,7 +72,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=9d1c8a9836aa63e2c6adb684186cbd4371c9e9dcc01d6e3bb447abf2d4d3d093 +OPENSSL_HASH=3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645

1 0

[tor-launcher/master] Bug 12895: add @riseup.net to Bridge Relay Help
by brade＠torproject.org 23 Aug '14

23 Aug '14

commit c1a09372770adb8a3f7085f69eca2fecae7c1107 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Aug 22 10:33:02 2014 -0400 Bug 12895: add @riseup.net to Bridge Relay Help --- src/chrome/content/network-settings-overlay.xul | 3 ++- src/chrome/locale/en/network-settings.dtd | 3 ++- src/chrome/skin/network-settings.css | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index c9a6a82..03171ec 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -116,7 +116,8 @@ </html:li> <html:li> <html:div class="heading">&torsettings.bridgeHelp3Heading;</html:div> - <html:div>&torsettings.bridgeHelp3;</html:div> + <html:div>&torsettings.bridgeHelp3.emailDesc;</html:div> + <html:div>&torsettings.bridgeHelp3.emailList;</html:div> </html:li> <html:li> <html:div class="heading">&torsettings.bridgeHelp4Heading;</html:div> diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index f46473e..aa54f3e 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -59,6 +59,7 @@ <!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"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index 60f1ef2..e4142d4 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -17,15 +17,15 @@ dialog.os-windows { } wizard { - width: 43em; - height: 34em; + width: 45em; + height: 35em; font: -moz-dialog; padding-top: 0px; } wizard.os-windows { - width: 45em; - height: 39em; + width: 46em; + height: 41em; } .wizard-page-box {

1 0

[tor-browser-bundle/master] Set security.tls.version.max=1 in meek-http-helper.
by gk＠torproject.org 21 Aug '14

21 Aug '14

commit 3c581f8426f4fd477eb26d2893dbdec42d76e23d Author: David Fifield <david(a)bamsoftware.com> Date: Fri Aug 15 18:02:53 2014 -0700 Set security.tls.version.max=1 in meek-http-helper. #11253 set security.tls.version.max=3 (i.e., TLSv1.2). We need to set it back to 1 (TLSv1.0) in the helper, or else we look unlike an ordinary installation of Firefox 24. https://trac.torproject.org/projects/tor/ticket/12766 --- Bundle-Data/PTConfigs/meek-http-helper-user.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js b/Bundle-Data/PTConfigs/meek-http-helper-user.js index cddc237..26fd819 100644 --- a/Bundle-Data/PTConfigs/meek-http-helper-user.js +++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js @@ -4,6 +4,14 @@ // to stdout. user_pref("browser.dom.window.dump.enabled", true); +// Make TLSv1.0 the maximum TLS version, as in stock Firefox 24. Since #11253, +// Tor Browser overrides the maximum to TLSv1.2, which would cause us to look +// unlike ordinary Firefox 24. +// https://trac.torproject.org/projects/tor/ticket/11253 +// https://trac.torproject.org/projects/tor/ticket/12766 +// http://kb.mozillazine.org/Security.tls.version.* +user_pref("security.tls.version.max", 1); + // Enable TLS session tickets (disabled by default in Tor Browser). Otherwise // there is a missing TLS extension. // https://trac.torproject.org/projects/tor/ticket/11183#comment:9

1 0

[tor-launcher/master] Bug 12444: Feedback when “Copy Tor Log” is clicked.
by brade＠torproject.org 20 Aug '14

20 Aug '14

commit 561440e8d64ca9b60f09d2b6869c4d07c5d06834 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 20 08:21:45 2014 -0400 Bug 12444: Feedback when “Copy Tor Log” is clicked. Show a transient popup near the "Copy Tor Log To Clipboard" button after is is clicked. The popup panel fades away after 4 seconds and can also be dismissed by clicking anywhere. --- src/chrome/content/network-settings-overlay.xul | 4 ++++ src/chrome/content/network-settings-wizard.xul | 1 + src/chrome/content/network-settings.js | 23 ++++++++++++++++++++++- src/chrome/content/network-settings.xul | 1 + src/chrome/locale/en/torlauncher.properties | 2 ++ src/chrome/skin/network-settings.css | 5 +++++ src/components/tl-protocol.js | 8 ++++++-- 7 files changed, 41 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index 6422802..c9a6a82 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -124,5 +124,9 @@ </html:li> </html:ol> </vbox> + <panel id="copyLogFeedbackPanel" type="arrow" fade="slow" + onclick="closeCopyLogFeedbackPanel()"> + <description flex="1" /> + </panel> </overlay> diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index 70d1bcf..6682fdd 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -189,4 +189,5 @@ <hbox pack="start"> <label id="forAssistance" /> </hbox> + <panel id="copyLogFeedbackPanel" /> </wizard> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 5f3f698..518d16d 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -713,9 +713,30 @@ function onCancel() function onCopyLog() { + // Copy tor log messages to the system clipboard. var chSvc = Cc["@mozilla.org/widget/clipboardhelper;1"] .getService(Ci.nsIClipboardHelper); - chSvc.copyString(gProtocolSvc.TorGetLog()); + let countObj = { value: 0 }; + chSvc.copyString(gProtocolSvc.TorGetLog(countObj)); + + // Display a feedback popup that fades away after a few seconds. + let forAssistance = document.getElementById("forAssistance"); + let panel = document.getElementById("copyLogFeedbackPanel"); + if (forAssistance && panel) + { + panel.firstChild.textContent = TorLauncherUtil.getFormattedLocalizedString( + "copiedNLogMessages", [countObj.value], 1); + let rectObj = forAssistance.getBoundingClientRect(); + panel.openPopup(null, null, rectObj.left, rectObj.top, false, false); + } +} + + +function closeCopyLogFeedbackPanel() +{ + let panel = document.getElementById("copyLogFeedbackPanel"); + if (panel && (panel.state =="open")) + panel.hidePopup(); } diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xul index a81a5f0..4f98559 100644 --- a/src/chrome/content/network-settings.xul +++ b/src/chrome/content/network-settings.xul @@ -85,4 +85,5 @@ </deck> <spring flex="1" /> <label id="forAssistance" /> + <panel id="copyLogFeedbackPanel" /> </dialog> diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 816d831..20f6db2 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -37,6 +37,8 @@ torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.copiedNLogMessages=Copy complete. %S tor log messages are ready to be pasted into a text editor or an email message. + torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection torlauncher.bootstrapStatus.requesting_status=Retrieving network status diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index 03f84d7..60f1ef2 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -148,6 +148,11 @@ dialog .help { margin-bottom: 8px; } +#copyLogFeedbackPanel { + margin: -15px 0px 0px 0px; + max-width: 34em; +} + /* Increase font size on Windows for readability */ .os-windows div, .os-windows label, diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index 9c4d957..09ec468 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -458,7 +458,8 @@ TorProtocolService.prototype = }, // Returns captured log message as a text string (one message per line). - TorGetLog: function() + // If aCountObj is passed, aCountObj.value is set to the message count. + TorGetLog: function(aCountObj) { let s = ""; if (this.mTorLog) @@ -468,7 +469,10 @@ TorProtocolService.prototype = let dateFormat = dateFmtSvc.dateFormatShort; let timeFormat = dateFmtSvc.timeFormatSecondsForce24Hour; let eol = (TorLauncherUtil.isWindows) ? "\r\n" : "\n"; - for (let i = 0; i < this.mTorLog.length; ++i) + let count = this.mTorLog.length; + if (aCountObj) + aCountObj.value = count; + for (let i = 0; i < count; ++i) { let logObj = this.mTorLog[i]; let secs = logObj.date.getSeconds();

1 0

[tor-browser-bundle/master] We want to have nightlies with the new OpenSSL.
by gk＠torproject.org 20 Aug '14

20 Aug '14

commit 81d698cab574c6fa2788362222b695b79752bf94 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 20 11:27:35 2014 +0000 We want to have nightlies with the new OpenSSL. --- gitian/versions.nightly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 0462eae..c65cf22 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -27,7 +27,7 @@ MEEK_TAG=master GITIAN_TAG=tor-browser-builder-3.x-6 -OPENSSL_VER=1.0.1h +OPENSSL_VER=1.0.1i GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.24

1 0

[tor-browser/tor-browser-24.7.0esr-3.x-1] fixup! Add canvas image extraction prompt.
by mikeperry＠torproject.org 20 Aug '14

20 Aug '14

commit 6048d4da85bd89f810f102517102ca27821bab21 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Aug 19 20:34:23 2014 -0700 fixup! Add canvas image extraction prompt. Use JSContext to get URL information for HTML5 canvas access. --- content/canvas/src/CanvasRenderingContext2D.cpp | 2 +- content/canvas/src/CanvasUtils.cpp | 18 +++++++++++++----- content/canvas/src/CanvasUtils.h | 2 +- content/html/content/src/HTMLCanvasElement.cpp | 9 +++++---- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/content/canvas/src/CanvasRenderingContext2D.cpp b/content/canvas/src/CanvasRenderingContext2D.cpp index 9be4ced..c53ac07 100644 --- a/content/canvas/src/CanvasRenderingContext2D.cpp +++ b/content/canvas/src/CanvasRenderingContext2D.cpp @@ -3506,7 +3506,7 @@ CanvasRenderingContext2D::GetImageDataArray(JSContext* aCx, if (mCanvasElement) { nsCOMPtr<nsIDocument> ownerDoc = mCanvasElement->OwnerDoc(); usePlaceholder = !ownerDoc || - !CanvasUtils::IsImageExtractionAllowed(ownerDoc); + !CanvasUtils::IsImageExtractionAllowed(ownerDoc, aCx); } if (usePlaceholder) { diff --git a/content/canvas/src/CanvasUtils.cpp b/content/canvas/src/CanvasUtils.cpp index f2f4536..591650a 100644 --- a/content/canvas/src/CanvasUtils.cpp +++ b/content/canvas/src/CanvasUtils.cpp @@ -35,6 +35,7 @@ using namespace mozilla::gfx; #include "nsUnicharUtils.h" #include "nsPrintfCString.h" #include "nsIConsoleService.h" +#include "jsdbgapi.h" #define TOPIC_CANVAS_PERMISSIONS_PROMPT "canvas-permissions-prompt" #define PERMISSION_CANVAS_EXTRACT_DATA "canvas/extractData" @@ -43,10 +44,9 @@ namespace mozilla { namespace CanvasUtils { // Check site-specific permission and display prompt if appropriate. -bool -IsImageExtractionAllowed(nsIDocument *aDocument) +bool IsImageExtractionAllowed(nsIDocument *aDocument, JSContext *aCx) { - if (!aDocument) + if (!aDocument || !aCx) return false; nsPIDOMWindow *win = aDocument->GetWindow(); @@ -87,13 +87,21 @@ IsImageExtractionAllowed(nsIDocument *aDocument) rv = thirdPartyUtil->IsThirdPartyURI(uri, docURI, &isThirdParty); NS_ENSURE_SUCCESS(rv, false); + nsCString scriptFile("unknown"); + unsigned scriptLine = 0; + JSScript *script; + if (JS_DescribeScriptedCaller(aCx, &script, &scriptLine)) { + scriptFile = JS_GetScriptFilename(aCx, script); + } + nsCString firstPartySpec; rv = uri->GetSpec(firstPartySpec); nsCString docSpec; docURI->GetSpec(docSpec); nsPrintfCString msg("On %s: blocked access to canvas image data" - " from %s ", // L10n - firstPartySpec.get(), docSpec.get()); + " from document %s, script from %s:%u ", // L10n + firstPartySpec.get(), docSpec.get(), + scriptFile.get(), scriptLine); nsCOMPtr<nsIConsoleService> console (do_GetService(NS_CONSOLESERVICE_CONTRACTID)); diff --git a/content/canvas/src/CanvasUtils.h b/content/canvas/src/CanvasUtils.h index d7aae4d..1e7f726 100644 --- a/content/canvas/src/CanvasUtils.h +++ b/content/canvas/src/CanvasUtils.h @@ -45,7 +45,7 @@ void DoDrawImageSecurityCheck(dom::HTMLCanvasElement *aCanvasElement, bool forceWriteOnly, bool CORSUsed); -bool IsImageExtractionAllowed(nsIDocument *aDocument); +bool IsImageExtractionAllowed(nsIDocument *aDocument, JSContext *aCx); // Make a double out of |v|, treating undefined values as 0.0 (for // the sake of sparse arrays). Return true iff coercion diff --git a/content/html/content/src/HTMLCanvasElement.cpp b/content/html/content/src/HTMLCanvasElement.cpp index e229e1c..d6cb88a 100644 --- a/content/html/content/src/HTMLCanvasElement.cpp +++ b/content/html/content/src/HTMLCanvasElement.cpp @@ -355,7 +355,7 @@ HTMLCanvasElement::ToDataURL(const nsAString& aType, const JS::Value& aParams, // Check site-specific permission and display prompt if appropriate. // If no permission, return all-white, opaque image data. - bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc()); + bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc(), aCx); return ToDataURLImpl(aCx, aType, aParams, usePlaceholder, aDataURL); } @@ -590,10 +590,11 @@ HTMLCanvasElement::ToBlob(nsIFileCallback* aCallback, } bool fallbackToPNG = false; + JSContext* cx = nsContentUtils::GetCurrentJSContext(); // Check site-specific permission and display prompt if appropriate. // If no permission, return all-white, opaque image data. - bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc()); + bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc(), cx); nsCOMPtr<nsIInputStream> stream; rv = ExtractData(type, EmptyString(), usePlaceholder, getter_AddRefs(stream), fallbackToPNG); @@ -616,7 +617,6 @@ HTMLCanvasElement::ToBlob(nsIFileCallback* aCallback, nsRefPtr<nsDOMMemoryFile> blob = new nsDOMMemoryFile(imgData, imgSize, type); - JSContext* cx = nsContentUtils::GetCurrentJSContext(); if (cx) { JS_updateMallocCounter(cx, imgSize); } @@ -648,7 +648,8 @@ HTMLCanvasElement::MozGetAsFile(const nsAString& aName, // Check site-speciifc permission and display prompt if appropriate. // If no permission, return all-white, opaque image data. - bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc()); + bool usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(OwnerDoc(), + nsContentUtils::GetCurrentJSContext()); return MozGetAsFileImpl(aName, aType, usePlaceholder, aResult); }

1 0