tbb-commits

tbb-commits@lists.torproject.org

1 participants
17624 discussions

[tor-browser/tor-browser-24.7.0esr-3.x-1] fixup! Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 28 Aug '14

28 Aug '14

commit 3b4d010889e1ab571698a3b6294e0bef348ed044 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 27 18:27:06 2014 -0700 fixup! Tor Browser's Firefox preference overrides. Open popups in new tabs to avoid full screen popups. --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index a6ff777..a58ce4a 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -73,6 +73,7 @@ pref("dom.enable_performance", false); pref("plugin.expose_full_path", false); pref("browser.zoom.siteSpecific", false); pref("intl.charset.default", "windows-1252"); +pref("browser.link.open_newwindow.restriction", 0); // Bug 9881: Open popups in new tabs (to avoid fullscreen popups) // 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] Stop checking HTTPS-Everywhere's tag. We use the xpi.
by mikeperry＠torproject.org 27 Aug '14

27 Aug '14

commit b923c68ede1199ad492cfae7045c5dd98ef017ba Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 27 16:07:53 2014 -0700 Stop checking HTTPS-Everywhere's tag. We use the xpi. --- gitian/record-inputs.sh | 2 +- gitian/verify-tags.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index 7ca4416..afcd70d 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -50,7 +50,7 @@ echo "`cd tor && git log --format=%H -1 $TOR_TAG` tor.git" >> bundle.inputs echo "`cd tor-browser && git log --format=%H -1 $TORBROWSER_TAG` tor-browser.git" >> bundle.inputs echo "`cd torbutton && git log --format=%H -1 $TORBUTTON_TAG` torbutton.git" >> bundle.inputs echo "`cd tor-launcher && git log --format=%H -1 $TORLAUNCHER_TAG` tor-launcher.git" >> bundle.inputs -echo "`cd https-everywhere && git log --format=%H -1 $HTTPSE_TAG` https-everywhere.git" >> bundle.inputs +#echo "`cd https-everywhere && git log --format=%H -1 $HTTPSE_TAG` https-everywhere.git" >> bundle.inputs echo "`cd tbb-windows-installer && git log --format=%H -1 $NSIS_TAG` tbb-windows-installer.git" >> bundle.inputs echo "`cd mingw-w64-git && git log --format=%H -1 $MINGW_TAG` mingw-w64.git" >> bundle.inputs echo "`cd $INPUTS_DIR && git log --format=%H -1` gitian-builder.git" >> bundle.inputs diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index a664b52..a4f6ca1 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -96,13 +96,13 @@ torbutton torbutton.gpg $TORBUTTON_TAG zlib zlib.gpg $ZLIB_TAG libevent libevent.gpg $LIBEVENT_TAG tor tor.gpg $TOR_TAG -https-everywhere https-everywhere.gpg $HTTPSE_TAG pyptlib pyptlib.gpg $PYPTLIB_TAG obfsproxy obfsproxy.gpg $OBFSPROXY_TAG flashproxy flashproxy.gpg $FLASHPROXY_TAG goptlib goptlib.gpg $GOPTLIB_TAG meek meek.gpg $MEEK_TAG EOF +#https-everywhere https-everywhere.gpg $HTTPSE_TAG while read dir commit; do check_git_hash "$dir" "$commit"

1 0

[tor-browser-bundle/maint-3.6] Stop checking HTTPS-Everywhere's tag. We use the xpi.
by mikeperry＠torproject.org 27 Aug '14

27 Aug '14

commit a5ccfbc333008607dee27d6d5a2d6c10e3720cb4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 27 16:05:02 2014 -0700 Stop checking HTTPS-Everywhere's tag. We use the xpi. --- gitian/record-inputs.sh | 2 +- gitian/verify-tags.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index bbae06f..7531589 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -51,7 +51,7 @@ echo "`cd tor && git log --format=%H -1 $TOR_TAG` tor.git" >> bundle.inputs echo "`cd tor-browser && git log --format=%H -1 $TORBROWSER_TAG` tor-browser.git" >> bundle.inputs echo "`cd torbutton && git log --format=%H -1 $TORBUTTON_TAG` torbutton.git" >> bundle.inputs echo "`cd tor-launcher && git log --format=%H -1 $TORLAUNCHER_TAG` tor-launcher.git" >> bundle.inputs -echo "`cd https-everywhere && git log --format=%H -1 $HTTPSE_TAG` https-everywhere.git" >> bundle.inputs +#echo "`cd https-everywhere && git log --format=%H -1 $HTTPSE_TAG` https-everywhere.git" >> bundle.inputs echo "`cd tbb-windows-installer && git log --format=%H -1 $NSIS_TAG` tbb-windows-installer.git" >> bundle.inputs echo "`cd $INPUTS_DIR && git log --format=%H -1` gitian-builder.git" >> bundle.inputs echo "`cd $WRAPPER_DIR && git log --format=%H -1` tor-browser-bundle.git" >> bundle.inputs diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 324a27a..9814440 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -96,11 +96,11 @@ torbutton torbutton.gpg $TORBUTTON_TAG zlib zlib.gpg $ZLIB_TAG libevent libevent.gpg $LIBEVENT_TAG tor tor.gpg $TOR_TAG -https-everywhere https-everywhere.gpg $HTTPSE_TAG pyptlib pyptlib.gpg $PYPTLIB_TAG obfsproxy obfsproxy.gpg $OBFSPROXY_TAG flashproxy flashproxy.gpg $FLASHPROXY_TAG EOF +#https-everywhere https-everywhere.gpg $HTTPSE_TAG while read dir commit; do check_git_hash "$dir" "$commit"

