- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-38.4.0esr-5.5-1] fixup! Bug #6253: Add canvas image extraction prompt.
by gk＠torproject.org 16 Nov '15

16 Nov '15

commit 57ff8d65a2ec29f778b5654b6b8284d2b20feb68 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Nov 6 16:41:29 2015 -0800 fixup! Bug #6253: Add canvas image extraction prompt. Ensure that third parties are never able to extract canvas image data, even if the same domain has been given permission previously as a first party. Also, refactor slightly to clarify logic of IsImageExtractionAllowed. --- dom/canvas/CanvasUtils.cpp | 179 +++++++++++++++++++++++--------------------- 1 file changed, 95 insertions(+), 84 deletions(-) diff --git a/dom/canvas/CanvasUtils.cpp b/dom/canvas/CanvasUtils.cpp index 9883a52..b3c83f6 100644 --- a/dom/canvas/CanvasUtils.cpp +++ b/dom/canvas/CanvasUtils.cpp @@ -46,99 +46,110 @@ namespace CanvasUtils { // Check site-specific permission and display prompt if appropriate. bool IsImageExtractionAllowed(nsIDocument *aDocument, JSContext *aCx) { - if (!aDocument || !aCx) - return false; + // Don't proceed if we don't have a document or JavaScript context. + if (!aDocument || !aCx) { + return false; + } - nsPIDOMWindow *win = aDocument->GetWindow(); - nsCOMPtr<nsIScriptObjectPrincipal> sop(do_QueryInterface(win)); - if (sop && nsContentUtils::IsSystemPrincipal(sop->GetPrincipal())) - return true; + // Documents with system principal can always extract canvas data. + nsPIDOMWindow *win = aDocument->GetWindow(); + nsCOMPtr<nsIScriptObjectPrincipal> sop(do_QueryInterface(win)); + if (sop && nsContentUtils::IsSystemPrincipal(sop->GetPrincipal())) { + return true; + } - // Don't show canvas prompt for chrome scripts (e.g. Page Inspector) - if (nsContentUtils::ThreadsafeIsCallerChrome()) - return true; + // Always give permission to chrome scripts (e.g. Page Inspector). + if (nsContentUtils::ThreadsafeIsCallerChrome()) { + return true; + } - JS::AutoFilename scriptFile; - unsigned scriptLine = 0; - bool isScriptKnown = false; - if (JS::DescribeScriptedCaller(aCx, &scriptFile, &scriptLine)) { - isScriptKnown = true; - // Don't show canvas prompt for PDF.js - if (scriptFile.get() && - strcmp(scriptFile.get(), "resource://pdf.js/build/pdf.js") == 0) - return true; - } - bool isAllowed = false; - nsCOMPtr<mozIThirdPartyUtil> thirdPartyUtil = - do_GetService(THIRDPARTYUTIL_CONTRACTID); - nsCOMPtr<nsIPermissionManager> permissionManager = - do_GetService(NS_PERMISSIONMANAGER_CONTRACTID); - if (thirdPartyUtil && permissionManager) { - nsCOMPtr<nsIURI> uri; - nsresult rv = thirdPartyUtil->GetFirstPartyURI(NULL, aDocument, - getter_AddRefs(uri)); - uint32_t permission = nsIPermissionManager::UNKNOWN_ACTION; - if (NS_SUCCEEDED(rv)) { - // Allow local files to access canvas data; check content permissions - // for remote pages. - bool isFileURL = false; - (void)uri->SchemeIs("file", &isFileURL); - if (isFileURL) - permission = nsIPermissionManager::ALLOW_ACTION; - else { - rv = permissionManager->TestPermission(uri, - PERMISSION_CANVAS_EXTRACT_DATA, &permission); - } + // Get the document URI and its spec. + nsIURI *docURI = aDocument->GetDocumentURI(); + nsCString docURISpec; + docURI->GetSpec(docURISpec); + + // Allow local files to extract canvas data. + bool isFileURL; + (void) docURI->SchemeIs("file", &isFileURL); + if (isFileURL) { + return true; } - if (NS_SUCCEEDED(rv)) { - isAllowed = (permission == nsIPermissionManager::ALLOW_ACTION); - - if (!isAllowed && (permission != nsIPermissionManager::DENY_ACTION)) { - // Log all attempted canvas access and block access by third parties. - bool isThirdParty = true; - nsIURI *docURI = aDocument->GetDocumentURI(); - rv = thirdPartyUtil->IsThirdPartyURI(uri, docURI, &isThirdParty); - NS_ENSURE_SUCCESS(rv, false); - - nsCString firstPartySpec; - rv = uri->GetSpec(firstPartySpec); - nsCString docSpec; - docURI->GetSpec(docSpec); - nsPrintfCString msg("On %s: blocked access to canvas image data" - " from document %s, ", // L10n - firstPartySpec.get(), docSpec.get()); - if (isScriptKnown && scriptFile.get()) { - msg += nsPrintfCString("script from %s:%u", // L10n - scriptFile.get(), scriptLine); - } else { - msg += nsPrintfCString("unknown script"); // L10n + // Get calling script file and line for logging. + JS::AutoFilename scriptFile; + unsigned scriptLine = 0; + bool isScriptKnown = false; + if (JS::DescribeScriptedCaller(aCx, &scriptFile, &scriptLine)) { + isScriptKnown = true; + // Don't show canvas prompt for PDF.js + if (scriptFile.get() && + strcmp(scriptFile.get(), "resource://pdf.js/build/pdf.js") == 0) { + return true; } - nsCOMPtr<nsIConsoleService> console - (do_GetService(NS_CONSOLESERVICE_CONTRACTID)); - if (console) - console->LogStringMessage(NS_ConvertUTF8toUTF16(msg).get()); - - // Log every canvas access attempt to stdout if debugging: -#ifdef DEBUG - printf("%s\n", msg.get()); -#endif - // Ensure URI is valid after logging, but before trying to notify the - // user: - NS_ENSURE_SUCCESS(rv, false); - - if (!isThirdParty) { - // Send notification so that a prompt is displayed. - nsCOMPtr<nsIObserverService> obs = - mozilla::services::GetObserverService(); - obs->NotifyObservers(win, TOPIC_CANVAS_PERMISSIONS_PROMPT, - NS_ConvertUTF8toUTF16(firstPartySpec).get()); + } + + // Load Third Party Util service. + nsresult rv; + nsCOMPtr<mozIThirdPartyUtil> thirdPartyUtil = + do_GetService(THIRDPARTYUTIL_CONTRACTID, &rv); + NS_ENSURE_SUCCESS(rv, false); + + // Get the First Party URI and its spec. + nsCOMPtr<nsIURI> firstPartyURI; + rv = thirdPartyUtil->GetFirstPartyURI(NULL, aDocument, + getter_AddRefs(firstPartyURI)); + NS_ENSURE_SUCCESS(rv, false); + nsCString firstPartySpec; + firstPartyURI->GetSpec(firstPartySpec); + + // Block all third-party attempts to extract canvas. + bool isThirdParty = true; + rv = thirdPartyUtil->IsThirdPartyURI(firstPartyURI, docURI, &isThirdParty); + NS_ENSURE_SUCCESS(rv, false); + if (isThirdParty) { + nsAutoCString message; + message.AppendPrintf("Blocked third party %s in page %s from extracting canvas data.", + docURISpec.get(), firstPartySpec.get()); + if (isScriptKnown) { + message.AppendPrintf(" %s:%u.", scriptFile.get(), scriptLine); } - } + nsContentUtils::LogMessageToConsole(message.get()); + return false; + } + + // Load Permission Manager service. + nsCOMPtr<nsIPermissionManager> permissionManager = + do_GetService(NS_PERMISSIONMANAGER_CONTRACTID); + NS_ENSURE_SUCCESS(rv, false); + + // Check if the site has permission to extract canvas data. + // Either permit or block extraction if a stored permission setting exists. + uint32_t permission; + rv = permissionManager->TestPermission(firstPartyURI, + PERMISSION_CANVAS_EXTRACT_DATA, &permission); + NS_ENSURE_SUCCESS(rv, false); + if (permission == nsIPermissionManager::ALLOW_ACTION) { + return true; + } else if (permission == nsIPermissionManager::DENY_ACTION) { + return false; } - } - return isAllowed; + // At this point, permission is unknown (nsIPermissionManager::UNKNOWN_ACTION). + nsAutoCString message; + message.AppendPrintf("Blocked %s in page %s from extracting canvas data.", + docURISpec.get(), firstPartySpec.get()); + if (isScriptKnown) { + message.AppendPrintf(" %s:%u.", scriptFile.get(), scriptLine); + } + nsContentUtils::LogMessageToConsole(message.get()); + + // Prompt the user (asynchronous). + nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService(); + obs->NotifyObservers(win, TOPIC_CANVAS_PERMISSIONS_PROMPT, + NS_ConvertUTF8toUTF16(firstPartySpec).get()); + + // We don't extract the image for now -- user may override at prompt. + return false; } void

