August 2017 - tor-commits - lists.torproject.org

[tor-browser-bundle/master] 7.5a3 changelog correction
by gk＠torproject.org 04 Aug '17

04 Aug '17

commit 6d54b0e2b8cf45fb817e2bbc822c61e5a4ad78de Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 4 07:02:29 2017 +0000 7.5a3 changelog correction --- Bundle-Data/Docs/ChangeLog.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 8558526..cb49399 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -48,7 +48,6 @@ Tor Browser 7.5a4 -- August 9 2017 Tor Browser 7.5a3 -- July 28 2017 * Linux * Bug 23044: Don't allow GIO supported protocols by default - * Bug 22829: Remove default obfs4 bridge riemann. Tor Browser 7.0.3 -- July 27 2017 * Linux

1 0

[tor-browser-bundle/master] Release preparations for 7.5a4
by gk＠torproject.org 04 Aug '17

04 Aug '17

commit 0d192217fc71cccf16bce16e3904460b0991b43d Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 4 07:02:07 2017 +0000 Release preparations for 7.5a4 Changelog update, version bumps, and config.yml update --- Bundle-Data/Docs/ChangeLog.txt | 47 +++++++++++++++++++++++++++++++++++++++ gitian/versions.alpha | 22 +++++++++--------- tools/update-responses/config.yml | 11 ++++----- 3 files changed, 64 insertions(+), 16 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 224ccaa..8558526 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,50 @@ +Tor Browser 7.5a4 -- August 9 2017 + * All Platforms + * Update Firefox to 52.3.0esr + * Update Tor to 0.3.1.5-alpha + * Update OpenSSL to 1.0.2l + * Update Torbutton to 1.9.8 + * Bug 22610: Avoid crashes when canceling external helper app related downloads + * Bug 22472: Fix FTP downloads when external helper app dialog is shown + * Bug 22471: Downloading pdf files via the PDF viewer download button is broken + * Bug 22618: Downloading pdf file via file:/// is stalling + * Bug 22542: Resize slider window to work without scrollbars + * Bug 21999: Fix display of language prompt in non-en-US locales + * Bug 18193: Don't let about:tor have chrome privileges + * Bug 22535: Search on about:tor discards search query + * Bug 21948: Going back to about:tor page gives "Address isn't valid" error + * Code clean-up + * Translations update + * Update Tor Launcher to 0.2.12.3 + * Bug 22592: Default bridge settings are not removed + * Translations update + * Update HTTPS-Everywhere to 5.2.21 + * Update NoScript to 5.0.8.1 + * Bug 22362: Remove workaround for XSS related browser freezing + * Bug 22067: NoScript Click-to-Play bypass with embedded videos and audio + * Bug 22610: Avoid crashes when canceling external helper app related downloads + * Bug 22472: Fix FTP downloads when external helper app dialog is shown + * Bug 22471: Downloading pdf files via the PDF viewer download button is broken + * Bug 22618: Downloading pdf file via file:/// is stalling + * Bug 21321: Exempt .onions from HTTP related security warnings + * Bug 21830: Copying large text from web console leaks to /tmp + * Bug 22073: Disable GetAddons option on addons page + * Bug 22884: Fix broken about:tor page on higher security levels + * Bug 22829: Remove default obfs4 bridge riemann. + * Windows + * Bug 21617: Fix single RWX page on Windows (included in 52.3.0esr) + * OS X + * Bug 22831: Enable Snowflake for mac + * Linux + * Bug 22832: Don't include monthly timestamp in libwebrtc build output + * Bug 20848: Deploy Selfrando in 32bit Linux builds + * Build system + * Windows + * Bug 22563: Update mingw-w64 to fix W^X violations + * Bug 20929: Bump GCC version to 5.4.0 + * Linux + * Bug 20929: Bump GCC version to 5.4.0 + Tor Browser 7.5a3 -- July 28 2017 * Linux * Bug 23044: Don't allow GIO supported protocols by default diff --git a/gitian/versions.alpha b/gitian/versions.alpha index c35c51b..1e20aa4 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -10,15 +10,15 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=52.2.0esr +FIREFOX_VERSION=52.3.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.5-1-build2 -TOR_TAG=tor-0.3.1.4-alpha -TORLAUNCHER_TAG=0.2.12.2 -TORBUTTON_TAG=1.9.7.4 -HTTPSE_TAG=5.2.19 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.5-2-build1 +TOR_TAG=tor-0.3.1.5-alpha +TORLAUNCHER_TAG=0.2.12.3 +TORBUTTON_TAG=1.9.8 +HTTPSE_TAG=5.2.21 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -49,12 +49,12 @@ SNOWFLAKE_TAG=9f2e9a6ecb696149708716ca06ce842df03cf492 UNIURI_TAG=8902c56451e9b58ff940bbe5fec35d5f9c04584a SELFRANDO_TAG=tb-v0.3.2 -GITIAN_TAG=tor-browser-builder-4-4 +GITIAN_TAG=tor-browser-builder-4-5 -OPENSSL_VER=1.0.2k +OPENSSL_VER=1.0.2l GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build1 +FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.24 GCC_VER=5.4.0 CLANG_VER=3.8.0 @@ -77,7 +77,7 @@ ELFUTILS_VER=0.166 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-5.0.7.1-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.0.8.1-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll @@ -113,7 +113,7 @@ ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2 OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -NOSCRIPT_HASH=fe85a4c72b5a763462f3b264f54a0ef1c6f6879eb95d903f2dfee337f768a50b +NOSCRIPT_HASH=ef648454965242a57583d2541290bcf9526747b18335aeccdd55f39a23873bc3 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index a4f1f91..e6dcf27 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -19,14 +19,15 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - alpha: 7.5a2 + alpha: 7.5a4 release: 6.0.1 versions: - 7.5a2: - platformVersion: 52.2.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-75a2-released + 7.5a4: + platformVersion: 52.3.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-75a4-released incremental_from: - - 7.5a1 + - 7.5a2 + - 7.5a3 migrate_archs: osx32: osx64 migrate_langs:

1 0