1 0

[tor-browser-bundle/maint-3.6] Switch to build candidates directory for fetching Firefox langpacks.
by mikeperry＠torproject.org 27 Aug '14

27 Aug '14

commit b139e04c388230ba3aef98376b3d69b7aa3f30e0 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 27 15:55:40 2014 -0700 Switch to build candidates directory for fetching Firefox langpacks. This will allow us to build earlier, and also make our build hashes reproducible in the event of a minor langpack hash change we decide to ignore. --- gitian/fetch-inputs.sh | 6 +++--- gitian/versions | 1 + gitian/versions.alpha | 1 + gitian/versions.beta | 1 + gitian/versions.nightly | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index be5c9d9..32c4139 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -248,13 +248,13 @@ cd langpacks-$FIREFOX_LANG_VER for i in $BUNDLE_LOCALES do cd linux-langpacks - wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$FIREFOX_LANG_VER/…" + wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_V…" cd .. cd win32-langpacks - wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$FIREFOX_LANG_VER/…" + wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_V…" cd .. cd mac-langpacks - wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$FIREFOX_LANG_VER/…" + wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_V…" cd .. done diff --git a/gitian/versions b/gitian/versions index e700ad3..25bafb0 100755 --- a/gitian/versions +++ b/gitian/versions @@ -28,6 +28,7 @@ GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1i GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 4906e1c..d7d3dc7 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -27,6 +27,7 @@ GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 diff --git a/gitian/versions.beta b/gitian/versions.beta index c76acde..346a5d1 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -28,6 +28,7 @@ GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index e19ebdc..335000b 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -28,6 +28,7 @@ GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5

1 0

[tor-browser-bundle/master] Switch to build candidates directory for fetching Firefox langpacks.
by mikeperry＠torproject.org 27 Aug '14

27 Aug '14

commit 2da330af506d344e97b8d192a512c4c7df4a663e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 27 15:52:08 2014 -0700 Switch to build candidates directory for fetching Firefox langpacks. This will allow us to build earlier, and also make our build hashes reproducible in the event of a minor langpack hash change we decide to ignore. --- gitian/fetch-inputs.sh | 6 +++--- gitian/versions | 1 + gitian/versions.alpha | 1 + gitian/versions.beta | 1 + gitian/versions.nightly | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 086085c..ad82ddf 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -227,13 +227,13 @@ cd langpacks-$FIREFOX_LANG_VER for i in $BUNDLE_LOCALES do cd linux-langpacks - wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$FIREFOX_LANG_VER/…" + wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_V…" cd .. cd win32-langpacks - wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$FIREFOX_LANG_VER/…" + wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_V…" cd .. cd mac-langpacks - wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$FIREFOX_LANG_VER/…" + wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_V…" cd .. done diff --git a/gitian/versions b/gitian/versions index 20c7e73..9be200c 100755 --- a/gitian/versions +++ b/gitian/versions @@ -30,6 +30,7 @@ GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=4.8.3 PYTHON_VER=2.7.5 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 52d0b9b..ec52a45 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -30,6 +30,7 @@ GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1i GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=4.8.3 PYTHON_VER=2.7.5 diff --git a/gitian/versions.beta b/gitian/versions.beta index dbb50d8..c35ad6c 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -30,6 +30,7 @@ GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index f2ef57c..0cf5d0b 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -30,6 +30,7 @@ GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1i GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=4.8.3 PYTHON_VER=2.7.5

1 0

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

27 Aug '14

commit 4825026471678728d5aa085717e301fc6551fe2b 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-browser/tor-browser-24.7.0esr-3.x-1] Bug #12974: Disable NTLM and Negotiate HTTP Auth
by mikeperry＠torproject.org 27 Aug '14

27 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 26 Aug '14

26 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 26 Aug '14

26 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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits