March 2015 - tor-commits - lists.torproject.org

[bridgedb/develop] Catch DescriptorWarnings and log them when we get identical descriptors.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit a27d79055d7b8de22a069c6ab8ee6ce2ffcd459a Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Mar 21 03:31:06 2015 +0000 Catch DescriptorWarnings and log them when we get identical descriptors. It turns out this actually does happen. Not very many times, though. When redeploying BridgeDB-0.3.0 with the new Stem descriptor parsers from #9380, [0] there were two bridges who had completely identical descriptor (including identical timestamps). Each of those bridges had exactly one perfectly identical duplicate descriptor each, and each bridge was quite new, having just appeared within the last 8 hours. Previously, the BridgeDB process would die because we didn't catch these errors. This fixes that. [0]: https://bugs.torproject.org/9380 --- lib/bridgedb/parse/descriptors.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/parse/descriptors.py b/lib/bridgedb/parse/descriptors.py index 80063ca..409a200 100644 --- a/lib/bridgedb/parse/descriptors.py +++ b/lib/bridgedb/parse/descriptors.py @@ -198,10 +198,14 @@ def deduplicate(descriptors): # ``platform`` line in its server-descriptor and tell whoever # wrote that code that they're probably (D)DOSing the Tor network. else: - raise DescriptorWarning( - ("Duplicate descriptor with identical timestamp (%s) for " - "router with fingerprint '%s'!") - % (descriptor.published, fingerprint)) + try: + raise DescriptorWarning( + ("Duplicate descriptor with identical timestamp (%s) " + "for router with fingerprint '%s'!") + % (descriptor.published, fingerprint)) + # And just in case it does happen, catch the warning: + except DescriptorWarning as descwarn: + logging.warn("DescriptorWarning: %s" % str(descwarn)) # Hoorah! No duplicates! (yet...) else:

1 0

[bridgedb/develop] Merge branch 'hotfix/9380-duplicate-extrainfo-error' into develop
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 8b0cabfaeefaef40af03ffa4ecce210702280beb Merge: 5b401e3 ed27df5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Mar 21 05:06:54 2015 +0000 Merge branch 'hotfix/9380-duplicate-extrainfo-error' into develop lib/bridgedb/parse/descriptors.py | 12 ++++++++---- lib/bridgedb/test/test_parse_descriptors.py | 9 +++++---- 2 files changed, 13 insertions(+), 8 deletions(-)

1 0