1 0

[tor-browser/tor-browser-38.4.0esr-5.5-1] Bug 920750 - Disable update xml certificate checks on Mac OS X. r=bbondy
by gk＠torproject.org 13 Nov '15

13 Nov '15

commit f90a87efb57f9e2fd7f3b23e812af721f092a733 Author: Robert Strong <robert.bugzilla(a)gmail.com> Date: Wed Apr 8 00:34:57 2015 -0700 Bug 920750 - Disable update xml certificate checks on Mac OS X. r=bbondy --- browser/app/profile/firefox.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 7d9677a..9944a82 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -99,6 +99,14 @@ pref("app.update.log", false); // the failure. pref("app.update.backgroundMaxErrors", 10); +// The aus update xml certificate checks for application update are disabled on +// Windows and Mac OS X since the mar signature check are implemented on these +// platforms and is sufficient to prevent us from applying a mar that is not +// valid. +#if defined(XP_WIN) || defined(XP_MACOSX) +pref("app.update.cert.requireBuiltIn", false); +pref("app.update.cert.checkAttributes", false); +#else // When |app.update.cert.requireBuiltIn| is true or not specified the // final certificate and all certificates the connection is redirected to before // the final certificate for the url specified in the |app.update.url| @@ -136,6 +144,7 @@ pref("app.update.cert.maxErrors", 5); pref("app.update.certs.1.issuerName", "CN=DigiCert SHA2 High Assurance Server CA,OU=www.digicert.com,O=DigiCert Inc,C=US"); pref("app.update.certs.1.commonName", "*.torproject.org"); +#endif // Whether or not app updates are enabled pref("app.update.enabled", true);