[tor-browser-bundle/master] Fold in stable changelog
by gk＠torproject.org 04 Aug '17

04 Aug '17

commit 6bc3048b901d3261f7644751232ecf98fc8680a6 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 2 10:46:40 2017 +0000 Fold in stable changelog --- Bundle-Data/Docs/ChangeLog.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 2e52d7c..2c5c7e8 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,8 @@ +Tor Browser 7.0.3 -- July 27 2017 + * Linux + * Bug 23044: Don't allow GIO supported protocols by default + * Bug 22829: Remove default obfs4 bridge riemann. + Tor Browser 7.5a2 -- July 6 2017 * All Platforms * Update Tor to 0.3.1.4-alpha

1 0

[tor-browser-bundle/master] Fold in 7.5a3 changelog
by gk＠torproject.org 04 Aug '17

04 Aug '17

commit 6be301f7449f4f320137027a242edcacd7b636c6 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 2 10:47:44 2017 +0000 Fold in 7.5a3 changelog --- Bundle-Data/Docs/ChangeLog.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 2c5c7e8..224ccaa 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,8 @@ +Tor Browser 7.5a3 -- July 28 2017 + * Linux + * Bug 23044: Don't allow GIO supported protocols by default + * Bug 22829: Remove default obfs4 bridge riemann. + Tor Browser 7.0.3 -- July 27 2017 * Linux * Bug 23044: Don't allow GIO supported protocols by default

1 0

[tor-browser/tor-browser-52.2.0esr-7.5-1] fixup! Bug 19273: Avoid JavaScript patching of the external app helper dialog.
by gk＠torproject.org 04 Aug '17

04 Aug '17