[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

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 21 Mar '15

21 Mar '15

commit 6b6ebbb129ed4328f7b744c266f20da678b486fc Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 21 03:45:45 2015 +0000 Update translations for torbutton-torbuttondtd --- zh_CN/torbutton.dtd | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/zh_CN/torbutton.dtd b/zh_CN/torbutton.dtd index 49b9d90..90076de 100644 --- a/zh_CN/torbutton.dtd +++ b/zh_CN/torbutton.dtd @@ -153,35 +153,35 @@ <!ENTITY torbutton.prefs.resist_fingerprinting "请修改区别你与其他 Tor 浏览器用户的详细信息"> <!ENTITY torbutton.prefs.sec_caption "安全等级"> <!ENTITY torbutton.prefs.sec_low "低（默认）"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "这提供了最多的使用体验。"> -<!ENTITY torbutton.prefs.sec_low_desc "在这个安全级别，所有浏览器功能被启用。"> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "SVG OpenType 字体渲染机制被禁用。"> +<!ENTITY torbutton.prefs.sec_low_usable_desc "该选项提供最具可用性的用户体验。"> +<!ENTITY torbutton.prefs.sec_low_desc "该安全级别将启用所有浏览器功能。"> +<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "禁用 SVG OpenType 字体渲染功能。"> <!ENTITY torbutton.prefs.sec_med_low "中低"> -<!ENTITY torbutton.prefs.sec_gen_desc "在这个安全级别，下列更改被应用（鼠标悬停查看细节）："> +<!ENTITY torbutton.prefs.sec_gen_desc "该安全级别具有以下更改（鼠标悬停可查看细节）："> <!ENTITY torbutton.prefs.sec_html5_desc "HTML5 视频和音频媒体通过 NoScript 实现点击播放。"> -<!ENTITY torbutton.prefs.sec_html5_tooltip "在某些网站，您可能需要使用 NoScript 工具栏按钮来启用这些媒体对象。"> -<!ENTITY torbutton.prefs.sec_some_jit_desc "一些 JavaScript 性能优化被禁用。"> +<!ENTITY torbutton.prefs.sec_html5_tooltip "在某些网站，可使用 NoScript 工具栏按钮来启用这些媒体对象。"> +<!ENTITY torbutton.prefs.sec_some_jit_desc "禁用某些 JavaScript 性能优化。"> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT、类型推断、ASM.JS。"> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT。"> <!ENTITY torbutton.prefs.sec_jit_slower_desc "一些网站的脚本可能运行更慢。"> -<!ENTITY torbutton.prefs.sec_jar_desc "远程 JAR 文件被阻止。"> -<!ENTITY torbutton.prefs.sec_jar_tooltip "放在网络上的 JAR 文件是罕见的，但这会成为 XSS 及其他攻击的源头。"> -<!ENTITY torbutton.prefs.sec_mathml_desc "一些数学方程式的显示机制被禁用。"> -<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML 被禁用。"> +<!ENTITY torbutton.prefs.sec_jar_desc "禁用远程 JAR 文件。"> +<!ENTITY torbutton.prefs.sec_jar_tooltip "网站上很少出现 JAR 文件，但可能成为 XSS 及其他攻击的源头。"> +<!ENTITY torbutton.prefs.sec_mathml_desc "禁用数学方程式的某些显示机制。"> +<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "禁用 MathML。"> <!ENTITY torbutton.prefs.sec_med_high "中高"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "所有 JavaScript 性能优化被禁用。"> -<!ENTITY torbutton.prefs.sec_font_rend_desc "一些字体渲染功能被禁用。"> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Graphite 字体渲染机制被禁用。"> -<!ENTITY torbutton.prefs.sec_svg_desc "一些图像类型被禁用。"> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG 图像被禁用。"> +<!ENTITY torbutton.prefs.sec_all_jit_desc "禁用全部 JavaScript 性能优化。"> +<!ENTITY torbutton.prefs.sec_font_rend_desc "禁用某些字体渲染功能。"> +<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "禁用 Graphite 字体渲染。"> +<!ENTITY torbutton.prefs.sec_svg_desc "禁用某些图像类型。"> +<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "禁用 SVG 图像。"> <!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript 在所有非 HTTPS 网站上被禁用。"> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript 可以在 NoScript 工具栏按钮上对特定网站启用。"> +<!ENTITY torbutton.prefs.sec_js_desc_tooltip "可按站点通过 NoScript 工具栏按钮上启用 JavaScript。"> <!ENTITY torbutton.prefs.sec_high "高"> -<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript 默认在所有网站上被禁用。"> -<!ENTITY torbutton.prefs.sec_audio_video_desc "大多数音频和视频格式被禁用。"> -<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM 是唯一继续启用的编码器。"> -<!ENTITY torbutton.prefs.sec_webfonts_desc "一些字体和图标可能显示不正确。"> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "网站提供的字体文件被阻止。"> +<!ENTITY torbutton.prefs.sec_all_js_desc "默认禁用所有网站 JavaScript。"> +<!ENTITY torbutton.prefs.sec_audio_video_desc "禁用大多数音频和视频格式。"> +<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "仅启用 WebM 编解码器。"> +<!ENTITY torbutton.prefs.sec_webfonts_desc "某些字体和图标可能无法正确显示。"> +<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "禁用网站提供的字体文件。"> <!ENTITY torbutton.prefs.sec_custom "自定义"> <!ENTITY torbutton.circuit_display.title "该站点所用的 Tor 线路">

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] 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