1 0

[tor-browser/tor-browser-38.4.0esr-5.5-1] Bug 1151485 - Disable app update xml certificate checks on Linux now that there is mar signing on Linux. r=bbondy
by gk＠torproject.org 13 Nov '15

13 Nov '15

commit c429e391927b9f6462274c5a7b51cf66cd253ddf Author: Robert Strong <robert.bugzilla(a)gmail.com> Date: Wed Jul 29 12:39:56 2015 -0700 Bug 1151485 - Disable app update xml certificate checks on Linux now that there is mar signing on Linux. r=bbondy --- browser/app/profile/firefox.js | 47 ++++------------------------------------ 1 file changed, 4 insertions(+), 43 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 9944a82..a827f52 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -100,51 +100,12 @@ pref("app.update.log", false); pref("app.update.backgroundMaxErrors", 10); // The aus update xml certificate checks for application update are disabled on -// Windows and Mac OS X since the mar signature check are implemented on these -// platforms and is sufficient to prevent us from applying a mar that is not -// valid. -#if defined(XP_WIN) || defined(XP_MACOSX) +// Windows, Mac OS X, and Linux since the mar signature check are implemented on +// these platforms and is sufficient to prevent us from applying a mar that is +// not valid. Bug 1182352 will remove the update xml certificate checks and the +// following two preferences. pref("app.update.cert.requireBuiltIn", false); pref("app.update.cert.checkAttributes", false); -#else -// When |app.update.cert.requireBuiltIn| is true or not specified the -// final certificate and all certificates the connection is redirected to before -// the final certificate for the url specified in the |app.update.url| -// preference must be built-in. -pref("app.update.cert.requireBuiltIn", true); - -// When |app.update.cert.checkAttributes| is true or not specified the -// certificate attributes specified in the |app.update.certs.| preference branch -// are checked against the certificate for the url specified by the -// |app.update.url| preference. -pref("app.update.cert.checkAttributes", true); - -// The number of certificate attribute check failures to allow for background -// update checks before notifying the user of the failure. User initiated update -// checks always notify the user of the certificate attribute check failure. -pref("app.update.cert.maxErrors", 5); - -// The |app.update.certs.| preference branch contains branches that are -// sequentially numbered starting at 1 that contain attribute name / value -// pairs for the certificate used by the server that hosts the update xml file -// as specified in the |app.update.url| preference. When these preferences are -// present the following conditions apply for a successful update check: -// 1. the uri scheme must be https -// 2. the preference name must exist as an attribute name on the certificate and -// the value for the name must be the same as the value for the attribute name -// on the certificate. -// If these conditions aren't met it will be treated the same as when there is -// no update available. This validation will not be performed when the -// |app.update.url.override| user preference has been set for testing updates or -// when the |app.update.cert.checkAttributes| preference is set to false. Also, -// the |app.update.url.override| preference should ONLY be used for testing. -// IMPORTANT! metro.js should also be updated for updates to certs.X.issuerName -// IMPORTANT! media.gmp-manager.certs.* prefs should also be updated if these -// are updated. - -pref("app.update.certs.1.issuerName", "CN=DigiCert SHA2 High Assurance Server CA,OU=www.digicert.com,O=DigiCert Inc,C=US"); -pref("app.update.certs.1.commonName", "*.torproject.org"); -#endif // Whether or not app updates are enabled pref("app.update.enabled", true);