commit 0c48149c2a4d4603f066c26c1b54f5e4fe554454 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jul 20 17:04:44 2017 -0400 fixup! Bug 19273: Avoid JavaScript patching of the external app helper dialog. When handling an external URI or downloading a file, invoke Torbutton's external app blocker component (which will present a download warning dialog unless the user has checked the "Automatically download files from now on" box). For e10s compatibility, avoid using a modal dialog and instead use a callback interface (nsIHelperAppWarningLauncher) to allow Torbutton to indicate the user's desire to cancel or continue each request. --- .../exthandler/nsExternalHelperAppService.cpp | 162 ++++++++++++++++++--- uriloader/exthandler/nsExternalHelperAppService.h | 3 + .../exthandler/nsIExternalHelperAppService.idl | 47 ++++++ 3 files changed, 195 insertions(+), 17 deletions(-) diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp index 51a7ee0f6ab6..df08905304fb 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -132,6 +132,9 @@ static const char NEVER_ASK_FOR_SAVE_TO_DISK_PREF[] = static const char NEVER_ASK_FOR_OPEN_FILE_PREF[] = "browser.helperApps.neverAsk.openFile"; +static const char WARNING_DIALOG_CONTRACT_ID[] = + "@torproject.org/torbutton-extAppBlocker;1"; + // Helper functions for Content-Disposition headers /** @@ -594,6 +597,107 @@ static const nsDefaultMimeTypeEntry nonDecodableExtensions[] = { { APPLICATION_GZIP, "svgz" } }; +////////////////////////////////////////////////////////////////////////////////////////////////////// +// begin nsExternalLoadURIHandler class definition and implementation +////////////////////////////////////////////////////////////////////////////////////////////////////// +class nsExternalLoadURIHandler final : public nsIHelperAppWarningLauncher +{ +public: + NS_DECL_THREADSAFE_ISUPPORTS + NS_DECL_NSIHELPERAPPWARNINGLAUNCHER + + nsExternalLoadURIHandler(nsIInterfaceRequestor * aWindowContext, + nsIURI *aURI, + nsIHandlerInfo *aHandlerInfo); + +protected: + ~nsExternalLoadURIHandler(); + + nsCOMPtr<nsIInterfaceRequestor> mWindowContext; + nsCOMPtr<nsIURI> mURI; + nsCOMPtr<nsIHandlerInfo> mHandlerInfo; + nsCOMPtr<nsIHelperAppWarningDialog> mWarningDialog; +}; + +NS_IMPL_ADDREF(nsExternalLoadURIHandler) +NS_IMPL_RELEASE(nsExternalLoadURIHandler) + +NS_INTERFACE_MAP_BEGIN(nsExternalLoadURIHandler) + NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIHelperAppWarningLauncher) + NS_INTERFACE_MAP_ENTRY(nsIHelperAppWarningLauncher) +NS_INTERFACE_MAP_END_THREADSAFE + +nsExternalLoadURIHandler::nsExternalLoadURIHandler( + nsIInterfaceRequestor *aWindowContext, + nsIURI *aURI, + nsIHandlerInfo *aHandlerInfo) +: mWindowContext(aWindowContext) +, mURI(aURI) +, mHandlerInfo(aHandlerInfo) +{ + nsresult rv = NS_OK; + mWarningDialog = do_CreateInstance(WARNING_DIALOG_CONTRACT_ID, &rv); + if (NS_SUCCEEDED(rv) && mWarningDialog) { + // This will create a reference cycle (the dialog holds a reference to us + // as nsIHelperAppWarningLauncher), which will be broken in ContinueRequest + // or CancelRequest. + rv = mWarningDialog->MaybeShow(this, aWindowContext); + } + + if (NS_FAILED(rv)) { + // If for some reason we could not open the download warning prompt, + // continue with the request. + ContinueRequest(); + } +} + +nsExternalLoadURIHandler::~nsExternalLoadURIHandler() +{ +} + +NS_IMETHODIMP nsExternalLoadURIHandler::ContinueRequest() +{ + MOZ_ASSERT(mURI); + MOZ_ASSERT(mHandlerInfo); + + // Break our reference cycle with the download warning dialog (set up in + // LoadURI). + mWarningDialog = nullptr; + + nsHandlerInfoAction preferredAction; + mHandlerInfo->GetPreferredAction(&preferredAction); + bool alwaysAsk = true; + mHandlerInfo->GetAlwaysAskBeforeHandling(&alwaysAsk); + + // if we are not supposed to ask, and the preferred action is to use + // a helper app or the system default, we just launch the URI. + if (!alwaysAsk && (preferredAction == nsIHandlerInfo::useHelperApp || + preferredAction == nsIHandlerInfo::useSystemDefault)) + return mHandlerInfo->LaunchWithURI(mURI, mWindowContext); + + nsresult rv = NS_OK; + nsCOMPtr<nsIContentDispatchChooser> chooser = + do_CreateInstance("@mozilla.org/content-dispatch-chooser;1", &rv); + NS_ENSURE_SUCCESS(rv, rv); + + return chooser->Ask(mHandlerInfo, mWindowContext, mURI, + nsIContentDispatchChooser::REASON_CANNOT_HANDLE); +} + +NS_IMETHODIMP nsExternalLoadURIHandler::CancelRequest(nsresult aReason) +{ + NS_ENSURE_ARG(NS_FAILED(aReason)); + + // Break our reference cycle with the download warning dialog (set up in + // LoadURI). + mWarningDialog = nullptr; + + return NS_OK; +} + +////////////////////////////////////////////////////////////////////////////////////////////////////// +// nsExternalHelperAppService definition and implementation +////////////////////////////////////////////////////////////////////////////////////////////////////// NS_IMPL_ISUPPORTS( nsExternalHelperAppService, nsIExternalHelperAppService, @@ -1014,23 +1118,13 @@ nsExternalHelperAppService::LoadURI(nsIURI *aURI, rv = GetProtocolHandlerInfo(scheme, getter_AddRefs(handler)); NS_ENSURE_SUCCESS(rv, rv); - nsHandlerInfoAction preferredAction; - handler->GetPreferredAction(&preferredAction); - bool alwaysAsk = true; - handler->GetAlwaysAskBeforeHandling(&alwaysAsk); + RefPtr<nsExternalLoadURIHandler> h = + new nsExternalLoadURIHandler(aWindowContext, uri, handler); + if (!h) { + return NS_ERROR_OUT_OF_MEMORY; + } - // if we are not supposed to ask, and the preferred action is to use - // a helper app or the system default, we just launch the URI. - if (!alwaysAsk && (preferredAction == nsIHandlerInfo::useHelperApp || - preferredAction == nsIHandlerInfo::useSystemDefault)) - return handler->LaunchWithURI(uri, aWindowContext); - - nsCOMPtr<nsIContentDispatchChooser> chooser = - do_CreateInstance("@mozilla.org/content-dispatch-chooser;1", &rv); - NS_ENSURE_SUCCESS(rv, rv); - - return chooser->Ask(handler, aWindowContext, uri, - nsIContentDispatchChooser::REASON_CANNOT_HANDLE); + return NS_OK; } NS_IMETHODIMP nsExternalHelperAppService::GetApplicationDescription(const nsACString& aScheme, nsAString& _retval) @@ -1198,6 +1292,7 @@ NS_INTERFACE_MAP_BEGIN(nsExternalAppHandler) NS_INTERFACE_MAP_ENTRY(nsIStreamListener) NS_INTERFACE_MAP_ENTRY(nsIRequestObserver) NS_INTERFACE_MAP_ENTRY(nsIHelperAppLauncher) + NS_INTERFACE_MAP_ENTRY(nsIHelperAppWarningLauncher) NS_INTERFACE_MAP_ENTRY(nsICancelable) NS_INTERFACE_MAP_ENTRY(nsITimerCallback) NS_INTERFACE_MAP_ENTRY(nsIBackgroundFileSaverObserver) @@ -1671,6 +1766,29 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest *request, nsISuppo httpInternal->SetChannelIsForDownload(true); } + mWarningDialog = do_CreateInstance(WARNING_DIALOG_CONTRACT_ID, &rv); + if (NS_SUCCEEDED(rv) && mWarningDialog) { + // This will create a reference cycle (the dialog holds a reference to us + // as nsIHelperAppWarningLauncher), which will be broken in ContinueRequest + // or CancelRequest. + rv = mWarningDialog->MaybeShow(this, GetDialogParent()); + } + + if (NS_FAILED(rv)) { + // If for some reason we could not open the download warning prompt, + // continue with the request. + ContinueRequest(); + } + + return NS_OK; +} + +NS_IMETHODIMP nsExternalAppHandler::ContinueRequest() +{ + // Break our reference cycle with the download warning dialog (set up in + // OnStartRequest) + mWarningDialog = nullptr; + // now that the temp file is set up, find out if we need to invoke a dialog // asking the user what they want us to do with this content... @@ -1731,6 +1849,7 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest *request, nsISuppo action = nsIMIMEInfo::saveToDisk; } + nsresult rv = NS_OK; if (alwaysAsk) { // Display the dialog @@ -1786,6 +1905,15 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest *request, nsISuppo return NS_OK; } +NS_IMETHODIMP nsExternalAppHandler::CancelRequest(nsresult aReason) +{ + // Break our reference cycle with the download warning dialog (set up in + // OnStartRequest) + mWarningDialog = nullptr; + + return Cancel(aReason); +} + // Convert error info into proper message text and send OnStatusChange // notification to the dialog progress listener or nsITransfer implementation. void nsExternalAppHandler::SendStatusChange(ErrorType type, nsresult rv, nsIRequest *aRequest, const nsAFlatString &path) @@ -2477,7 +2605,7 @@ NS_IMETHODIMP nsExternalAppHandler::Cancel(nsresult aReason) } // Break our reference cycle with the helper app dialog (set up in - // OnStartRequest) + // ContinueRequest) mDialog = nullptr; mRequest = nullptr; diff --git a/uriloader/exthandler/nsExternalHelperAppService.h b/uriloader/exthandler/nsExternalHelperAppService.h index ceec66661dd4..3146407dcbe5 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.h +++ b/uriloader/exthandler/nsExternalHelperAppService.h @@ -210,6 +210,7 @@ private: */ class nsExternalAppHandler final : public nsIStreamListener, public nsIHelperAppLauncher, + public nsIHelperAppWarningLauncher, public nsITimerCallback, public nsIBackgroundFileSaverObserver { @@ -218,6 +219,7 @@ public: NS_DECL_NSISTREAMLISTENER NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSIHELPERAPPLAUNCHER + NS_DECL_NSIHELPERAPPWARNINGLAUNCHER NS_DECL_NSICANCELABLE NS_DECL_NSITIMERCALLBACK NS_DECL_NSIBACKGROUNDFILESAVEROBSERVER @@ -478,6 +480,7 @@ protected: nsCOMPtr<nsIChannel> mOriginalChannel; /**< in the case of a redirect, this will be the pre-redirect channel. */ nsCOMPtr<nsIHelperAppLauncherDialog> mDialog; + nsCOMPtr<nsIHelperAppWarningDialog> mWarningDialog; /** * Keep request alive in case when helper non-modal dialog shown. diff --git a/uriloader/exthandler/nsIExternalHelperAppService.idl b/uriloader/exthandler/nsIExternalHelperAppService.idl index bfdfff5ceaa8..546252f04ba3 100644 --- a/uriloader/exthandler/nsIExternalHelperAppService.idl +++ b/uriloader/exthandler/nsIExternalHelperAppService.idl @@ -152,3 +152,50 @@ interface nsIHelperAppLauncher : nsICancelable */ readonly attribute int64_t contentLength; }; + +/** + * nsIHelperAppWarningLauncher is implemented by two classes: + * nsExternalLoadURIHandler + * nsExternalAppHandler + */ +[scriptable, uuid(cffd508b-4aaf-43ad-99c6-671d35cbc558)] +interface nsIHelperAppWarningLauncher : nsISupports +{ + /** + * Callback invoked by the external app warning dialog to continue the + * request. + * NOTE: This will release the reference to the nsIHelperAppWarningDialog. + */ + void continueRequest(); + + /** + * Callback invoked by the external app warning dialog to cancel the request. + * NOTE: This will release the reference to the nsIHelperAppWarningDialog. + * + * @param aReason + * Pass a failure code to indicate the reason why this operation is + * being canceled. It is an error to pass a success code. + */ + void cancelRequest(in nsresult aReason); +}; + +/** + * nsIHelperAppWarningDialog is implemented by Torbutton's external app + * blocker (src/components/external-app-blocker.js). + */ +[scriptable, uuid(f4899a3f-0df3-42cc-9db8-bdf599e5a208)] +interface nsIHelperAppWarningDialog : nsISupports +{ + /** + * Possibly show a launch warning dialog (it will not be shown if the user + * has chosen to not see the warning again). + * + * @param aLauncher + * A nsIHelperAppWarningLauncher to be invoked after the user confirms + * or cancels the download. + * @param aWindowContext + * The window associated with the download. + */ + void maybeShow(in nsIHelperAppWarningLauncher aLauncher, + in nsISupports aWindowContext); +};