[bridgedb/master] Update CHANGELOG entries for bridgedb-0.3.0.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit cdc0ffab82864ca4c2ad75492da029b70927395e Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Mar 21 01:53:50 2015 +0000 Update CHANGELOG entries for bridgedb-0.3.0. --- CHANGELOG | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 081c79d..d0f99e1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -42,6 +42,14 @@ Changes in version 0.3.0 - XXX the Mechanize-based integrations tests in lib/bridgedb/test/test_https.py. hotfix/0.2.4-mechanize-tags + * FIXES part of #12507 https://bugs.torproject.org/12507 + BridgeDB now has semi-automated developer documentation builds at + https://pythonhosted.org/bridgedb/. + + * FIXES #12805 https://bugs.torproject.org/12805 + BridgeDB is now packaged on PyPI, in the hopes that someday other + organisations will be able to run their own BridgeDBs. + * FIXES #12843 https://bugs.torproject.org/12843 BridgeDB will no longer distribute bridges which it believes are located in Iran or Syria.

1 0

[bridgedb/master] Merge branch 'release-0.3.0'
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 6f0f5365f92d3f39db6ee3d52b7a5eedc09176ab Merge: e08b98e cdc0ffa Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Mar 21 02:00:24 2015 +0000 Merge branch 'release-0.3.0' .gitignore | 6 +- .gnupg/TESTING.pub | Bin 0 -> 4622 bytes .gnupg/TESTING.subkeys.sec | Bin 0 -> 7212 bytes .gnupg/bridgedb-offline-key.pub.asc | 113 ++ .gnupg/bridgedb-online-key.pub.asc | 100 ++ .gnupg/gpg.conf | 96 ++ .gnupg/pubring.gpg | Bin 0 -> 4634 bytes .gnupg/secring.gpg | Bin 0 -> 7224 bytes .test.requirements.txt | 2 +- .travis.requirements.txt | 9 +- .travis.yml | 28 +- CHANGELOG | 285 +++- Makefile | 6 +- README.rst | 73 +- TODO | 58 - bridgedb.conf | 87 +- doc/sphinx/source/bridgedb.Tests.rst | 8 - doc/sphinx/source/bridgedb.bridges.rst | 8 + doc/sphinx/source/bridgedb.geo.rst | 8 + doc/sphinx/source/bridgedb.parse.rst | 4 +- doc/sphinx/source/bridgedb.proxy.rst | 8 + doc/sphinx/source/bridgedb.qrcodes.rst | 8 + doc/sphinx/source/bridgedb.rst | 5 +- doc/sphinx/source/conf.py | 11 +- gnupghome/TESTING.subkeys.sec | Bin 7212 -> 0 bytes gnupghome/TESTING.subkeys.sec.EXPIRED-2013-09-11 | Bin 6505 -> 0 bytes gnupghome/bridgedb-offline-key.pub.asc | 113 -- gnupghome/bridgedb-online-signing-key.pub.asc | 148 -- gnupghome/gpg.conf | 96 -- lib/bridgedb/Bridges.py | 686 +-------- lib/bridgedb/Filters.py | 89 +- lib/bridgedb/HTTPServer.py | 37 +- lib/bridgedb/Main.py | 352 ++--- lib/bridgedb/Stability.py | 2 +- lib/bridgedb/Storage.py | 5 +- lib/bridgedb/Tests.py | 780 ----------- lib/bridgedb/bridgerequest.py | 54 +- lib/bridgedb/bridges.py | 1603 ++++++++++++++++++++++ lib/bridgedb/configure.py | 22 +- lib/bridgedb/crypto.py | 328 ++--- lib/bridgedb/email/autoresponder.py | 44 +- lib/bridgedb/email/server.py | 12 +- lib/bridgedb/geo.py | 78 ++ lib/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po | 21 +- lib/bridgedb/i18n/az/LC_MESSAGES/bridgedb.po | 357 +++++ lib/bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po | 357 +++++ lib/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po | 392 +++++- lib/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po | 367 ++++- lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po | 169 ++- lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po | 103 +- lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po | 20 +- lib/bridgedb/i18n/en/LC_MESSAGES/bridgedb.po | 445 +++++- lib/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po | 387 +++++- lib/bridgedb/i18n/en_US/LC_MESSAGES/bridgedb.po | 447 +++++- lib/bridgedb/i18n/eo/LC_MESSAGES/bridgedb.po | 359 +++++ lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po | 79 +- lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po | 63 +- lib/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po | 63 +- lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 61 +- lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po | 64 +- lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po | 72 +- lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po | 59 +- lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po | 161 ++- lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po | 145 +- lib/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po | 19 +- lib/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po | 20 +- lib/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po | 161 ++- lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 170 ++- lib/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po | 100 +- lib/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po | 64 +- lib/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 53 +- lib/bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po | 21 +- lib/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po | 65 +- lib/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po | 367 ++++- lib/bridgedb/i18n/sk_SK/LC_MESSAGES/bridgedb.po | 357 +++++ lib/bridgedb/i18n/sl_SI/LC_MESSAGES/bridgedb.po | 359 +++++ lib/bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po | 380 +++++ lib/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po | 61 +- lib/bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po | 357 +++++ lib/bridgedb/i18n/templates/bridgedb.pot | 90 +- lib/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po | 97 +- lib/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po | 184 ++- lib/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po | 121 +- lib/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po | 22 +- lib/bridgedb/parse/addr.py | 7 + lib/bridgedb/parse/descriptors.py | 274 ++++ lib/bridgedb/parse/fingerprint.py | 16 +- lib/bridgedb/parse/networkstatus.py | 280 ---- lib/bridgedb/parse/nickname.py | 58 + lib/bridgedb/persistent.py | 45 +- lib/bridgedb/proxy.py | 470 +++++++ lib/bridgedb/qrcodes.py | 8 +- lib/bridgedb/runner.py | 29 + lib/bridgedb/schedule.py | 6 +- lib/bridgedb/strings.py | 5 +- lib/bridgedb/templates/bridgedb.asc | 226 ++- lib/bridgedb/test/deprecated.py | 520 +++++++ lib/bridgedb/test/deprecated_networkstatus.py | 275 ++++ lib/bridgedb/test/email_helpers.py | 15 +- lib/bridgedb/test/legacy_Tests.py | 725 ++++++++++ lib/bridgedb/test/test_Bridges.py | 199 --- lib/bridgedb/test/test_Main.py | 432 ++++++ lib/bridgedb/test/test_Tests.py | 13 +- lib/bridgedb/test/test_bridgedb.py | 1 + lib/bridgedb/test/test_bridges.py | 1357 ++++++++++++++++++ lib/bridgedb/test/test_crypto.py | 364 ++--- lib/bridgedb/test/test_email_autoresponder.py | 2 +- lib/bridgedb/test/test_geo.py | 96 ++ lib/bridgedb/test/test_https.py | 10 +- lib/bridgedb/test/test_parse_descriptors.py | 653 +++++++++ lib/bridgedb/test/test_parse_networkstatus.py | 414 ------ lib/bridgedb/test/test_parse_nickname.py | 63 + lib/bridgedb/test/test_persistentSaveAndLoad.py | 68 +- lib/bridgedb/test/test_proxy.py | 590 ++++++++ lib/bridgedb/test/test_qrcodes.py | 73 + lib/bridgedb/test/test_smtp.py | 1 + lib/bridgedb/test/test_util.py | 42 + lib/bridgedb/util.py | 10 +- requirements.txt | 3 +- scripts/get-tor-exits | 199 +++ setup.cfg | 4 + setup.py | 5 +- 122 files changed, 15331 insertions(+), 4858 deletions(-)

1 0

[bridgedb/master] Make a note of the developer documentation in README.rst.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 464009411e7ef4ce5c005f88851afbb90df1bf1a Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Mar 21 01:23:34 2015 +0000 Make a note of the developer documentation in README.rst. --- README.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.rst b/README.rst index 01b4e2c..b4472c7 100644 --- a/README.rst +++ b/README.rst @@ -66,6 +66,10 @@ instructions for getting extra Bridges. Maintainer Setup ================ +If you'd like to hack on BridgeDB, you might wish to read BridgeDB's +`developer documentation <https://pythonhosted.org/bridgedb/>`__. The rest of +this document mainly concerns mainenance and installation instructions. + ----------------------------- Dependencies and installation -----------------------------

1 0