1 0

[tor-launcher/master] fixup! Bug 11199: Improve behavior if tor exits.
by brade＠torproject.org 12 Nov '15

12 Nov '15

commit f2aee156c2ca846b0220109051e22cab96ad6404 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Nov 12 10:33:55 2015 -0500 fixup! Bug 11199: Improve behavior if tor exits. Remove leftover strings and code for restarting the browser. --- src/chrome/locale/af-ZA/torlauncher.properties | 3 +-- src/chrome/locale/bg-BG/torlauncher.properties | 3 +-- src/chrome/locale/bn-BD/torlauncher.properties | 3 +-- src/chrome/locale/ca-ES/torlauncher.properties | 3 +-- src/chrome/locale/cs-CZ/torlauncher.properties | 3 +-- src/chrome/locale/el-GR/torlauncher.properties | 3 +-- src/chrome/locale/es-NI/torlauncher.properties | 3 +-- src/chrome/locale/ms/torlauncher.properties | 3 +-- src/chrome/locale/pl-PL/torlauncher.properties | 3 +-- src/chrome/locale/sv-SE/torlauncher.properties | 3 +-- src/chrome/locale/zh-CN.GB2312/torlauncher.properties | 3 +-- src/chrome/locale/zh/torlauncher.properties | 3 +-- src/components/tl-process.js | 6 ------ 13 files changed, 12 insertions(+), 30 deletions(-) diff --git a/src/chrome/locale/af-ZA/torlauncher.properties b/src/chrome/locale/af-ZA/torlauncher.properties index a2550db..12a2dc9 100644 --- a/src/chrome/locale/af-ZA/torlauncher.properties +++ b/src/chrome/locale/af-ZA/torlauncher.properties @@ -1,10 +1,9 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2015, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/bg-BG/torlauncher.properties b/src/chrome/locale/bg-BG/torlauncher.properties index a2550db..12a2dc9 100644 --- a/src/chrome/locale/bg-BG/torlauncher.properties +++ b/src/chrome/locale/bg-BG/torlauncher.properties @@ -1,10 +1,9 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2015, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/bn-BD/torlauncher.properties b/src/chrome/locale/bn-BD/torlauncher.properties index a2550db..12a2dc9 100644 --- a/src/chrome/locale/bn-BD/torlauncher.properties +++ b/src/chrome/locale/bn-BD/torlauncher.properties @@ -1,10 +1,9 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2015, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/ca-ES/torlauncher.properties b/src/chrome/locale/ca-ES/torlauncher.properties index d82d688..38a81f0 100644 --- a/src/chrome/locale/ca-ES/torlauncher.properties +++ b/src/chrome/locale/ca-ES/torlauncher.properties @@ -1,10 +1,9 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2015, The Tor Project, Inc. ### See LICENSE for licensing information. # torlauncher.error_title=Tor Launcher # torlauncher.tor_exited=Tor unexpectedly exited. -# torlauncher.please_restart_app=Please restart this application. # torlauncher.tor_controlconn_failed=Could not connect to Tor control port. # torlauncher.tor_failed_to_start=Tor failed to start. # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. diff --git a/src/chrome/locale/cs-CZ/torlauncher.properties b/src/chrome/locale/cs-CZ/torlauncher.properties index a2550db..12a2dc9 100644 --- a/src/chrome/locale/cs-CZ/torlauncher.properties +++ b/src/chrome/locale/cs-CZ/torlauncher.properties @@ -1,10 +1,9 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2015, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/el-GR/torlauncher.properties b/src/chrome/locale/el-GR/torlauncher.properties index a2550db..12a2dc9 100644 --- a/src/chrome/locale/el-GR/torlauncher.properties +++ b/src/chrome/locale/el-GR/torlauncher.properties @@ -1,10 +1,9 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2015, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/es-NI/torlauncher.properties b/src/chrome/locale/es-NI/torlauncher.properties index d04cac5..d1baf09 100644 --- a/src/chrome/locale/es-NI/torlauncher.properties +++ b/src/chrome/locale/es-NI/torlauncher.properties @@ -1,10 +1,9 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2015, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. diff --git a/src/chrome/locale/ms/torlauncher.properties b/src/chrome/locale/ms/torlauncher.properties index fcd4d83..b12a0e3 100644 --- a/src/chrome/locale/ms/torlauncher.properties +++ b/src/chrome/locale/ms/torlauncher.properties @@ -1,10 +1,9 @@ -### Copyright (c) 2013, The Tor Project, Inc. +### Copyright (c) 2015, The Tor Project, Inc. ### See LICENSE for licensing information. # torlauncher.error_title=Tor Launcher # torlauncher.tor_exited=Tor unexpectedly exited. -# torlauncher.please_restart_app=Please restart this application. # torlauncher.tor_controlconn_failed=Could not connect to Tor control port. # torlauncher.tor_failed_to_start=Tor failed to start. # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S diff --git a/src/chrome/locale/pl-PL/torlauncher.properties b/src/chrome/locale/pl-PL/torlauncher.properties index 54c1f90..032bb5f 100644 --- a/src/chrome/locale/pl-PL/torlauncher.properties +++ b/src/chrome/locale/pl-PL/torlauncher.properties @@ -1,10 +1,9 @@ -### Copyright (c) 2013, The Tor Project, Inc. +### Copyright (c) 2015, The Tor Project, Inc. ### See LICENSE for licensing information. # torlauncher.error_title=Tor Launcher # torlauncher.tor_exited=Tor unexpectedly exited. -# torlauncher.please_restart_app=Please restart this application. # torlauncher.tor_controlconn_failed=Could not connect to Tor control port. # torlauncher.tor_failed_to_start=Tor failed to start. # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S diff --git a/src/chrome/locale/sv-SE/torlauncher.properties b/src/chrome/locale/sv-SE/torlauncher.properties index fcd4d83..b12a0e3 100644 --- a/src/chrome/locale/sv-SE/torlauncher.properties +++ b/src/chrome/locale/sv-SE/torlauncher.properties @@ -1,10 +1,9 @@ -### Copyright (c) 2013, The Tor Project, Inc. +### Copyright (c) 2015, The Tor Project, Inc. ### See LICENSE for licensing information. # torlauncher.error_title=Tor Launcher # torlauncher.tor_exited=Tor unexpectedly exited. -# torlauncher.please_restart_app=Please restart this application. # torlauncher.tor_controlconn_failed=Could not connect to Tor control port. # torlauncher.tor_failed_to_start=Tor failed to start. # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S diff --git a/src/chrome/locale/zh-CN.GB2312/torlauncher.properties b/src/chrome/locale/zh-CN.GB2312/torlauncher.properties index d82d688..38a81f0 100644 --- a/src/chrome/locale/zh-CN.GB2312/torlauncher.properties +++ b/src/chrome/locale/zh-CN.GB2312/torlauncher.properties @@ -1,10 +1,9 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2015, The Tor Project, Inc. ### See LICENSE for licensing information. # torlauncher.error_title=Tor Launcher # torlauncher.tor_exited=Tor unexpectedly exited. -# torlauncher.please_restart_app=Please restart this application. # torlauncher.tor_controlconn_failed=Could not connect to Tor control port. # torlauncher.tor_failed_to_start=Tor failed to start. # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. diff --git a/src/chrome/locale/zh/torlauncher.properties b/src/chrome/locale/zh/torlauncher.properties index d82d688..38a81f0 100644 --- a/src/chrome/locale/zh/torlauncher.properties +++ b/src/chrome/locale/zh/torlauncher.properties @@ -1,10 +1,9 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2015, The Tor Project, Inc. ### See LICENSE for licensing information. # torlauncher.error_title=Tor Launcher # torlauncher.tor_exited=Tor unexpectedly exited. -# torlauncher.please_restart_app=Please restart this application. # torlauncher.tor_controlconn_failed=Could not connect to Tor control port. # torlauncher.tor_failed_to_start=Tor failed to start. # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 5113203..bb327dc 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -217,10 +217,7 @@ TorProcessService.prototype = else if (kOpenNetworkSettingsTopic == aTopic) this._openNetworkSettings(false); else if (kUserQuitTopic == aTopic) - { this.mQuitSoon = true; - this.mRestartWithQuit = ("restart" == aParam); - } }, canUnload: function(aCompMgr) { return true; }, @@ -294,7 +291,6 @@ TorProcessService.prototype = mControlConnTimer: null, mControlConnDelayMS: 0, mQuitSoon: false, // Quit was requested by the user; do so soon. - mRestartWithQuit: false, mLastTorWarningPhase: null, mLastTorWarningReason: null, @@ -489,8 +485,6 @@ TorProcessService.prototype = var asSvc = Cc["@mozilla.org/toolkit/app-startup;1"] .getService(Ci.nsIAppStartup); var flags = asSvc.eAttemptQuit; - if (this.mRestartWithQuit) - flags |= asSvc.eRestart; asSvc.quit(flags); } catch (e)

