tbb-commits March 2015

tbb-commits@lists.torproject.org

4 participants
98 discussions

[tor-browser/tor-browser-31.5.0esr-4.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 21 Mar '15

21 Mar '15

commit 709dd9e8d74ac13a6a0e436c5d947b0564e3793d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Mar 17 19:10:23 2015 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Bug 15029: Don't prompt to install missing plugins. --- 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 91a5b71..2e2984c 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -115,6 +115,7 @@ pref("network.protocol-handler.warn-external.snews", true); pref("plugins.click_to_play", true); pref("plugin.state.flash", 1); pref("plugins.hide_infobar_for_missing_plugin", true); +pref("plugins.hideMissingPluginsNotification", true); pref("media.peerconnection.enabled", false); // Disable WebRTC interfaces pref("svg.in-content.enabled", true); // May be disabled via Torbutton's security slider.

1 0

[tor-browser/tor-browser-31.5.0esr-4.5-1] Merge branch 'bug12827-01' into tor-browser-31.5.0esr-4.5-1
by mikeperry＠torproject.org 21 Mar '15

21 Mar '15

commit 2dbf9589bff621cd9fc88dafa26b20ccdbddf935 Merge: 4a14559 7dd093a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 20 19:37:27 2015 -0700 Merge branch 'bug12827-01' into tor-browser-31.5.0esr-4.5-1 browser/app/profile/000-tor-browser.js | 1 + content/base/src/nsNameSpaceManager.cpp | 3 ++- content/base/src/nsObjectLoadingContent.cpp | 16 +++++++++--- content/svg/content/src/nsSVGFeatures.cpp | 13 ++++++++++ gfx/thebes/gfxFont.cpp | 6 ++++- image/src/ImageFactory.cpp | 33 ++++++++++++++++-------- layout/base/nsCSSFrameConstructor.cpp | 15 +++++++---- layout/build/nsContentDLF.cpp | 27 +++++++++++-------- layout/svg/nsSVGUtils.cpp | 37 +++++++++++++++++++++++++++ layout/svg/nsSVGUtils.h | 3 +++ uriloader/base/nsURILoader.cpp | 13 +++++++--- 11 files changed, 131 insertions(+), 36 deletions(-)

1 0

[tor-browser/tor-browser-31.5.0esr-4.5-1] Bug 12827: Create preference to disable SVG.
by mikeperry＠torproject.org 21 Mar '15

21 Mar '15

commit 7dd093abb5c68728b5ba6c940cca224345d89f3e Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Mar 18 15:21:30 2015 -0400 Bug 12827: Create preference to disable SVG. If the svg.inContent.enabled preference is false, disallow all use of SVG within content pages. In the following situations it is very difficult to determine if code is executing within a chrome context or not: SVG hasFeature() API. SVG hasExtension() API. Use of SVG glyphs within custom OpenType fonts. In these cases, everything is assumed to be content; that is, setting the pref. to false will block use of the above features from chrome as well. This is OK because these features are unlikely to be used by core browser code. --- browser/app/profile/000-tor-browser.js | 1 + content/base/src/nsNameSpaceManager.cpp | 3 ++- content/base/src/nsObjectLoadingContent.cpp | 16 +++++++++--- content/svg/content/src/nsSVGFeatures.cpp | 13 ++++++++++ gfx/thebes/gfxFont.cpp | 6 ++++- image/src/ImageFactory.cpp | 33 ++++++++++++++++-------- layout/base/nsCSSFrameConstructor.cpp | 15 +++++++---- layout/build/nsContentDLF.cpp | 27 +++++++++++-------- layout/svg/nsSVGUtils.cpp | 37 +++++++++++++++++++++++++++ layout/svg/nsSVGUtils.h | 3 +++ uriloader/base/nsURILoader.cpp | 13 +++++++--- 11 files changed, 131 insertions(+), 36 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index ceb9394..e87ccff 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -116,6 +116,7 @@ pref("plugins.click_to_play", true); pref("plugin.state.flash", 1); pref("plugins.hide_infobar_for_missing_plugin", true); pref("media.peerconnection.enabled", false); // Disable WebRTC interfaces +pref("svg.inContent.enabled", true); // May be disabled via Torbutton's security slider. // Network and performance pref("network.http.pipelining", true); diff --git a/content/base/src/nsNameSpaceManager.cpp b/content/base/src/nsNameSpaceManager.cpp index 409e08c..3f4f9f8 100644 --- a/content/base/src/nsNameSpaceManager.cpp +++ b/content/base/src/nsNameSpaceManager.cpp @@ -17,6 +17,7 @@ #include "nsContentCreatorFunctions.h" #include "nsString.h" #include "nsINodeInfo.h" +#include "nsSVGUtils.h" #include "mozilla/ClearOnShutdown.h" #include "mozilla/dom/XBLChildrenElement.h" #include "mozilla/dom/Element.h" @@ -153,7 +154,7 @@ NS_NewElement(Element** aResult, if (ns == kNameSpaceID_MathML) { return NS_NewMathMLElement(aResult, ni.forget()); } - if (ns == kNameSpaceID_SVG) { + if (ns == kNameSpaceID_SVG && NS_SVGEnabled(ni->GetDocument())) { return NS_NewSVGElement(aResult, ni.forget(), aFromParser); } if (ns == kNameSpaceID_XBL && ni->Equals(nsGkAtoms::children)) { diff --git a/content/base/src/nsObjectLoadingContent.cpp b/content/base/src/nsObjectLoadingContent.cpp index 8d9bdaa..d14c83e 100644 --- a/content/base/src/nsObjectLoadingContent.cpp +++ b/content/base/src/nsObjectLoadingContent.cpp @@ -57,6 +57,7 @@ #include "nsMimeTypes.h" #include "nsStyleUtil.h" #include "nsUnicharUtils.h" +#include "nsSVGUtils.h" #include "mozilla/Preferences.h" #include "nsSandboxFlags.h" @@ -2530,9 +2531,18 @@ nsObjectLoadingContent::GetTypeOfContent(const nsCString& aMIMEType) // SVGs load as documents, but are their own capability bool isSVG = aMIMEType.LowerCaseEqualsLiteral("image/svg+xml"); - Capabilities supportType = isSVG ? eSupportSVG : eSupportDocuments; - if ((caps & supportType) && IsSupportedDocument(aMIMEType)) { - return eType_Document; + bool isSVGEnabled = false; + if (isSVG) { + nsCOMPtr<nsIContent> thisContent = + do_QueryInterface(static_cast<nsIImageLoadingContent*>(this)); + isSVGEnabled = NS_SVGEnabled(thisContent->OwnerDoc()); + } + + if (isSVGEnabled || !isSVG) { + Capabilities supportType = isSVG ? eSupportSVG : eSupportDocuments; + if ((caps & supportType) && IsSupportedDocument(aMIMEType)) { + return eType_Document; + } } if (caps & eSupportPlugins && PluginExistsForType(aMIMEType.get())) { diff --git a/content/svg/content/src/nsSVGFeatures.cpp b/content/svg/content/src/nsSVGFeatures.cpp index 153a00c..04e9917 100644 --- a/content/svg/content/src/nsSVGFeatures.cpp +++ b/content/svg/content/src/nsSVGFeatures.cpp @@ -13,6 +13,7 @@ */ #include "nsSVGFeatures.h" +#include "nsSVGUtils.h" #include "nsIContent.h" #include "nsIDocument.h" #include "mozilla/Preferences.h" @@ -22,6 +23,12 @@ using namespace mozilla; /*static*/ bool nsSVGFeatures::HasFeature(nsISupports* aObject, const nsAString& aFeature) { + // Since we do not have access to the document here we pass nullptr, which + // means only the svg.inContent.enabled pref is checked. This is OK since + // we do not expect chrome code to use the HasFeature() API. + if (!NS_SVGEnabled(nullptr)) + return false; + if (aFeature.EqualsLiteral("http://www.w3.org/TR/SVG11/feature#Script")) { nsCOMPtr<nsIContent> content(do_QueryInterface(aObject)); if (content) { @@ -44,6 +51,12 @@ nsSVGFeatures::HasFeature(nsISupports* aObject, const nsAString& aFeature) /*static*/ bool nsSVGFeatures::HasExtension(const nsAString& aExtension) { + // Since we do not have access to the document here we pass nullptr, which + // means only the svg.inContent.enabled pref is checked. This is OK since + // we do not expect chrome code to use the HasExtension() API. + if (!NS_SVGEnabled(nullptr)) + return false; + #define SVG_SUPPORTED_EXTENSION(str) if (aExtension.EqualsLiteral(str)) return true; SVG_SUPPORTED_EXTENSION("http://www.w3.org/1999/xhtml") SVG_SUPPORTED_EXTENSION("http://www.w3.org/1998/Math/MathML") diff --git a/gfx/thebes/gfxFont.cpp b/gfx/thebes/gfxFont.cpp index c5e2957..da25374 100644 --- a/gfx/thebes/gfxFont.cpp +++ b/gfx/thebes/gfxFont.cpp @@ -38,6 +38,7 @@ #include "mozilla/Preferences.h" #include "mozilla/Services.h" #include "mozilla/Telemetry.h" +#include "nsSVGUtils.h" #include "gfxSVGGlyphs.h" #include "gfxMathTable.h" #include "gfx2DGlue.h" @@ -364,7 +365,10 @@ gfxFontEntry::RenderSVGGlyph(gfxContext *aContext, uint32_t aGlyphId, bool gfxFontEntry::TryGetSVGData(gfxFont* aFont) { - if (!gfxPlatform::GetPlatform()->OpenTypeSVGEnabled()) { + // For the NS_SVGEnabled() check, we pass nullptr because we do not have + // access to the document here. That is OK because we do not expect + // chrome documents to use custom fonts that contain embedded SVG glyphs. + if (!gfxPlatform::GetPlatform()->OpenTypeSVGEnabled() || !NS_SVGEnabled(nullptr)) { return false; } diff --git a/image/src/ImageFactory.cpp b/image/src/ImageFactory.cpp index 2daba13..578f95c 100644 --- a/image/src/ImageFactory.cpp +++ b/image/src/ImageFactory.cpp @@ -20,6 +20,7 @@ #include "Image.h" #include "nsMediaFragmentURIParser.h" #include "nsContentUtils.h" +#include "nsSVGUtils.h" #include "nsIScriptSecurityManager.h" #include "ImageFactory.h" @@ -110,6 +111,17 @@ ImageFactory::CanRetargetOnDataAvailable(ImageURL* aURI, bool aIsMultiPart) return true; } +// Marks an image as having an error before returning it. Used with macros like +// NS_ENSURE_SUCCESS, since we guarantee to always return an image even if an +// error occurs, but callers need to be able to tell that this happened. +template <typename T> +static already_AddRefed<Image> +BadImage(nsRefPtr<T>& image) +{ + image->SetHasError(); + return image.forget(); +} + /* static */ already_AddRefed<Image> ImageFactory::CreateImage(nsIRequest* aRequest, imgStatusTracker* aStatusTracker, @@ -126,6 +138,16 @@ ImageFactory::CreateImage(nsIRequest* aRequest, // Select the type of image to create based on MIME type. if (aMimeType.EqualsLiteral(IMAGE_SVG_XML)) { + nsCOMPtr<nsIChannel> channel(do_QueryInterface(aRequest)); + if (!NS_SVGEnabledForChannel(channel)) { + // SVG is disabled. We must return an image object that is marked + // "bad", but we want to avoid invoking the VectorImage class (SVG code), + // so we return a PNG with the error flag set. + nsRefPtr<RasterImage> badImage = new RasterImage(aStatusTracker, aURI); + (void)badImage->Init(IMAGE_PNG, Image::INIT_FLAG_NONE); + return BadImage(badImage); + } + return CreateVectorImage(aRequest, aStatusTracker, aMimeType, aURI, imageFlags, aInnerWindowId); } else { @@ -134,17 +156,6 @@ ImageFactory::CreateImage(nsIRequest* aRequest, } } -// Marks an image as having an error before returning it. Used with macros like -// NS_ENSURE_SUCCESS, since we guarantee to always return an image even if an -// error occurs, but callers need to be able to tell that this happened. -template <typename T> -static already_AddRefed<Image> -BadImage(nsRefPtr<T>& image) -{ - image->SetHasError(); - return image.forget(); -} - /* static */ already_AddRefed<Image> ImageFactory::CreateAnonymousImage(const nsCString& aMimeType) { diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp index 5cab7ca..786e3c2 100644 --- a/layout/base/nsCSSFrameConstructor.cpp +++ b/layout/base/nsCSSFrameConstructor.cpp @@ -89,6 +89,7 @@ #include "nsMathMLParts.h" #include "mozilla/dom/SVGTests.h" #include "nsSVGUtils.h" +#include "nsIDOMSVGElement.h" #include "nsRefreshDriver.h" #include "nsRuleProcessorData.h" @@ -2423,7 +2424,8 @@ nsCSSFrameConstructor::ConstructDocElementFrame(Element* aDocEle else #endif if (aDocElement->IsSVG()) { - if (aDocElement->Tag() != nsGkAtoms::svg) { + nsCOMPtr<nsIDOMSVGElement> svgElem = do_QueryInterface(aDocElement); + if (!svgElem || (aDocElement->Tag() != nsGkAtoms::svg)) { return nullptr; } // We're going to call the right function ourselves, so no need to give a @@ -5296,10 +5298,13 @@ nsCSSFrameConstructor::AddFrameConstructionItemsInternal(nsFrameConstructorState data = FindMathMLData(element, aTag, aNameSpaceID, styleContext); } if (!data) { - data = FindSVGData(element, aTag, aNameSpaceID, aParentFrame, - aFlags & ITEM_IS_WITHIN_SVG_TEXT, - aFlags & ITEM_ALLOWS_TEXT_PATH_CHILD, - styleContext); + nsCOMPtr<nsIDOMSVGElement> svgElem = do_QueryInterface(element); + if (svgElem) { + data = FindSVGData(element, aTag, aNameSpaceID, aParentFrame, + aFlags & ITEM_IS_WITHIN_SVG_TEXT, + aFlags & ITEM_ALLOWS_TEXT_PATH_CHILD, + styleContext); + } } // Now check for XUL display types diff --git a/layout/build/nsContentDLF.cpp b/layout/build/nsContentDLF.cpp index d3081dd..1275590 100644 --- a/layout/build/nsContentDLF.cpp +++ b/layout/build/nsContentDLF.cpp @@ -25,6 +25,7 @@ #include "nsCRT.h" #include "nsIViewSourceChannel.h" #include "nsContentUtils.h" +#include "nsSVGUtils.h" #include "imgLoader.h" #include "nsCharsetSource.h" #include "nsMimeTypes.h" @@ -171,9 +172,11 @@ nsContentDLF::CreateInstance(const char* aCommand, } } - for (typeIndex = 0; gSVGTypes[typeIndex] && !knownType; ++typeIndex) { - if (type.Equals(gSVGTypes[typeIndex])) { - knownType = true; + if (NS_SVGEnabledForChannel(aChannel)) { + for (typeIndex = 0; gSVGTypes[typeIndex] && !knownType; ++typeIndex) { + if (type.Equals(gSVGTypes[typeIndex])) { + knownType = true; + } } } @@ -218,14 +221,16 @@ nsContentDLF::CreateInstance(const char* aCommand, } } - // Try SVG - typeIndex = 0; - while(gSVGTypes[typeIndex]) { - if (!PL_strcmp(gSVGTypes[typeIndex++], aContentType)) { - return CreateDocument(aCommand, - aChannel, aLoadGroup, - aContainer, kSVGDocumentCID, - aDocListener, aDocViewer); + if (NS_SVGEnabledForChannel(aChannel)) { + // Try SVG + typeIndex = 0; + while(gSVGTypes[typeIndex]) { + if (!PL_strcmp(gSVGTypes[typeIndex++], aContentType)) { + return CreateDocument(aCommand, + aChannel, aLoadGroup, + aContainer, kSVGDocumentCID, + aDocListener, aDocViewer); + } } } diff --git a/layout/svg/nsSVGUtils.cpp b/layout/svg/nsSVGUtils.cpp index 3ebfbd7..da55070 100644 --- a/layout/svg/nsSVGUtils.cpp +++ b/layout/svg/nsSVGUtils.cpp @@ -48,6 +48,8 @@ #include "nsSVGPaintServerFrame.h" #include "mozilla/dom/SVGSVGElement.h" #include "nsTextFrame.h" +#include "nsNetUtil.h" +#include "nsContentUtils.h" #include "SVGContentUtils.h" #include "mozilla/unused.h" @@ -55,9 +57,41 @@ using namespace mozilla; using namespace mozilla::dom; using namespace mozilla::gfx; +static bool sSVGEnabledInContent; static bool sSVGDisplayListHitTestingEnabled; static bool sSVGDisplayListPaintingEnabled; +// Determine if SVG should be enabled for aDoc. The svg.inContent.enabled +// preference is checked as well as whether aDoc is a content or chrome doc. +// If aChannel is NULL, the pref. value is returned. +bool +NS_SVGEnabled(nsIDocument *aDoc) +{ + return NS_SVGEnabledForChannel(aDoc ? aDoc->GetChannel() : nullptr); +} + +// Determine if SVG should be enabled for aChannel. The svg.inContent.enabled +// preference is checked as well as whether the load context associated with +// aChannel is content or chrome. +// If aChannel is NULL, the pref. value is returned. +bool +NS_SVGEnabledForChannel(nsIChannel *aChannel) +{ + if (sSVGEnabledInContent) + return true; + + if (!aChannel) + return false; + + bool isContent = true; + nsCOMPtr<nsILoadContext> ctx; + NS_QueryNotificationCallbacks(aChannel, ctx); + if (ctx) + ctx->GetIsContent(&isContent); + + return !isContent; +} + bool NS_SVGDisplayListHitTestingEnabled() { @@ -125,6 +159,9 @@ SVGAutoRenderState::IsPaintingToWindow(nsRenderingContext *aContext) void nsSVGUtils::Init() { + Preferences::AddBoolVarCache(&sSVGEnabledInContent, + "svg.inContent.enabled"); + Preferences::AddBoolVarCache(&sSVGDisplayListHitTestingEnabled, "svg.display-lists.hit-testing.enabled"); diff --git a/layout/svg/nsSVGUtils.h b/layout/svg/nsSVGUtils.h index 5f99fa7..0cd67b8 100644 --- a/layout/svg/nsSVGUtils.h +++ b/layout/svg/nsSVGUtils.h @@ -77,6 +77,9 @@ class SourceSurface; bool NS_SVGDisplayListHitTestingEnabled(); bool NS_SVGDisplayListPaintingEnabled(); +bool NS_SVGEnabled(nsIDocument *aDoc); +bool NS_SVGEnabledForChannel(nsIChannel *aChannel); + /** * Sometimes we need to distinguish between an empty box and a box * that contains an element that has no size e.g. a point at the origin. diff --git a/uriloader/base/nsURILoader.cpp b/uriloader/base/nsURILoader.cpp index e1545f2..1871784 100644 --- a/uriloader/base/nsURILoader.cpp +++ b/uriloader/base/nsURILoader.cpp @@ -37,6 +37,7 @@ #include "nsNetUtil.h" #include "nsThreadUtils.h" #include "nsReadableUtils.h" +#include "nsSVGUtils.h" #include "nsError.h" #include "nsICategoryManager.h" @@ -442,11 +443,15 @@ nsresult nsDocumentOpenInfo::DispatchContent(nsIRequest *request, nsISupports * // // Fourth step: try to find an nsIContentHandler for our type. // - nsAutoCString handlerContractID (NS_CONTENT_HANDLER_CONTRACTID_PREFIX); - handlerContractID += mContentType; + nsCOMPtr<nsIContentHandler> contentHandler; + if (!mContentType.EqualsASCII(IMAGE_SVG_XML) || + NS_SVGEnabledForChannel(aChannel)) { + nsAutoCString handlerContractID (NS_CONTENT_HANDLER_CONTRACTID_PREFIX); + handlerContractID += mContentType; + + contentHandler = do_CreateInstance(handlerContractID.get()); + } - nsCOMPtr<nsIContentHandler> contentHandler = - do_CreateInstance(handlerContractID.get()); if (contentHandler) { LOG((" Content handler found")); rv = contentHandler->HandleContent(mContentType.get(),

1 0

[tor-browser/tor-browser-31.5.0esr-4.5-1] fixup! Bug 12827: Create preference to disable SVG.
by mikeperry＠torproject.org 21 Mar '15

21 Mar '15

commit 4029568bb2283ce1203d0cdff0e857f7da8bce42 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 20 19:40:18 2015 -0700 fixup! Bug 12827: Create preference to disable SVG. Call the pref svg.in-content.enabled. --- browser/app/profile/000-tor-browser.js | 2 +- content/svg/content/src/nsSVGFeatures.cpp | 4 ++-- layout/svg/nsSVGUtils.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index e87ccff..91a5b71 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -116,7 +116,7 @@ pref("plugins.click_to_play", true); pref("plugin.state.flash", 1); pref("plugins.hide_infobar_for_missing_plugin", true); pref("media.peerconnection.enabled", false); // Disable WebRTC interfaces -pref("svg.inContent.enabled", true); // May be disabled via Torbutton's security slider. +pref("svg.in-content.enabled", true); // May be disabled via Torbutton's security slider. // Network and performance pref("network.http.pipelining", true); diff --git a/content/svg/content/src/nsSVGFeatures.cpp b/content/svg/content/src/nsSVGFeatures.cpp index 04e9917..4348de7 100644 --- a/content/svg/content/src/nsSVGFeatures.cpp +++ b/content/svg/content/src/nsSVGFeatures.cpp @@ -24,7 +24,7 @@ using namespace mozilla; nsSVGFeatures::HasFeature(nsISupports* aObject, const nsAString& aFeature) { // Since we do not have access to the document here we pass nullptr, which - // means only the svg.inContent.enabled pref is checked. This is OK since + // means only the svg.in-content.enabled pref is checked. This is OK since // we do not expect chrome code to use the HasFeature() API. if (!NS_SVGEnabled(nullptr)) return false; @@ -52,7 +52,7 @@ nsSVGFeatures::HasFeature(nsISupports* aObject, const nsAString& aFeature) nsSVGFeatures::HasExtension(const nsAString& aExtension) { // Since we do not have access to the document here we pass nullptr, which - // means only the svg.inContent.enabled pref is checked. This is OK since + // means only the svg.in-content.enabled pref is checked. This is OK since // we do not expect chrome code to use the HasExtension() API. if (!NS_SVGEnabled(nullptr)) return false; diff --git a/layout/svg/nsSVGUtils.cpp b/layout/svg/nsSVGUtils.cpp index da55070..49957fd 100644 --- a/layout/svg/nsSVGUtils.cpp +++ b/layout/svg/nsSVGUtils.cpp @@ -61,7 +61,7 @@ static bool sSVGEnabledInContent; static bool sSVGDisplayListHitTestingEnabled; static bool sSVGDisplayListPaintingEnabled; -// Determine if SVG should be enabled for aDoc. The svg.inContent.enabled +// Determine if SVG should be enabled for aDoc. The svg.in-content.enabled // preference is checked as well as whether aDoc is a content or chrome doc. // If aChannel is NULL, the pref. value is returned. bool @@ -70,7 +70,7 @@ NS_SVGEnabled(nsIDocument *aDoc) return NS_SVGEnabledForChannel(aDoc ? aDoc->GetChannel() : nullptr); } -// Determine if SVG should be enabled for aChannel. The svg.inContent.enabled +// Determine if SVG should be enabled for aChannel. The svg.in-content.enabled // preference is checked as well as whether the load context associated with // aChannel is content or chrome. // If aChannel is NULL, the pref. value is returned. @@ -160,7 +160,7 @@ void nsSVGUtils::Init() { Preferences::AddBoolVarCache(&sSVGEnabledInContent, - "svg.inContent.enabled"); + "svg.in-content.enabled"); Preferences::AddBoolVarCache(&sSVGDisplayListHitTestingEnabled, "svg.display-lists.hit-testing.enabled");

1 0

[tor-browser/tor-browser-31.5.0esr-4.5-1] Bug 15201: Windows: disable "runas" code path in updater.
by mikeperry＠torproject.org 21 Mar '15

21 Mar '15

commit 4a145590d0e636e3acdd1f00037429771e64e3b8 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Mar 20 15:40:23 2015 -0400 Bug 15201: Windows: disable "runas" code path in updater. Instead of using "runas" to try to elevate privileges, the updater now fails if the user does not have permission to apply an update. This avoids potential security issues such as CVE-2015-0833. --- toolkit/mozapps/update/updater/updater.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp index ee7e245..3ba92b3 100644 --- a/toolkit/mozapps/update/updater/updater.cpp +++ b/toolkit/mozapps/update/updater/updater.cpp @@ -3033,6 +3033,16 @@ int NS_main(int argc, NS_tchar **argv) // using the service is because we are testing. if (!useService && !noServiceFallback && updateLockFileHandle == INVALID_HANDLE_VALUE) { +#ifdef TOR_BROWSER_UPDATE + // Because the user profile is contained within the Tor Browser + // installation directory, the user almost certainly has permission to + // apply updates. Therefore, to avoid potential security issues such + // as CVE-2015-0833, do not attempt to elevate privileges. Instead, + // write a "failed" message to the update status file (this function + // will return immediately after the CloseHandle(elevatedFileHandle) + // call below). + WriteStatusFile(WRITE_ERROR_ACCESS_DENIED); +#else SHELLEXECUTEINFO sinfo; memset(&sinfo, 0, sizeof(SHELLEXECUTEINFO)); sinfo.cbSize = sizeof(SHELLEXECUTEINFO); @@ -3054,6 +3064,7 @@ int NS_main(int argc, NS_tchar **argv) } else { WriteStatusFile(ELEVATION_CANCELED); } +#endif } if (argc > callbackIndex) {

1 0

[torbutton/master] Bug 13650: Clip window height to 1000px (configurable)
by mikeperry＠torproject.org 20 Mar '15

20 Mar '15

commit 1f4436524793eb7321ac2cfafacb5c2ea8485790 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Mar 19 18:54:26 2015 -0700 Bug 13650: Clip window height to 1000px (configurable) 1000px was chosen based on the cutoff for vertical display users from the data in: https://trac.torproject.org/projects/tor/ticket/13025#comment:17 --- src/chrome/content/torbutton.js | 12 ++++++++---- src/defaults/preferences/preferences.js | 3 +++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 09d6080..7084584 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -3452,16 +3452,20 @@ var torbutton_resizelistener = try { width = m_tb_prefs.getIntPref("extensions.torbutton.window.innerWidth"); } catch(e) { - if (maxWidth > 1000) { - width = 1000; - } else { - width = Math.floor(maxWidth/200.0)*200; + let cappedWidth = m_tb_prefs.getIntPref("extensions.torbutton.window.maxWidth"); + if (maxWidth > cappedWidth) { + maxWidth = cappedWidth; } + width = Math.floor(maxWidth/200.0)*200; } try { height = m_tb_prefs.getIntPref("extensions.torbutton.window.innerHeight"); } catch(e) { + let cappedHeight = m_tb_prefs.getIntPref("extensions.torbutton.window.maxHeight"); + if (maxHeight > cappedHeight) { + maxHeight = cappedHeight; + } height = Math.floor(maxHeight/100.0)*100; } diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index fb1a702..e1686c4 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -227,3 +227,6 @@ pref("extensions.torbutton.confirm_newnym", true); // Browser home page, and spell checker dictionary: pref("browser.startup.homepage", "chrome://torbutton/locale/browser.properties"); pref("spellchecker.dictionary", "chrome://torbutton/locale/browser.properties"); + +pref("extensions.torbutton.window.maxHeight", 1000); +pref("extensions.torbutton.window.maxWidth", 1000);

1 0

[torbutton/master] Merge remote-tracking branch 'mikeperry/bug13650'
by mikeperry＠torproject.org 20 Mar '15

20 Mar '15

commit 55d3976e8dbfe7e0d969faf50722e6b0e5f869ac Merge: 430ccaa 1f44365 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 20 14:21:54 2015 -0700 Merge remote-tracking branch 'mikeperry/bug13650' src/chrome/content/torbutton.js | 12 ++++++++---- src/defaults/preferences/preferences.js | 3 +++ 2 files changed, 11 insertions(+), 4 deletions(-)

1 0

[torbutton/master] Bug 9387: Version 0.9 of the Security Slider
by mikeperry＠torproject.org 20 Mar '15

20 Mar '15

commit 430ccaa1596e03e3ea0a36c51c4623fe8ff67d52 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 20 14:54:09 2015 +0000 Bug 9387: Version 0.9 of the Security Slider Showing a notification to the user hinting at our new security slider to adjust the security settings. --- src/chrome/content/torbutton.js | 28 ++++++++++++++++++++++++++++ src/chrome/locale/en/torbutton.properties | 3 +++ src/defaults/preferences/preferences.js | 1 + 3 files changed, 32 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index d3afef8..77dc871 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1044,6 +1044,34 @@ function torbutton_on_abouttor_load(aDoc) { if (m_tb_orig_BrowserOnAboutPageLoad) m_tb_orig_BrowserOnAboutPageLoad(aDoc); + + // Show the notification about the new security slider. + if (m_tb_prefs. + getBoolPref("extensions.torbutton.show_slider_notification")) { + let sb = torbutton_get_stringbundle(); + let button_label = + torbutton_get_property_string("torbutton.slider_notification_button"); + let box = gBrowser.getNotificationBox(); + + let buttons = [{ + label: button_label, + accessKey: 'S', + popup: null, + callback: function() { + window.openDialog("chrome://torbutton/content/preferences.xul", + "torbutton-preferences","chrome");} + }]; + + let priority = box.PRIORITY_INFO_LOW; + let message = + torbutton_get_property_string("torbutton.slider_notification"); + + box.appendNotification(message, 'new-menu-notification', + "chrome://torbutton/skin/tor-enabled-16.png", + priority, buttons); + m_tb_prefs. + setBoolPref("extensions.torbutton.show_slider_notification", false); + } } function torbutton_is_abouttor_doc(aDoc) { diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index 7998437..8fc4600 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -55,6 +55,9 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an torbutton.popup.never_ask_again = Never ask me again torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n +torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! +torbutton.slider_notification_button = Open security settings + # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? canvas.notNow=Not Now diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 677447b..9a5df09 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -178,6 +178,7 @@ pref("extensions.torbutton.restrict_thirdparty", true); // Security Slider pref("extensions.torbutton.security_slider", 4); pref("extensions.torbutton.security_custom", false); +pref("extensions.torbutton.show_slider_notification", true); // Google Captcha prefs // FIXME: NID cookie?

1 0

[torbutton/master] Bug 9387: Version 0.8 of the Security Slider
by gk＠torproject.org 20 Mar '15

20 Mar '15

commit 35970c68d6af10fdec19189aae64d76e048acc4e Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 20 08:13:41 2015 +0000 Bug 9387: Version 0.8 of the Security Slider This is the first version of the slider that contains explanatory strings to make it more clear to the user what is changed and why. Special thanks to Mike Perry for helping out getting this part of the UI in good shape. --- src/chrome/content/preferences.js | 48 ++++++++ src/chrome/content/preferences.xul | 172 ++++++++++++++++++++++++++-- src/chrome/content/torbutton.js | 185 ++++++++----------------------- src/chrome/locale/en/torbutton.dtd | 27 +++++ src/chrome/skin/preferences.css | 7 ++ src/defaults/preferences/preferences.js | 2 +- 6 files changed, 292 insertions(+), 149 deletions(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index eaaa059..be77793 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -192,13 +192,18 @@ function torbutton_prefs_init(doc) { sec_slider.value = o_torprefs.getIntPref('security_slider'); sec_custom.checked = custom_values; sec_custom.disabled = !custom_values; + torbutton_set_slider_text(doc, sec_custom.checked); // If the custom checkbox is checked and the user is done with dragging // uncheck the checkbox to allow setting the (newly) chosen security level. sec_slider.dragStateChanged = function(isDragging) { if (!isDragging && sec_custom.checked) { sec_custom.checked = false; + sec_custom.disabled = true; } } + sec_slider.valueChanged = function(which, newValue, userChanged) { + torbutton_set_slider_text(doc, false); + } torbutton_prefs_set_field_attributes(doc); } @@ -473,6 +478,49 @@ function torbutton_toggle_slider(doc, pos) { if (sec_custom.checked) { sec_custom.checked = false; } + torbutton_set_slider_text(doc, false); +} + +function torbutton_set_slider_text(doc, custom) { + let level = doc.getElementById("torbutton_sec_slider").value; + if (custom) { + level = 5; + } + switch (level) { + case (1): + doc.getElementById("desc_low").collapsed = true; + doc.getElementById("desc_medium_low").collapsed = true; + doc.getElementById("desc_medium_high").collapsed = true; + doc.getElementById("desc_high").collapsed = false; + break; + case (2): + doc.getElementById("desc_low").collapsed = true; + doc.getElementById("desc_medium_low").collapsed = true; + doc.getElementById("desc_medium_high").collapsed = false; + doc.getElementById("desc_high").collapsed = true; + break; + case (3): + doc.getElementById("desc_low").collapsed = true; + doc.getElementById("desc_medium_low").collapsed = false; + doc.getElementById("desc_medium_high").collapsed = true; + doc.getElementById("desc_high").collapsed = true; + break; + case (4): + doc.getElementById("desc_low").collapsed = false; + doc.getElementById("desc_medium_low").collapsed = true; + doc.getElementById("desc_medium_high").collapsed = true; + doc.getElementById("desc_high").collapsed = true; + break; + case (5): + doc.getElementById("desc_low").collapsed = true; + doc.getElementById("desc_medium_low").collapsed = true; + doc.getElementById("desc_medium_high").collapsed = true; + doc.getElementById("desc_high").collapsed = true; + break; + } + // It can happen that the descriptions of the slider settings consume more + // space than originally allocated. Adapt the dialog size accordingly. + sizeToContent(); } function torbutton_prefs_check_disk() { diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index 0a90f0f..d25fba4 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://torbutton/skin/preferences.css" type="text/css"?> <!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd"> @@ -156,36 +157,144 @@ <groupbox> <caption label="&torbutton.prefs.sec_caption;"/> <hbox> - <vbox> - <scale id="torbutton_sec_slider" height="200" min="1" max="4" + <vbox height="200"> + <scale id="torbutton_sec_slider" flex="1" min="1" max="4" movetoclick="true" orient="vertical"/> </vbox> <vbox height="200"> - <hbox flex="1" align="center"> - <description id="torbutton_sec_low" + <hbox flex="1" align="start"> + <description id="torbutton_sec_high" + tooltip="high_preview" onclick="torbutton_toggle_slider(document, 1);"> - &torbutton.prefs.sec_low; + &torbutton.prefs.sec_high; </description> </hbox> <hbox flex="1" align="center"> - <description id="torbutton_sec_med_low" + <description id="torbutton_sec_med_high" + tooltip="mh_preview" onclick="torbutton_toggle_slider(document, 2);"> - &torbutton.prefs.sec_med_low; + &torbutton.prefs.sec_med_high; </description> </hbox> <hbox flex="1" align="center"> - <description id="torbutton_sec_med_high" + <description id="torbutton_sec_med_low" + tooltip="ml_preview" onclick="torbutton_toggle_slider(document, 3);"> - &torbutton.prefs.sec_med_high; + &torbutton.prefs.sec_med_low; </description> </hbox> - <hbox flex="1" align="center"> - <description id="torbutton_sec_high" + <hbox flex="1" align="end"> + <description id="torbutton_sec_low" + tooltip="low_preview" onclick="torbutton_toggle_slider(document, 4);"> - &torbutton.prefs.sec_high; + &torbutton.prefs.sec_low; </description> </hbox> </vbox> + <spacer flex="1"/> +  + <vbox flex="1" width="300"> + <vbox id="desc_high" collapsed="true"> + <description + class="slider-text-size, slider-text-weight"> + &torbutton.prefs.sec_gen_desc; + </description> + <description class="slider-text-size" + tooltiptext="&torbutton.prefs.sec_html5_tooltip;"> + &torbutton.prefs.sec_html5_desc; + </description> + <description class="slider-text-size" + tooltiptext="&torbutton.prefs.sec_jit_desc_tooltip; &torbutton.prefs.sec_baseline_jit_desc_tooltip;"> + &torbutton.prefs.sec_all_jit_desc; &torbutton.prefs.sec_jit_slower_desc; + </description> + <description class="slider-text-size" + tooltiptext="&torbutton.prefs.sec_jar_tooltip;"> + &torbutton.prefs.sec_jar_desc; + </description> + <description class="slider-text-size" + tooltiptext="&torbutton.prefs.sec_mathml_desc_tooltip;"> + &torbutton.prefs.sec_mathml_desc; + </description> + <description class="slider-text-size" + tooltiptext="&torbutton.prefs.sec_font_rend_svg_tooltip; &torbutton.prefs.sec_font_rend_graphite_tooltip;"> + &torbutton.prefs.sec_font_rend_desc; + </description> + <description class="slider-text-size" + tooltiptext="&torbutton.prefs.sec_js_desc_tooltip;"> + &torbutton.prefs.sec_all_js_desc; + </description> + <description class="slider-text-size" + tooltiptext="&torbutton.prefs.sec_svg_desc_tooltip;"> + &torbutton.prefs.sec_svg_desc; + </description> + <description class="slider-text-size" + tooltiptext="&torbutton.prefs.sec_webfonts_desc_tooltip;"> + &torbutton.prefs.sec_webfonts_desc; + </description> + </vbox> + <vbox id="desc_medium_high" collapsed="true"> + <description + class="slider-text-size, slider-text-weight"> + &torbutton.prefs.sec_gen_desc; + </description> + <description class="slider-text-size" + tooltiptext="&torbutton.prefs.sec_html5_tooltip;"> + &torbutton.prefs.sec_html5_desc; + </description> + <description class="slider-text-size" + tooltiptext="&torbutton.prefs.sec_jit_desc_tooltip; &torbutton.prefs.sec_baseline_jit_desc_tooltip;"> + &torbutton.prefs.sec_all_jit_desc; &torbutton.prefs.sec_jit_slower_desc; + </description> + <description class="slider-text-size" + tooltiptext="&torbutton.prefs.sec_jar_tooltip;"> + &torbutton.prefs.sec_jar_desc; + </description> + <description class="slider-text-size" + tooltiptext="&torbutton.prefs.sec_mathml_desc_tooltip;"> + &torbutton.prefs.sec_mathml_desc; + </description> + <description class="slider-text-size" + tooltiptext="&torbutton.prefs.sec_font_rend_svg_tooltip; &torbutton.prefs.sec_font_rend_graphite_tooltip;"> + &torbutton.prefs.sec_font_rend_desc; + </description> + <description class="slider-text-size" + tooltiptext="&torbutton.prefs.sec_js_desc_tooltip;"> + &torbutton.prefs.sec_js_https_desc; + </description> + </vbox> + <vbox id="desc_medium_low" collapsed="true"> + <description + class="slider-text-size, slider-text-weight"> + &torbutton.prefs.sec_gen_desc; + </description> + <description class="slider-text-size" + tooltiptext="&torbutton.prefs.sec_html5_tooltip;"> + &torbutton.prefs.sec_html5_desc; + </description> + <description class="slider-text-size" + tooltiptext="&torbutton.prefs.sec_jit_desc_tooltip;"> + &torbutton.prefs.sec_some_jit_desc; &torbutton.prefs.sec_jit_slower_desc; + </description> + <description class="slider-text-size" + tooltiptext="&torbutton.prefs.sec_jar_tooltip;"> + &torbutton.prefs.sec_jar_desc; + </description> + <description class="slider-text-size" + tooltiptext="&torbutton.prefs.sec_mathml_desc_tooltip;"> + &torbutton.prefs.sec_mathml_desc; + </description> + </vbox> + <vbox id="desc_low" collapsed="false"> + <description + class="slider-text-size, slider-text-weight"> + &torbutton.prefs.sec_low_desc; + </description> + <description class="slider-text-size"> + &torbutton.prefs.sec_low_usable_desc; + </description> + </vbox> + </vbox> </hbox> <hbox> <checkbox id="torbutton_sec_custom" flex="1" @@ -198,4 +307,43 @@ </tabpanels> </tabbox> + <tooltip id="high_preview"> + <html:b>&torbutton.prefs.sec_gen_desc;</html:b> + <html:br></html:br> + <html:br></html:br> + <html:div>&torbutton.prefs.sec_html5_desc;</html:div> + <html:div>&torbutton.prefs.sec_some_jit_desc;</html:div> + <html:div>&torbutton.prefs.sec_jar_desc;</html:div> + <html:div>&torbutton.prefs.sec_mathml_desc;</html:div> + <html:div>&torbutton.prefs.sec_font_rend_desc;</html:div> + <html:div>&torbutton.prefs.sec_all_js_desc;</html:div> + <html:div>&torbutton.prefs.sec_svg_desc;</html:div> + <html:div>&torbutton.prefs.sec_webfonts_desc;</html:div> + </tooltip> + <tooltip id="mh_preview"> + <html:b>&torbutton.prefs.sec_gen_desc;</html:b> + <html:br></html:br> + <html:br></html:br> + <html:div>&torbutton.prefs.sec_html5_desc;</html:div> + <html:div>&torbutton.prefs.sec_some_jit_desc;</html:div> + <html:div>&torbutton.prefs.sec_jar_desc;</html:div> + <html:div>&torbutton.prefs.sec_mathml_desc;</html:div> + <html:div>&torbutton.prefs.sec_font_rend_desc;</html:div> + <html:div>&torbutton.prefs.sec_js_https_desc;</html:div> + </tooltip> + <tooltip id="ml_preview"> + <html:b>&torbutton.prefs.sec_gen_desc;</html:b> + <html:br></html:br> + <html:br></html:br> + <html:div>&torbutton.prefs.sec_html5_desc;</html:div> + <html:div>&torbutton.prefs.sec_some_jit_desc;</html:div> + <html:div>&torbutton.prefs.sec_jar_desc;</html:div> + <html:div>&torbutton.prefs.sec_mathml_desc;</html:div> + </tooltip> + <tooltip id="low_preview"> + <html:b>&torbutton.prefs.sec_low_desc;</html:b> + <html:br></html:br> + <html:br></html:br> + <html:div>&torbutton.prefs.sec_low_usable_desc;</html:div> + </tooltip> </dialog> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index f7e99a0..d3afef8 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -235,15 +235,12 @@ var torbutton_unique_pref_observer = case "noscript.forbidMedia": case "media.webaudio.enabled": case "network.jar.block-remote-files": + case "mathml.disabled": case "javascript.options.baselinejit.content": case "noscript.forbidFonts": case "gfx.font_rendering.graphite.enabled": case "noscript.globalHttpsWhitelist": case "noscript.global": - case "media.ogg.enabled": - case "media.opus.enabled": - case "media.wave.enabled": - case "media.apple.mp3.enabled": // |m_tb_slider_update| is only set if the user updated a // preference under control of the security slider via the // slider on the Torbutton dialog. This in turn means we can @@ -2197,10 +2194,6 @@ function torbutton_update_thirdparty_prefs() { prefService.savePrefFile(null); } -var torbutton_sec_l_bool_prefs = { - "gfx.font_rendering.opentype_svg.enabled" : false, -}; - var torbutton_sec_ml_bool_prefs = { "javascript.options.ion.content" : false, "javascript.options.typeinference" : false, @@ -2208,23 +2201,21 @@ var torbutton_sec_ml_bool_prefs = { "noscript.forbidMedia" : true, "media.webaudio.enabled" : false, "network.jar.block-remote-files" : true, - // XXX: pref for disabling MathML is missing + "mathml.disabled" : true }; var torbutton_sec_mh_bool_prefs = { "javascript.options.baselinejit.content" : false, + "gfx.font_rendering.graphite.enabled" : false, + "gfx.font_rendering.opentype_svg.enabled" : false, "noscript.global" : false, - "noscript.globalHttpsWhitelist" : true, - // XXX: pref for disableing SVG is missing + "noscript.globalHttpsWhitelist" : true }; var torbutton_sec_h_bool_prefs = { "noscript.forbidFonts" : true, "noscript.global" : false, - "media.ogg.enabled" : false, - "media.opus.enabled" : false, - "media.wave.enabled" : false, - "media.apple.mp3.enabled" : false + // XXX: pref for disabling SVG is missing }; function torbutton_update_security_slider() { @@ -2233,18 +2224,20 @@ function torbutton_update_security_slider() { let mode = m_tb_prefs.getIntPref("extensions.torbutton.security_slider"); let capValue = m_tb_prefs.getCharPref("capability.policy.maonoscript.sites"); switch (mode) { - case 1: - for (p in torbutton_sec_l_bool_prefs) { - m_tb_prefs.setBoolPref(p, torbutton_sec_l_bool_prefs[p]); - } + case 1: for (p in torbutton_sec_ml_bool_prefs) { - m_tb_prefs.setBoolPref(p, !torbutton_sec_ml_bool_prefs[p]) + m_tb_prefs.setBoolPref(p, torbutton_sec_ml_bool_prefs[p]) } for (p in torbutton_sec_mh_bool_prefs) { - m_tb_prefs.setBoolPref(p, !torbutton_sec_mh_bool_prefs[p]) + m_tb_prefs.setBoolPref(p, torbutton_sec_mh_bool_prefs[p]) + // noscript.globalHttpsWhitelist is special: We don't want it in this + // mode. + if (p === "noscript.globalHttpsWhitelist") { + m_tb_prefs.setBoolPref(p, !torbutton_sec_mh_bool_prefs[p]) + } } for (p in torbutton_sec_h_bool_prefs) { - m_tb_prefs.setBoolPref(p, !torbutton_sec_h_bool_prefs[p]) + m_tb_prefs.setBoolPref(p, torbutton_sec_h_bool_prefs[p]) } // Removing "https:" is needed due to a bug in older Noscript versions. // We leave that in for a while as there may be users that were affected @@ -2254,18 +2247,22 @@ function torbutton_update_security_slider() { m_tb_prefs.setCharPref("capability.policy.maonoscript.sites", capValue.replace(" https:", "")); } - if (m_tb_prefs.getCharPref("general.useragent.locale") !== "ko" || - m_tb_prefs.getCharPref("general.useragent.locale") !== "vi" || - m_tb_prefs.getCharPref("general.useragent.locale") !== "zh-CN") { - m_tb_prefs.setBoolPref("gfx.font_rendering.graphite.enabled", false); - } else { - m_tb_prefs.setBoolPref("gfx.font_rendering.graphite.enabled", true); - } break; case 2: - for (p in torbutton_sec_l_bool_prefs) { - m_tb_prefs.setBoolPref(p, torbutton_sec_l_bool_prefs[p]); + for (p in torbutton_sec_ml_bool_prefs) { + m_tb_prefs.setBoolPref(p, torbutton_sec_ml_bool_prefs[p]) + } + // Order matters here as both the high mode and the medium-high mode + // share some preferences/values. So, let's revert the high mode + // preferences first and set the medium-high mode ones afterwards. + for (p in torbutton_sec_h_bool_prefs) { + m_tb_prefs.setBoolPref(p, !torbutton_sec_h_bool_prefs[p]) + } + for (p in torbutton_sec_mh_bool_prefs) { + m_tb_prefs.setBoolPref(p, torbutton_sec_mh_bool_prefs[p]) } + break; + case 3: for (p in torbutton_sec_ml_bool_prefs) { m_tb_prefs.setBoolPref(p, torbutton_sec_ml_bool_prefs[p]) } @@ -2283,49 +2280,16 @@ function torbutton_update_security_slider() { m_tb_prefs.setCharPref("capability.policy.maonoscript.sites", capValue.replace(" https:", "")); } - if (m_tb_prefs.getCharPref("general.useragent.locale") !== "ko" || - m_tb_prefs.getCharPref("general.useragent.locale") !== "vi" || - m_tb_prefs.getCharPref("general.useragent.locale") !== "zh-CN") { - m_tb_prefs.setBoolPref("gfx.font_rendering.graphite.enabled", false); - } else { - m_tb_prefs.setBoolPref("gfx.font_rendering.graphite.enabled", true); - } - break; - case 3: - for (p in torbutton_sec_l_bool_prefs) { - m_tb_prefs.setBoolPref(p, torbutton_sec_l_bool_prefs[p]); - } - for (p in torbutton_sec_ml_bool_prefs) { - m_tb_prefs.setBoolPref(p, torbutton_sec_ml_bool_prefs[p]) - } - // Order matters here as both the high mode and the medium-high mode - // share some preferences/values. So, let's revert the high mode - // preferences first and set the medium-high mode ones afterwards. - for (p in torbutton_sec_h_bool_prefs) { - m_tb_prefs.setBoolPref(p, !torbutton_sec_h_bool_prefs[p]) - } - for (p in torbutton_sec_mh_bool_prefs) { - m_tb_prefs.setBoolPref(p, torbutton_sec_mh_bool_prefs[p]) - } - m_tb_prefs.setBoolPref("gfx.font_rendering.graphite.enabled", false); break; case 4: - for (p in torbutton_sec_l_bool_prefs) { - m_tb_prefs.setBoolPref(p, torbutton_sec_l_bool_prefs[p]); - } for (p in torbutton_sec_ml_bool_prefs) { - m_tb_prefs.setBoolPref(p, torbutton_sec_ml_bool_prefs[p]) + m_tb_prefs.setBoolPref(p, !torbutton_sec_ml_bool_prefs[p]) } for (p in torbutton_sec_mh_bool_prefs) { - m_tb_prefs.setBoolPref(p, torbutton_sec_mh_bool_prefs[p]) - // noscript.globalHttpsWhitelist is special: We don't want it in this - // mode. - if (p === "noscript.globalHttpsWhitelist") { - m_tb_prefs.setBoolPref(p, !torbutton_sec_mh_bool_prefs[p]) - } + m_tb_prefs.setBoolPref(p, !torbutton_sec_mh_bool_prefs[p]) } for (p in torbutton_sec_h_bool_prefs) { - m_tb_prefs.setBoolPref(p, torbutton_sec_h_bool_prefs[p]) + m_tb_prefs.setBoolPref(p, !torbutton_sec_h_bool_prefs[p]) } // Removing "https:" is needed due to a bug in older Noscript versions. // We leave that in for a while as there may be users that were affected @@ -2335,7 +2299,6 @@ function torbutton_update_security_slider() { m_tb_prefs.setCharPref("capability.policy.maonoscript.sites", capValue.replace(" https:", "")); } - m_tb_prefs.setBoolPref("gfx.font_rendering.graphite.enabled", true); break; } m_tb_sliderUpdate = false; @@ -2348,35 +2311,23 @@ function torbutton_security_slider_custom_check(mode) { let capValue = m_tb_prefs.getCharPref("capability.policy.maonoscript.sites"); switch (mode) { case 1: - for (p in torbutton_sec_l_bool_prefs) { - if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_l_bool_prefs[p]) { - return; - } - } for (p in torbutton_sec_ml_bool_prefs) { - if (m_tb_prefs.getBoolPref(p) === torbutton_sec_ml_bool_prefs[p]) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_ml_bool_prefs[p]) { return; } } for (p in torbutton_sec_mh_bool_prefs) { - if (m_tb_prefs.getBoolPref(p) === torbutton_sec_mh_bool_prefs[p]) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_mh_bool_prefs[p]) { + // We don't want to have the whitelist in high mode. JavaScript is + // disabled globally. + if (p === "noscript.globalHttpsWhitelist") { + continue; + } return; } } for (p in torbutton_sec_h_bool_prefs) { - if (m_tb_prefs.getBoolPref(p) === torbutton_sec_h_bool_prefs[p]) { - return; - } - } - if (m_tb_prefs.getCharPref("general.useragent.locale") !== "ko" || - m_tb_prefs.getCharPref("general.useragent.locale") !== "vi" || - m_tb_prefs.getCharPref("general.useragent.locale") !== "zh-CN") { - - if (m_tb_prefs.getBoolPref("gfx.font_rendering.graphite.enabled")) { - return; - } - } else { - if (!m_tb_prefs.getBoolPref("gfx.font_rendering.graphite.enabled")) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_h_bool_prefs[p]) { return; } } @@ -2385,35 +2336,23 @@ function torbutton_security_slider_custom_check(mode) { m_tb_prefs.setBoolPref("extensions.torbutton.security_custom", false); break; case 2: - for (p in torbutton_sec_l_bool_prefs) { - if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_l_bool_prefs[p]) { - return; - } - } for (p in torbutton_sec_ml_bool_prefs) { if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_ml_bool_prefs[p]) { return; } } for (p in torbutton_sec_mh_bool_prefs) { - if (m_tb_prefs.getBoolPref(p) === torbutton_sec_mh_bool_prefs[p]) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_mh_bool_prefs[p]) { return; } } for (p in torbutton_sec_h_bool_prefs) { if (m_tb_prefs.getBoolPref(p) === torbutton_sec_h_bool_prefs[p]) { - return; - } - } - if (m_tb_prefs.getCharPref("general.useragent.locale") !== "ko" || - m_tb_prefs.getCharPref("general.useragent.locale") !== "vi" || - m_tb_prefs.getCharPref("general.useragent.locale") !== "zh-CN") { - - if (m_tb_prefs.getBoolPref("gfx.font_rendering.graphite.enabled")) { - return; - } - } else { - if (!m_tb_prefs.getBoolPref("gfx.font_rendering.graphite.enabled")) { + // We have the whitelist and JavaScript is disabled in medium-high + // mode as well. + if (p === "noscript.global") { + continue; + } return; } } @@ -2422,67 +2361,41 @@ function torbutton_security_slider_custom_check(mode) { m_tb_prefs.setBoolPref("extensions.torbutton.security_custom", false); break; case 3: - for (p in torbutton_sec_l_bool_prefs) { - if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_l_bool_prefs[p]) { - return; - } - } for (p in torbutton_sec_ml_bool_prefs) { if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_ml_bool_prefs[p]) { return; } } for (p in torbutton_sec_mh_bool_prefs) { - if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_mh_bool_prefs[p]) { + if (m_tb_prefs.getBoolPref(p) === torbutton_sec_mh_bool_prefs[p]) { return; } } for (p in torbutton_sec_h_bool_prefs) { if (m_tb_prefs.getBoolPref(p) === torbutton_sec_h_bool_prefs[p]) { - // We have the whitelist and JavaScript is disabled in medium-high - // mode as well. - if (p === "noscript.global") { - continue; - } return; } } - if (m_tb_prefs.getBoolPref("gfx.font_rendering.graphite.enabled")) { - return; - } // We are still here which means all preferences are properly reset. Leave // custom mode. m_tb_prefs.setBoolPref("extensions.torbutton.security_custom", false); break; case 4: - for (p in torbutton_sec_l_bool_prefs) { - if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_l_bool_prefs[p]) { - return; - } - } for (p in torbutton_sec_ml_bool_prefs) { - if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_ml_bool_prefs[p]) { + if (m_tb_prefs.getBoolPref(p) === torbutton_sec_ml_bool_prefs[p]) { return; } } for (p in torbutton_sec_mh_bool_prefs) { - if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_mh_bool_prefs[p]) { - // We don't want to have the whitelist in high mode. JavaScript is - // disabled globally. - if (p === "noscript.globalHttpsWhitelist") { - continue; - } + if (m_tb_prefs.getBoolPref(p) === torbutton_sec_mh_bool_prefs[p]) { return; } } for (p in torbutton_sec_h_bool_prefs) { - if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_h_bool_prefs[p]) { + if (m_tb_prefs.getBoolPref(p) === torbutton_sec_h_bool_prefs[p]) { return; } } - if (!m_tb_prefs.getBoolPref("gfx.font_rendering.graphite.enabled")) { - return; - } // We are still here which means all preferences are properly reset. Leave // custom mode. m_tb_prefs.setBoolPref("extensions.torbutton.security_custom", false); diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 15ae1e6..4a7bf7e 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -153,8 +153,35 @@ <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> <!ENTITY torbutton.prefs.sec_caption "Security Level"> <!ENTITY torbutton.prefs.sec_low "Low (default)"> +<!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience."> +<!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled."> +<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled."> <!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> +<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):"> +<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript."> +<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects."> +<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled."> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> +<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower."> +<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked."> +<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks."> +<!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> +<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled."> <!ENTITY torbutton.prefs.sec_med_high "Medium-High"> +<!ENTITY torbutton.prefs.sec_all_jit_desc "All JavaScript performance optimizations are disabled."> +<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled."> +<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> +<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled."> +<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled."> +<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites."> +<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> <!ENTITY torbutton.prefs.sec_high "High"> +<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites."> +<!ENTITY torbutton.prefs.sec_audio_video_desc "Most audio and video formats are disabled."> +<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM is the only codec that remains enabled."> +<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly."> +<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> <!ENTITY torbutton.prefs.sec_custom "Custom Values"> <!ENTITY torbutton.circuit_display.title "Tor circuit for this site"> + diff --git a/src/chrome/skin/preferences.css b/src/chrome/skin/preferences.css new file mode 100644 index 0000000..013b367 --- /dev/null +++ b/src/chrome/skin/preferences.css @@ -0,0 +1,7 @@ +.slider-text-weight { + font-weight: bold; +} + +.slider-text-size { + font-size: 95%; +} diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index fb1a702..677447b 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -176,7 +176,7 @@ pref("extensions.torbutton.block_disk", true); pref("extensions.torbutton.resist_fingerprinting", true); pref("extensions.torbutton.restrict_thirdparty", true); // Security Slider -pref("extensions.torbutton.security_slider", 1); +pref("extensions.torbutton.security_slider", 4); pref("extensions.torbutton.security_custom", false); // Google Captcha prefs

1 0

[tor-browser-bundle/master] Bug 14688: Create Desktop and Start Menu shortcuts for Windows
by mikeperry＠torproject.org 20 Mar '15

20 Mar '15

commit dad9a582b97d8720f788881461ead2284281eea8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Mar 19 17:54:09 2015 -0700 Bug 14688: Create Desktop and Start Menu shortcuts for Windows This is on by default, but can be turned of in a checkbox on the installer. We also switch back to Moritz's NSIS repo and gpg key with this. Unfortunately, he tagged the same version as mcs did, but that's not a big deal. --- gitian/fetch-inputs.sh | 2 +- gitian/gpg/tbb-windows-installer.gpg | Bin 1213 -> 15689 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index e58c4d3..3b3c43a 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -247,7 +247,7 @@ cd inputs while read dir url tag; do update_git "$dir" "$url" "$tag" done << EOF -tbb-windows-installer https://github.com/MarkCSmith/tbb-windows-installer.git $NSIS_TAG +tbb-windows-installer https://github.com/moba/tbb-windows-installer.git $NSIS_TAG zlib https://github.com/madler/zlib.git $ZLIB_TAG libevent https://github.com/libevent/libevent.git $LIBEVENT_TAG tor https://git.torproject.org/tor.git $TOR_TAG diff --git a/gitian/gpg/tbb-windows-installer.gpg b/gitian/gpg/tbb-windows-installer.gpg index e753e57..fab3a99 100644 Binary files a/gitian/gpg/tbb-windows-installer.gpg and b/gitian/gpg/tbb-windows-installer.gpg differ

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits March 2015