1 0

[tor-browser/tor-browser-52.2.0esr-7.5-1] Revert "Bug 19273: Avoid JavaScript patching of the external app helper dialog."
by gk＠torproject.org 04 Aug '17

04 Aug '17

commit 47df7aa33aa1ea4a72ac029169725609f2f518aa Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jul 18 16:22:32 2017 -0400 Revert "Bug 19273: Avoid JavaScript patching of the external app helper dialog." This reverts commit 648d842b127e6ca6457d43e45244c65ee1773aa3. --- netwerk/protocol/http/HttpBaseChannel.cpp | 7 --- netwerk/protocol/http/HttpBaseChannel.h | 1 - netwerk/protocol/http/NullHttpChannel.cpp | 6 --- netwerk/protocol/http/nsIHttpChannel.idl | 9 +--- .../protocol/viewsource/nsViewSourceChannel.cpp | 11 ----- .../exthandler/nsExternalHelperAppService.cpp | 57 ---------------------- 6 files changed, 1 insertion(+), 90 deletions(-) diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp index 5ea6a002a40f..e0f7edec05f9 100644 --- a/netwerk/protocol/http/HttpBaseChannel.cpp +++ b/netwerk/protocol/http/HttpBaseChannel.cpp @@ -1233,13 +1233,6 @@ NS_IMETHODIMP HttpBaseChannel::SetTopLevelContentWindowId(uint64_t aWindowId) return NS_OK; } -NS_IMETHODIMP HttpBaseChannel::IsPendingUnforced(bool *aIsPendingUnforced) -{ - NS_ENSURE_ARG_POINTER(aIsPendingUnforced); - *aIsPendingUnforced = mIsPending; - return NS_OK; -} - NS_IMETHODIMP HttpBaseChannel::GetTransferSize(uint64_t *aTransferSize) { diff --git a/netwerk/protocol/http/HttpBaseChannel.h b/netwerk/protocol/http/HttpBaseChannel.h index 3a1a8ba525b0..c8184a601b9e 100644 --- a/netwerk/protocol/http/HttpBaseChannel.h +++ b/netwerk/protocol/http/HttpBaseChannel.h @@ -190,7 +190,6 @@ public: NS_IMETHOD SetChannelId(const nsACString& aChannelId) override; NS_IMETHOD GetTopLevelContentWindowId(uint64_t *aContentWindowId) override; NS_IMETHOD SetTopLevelContentWindowId(uint64_t aContentWindowId) override; - NS_IMETHOD IsPendingUnforced(bool *aIsPendingUnforced) override; // nsIHttpChannelInternal NS_IMETHOD GetDocumentURI(nsIURI **aDocumentURI) override; diff --git a/netwerk/protocol/http/NullHttpChannel.cpp b/netwerk/protocol/http/NullHttpChannel.cpp index 8b362cb24233..8c048a6b5a7e 100644 --- a/netwerk/protocol/http/NullHttpChannel.cpp +++ b/netwerk/protocol/http/NullHttpChannel.cpp @@ -82,12 +82,6 @@ NullHttpChannel::SetTopLevelContentWindowId(uint64_t aWindowId) } NS_IMETHODIMP -NullHttpChannel::IsPendingUnforced(bool *_retval) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - -NS_IMETHODIMP NullHttpChannel::GetTransferSize(uint64_t *aTransferSize) { return NS_ERROR_NOT_IMPLEMENTED; diff --git a/netwerk/protocol/http/nsIHttpChannel.idl b/netwerk/protocol/http/nsIHttpChannel.idl index 0de0676ad156..75ec2c73989a 100644 --- a/netwerk/protocol/http/nsIHttpChannel.idl +++ b/netwerk/protocol/http/nsIHttpChannel.idl @@ -14,7 +14,7 @@ interface nsIHttpHeaderVisitor; * the inspection of the resulting HTTP response status and headers when they * become available. */ -[builtinclass, scriptable, uuid(e0d8071b-5389-48c2-92c7-6708c968044d)] +[builtinclass, scriptable, uuid(c5a4a073-4539-49c7-a3f2-cec3f0619c6c)] interface nsIHttpChannel : nsIChannel { /************************************************************************** @@ -469,11 +469,4 @@ interface nsIHttpChannel : nsIChannel * this channels is being load in. */ attribute uint64_t topLevelContentWindowId; - - /** - * Returns true if a request is pending due to "natural" causes and - * not just because ForcePending() has been called. See isPending() - * in nsIRequest.idl for more details about pending requests. - */ - boolean isPendingUnforced(); }; diff --git a/netwerk/protocol/viewsource/nsViewSourceChannel.cpp b/netwerk/protocol/viewsource/nsViewSourceChannel.cpp index 9f9b89438fba..9ed71c4ef001 100644 --- a/netwerk/protocol/viewsource/nsViewSourceChannel.cpp +++ b/netwerk/protocol/viewsource/nsViewSourceChannel.cpp @@ -740,17 +740,6 @@ nsViewSourceChannel::SetTopLevelContentWindowId(uint64_t aWindowId) } NS_IMETHODIMP -nsViewSourceChannel::IsPendingUnforced(bool *result) -{ - if (mHttpChannel) { - return mHttpChannel->IsPendingUnforced(result); - } - - NS_ENSURE_TRUE(mChannel, NS_ERROR_FAILURE); - return mChannel->IsPending(result); -} - -NS_IMETHODIMP nsViewSourceChannel::GetRequestMethod(nsACString & aRequestMethod) { return !mHttpChannel ? NS_ERROR_NULL_POINTER : diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp index 4a7fd7f92f15..51a7ee0f6ab6 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -41,7 +41,6 @@ #include "nsThreadUtils.h" #include "nsAutoPtr.h" #include "nsIMutableArray.h" -#include "nsISupportsPrimitives.h" // for nsISupportsPRBool // used to access our datastore of user-configured helper applications #include "nsIHandlerService.h" @@ -106,7 +105,6 @@ #include "mozilla/Preferences.h" #include "mozilla/ipc/URIUtils.h" -#include "mozilla/Unused.h" using namespace mozilla; using namespace mozilla::ipc; @@ -436,22 +434,6 @@ static nsresult GetDownloadDirectory(nsIFile **_directory, return NS_OK; } -static nsresult shouldCancel(bool *aShouldCancel) -{ - NS_ENSURE_ARG_POINTER(aShouldCancel); - - nsCOMPtr<nsISupportsPRBool> cancelObj = - do_CreateInstance(NS_SUPPORTS_PRBOOL_CONTRACTID); - cancelObj->SetData(false); - nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService(); - if (!obs) - return NS_ERROR_FAILURE; - - obs->NotifyObservers(cancelObj, "external-app-requested", nullptr); - cancelObj->GetData(aShouldCancel); - return NS_OK; -} - /** * Structure for storing extension->type mappings. * @see defaultMimeEntries @@ -1028,14 +1010,6 @@ nsExternalHelperAppService::LoadURI(nsIURI *aURI, return NS_OK; // explicitly denied } - // Give other modules, including extensions, a chance to cancel. - bool doCancel = false; - rv = shouldCancel(&doCancel); - NS_ENSURE_SUCCESS(rv, rv); - if (doCancel) { - return NS_OK; - } - nsCOMPtr<nsIHandlerInfo> handler; rv = GetProtocolHandlerInfo(scheme, getter_AddRefs(handler)); NS_ENSURE_SUCCESS(rv, rv); @@ -1669,37 +1643,6 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest *request, nsISuppo return NS_OK; } - // Give other modules, including extensions, a chance to cancel. - // To avoid a problem where OnDataAvailable fires but is not handled - // correctly while a modal dialog displayed by Torbutton is open, we - // suspend and then we either cancel or resume active requests. - // See bugs 21766 and 21886. - bool isPending = false; - nsCOMPtr<nsIHttpChannel> httpChan = do_QueryInterface(request); - if (httpChan) { - rv = httpChan->IsPendingUnforced(&isPending); - } else { - rv = request->IsPending(&isPending); - } - NS_ENSURE_SUCCESS(rv, rv); - - if (isPending) { - Unused << request->Suspend(); // Best effort: ignore failures. - } - - bool doCancel = false; - rv = shouldCancel(&doCancel); - NS_ENSURE_SUCCESS(rv, rv); - if (doCancel) { - mCanceled = true; - request->Cancel(NS_BINDING_ABORTED); - return NS_OK; - } - - if (isPending) { - Unused << request->Resume(); // Best effort: ignore failures. - } - rv = SetUpTempFile(aChannel); if (NS_FAILED(rv)) { nsresult transferError = rv;

1 0

[tor-browser/tor-browser-52.2.0esr-7.5-1] Bug 21830: Copying large test from web console leaks to /tmp
by gk＠torproject.org 04 Aug '17

04 Aug '17

commit 06580161f901dedf60e6dcb9252e7ce6b3e7b37b Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 4 05:55:49 2017 +0000 Bug 21830: Copying large test from web console leaks to /tmp Patch written by Neill Miller --- widget/nsTransferable.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/widget/nsTransferable.cpp b/widget/nsTransferable.cpp index e99d45401df8..976180c7581e 100644 --- a/widget/nsTransferable.cpp +++ b/widget/nsTransferable.cpp @@ -39,6 +39,7 @@ Notes to self: #include "nsIFile.h" #include "nsILoadContext.h" #include "mozilla/UniquePtr.h" +#include "mozilla/Preferences.h" NS_IMPL_ISUPPORTS(nsTransferable, nsITransferable) @@ -248,6 +249,11 @@ nsTransferable::Init(nsILoadContext* aContext) if (aContext) { mPrivateData = aContext->UsePrivateBrowsing(); + } else { + // without aContext here to provide PrivateBrowsing information, + // we defer to the active configured setting + mPrivateData = + mozilla::Preferences::GetBool("browser.privatebrowsing.autostart"); } #ifdef DEBUG mInitialized = true;

1 0

[torbutton/master] Changelog update and version bump
by gk＠torproject.org 04 Aug '17

04 Aug '17

commit 6c76c3083f5ed221deddc51d13e09e8f8b6418f4 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 4 05:33:06 2017 +0000 Changelog update and version bump --- src/CHANGELOG | 13 +++++++++++++ src/install.rdf | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 775884c..ddd40d8 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,16 @@ +1.9.8 + * Bug 22610: Avoid crashes when canceling external helper app related downloads + * Bug 22472: Fix FTP downloads when external helper app dialog is shown + * Bug 22471: Downloading pdf files via the PDF viewer download button is broken + * Bug 22618: Downloading pdf file via file:/// is stalling + * Bug 22542: Resize slider window to work without scrollbars + * Bug 21999: Fix display of language prompt in non-en-US locales + * Bug 18193: Don't let about:tor have chrome privileges + * Bug 22535: Search on about:tor discards search query + * Bug 21948: Going back to about:tor page gives "Address isn't valid" error + * Code clean-up + * Translations update + 1.9.7.4 * Bug 22542: Security Settings window too small on macOS 10.12 diff --git a/src/install.rdf b/src/install.rdf index 868faea..c501b6a 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.7.4</em:version> + <em:version>1.9.8</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL>

1 0

[torbutton/master] fixup! Bug 19273: Avoid JavaScript patching of the external app helper dialog.
by gk＠torproject.org 04 Aug '17

04 Aug '17

commit d48388d248ddf23150e70c7f0e4b84109e793a0d Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jul 20 17:11:53 2017 -0400 fixup! Bug 19273: Avoid JavaScript patching of the external app helper dialog. For compatibility with recent changes to our browser patch, change the external app blocker module so it implements the new nsIHelperAppWarningDialog interface. Since the external app blocker module is no longer a service, split the drag and drop filter into a separate component (which remains a service). --- src/chrome.manifest | 7 +- src/components/dragDropFilter.js | 86 +++++++++++++++++ src/components/external-app-blocker.js | 169 ++++++++++++++++----------------- 3 files changed, 175 insertions(+), 87 deletions(-) diff --git a/src/chrome.manifest b/src/chrome.manifest index 272401b..65f55a9 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -143,8 +143,11 @@ skin torbutton classic/1.0 chrome/skin/ style chrome://global/content/customizeToolbar.xul chrome://torbutton/skin/torbutton.css # Firefox 4-style component registration +component {f605ec27-d867-44b5-ad97-2a29276642c3} components/dragDropFilter.js +contract @torproject.org/torbutton-dragDropFilter;1 {f605ec27-d867-44b5-ad97-2a29276642c3} + component {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} components/external-app-blocker.js -contract @torproject.org/torbutton-extAppBlockerService;1 {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} +contract @torproject.org/torbutton-extAppBlocker;1 {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} component {06322def-6fde-4c06-aef6-47ae8e799629} components/startup-observer.js contract @torproject.org/startup-observer;1 {06322def-6fde-4c06-aef6-47ae8e799629} @@ -165,4 +168,4 @@ category profile-after-change CookieJarSelector @torproject.org/cookie-jar-selec category profile-after-change StartupObserver @torproject.org/startup-observer;1 category profile-after-change DomainIsolator @torproject.org/domain-isolator;1 -category profile-after-change ExtAppBlockerService @torproject.org/torbutton-extAppBlockerService;1 +category profile-after-change DragDropFilter @torproject.org/torbutton-dragDropFilter;1 diff --git a/src/components/dragDropFilter.js b/src/components/dragDropFilter.js new file mode 100644 index 0000000..22dde86 --- /dev/null +++ b/src/components/dragDropFilter.js @@ -0,0 +1,86 @@ +/************************************************************************* + * Drag and Drop Handler. + * + * Implements an observer that filters drag events to prevent OS + * access to URLs (a potential proxy bypass vector). + *************************************************************************/ + +const Cc = Components.classes; +const Ci = Components.interfaces; +const Cu = Components.utils; + +Cu.import("resource://gre/modules/XPCOMUtils.jsm"); + +// Module specific constants +const kMODULE_NAME = "Torbutton Drag and Drop Handler"; +const kCONTRACT_ID = "@torproject.org/torbutton-dragDropFilter;1"; +const kMODULE_CID = Components.ID("f605ec27-d867-44b5-ad97-2a29276642c3"); + +const kInterfaces = [Ci.nsIObserver, Ci.nsIClassInfo]; + +function DragDropFilter() { + this.logger = Cc["@torproject.org/torbutton-logger;1"] + .getService(Ci.nsISupports).wrappedJSObject; + this.logger.log(3, "Component Load 0: New DragDropFilter."); + + try { + var observerService = Cc["@mozilla.org/observer-service;1"]. + getService(Ci.nsIObserverService); + observerService.addObserver(this, "on-datatransfer-available", false); + } catch(e) { + this.logger.log(5, "Failed to register drag observer"); + } +} + +DragDropFilter.prototype = +{ + QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports, Ci.nsIObserver]), + + // make this an nsIClassInfo object + flags: Ci.nsIClassInfo.DOM_OBJECT, + classDescription: kMODULE_NAME, + contractID: kCONTRACT_ID, + classID: kMODULE_CID, + + // method of nsIClassInfo + getInterfaces: function(count) { + count.value = kInterfaces.length; + return kInterfaces; + }, + + // method of nsIClassInfo + getHelperForLanguage: function(count) { return null; }, + + // method of nsIObserver + observe: function(subject, topic, data) { + if (topic == "on-datatransfer-available") { + this.logger.log(3, "The DataTransfer is available"); + return this.filterDataTransferURLs(subject); + } + }, + + filterDataTransferURLs: function(aDataTransfer) { + var types = null; + var type = ""; + var count = aDataTransfer.mozItemCount; + var len = 0; + for (var i = 0; i < count; ++i) { + this.logger.log(3, "Inspecting the data transfer: " + i); + types = aDataTransfer.mozTypesAt(i); + len = types.length; + for (var j = 0; j < len; ++j) { + type = types[j]; + this.logger.log(3, "Type is: " + type); + if (type == "text/x-moz-url" || + type == "text/x-moz-url-data" || + type == "text/uri-list" || + type == "application/x-moz-file-promise-url") { + aDataTransfer.clearData(type); + this.logger.log(3, "Removing " + type); + } + } + } + } +}; + +var NSGetFactory = XPCOMUtils.generateNSGetFactory([DragDropFilter]); diff --git a/src/components/external-app-blocker.js b/src/components/external-app-blocker.js index e56fed3..ca86580 100644 --- a/src/components/external-app-blocker.js +++ b/src/components/external-app-blocker.js @@ -7,19 +7,24 @@ * Handles displaying confirmation dialogs for external apps and protocols * due to Firefox Bug https://bugzilla.mozilla.org/show_bug.cgi?id=440892 * - * Also implements an observer that filters drag events to prevent OS - * access to URLs (a potential proxy bypass vector). + * An instance of this module is created each time the browser starts to + * download a file that may be opened by another or application and when + * an external application may be invoked to handle an URL (e.g., when the + * user clicks on a mailto: URL). *************************************************************************/ const Cc = Components.classes; const Ci = Components.interfaces; +const Cr = Components.results; const Cu = Components.utils; Cu.import("resource://gre/modules/XPCOMUtils.jsm"); +Cu.import("resource://gre/modules/Services.jsm"); +Cu.import("resource://gre/modules/SharedPromptUtils.jsm"); // Module specific constants const kMODULE_NAME = "Torbutton External App Handler"; -const kCONTRACT_ID = "@torproject.org/torbutton-extAppBlockerService;1"; +const kCONTRACT_ID = "@torproject.org/torbutton-extAppBlocker;1"; const kMODULE_CID = Components.ID("3da0269f-fc29-4e9e-a678-c3b1cafcf13f"); const kInterfaces = [Ci.nsIObserver, Ci.nsIClassInfo]; @@ -28,23 +33,14 @@ function ExternalAppBlocker() { this.logger = Cc["@torproject.org/torbutton-logger;1"] .getService(Ci.nsISupports).wrappedJSObject; this.logger.log(3, "Component Load 0: New ExternalAppBlocker."); - - this._prefs = Cc["@mozilla.org/preferences-service;1"] - .getService(Ci.nsIPrefBranch); - - try { - var observerService = Cc["@mozilla.org/observer-service;1"]. - getService(Ci.nsIObserverService); - observerService.addObserver(this, "external-app-requested", false); - observerService.addObserver(this, "on-datatransfer-available", false); - } catch(e) { - this.logger.log(5, "Failed to register external app observer or drag observer"); - } } ExternalAppBlocker.prototype = { - QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports, Ci.nsIObserver]), + _helperAppLauncher: undefined, + + QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports, Ci.nsIObserver, + Ci.nsIHelperAppWarningDialog]), // make this an nsIClassInfo object flags: Ci.nsIClassInfo.DOM_OBJECT, @@ -58,83 +54,86 @@ ExternalAppBlocker.prototype = return kInterfaces; }, - // method of nsIClassInfo + // method of nsIClassInfo getHelperForLanguage: function(count) { return null; }, - // Returns true if launch should proceed. - _confirmLaunch: function() { - if (!this._prefs.getBoolPref("extensions.torbutton.launch_warning")) { - return true; - } - - var wm = Cc["@mozilla.org/appshell/window-mediator;1"] - .getService(Ci.nsIWindowMediator); - var chrome = wm.getMostRecentWindow("navigator:browser"); - - var prompts = Cc["@mozilla.org/embedcomp/prompt-service;1"] - .getService(Ci.nsIPromptService); - var flags = prompts.BUTTON_POS_0 * prompts.BUTTON_TITLE_IS_STRING + - prompts.BUTTON_POS_1 * prompts.BUTTON_TITLE_IS_STRING + - prompts.BUTTON_DELAY_ENABLE + - prompts.BUTTON_POS_1_DEFAULT; - - var title = chrome.torbutton_get_property_string("torbutton.popup.external.title"); - var app = chrome.torbutton_get_property_string("torbutton.popup.external.app"); - var note = chrome.torbutton_get_property_string("torbutton.popup.external.note"); - var suggest = chrome.torbutton_get_property_string("torbutton.popup.external.suggest"); - var launch = chrome.torbutton_get_property_string("torbutton.popup.launch"); - var cancel = chrome.torbutton_get_property_string("torbutton.popup.cancel"); - var dontask = chrome.torbutton_get_property_string("torbutton.popup.dontask"); - - var check = {value: false}; - var result = prompts.confirmEx(chrome, title, app+note+suggest+" ", - flags, launch, cancel, "", dontask, check); - - if (check.value) { - this._prefs.setBoolPref("extensions.torbutton.launch_warning", false); + // method of nsIHelperAppWarningDialog + maybeShow: function(aLauncher, aWindowContext) + { + // Hold a reference to the object that called this component. This is + // important not just because we need to later invoke the + // continueRequest() or cancelRequest() callback on aLauncher, but also + // so that the launcher object (which is a reference counted object) is + // not released too soon. + this._helperAppLauncher = aLauncher; + + if (!Services.prefs.getBoolPref("extensions.torbutton.launch_warning")) { + this._helperAppLauncher.continueRequest(); + return; } - return (0 == result); - }, - - observe: function(subject, topic, data) { - if (topic == "external-app-requested") { - this.logger.log(3, "External app requested"); - // subject.data is true if the launch should be canceled. - if ((subject instanceof Ci.nsISupportsPRBool) - && !subject.data /* not canceled already */ - && !this._confirmLaunch()) { - subject.data = true; // The user said to cancel the launch. - } - } else if (topic == "on-datatransfer-available") { - this.logger.log(3, "The DataTransfer is available"); - return this.filterDataTransferURLs(subject); - } + this._showPrompt(aWindowContext); }, - filterDataTransferURLs: function(aDataTransfer) { - var types = null; - var type = ""; - var count = aDataTransfer.mozItemCount; - var len = 0; - for (var i = 0; i < count; ++i) { - this.logger.log(3, "Inspecting the data transfer: " + i); - types = aDataTransfer.mozTypesAt(i); - len = types.length; - for (var j = 0; j < len; ++j) { - type = types[j]; - this.logger.log(3, "Type is: " + type); - if (type == "text/x-moz-url" || - type == "text/x-moz-url-data" || - type == "text/uri-list" || - type == "application/x-moz-file-promise-url") { - aDataTransfer.clearData(type); - this.logger.log(3, "Removing " + type); - } - } + /* + * The _showPrompt() implementation uses some XUL and JS that is part of the + * browser's confirmEx() implementation. Specifically, _showPrompt() depends + * on chrome://global/content/commonDialog.xul as well as some of the code + * in resource://gre/modules/SharedPromptUtils.jsm. + */ + _showPrompt: function(aWindowContext) { + let parentWin; + try { + parentWin = aWindowContext.getInterface(Ci.nsIDOMWindow); + } catch (e) { + parentWin = Services.wm.getMostRecentWindow("navigator:browser"); } - } + let title = parentWin.torbutton_get_property_string("torbutton.popup.external.title"); + let app = parentWin.torbutton_get_property_string("torbutton.popup.external.app"); + let note = parentWin.torbutton_get_property_string("torbutton.popup.external.note"); + let suggest = parentWin.torbutton_get_property_string("torbutton.popup.external.suggest"); + let launch = parentWin.torbutton_get_property_string("torbutton.popup.launch"); + let cancel = parentWin.torbutton_get_property_string("torbutton.popup.cancel"); + let dontask = parentWin.torbutton_get_property_string("torbutton.popup.dontask"); + + let args = { + promptType: "confirmEx", + title: title, + text: app+note+suggest+" ", + checkLabel: dontask, + checked: false, + ok: false, + button0Label: launch, + button1Label: cancel, + defaultButtonNum: 1, // Cancel + buttonNumClicked: 1, // Cancel + enableDelay: true, + }; + + let propBag = PromptUtils.objectToPropBag(args); + let uri = "chrome://global/content/commonDialog.xul"; + let promptWin = Services.ww.openWindow(parentWin, uri, "_blank", + "centerscreen,chrome,titlebar", propBag); + promptWin.addEventListener("load", aEvent => { + promptWin.addEventListener("unload", aEvent => { + PromptUtils.propBagToObject(propBag, args); + + if (0 == args.buttonNumClicked) { + // Save the checkbox value and tell the browser's external helper app + // module about the user's choice. + if (args.checked) { + Services.prefs.setBoolPref("extensions.torbutton.launch_warning", + false); + } + + this._helperAppLauncher.continueRequest(); + } else { + this._helperAppLauncher.cancelRequest(Cr.NS_BINDING_ABORTED); + } + }, false); + }, false); + }, }; var NSGetFactory = XPCOMUtils.generateNSGetFactory([ExternalAppBlocker]);

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 04 Aug '17

04 Aug '17

commit caa11b419cd2816f42da14182c1f960e4d41d10f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 4 04:45:40 2017 +0000 Update translations for https_everywhere_completed --- zh_CN/https-everywhere.dtd | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/zh_CN/https-everywhere.dtd b/zh_CN/https-everywhere.dtd index 30e61f0ac..eff1e68a4 100644 --- a/zh_CN/https-everywhere.dtd +++ b/zh_CN/https-everywhere.dtd @@ -24,9 +24,22 @@ <!ENTITY https-everywhere.menu.showCounter "显示计数器"> <!ENTITY https-everywhere.menu.viewAllRules "查看所有规则"> +<!ENTITY https-everywhere.options.importSettings "导入设置"> +<!ENTITY https-everywhere.options.import "导入"> +<!ENTITY https-everywhere.options.imported "您的设置已导入。"> + <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere 首选项"> <!ENTITY https-everywhere.prefs.enable_all "全部启用"> <!ENTITY https-everywhere.prefs.disable_all "全部禁用"> +<!ENTITY https-everywhere.prefs.export_settings "导出设置"> +<!ENTITY https-everywhere.prefs.settings_warning "警告："> +<!ENTITY https-everywhere.prefs.settings_warning_delete "您的某些 HTTPS Everywhere 设置即将被删除！"> +<!ENTITY https-everywhere.prefs.settings_warning_explain "此扩展将在不久后大幅升级。如果您不导出您的设置，您或许会丢失下列一个或多个设置："> +<!ENTITY https-everywhere.prefs.settings_global "全局偏好设置"> +<!ENTITY https-everywhere.prefs.settings_toggle "各网站开关设置"> +<!ENTITY https-everywhere.prefs.settings_custom "自定义站点规则"> +<!ENTITY https-everywhere.prefs.settings_click_ok "请按“确定”"> +<!ENTITY https-everywhere.prefs.settings_warning_closing "以确保保存您的设置。您需要在 HTTPS Everywhere 升级后从扩展选项处导入这些设置。"> <!ENTITY https-everywhere.prefs.reset_defaults "重置为默认值"> <!ENTITY https-everywhere.prefs.search "搜索"> <!ENTITY https-everywhere.prefs.site "站点">

1 0