1 0

[torbutton/maint-1.9.3] Bug 16990: Avoid matching '250 ' to the end of node name
by gk＠torproject.org 10 Nov '15

10 Nov '15

commit c0e4b60c3dea82ad49d366038d5d950077a1c0fe Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Nov 5 08:15:16 2015 -0800 Bug 16990: Avoid matching '250 ' to the end of node name --- src/modules/tor-control-port.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index de9f10a..2b41897 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -517,11 +517,11 @@ info.stringToValue = function (string) { key = matchForKey ? matchForKey[1] : null; if (key === null) return null; // matchResult finds a single-line result for `250-` or a multi-line one for `250+`. - let matchResult = string.match(/250[ -].+?=(.*?)$/mi) || - string.match(/250\+.+?=([\s\S]*?)^\.$/mi), + let matchResult = string.match(/^250[ -].+?=(.*?)$/mi) || + string.match(/^250\+.+?=([\s\S]*?)^\.$/mi), // Retrieve the captured group (the text of the value in the key-value pair) valueString = matchResult ? matchResult[1] : null, - // Get the parser functino for the key found. + // Get the parser function for the key found. parse = info.getParser(key.toLowerCase()); if (parse === undefined) { throw new Error("No parser found for '" + key + "'");

1 0

[torbutton/master] Bug 16990: Avoid matching '250 ' to the end of node name
by gk＠torproject.org 10 Nov '15

10 Nov '15

commit 55724056112b1fd6bc2a42046a42dc265e1e44ea Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Nov 5 08:15:16 2015 -0800 Bug 16990: Avoid matching '250 ' to the end of node name --- src/modules/tor-control-port.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index de9f10a..2b41897 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -517,11 +517,11 @@ info.stringToValue = function (string) { key = matchForKey ? matchForKey[1] : null; if (key === null) return null; // matchResult finds a single-line result for `250-` or a multi-line one for `250+`. - let matchResult = string.match(/250[ -].+?=(.*?)$/mi) || - string.match(/250\+.+?=([\s\S]*?)^\.$/mi), + let matchResult = string.match(/^250[ -].+?=(.*?)$/mi) || + string.match(/^250\+.+?=([\s\S]*?)^\.$/mi), // Retrieve the captured group (the text of the value in the key-value pair) valueString = matchResult ? matchResult[1] : null, - // Get the parser functino for the key found. + // Get the parser function for the key found. parse = info.getParser(key.toLowerCase()); if (parse === undefined) { throw new Error("No parser found for '" + key + "'");

1 0

[torbutton/maint-1.9.3] Fix typo in changelog
by gk＠torproject.org 05 Nov '15

05 Nov '15

commit 1da9b00d14456eea343601c1342c493062e1975b Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 5 11:24:50 2015 +0000 Fix typo in changelog --- src/CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index db50644..77a7090 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,5 +1,5 @@ 1.9.3.5 - * Bug 9263: Spoof Referer when leaving a .onion domain + * Bug 9623: Spoof Referer when leaving a .onion domain * Bug 16735: about:tor should accommodate different fonts/font sizes * Bug 16937: Don't translate the hompepage/spellchecker dictionary string * Bug 17164: Don't show text-select cursor on circuit display

1 0

[torbutton/master] Fix typo in changelog
by gk＠torproject.org 05 Nov '15

05 Nov '15

commit 198575775b862d79beb12357b33e7d96931c8ba8 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 5 11:24:06 2015 +0000 Fix typo in changelog --- src/CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 0347f11..91ece83 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,5 +1,5 @@ 1.9.4.1 - * Bug 9263: Spoof Referer when leaving a .onion domain + * Bug 9623: Spoof Referer when leaving a .onion domain * Bug 16620: Move window.name handling into a Firefox patch * Bug 17164: Don't show text-select cursor on circuit display * Bug 17351: Remove unused code

1 0

[tor-browser-bundle/hardened-builds] Fix typo in changelog
by gk＠torproject.org 05 Nov '15

05 Nov '15

commit 310740285eed2a0e5fc2fd05c29eaa5ebeec27b9 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 5 11:16:53 2015 +0000 Fix typo in changelog --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 0b2a51c..2a4af99 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -5,7 +5,7 @@ Tor Browser 5.5a4 -- November 3 2015 * Update NoScript to 2.6.9.39 * Update HTTPS-Everywhere to 5.1.1 * Update Torbutton to 1.9.4.1 - * Bug 9263: Spoof Referer when leaving a .onion domain + * Bug 9623: Spoof Referer when leaving a .onion domain * Bug 16620: Remove old window.name handling code * Bug 17164: Don't show text-select cursor on circuit display * Bug 17351: Remove unused code

1 0

[tor-browser-bundle/hardened-builds] Merge branch 'master' into hardened-builds
by gk＠torproject.org 05 Nov '15

05 Nov '15

commit c5fea3d34360a78237fdd734d20b7e79f88faba3 Merge: 6f3b8d5 3107402 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 5 11:20:13 2015 +0000 Merge branch 'master' into hardened-builds Bundle-Data/Docs/ChangeLog.txt | 3 ++- tools/continuous-builds/build-tbb.sh | 4 ++-- tools/continuous-builds/park-nightly.sh | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-)

1 0