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

[tor-browser/tor-browser-52.1.1esr-7.0-1] Bug 22452: Isolate tab list menuitem favicons to content first party
by gk＠torproject.org 31 May '17

31 May '17

commit 93469df805f4001dc837299bc3076855d7bff6ae Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue May 30 00:43:48 2017 -0700 Bug 22452: Isolate tab list menuitem favicons to content first party --- browser/base/content/tabbrowser.xml | 1 + toolkit/content/widgets/menu.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml index 2b3ac67..f82dd5a 100644 --- a/browser/base/content/tabbrowser.xml +++ b/browser/base/content/tabbrowser.xml @@ -7068,6 +7068,7 @@ aMenuitem.setAttribute("busy", aTab.getAttribute("busy")); aMenuitem.removeAttribute("image"); } else { + aMenuitem.setAttribute("iconLoadingPrincipal", aTab.getAttribute("iconLoadingPrincipal")); aMenuitem.setAttribute("image", aTab.getAttribute("image")); aMenuitem.removeAttribute("busy"); } diff --git a/toolkit/content/widgets/menu.xml b/toolkit/content/widgets/menu.xml index 26dcad4..6b0886c 100644 --- a/toolkit/content/widgets/menu.xml +++ b/toolkit/content/widgets/menu.xml @@ -214,7 +214,7 @@ <content> <xul:hbox class="menu-iconic-left" align="center" pack="center" xbl:inherits="selected,_moz-menuactive,disabled,checked"> - <xul:image class="menu-iconic-icon" xbl:inherits="src=image,validate,src"/> + <xul:image class="menu-iconic-icon" xbl:inherits="src=image,loadingprincipal=iconLoadingPrincipal,validate,src"/> </xul:hbox> <xul:label class="menu-iconic-text" flex="1" xbl:inherits="value=label,accesskey,crop" crop="right"/> <children/>

1 0

[tor-browser/tor-browser-52.1.0esr-7.0-2] Bug 22452: Isolate tab list menuitem favicons to content first party
by gk＠torproject.org 31 May '17

31 May '17

commit 1cb4d06b54d26e35c78b398abdd456444b26acd7 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue May 30 00:43:48 2017 -0700 Bug 22452: Isolate tab list menuitem favicons to content first party --- browser/base/content/tabbrowser.xml | 1 + toolkit/content/widgets/menu.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml index 2b3ac67..f82dd5a 100644 --- a/browser/base/content/tabbrowser.xml +++ b/browser/base/content/tabbrowser.xml @@ -7068,6 +7068,7 @@ aMenuitem.setAttribute("busy", aTab.getAttribute("busy")); aMenuitem.removeAttribute("image"); } else { + aMenuitem.setAttribute("iconLoadingPrincipal", aTab.getAttribute("iconLoadingPrincipal")); aMenuitem.setAttribute("image", aTab.getAttribute("image")); aMenuitem.removeAttribute("busy"); } diff --git a/toolkit/content/widgets/menu.xml b/toolkit/content/widgets/menu.xml index 26dcad4..6b0886c 100644 --- a/toolkit/content/widgets/menu.xml +++ b/toolkit/content/widgets/menu.xml @@ -214,7 +214,7 @@ <content> <xul:hbox class="menu-iconic-left" align="center" pack="center" xbl:inherits="selected,_moz-menuactive,disabled,checked"> - <xul:image class="menu-iconic-icon" xbl:inherits="src=image,validate,src"/> + <xul:image class="menu-iconic-icon" xbl:inherits="src=image,loadingprincipal=iconLoadingPrincipal,validate,src"/> </xul:hbox> <xul:label class="menu-iconic-text" flex="1" xbl:inherits="value=label,accesskey,crop" crop="right"/> <children/>

1 0

[tor-browser/tor-browser-52.1.0esr-7.0-2] Bug 1319908 - Load the menu icons for the bookmarks menu with the correct content type and principal on OSX; r=baku
by gk＠torproject.org 31 May '17

31 May '17

commit ef0f9d150d4210bed5b517763cf8872e7f729649 Author: Ehsan Akhgari <ehsan(a)mozilla.com> Date: Wed Dec 14 15:52:57 2016 -0500 Bug 1319908 - Load the menu icons for the bookmarks menu with the correct content type and principal on OSX; r=baku This patch makes nsMenuItemIconX also participate in the setup introduced in bug 1277803. --- browser/base/content/browser-places.js | 5 +++++ dom/base/nsContentUtils.cpp | 31 +++++++++++++++++++++++++++++++ dom/base/nsContentUtils.h | 10 ++++++++++ layout/xul/nsImageBoxFrame.cpp | 28 +++++----------------------- widget/cocoa/nsMenuItemIconX.h | 3 +++ widget/cocoa/nsMenuItemIconX.mm | 14 ++++++++++---- 6 files changed, 64 insertions(+), 27 deletions(-) diff --git a/browser/base/content/browser-places.js b/browser/base/content/browser-places.js index 14e90cd..3998b5b 100644 --- a/browser/base/content/browser-places.js +++ b/browser/base/content/browser-places.js @@ -1509,6 +1509,10 @@ var BookmarkingUI = { options.maxResults = kMaxResults; let query = PlacesUtils.history.getNewQuery(); + let sh = Cc["@mozilla.org/network/serialization-helper;1"] + .getService(Ci.nsISerializationHelper); + let loadingPrincipal = sh.serializeToString(document.nodePrincipal); + let fragment = document.createDocumentFragment(); let root = PlacesUtils.history.executeQuery(query, options).root; root.containerOpen = true; @@ -1528,6 +1532,7 @@ var BookmarkingUI = { aExtraCSSClass); if (icon) { item.setAttribute("image", icon); + item.setAttribute("loadingprincipal", loadingPrincipal); } item._placesNode = node; fragment.appendChild(item); diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index 539d189..48f7991 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -189,6 +189,7 @@ #include "nsReferencedElement.h" #include "nsSandboxFlags.h" #include "nsScriptSecurityManager.h" +#include "nsSerializationHelper.h" #include "nsStreamUtils.h" #include "nsTextEditorState.h" #include "nsTextFragment.h" @@ -9870,3 +9871,33 @@ nsContentUtils::AttemptLargeAllocationLoad(nsIHttpChannel* aChannel) return reloadSucceeded; } + +/* static */ void +nsContentUtils::GetContentPolicyTypeForUIImageLoading(nsIContent* aLoadingNode, + nsIPrincipal** aLoadingPrincipal, + nsContentPolicyType& aContentPolicyType) +{ + // Use the serialized loadingPrincipal from the image element. Fall back + // to mContent's principal (SystemPrincipal) if not available. + aContentPolicyType = nsIContentPolicy::TYPE_INTERNAL_IMAGE; + nsCOMPtr<nsIPrincipal> loadingPrincipal = aLoadingNode->NodePrincipal(); + nsAutoString imageLoadingPrincipal; + aLoadingNode->GetAttr(kNameSpaceID_None, nsGkAtoms::loadingprincipal, + imageLoadingPrincipal); + if (!imageLoadingPrincipal.IsEmpty()) { + nsCOMPtr<nsISupports> serializedPrincipal; + NS_DeserializeObject(NS_ConvertUTF16toUTF8(imageLoadingPrincipal), + getter_AddRefs(serializedPrincipal)); + loadingPrincipal = do_QueryInterface(serializedPrincipal); + + if (loadingPrincipal) { + // Set the content policy type to TYPE_INTERNAL_IMAGE_FAVICON for + // indicating it's a favicon loading. + aContentPolicyType = nsIContentPolicy::TYPE_INTERNAL_IMAGE_FAVICON; + } else { + // Fallback if the deserialization is failed. + loadingPrincipal = aLoadingNode->NodePrincipal(); + } + } + loadingPrincipal.forget(aLoadingPrincipal); +} diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index e991fb7..3c7d9eb 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -2736,6 +2736,16 @@ public: static bool AttemptLargeAllocationLoad(nsIHttpChannel* aChannel); + /** + * Returns the content policy type that should be used for loading images + * for displaying in the UI. The sources of such images can be <xul:image>, + * <xul:menuitem> on OSX where we load the image through nsMenuItemIconX, etc. + */ + static void + GetContentPolicyTypeForUIImageLoading(nsIContent* aLoadingNode, + nsIPrincipal** aLoadingPrincipal, + nsContentPolicyType& aContentPolicyType); + private: static bool InitializeEventTable(); diff --git a/layout/xul/nsImageBoxFrame.cpp b/layout/xul/nsImageBoxFrame.cpp index fd7c7be..89b583c 100644 --- a/layout/xul/nsImageBoxFrame.cpp +++ b/layout/xul/nsImageBoxFrame.cpp @@ -48,7 +48,6 @@ #include "nsIContent.h" #include "nsContentUtils.h" -#include "nsSerializationHelper.h" #include "mozilla/BasicEvents.h" #include "mozilla/EventDispatcher.h" @@ -227,28 +226,11 @@ nsImageBoxFrame::UpdateImage() if (mUseSrcAttr) { nsIDocument* doc = mContent->GetComposedDoc(); if (doc) { - // Use the serialized loadingPrincipal from the image element. Fall back - // to mContent's principal (SystemPrincipal) if not available. - nsContentPolicyType contentPolicyType = nsIContentPolicy::TYPE_INTERNAL_IMAGE; - nsCOMPtr<nsIPrincipal> loadingPrincipal = mContent->NodePrincipal(); - nsAutoString imageLoadingPrincipal; - mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::loadingprincipal, - imageLoadingPrincipal); - if (!imageLoadingPrincipal.IsEmpty()) { - nsCOMPtr<nsISupports> serializedPrincipal; - NS_DeserializeObject(NS_ConvertUTF16toUTF8(imageLoadingPrincipal), - getter_AddRefs(serializedPrincipal)); - loadingPrincipal = do_QueryInterface(serializedPrincipal); - - if (loadingPrincipal) { - // Set the content policy type to TYPE_INTERNAL_IMAGE_FAVICON for - // indicating it's a favicon loading. - contentPolicyType = nsIContentPolicy::TYPE_INTERNAL_IMAGE_FAVICON; - } else { - // Fallback if the deserialization is failed. - loadingPrincipal = mContent->NodePrincipal(); - } - } + nsContentPolicyType contentPolicyType; + nsCOMPtr<nsIPrincipal> loadingPrincipal; + nsContentUtils::GetContentPolicyTypeForUIImageLoading(mContent, + getter_AddRefs(loadingPrincipal), + contentPolicyType); nsCOMPtr<nsIURI> baseURI = mContent->GetBaseURI(); nsCOMPtr<nsIURI> uri; diff --git a/widget/cocoa/nsMenuItemIconX.h b/widget/cocoa/nsMenuItemIconX.h index 7352a94..3bbe5d9 100644 --- a/widget/cocoa/nsMenuItemIconX.h +++ b/widget/cocoa/nsMenuItemIconX.h @@ -13,6 +13,7 @@ #include "mozilla/RefPtr.h" #include "nsCOMPtr.h" #include "imgINotificationObserver.h" +#include "nsIContentPolicy.h" class nsIURI; class nsIContent; @@ -55,6 +56,8 @@ protected: nsresult OnFrameComplete(imgIRequest* aRequest); nsCOMPtr<nsIContent> mContent; + nsCOMPtr<nsIPrincipal> mLoadingPrincipal; + nsContentPolicyType mContentType; RefPtr<imgRequestProxy> mIconRequest; nsMenuObjectX* mMenuObject; // [weak] nsIntRect mImageRegionRect; diff --git a/widget/cocoa/nsMenuItemIconX.mm b/widget/cocoa/nsMenuItemIconX.mm index 7589c27..261e63b 100644 --- a/widget/cocoa/nsMenuItemIconX.mm +++ b/widget/cocoa/nsMenuItemIconX.mm @@ -59,6 +59,8 @@ nsMenuItemIconX::nsMenuItemIconX(nsMenuObjectX* aMenuItem, nsIContent* aContent, NSMenuItem* aNativeMenuItem) : mContent(aContent) +, mLoadingPrincipal(aContent->NodePrincipal()) +, mContentType(nsIContentPolicy::TYPE_INTERNAL_IMAGE) , mMenuObject(aMenuItem) , mLoadedIcon(false) , mSetIcon(false) @@ -209,6 +211,10 @@ nsMenuItemIconX::GetIconURI(nsIURI** aIconURI) rv = primitiveValue->GetStringValue(imageURIString); if (NS_FAILED(rv)) return rv; + } else { + nsContentUtils::GetContentPolicyTypeForUIImageLoading(mContent, + getter_AddRefs(mLoadingPrincipal), + mContentType); } // Empty the mImageRegionRect initially as the image region CSS could @@ -310,10 +316,10 @@ nsMenuItemIconX::LoadIcon(nsIURI* aIconURI) } nsresult rv = loader->LoadImage(aIconURI, nullptr, nullptr, - mozilla::net::RP_Default, - nullptr, loadGroup, this, - nullptr, nullptr, nsIRequest::LOAD_NORMAL, nullptr, - nsIContentPolicy::TYPE_INTERNAL_IMAGE, EmptyString(), + mozilla::net::RP_Unset, + mLoadingPrincipal, loadGroup, this, + mContent, document, nsIRequest::LOAD_NORMAL, nullptr, + mContentType, EmptyString(), getter_AddRefs(mIconRequest)); if (NS_FAILED(rv)) return rv;

1 0

[tor-browser/tor-browser-52.1.0esr-7.0-2] Bug 22327: Isolate Page Info media previews to content first party
by gk＠torproject.org 31 May '17

31 May '17

commit af4e5af7cfa3cfd73ff53fd6ec1be4e97e43f630 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed May 10 17:10:23 2017 -0700 Bug 22327: Isolate Page Info media previews to content first party --- browser/base/content/pageinfo/pageInfo.js | 9 +++++ dom/base/nsContentUtils.cpp | 63 ++++++++++++++++++++++--------- dom/base/nsContentUtils.h | 7 ++++ dom/html/HTMLMediaElement.cpp | 2 + dom/media/MediaResource.cpp | 2 + 5 files changed, 66 insertions(+), 17 deletions(-) diff --git a/browser/base/content/pageinfo/pageInfo.js b/browser/base/content/pageinfo/pageInfo.js index 7a6d0a0..fc3e3bb 100644 --- a/browser/base/content/pageinfo/pageInfo.js +++ b/browser/base/content/pageinfo/pageInfo.js @@ -4,6 +4,11 @@ Components.utils.import("resource://gre/modules/LoadContextInfo.jsm"); Components.utils.import("resource://gre/modules/Services.jsm"); +Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); + +XPCOMUtils.defineLazyServiceGetter(this, "gSerializationHelper", + "@mozilla.org/network/serialization-helper;1", + "nsISerializationHelper"); // define a js object to implement nsITreeView function pageInfoTreeView(treeid, copycol) @@ -881,6 +886,8 @@ function makePreview(row) var newImage = new Image; newImage.id = "thepreviewimage"; + let loadingPrincipalString = gSerializationHelper.serializeToString(gDocInfo.principal); + newImage.setAttribute("loadingprincipal", loadingPrincipalString); var physWidth = 0, physHeight = 0; var width = 0, height = 0; @@ -928,6 +935,7 @@ function makePreview(row) else if (item.HTMLVideoElement && isProtocolAllowed) { newImage = document.createElementNS("http://www.w3.org/1999/xhtml", "video"); newImage.id = "thepreviewimage"; + newImage.setAttribute("loadingprincipal", loadingPrincipalString); newImage.src = url; newImage.controls = true; width = physWidth = item.videoWidth; @@ -939,6 +947,7 @@ function makePreview(row) else if (item.HTMLAudioElement && isProtocolAllowed) { newImage = new Audio; newImage.id = "thepreviewimage"; + newImage.setAttribute("loadingprincipal", loadingPrincipalString); newImage.src = url; newImage.controls = true; isAudio = true; diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index 48f7991..f932742 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -3367,6 +3367,15 @@ nsContentUtils::LoadImage(nsIURI* aURI, nsINode* aContext, NS_PRECONDITION(aLoadingPrincipal, "Must have a principal"); NS_PRECONDITION(aRequest, "Null out param"); + // If the image is in a chrome document and the image node has been assigned a + // "loadingprincipal" attribute, we should use that principal instead. + if (IsSystemPrincipal(aLoadingPrincipal) && aContext->IsContent()) { + nsContentPolicyType contentPolicyType; + GetContentPolicyTypeForUIImageLoading(aContext->AsContent(), + &aLoadingPrincipal, contentPolicyType); + aContentPolicyType = (int32_t) contentPolicyType; + } + imgLoader* imgLoader = GetImgLoaderForDocument(aLoadingDocument); if (!imgLoader) { // nothing we can do here @@ -9879,25 +9888,45 @@ nsContentUtils::GetContentPolicyTypeForUIImageLoading(nsIContent* aLoadingNode, { // Use the serialized loadingPrincipal from the image element. Fall back // to mContent's principal (SystemPrincipal) if not available. - aContentPolicyType = nsIContentPolicy::TYPE_INTERNAL_IMAGE; nsCOMPtr<nsIPrincipal> loadingPrincipal = aLoadingNode->NodePrincipal(); - nsAutoString imageLoadingPrincipal; - aLoadingNode->GetAttr(kNameSpaceID_None, nsGkAtoms::loadingprincipal, - imageLoadingPrincipal); - if (!imageLoadingPrincipal.IsEmpty()) { - nsCOMPtr<nsISupports> serializedPrincipal; - NS_DeserializeObject(NS_ConvertUTF16toUTF8(imageLoadingPrincipal), - getter_AddRefs(serializedPrincipal)); - loadingPrincipal = do_QueryInterface(serializedPrincipal); - - if (loadingPrincipal) { - // Set the content policy type to TYPE_INTERNAL_IMAGE_FAVICON for - // indicating it's a favicon loading. - aContentPolicyType = nsIContentPolicy::TYPE_INTERNAL_IMAGE_FAVICON; - } else { - // Fallback if the deserialization is failed. - loadingPrincipal = aLoadingNode->NodePrincipal(); + if (IsSystemPrincipal(loadingPrincipal)) { + aContentPolicyType = nsIContentPolicy::TYPE_INTERNAL_IMAGE; + nsAutoString imageLoadingPrincipal; + aLoadingNode->GetAttr(kNameSpaceID_None, nsGkAtoms::loadingprincipal, + imageLoadingPrincipal); + if (!imageLoadingPrincipal.IsEmpty()) { + nsCOMPtr<nsISupports> serializedPrincipal; + NS_DeserializeObject(NS_ConvertUTF16toUTF8(imageLoadingPrincipal), + getter_AddRefs(serializedPrincipal)); + loadingPrincipal = do_QueryInterface(serializedPrincipal); + + if (loadingPrincipal) { + // Set the content policy type to TYPE_INTERNAL_IMAGE_FAVICON for + // indicating it's a favicon loading. + aContentPolicyType = nsIContentPolicy::TYPE_INTERNAL_IMAGE_FAVICON; + } else { + // Fallback if the deserialization is failed. + loadingPrincipal = aLoadingNode->NodePrincipal(); + } } } loadingPrincipal.forget(aLoadingPrincipal); } + +/* static */ void +nsContentUtils::ApplyCustomLoadPrincipalToChannel(Element* aElement, nsIChannel* aChannel) +{ + nsCOMPtr<nsIPrincipal> loadingPrincipal = aElement->NodePrincipal(); + if (loadingPrincipal && nsContentUtils::IsSystemPrincipal(loadingPrincipal)) { + nsContentPolicyType dummyContentPolicyType; + nsContentUtils::GetContentPolicyTypeForUIImageLoading( + aElement, getter_AddRefs(loadingPrincipal), dummyContentPolicyType); + NeckoOriginAttributes neckoAttrs; + neckoAttrs.InheritFromDocToNecko( + BasePrincipal::Cast(loadingPrincipal)->OriginAttributesRef()); + nsCOMPtr<nsILoadInfo> loadInfo = aChannel->GetLoadInfo(); + if (loadInfo) { + Unused << loadInfo->SetOriginAttributes(neckoAttrs); + } + } +} diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index 3c7d9eb..08c5cbf 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -2746,6 +2746,13 @@ public: nsIPrincipal** aLoadingPrincipal, nsContentPolicyType& aContentPolicyType); + /** + * If aElement has a "loadprincipal" attribute, apply the origin attributes + * to the loadInfo belonging to aChannel. + */ + static void + ApplyCustomLoadPrincipalToChannel(Element* aElement, nsIChannel* aChannel); + private: static bool InitializeEventTable(); diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp index 2f4f73f..37deffc 100644 --- a/dom/html/HTMLMediaElement.cpp +++ b/dom/html/HTMLMediaElement.cpp @@ -586,6 +586,8 @@ public: return; } + nsContentUtils::ApplyCustomLoadPrincipalToChannel(aElement, channel); + // The listener holds a strong reference to us. This creates a // reference cycle, once we've set mChannel, which is manually broken // in the listener's OnStartRequest method after it is finished with diff --git a/dom/media/MediaResource.cpp b/dom/media/MediaResource.cpp index d36783b..a8f600f 100644 --- a/dom/media/MediaResource.cpp +++ b/dom/media/MediaResource.cpp @@ -833,6 +833,8 @@ ChannelMediaResource::RecreateChannel() loadFlags); NS_ENSURE_SUCCESS(rv, rv); + nsContentUtils::ApplyCustomLoadPrincipalToChannel(element, mChannel); + // We have cached the Content-Type, which should not change. Give a hint to // the channel to avoid a sniffing failure, which would be expected because we // are probably seeking in the middle of the bitstream, and sniffing relies

1 0

[tor-browser/tor-browser-52.1.1esr-7.0-1] Bug 1319908 - Load the menu icons for the bookmarks menu with the correct content type and principal on OSX; r=baku
by gk＠torproject.org 31 May '17

31 May '17

commit 24862c15f6f719cd05a42d784ed7a7b7bb05c567 Author: Ehsan Akhgari <ehsan(a)mozilla.com> Date: Wed Dec 14 15:52:57 2016 -0500 Bug 1319908 - Load the menu icons for the bookmarks menu with the correct content type and principal on OSX; r=baku This patch makes nsMenuItemIconX also participate in the setup introduced in bug 1277803. --- browser/base/content/browser-places.js | 5 +++++ dom/base/nsContentUtils.cpp | 31 +++++++++++++++++++++++++++++++ dom/base/nsContentUtils.h | 10 ++++++++++ layout/xul/nsImageBoxFrame.cpp | 28 +++++----------------------- widget/cocoa/nsMenuItemIconX.h | 3 +++ widget/cocoa/nsMenuItemIconX.mm | 14 ++++++++++---- 6 files changed, 64 insertions(+), 27 deletions(-) diff --git a/browser/base/content/browser-places.js b/browser/base/content/browser-places.js index 14e90cd..3998b5b 100644 --- a/browser/base/content/browser-places.js +++ b/browser/base/content/browser-places.js @@ -1509,6 +1509,10 @@ var BookmarkingUI = { options.maxResults = kMaxResults; let query = PlacesUtils.history.getNewQuery(); + let sh = Cc["@mozilla.org/network/serialization-helper;1"] + .getService(Ci.nsISerializationHelper); + let loadingPrincipal = sh.serializeToString(document.nodePrincipal); + let fragment = document.createDocumentFragment(); let root = PlacesUtils.history.executeQuery(query, options).root; root.containerOpen = true; @@ -1528,6 +1532,7 @@ var BookmarkingUI = { aExtraCSSClass); if (icon) { item.setAttribute("image", icon); + item.setAttribute("loadingprincipal", loadingPrincipal); } item._placesNode = node; fragment.appendChild(item); diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index 539d189..48f7991 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -189,6 +189,7 @@ #include "nsReferencedElement.h" #include "nsSandboxFlags.h" #include "nsScriptSecurityManager.h" +#include "nsSerializationHelper.h" #include "nsStreamUtils.h" #include "nsTextEditorState.h" #include "nsTextFragment.h" @@ -9870,3 +9871,33 @@ nsContentUtils::AttemptLargeAllocationLoad(nsIHttpChannel* aChannel) return reloadSucceeded; } + +/* static */ void +nsContentUtils::GetContentPolicyTypeForUIImageLoading(nsIContent* aLoadingNode, + nsIPrincipal** aLoadingPrincipal, + nsContentPolicyType& aContentPolicyType) +{ + // Use the serialized loadingPrincipal from the image element. Fall back + // to mContent's principal (SystemPrincipal) if not available. + aContentPolicyType = nsIContentPolicy::TYPE_INTERNAL_IMAGE; + nsCOMPtr<nsIPrincipal> loadingPrincipal = aLoadingNode->NodePrincipal(); + nsAutoString imageLoadingPrincipal; + aLoadingNode->GetAttr(kNameSpaceID_None, nsGkAtoms::loadingprincipal, + imageLoadingPrincipal); + if (!imageLoadingPrincipal.IsEmpty()) { + nsCOMPtr<nsISupports> serializedPrincipal; + NS_DeserializeObject(NS_ConvertUTF16toUTF8(imageLoadingPrincipal), + getter_AddRefs(serializedPrincipal)); + loadingPrincipal = do_QueryInterface(serializedPrincipal); + + if (loadingPrincipal) { + // Set the content policy type to TYPE_INTERNAL_IMAGE_FAVICON for + // indicating it's a favicon loading. + aContentPolicyType = nsIContentPolicy::TYPE_INTERNAL_IMAGE_FAVICON; + } else { + // Fallback if the deserialization is failed. + loadingPrincipal = aLoadingNode->NodePrincipal(); + } + } + loadingPrincipal.forget(aLoadingPrincipal); +} diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index e991fb7..3c7d9eb 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -2736,6 +2736,16 @@ public: static bool AttemptLargeAllocationLoad(nsIHttpChannel* aChannel); + /** + * Returns the content policy type that should be used for loading images + * for displaying in the UI. The sources of such images can be <xul:image>, + * <xul:menuitem> on OSX where we load the image through nsMenuItemIconX, etc. + */ + static void + GetContentPolicyTypeForUIImageLoading(nsIContent* aLoadingNode, + nsIPrincipal** aLoadingPrincipal, + nsContentPolicyType& aContentPolicyType); + private: static bool InitializeEventTable(); diff --git a/layout/xul/nsImageBoxFrame.cpp b/layout/xul/nsImageBoxFrame.cpp index fd7c7be..89b583c 100644 --- a/layout/xul/nsImageBoxFrame.cpp +++ b/layout/xul/nsImageBoxFrame.cpp @@ -48,7 +48,6 @@ #include "nsIContent.h" #include "nsContentUtils.h" -#include "nsSerializationHelper.h" #include "mozilla/BasicEvents.h" #include "mozilla/EventDispatcher.h" @@ -227,28 +226,11 @@ nsImageBoxFrame::UpdateImage() if (mUseSrcAttr) { nsIDocument* doc = mContent->GetComposedDoc(); if (doc) { - // Use the serialized loadingPrincipal from the image element. Fall back - // to mContent's principal (SystemPrincipal) if not available. - nsContentPolicyType contentPolicyType = nsIContentPolicy::TYPE_INTERNAL_IMAGE; - nsCOMPtr<nsIPrincipal> loadingPrincipal = mContent->NodePrincipal(); - nsAutoString imageLoadingPrincipal; - mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::loadingprincipal, - imageLoadingPrincipal); - if (!imageLoadingPrincipal.IsEmpty()) { - nsCOMPtr<nsISupports> serializedPrincipal; - NS_DeserializeObject(NS_ConvertUTF16toUTF8(imageLoadingPrincipal), - getter_AddRefs(serializedPrincipal)); - loadingPrincipal = do_QueryInterface(serializedPrincipal); - - if (loadingPrincipal) { - // Set the content policy type to TYPE_INTERNAL_IMAGE_FAVICON for - // indicating it's a favicon loading. - contentPolicyType = nsIContentPolicy::TYPE_INTERNAL_IMAGE_FAVICON; - } else { - // Fallback if the deserialization is failed. - loadingPrincipal = mContent->NodePrincipal(); - } - } + nsContentPolicyType contentPolicyType; + nsCOMPtr<nsIPrincipal> loadingPrincipal; + nsContentUtils::GetContentPolicyTypeForUIImageLoading(mContent, + getter_AddRefs(loadingPrincipal), + contentPolicyType); nsCOMPtr<nsIURI> baseURI = mContent->GetBaseURI(); nsCOMPtr<nsIURI> uri; diff --git a/widget/cocoa/nsMenuItemIconX.h b/widget/cocoa/nsMenuItemIconX.h index 7352a94..3bbe5d9 100644 --- a/widget/cocoa/nsMenuItemIconX.h +++ b/widget/cocoa/nsMenuItemIconX.h @@ -13,6 +13,7 @@ #include "mozilla/RefPtr.h" #include "nsCOMPtr.h" #include "imgINotificationObserver.h" +#include "nsIContentPolicy.h" class nsIURI; class nsIContent; @@ -55,6 +56,8 @@ protected: nsresult OnFrameComplete(imgIRequest* aRequest); nsCOMPtr<nsIContent> mContent; + nsCOMPtr<nsIPrincipal> mLoadingPrincipal; + nsContentPolicyType mContentType; RefPtr<imgRequestProxy> mIconRequest; nsMenuObjectX* mMenuObject; // [weak] nsIntRect mImageRegionRect; diff --git a/widget/cocoa/nsMenuItemIconX.mm b/widget/cocoa/nsMenuItemIconX.mm index 7589c27..261e63b 100644 --- a/widget/cocoa/nsMenuItemIconX.mm +++ b/widget/cocoa/nsMenuItemIconX.mm @@ -59,6 +59,8 @@ nsMenuItemIconX::nsMenuItemIconX(nsMenuObjectX* aMenuItem, nsIContent* aContent, NSMenuItem* aNativeMenuItem) : mContent(aContent) +, mLoadingPrincipal(aContent->NodePrincipal()) +, mContentType(nsIContentPolicy::TYPE_INTERNAL_IMAGE) , mMenuObject(aMenuItem) , mLoadedIcon(false) , mSetIcon(false) @@ -209,6 +211,10 @@ nsMenuItemIconX::GetIconURI(nsIURI** aIconURI) rv = primitiveValue->GetStringValue(imageURIString); if (NS_FAILED(rv)) return rv; + } else { + nsContentUtils::GetContentPolicyTypeForUIImageLoading(mContent, + getter_AddRefs(mLoadingPrincipal), + mContentType); } // Empty the mImageRegionRect initially as the image region CSS could @@ -310,10 +316,10 @@ nsMenuItemIconX::LoadIcon(nsIURI* aIconURI) } nsresult rv = loader->LoadImage(aIconURI, nullptr, nullptr, - mozilla::net::RP_Default, - nullptr, loadGroup, this, - nullptr, nullptr, nsIRequest::LOAD_NORMAL, nullptr, - nsIContentPolicy::TYPE_INTERNAL_IMAGE, EmptyString(), + mozilla::net::RP_Unset, + mLoadingPrincipal, loadGroup, this, + mContent, document, nsIRequest::LOAD_NORMAL, nullptr, + mContentType, EmptyString(), getter_AddRefs(mIconRequest)); if (NS_FAILED(rv)) return rv;

1 0

[tor-browser/tor-browser-52.1.1esr-7.0-1] Bug 22327: Isolate Page Info media previews to content first party
by gk＠torproject.org 31 May '17

31 May '17

commit 2d4d11e1e6bad5f384c409fa0391e97a9c202439 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed May 10 17:10:23 2017 -0700 Bug 22327: Isolate Page Info media previews to content first party --- browser/base/content/pageinfo/pageInfo.js | 9 +++++ dom/base/nsContentUtils.cpp | 63 ++++++++++++++++++++++--------- dom/base/nsContentUtils.h | 7 ++++ dom/html/HTMLMediaElement.cpp | 2 + dom/media/MediaResource.cpp | 2 + 5 files changed, 66 insertions(+), 17 deletions(-) diff --git a/browser/base/content/pageinfo/pageInfo.js b/browser/base/content/pageinfo/pageInfo.js index 7a6d0a0..fc3e3bb 100644 --- a/browser/base/content/pageinfo/pageInfo.js +++ b/browser/base/content/pageinfo/pageInfo.js @@ -4,6 +4,11 @@ Components.utils.import("resource://gre/modules/LoadContextInfo.jsm"); Components.utils.import("resource://gre/modules/Services.jsm"); +Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); + +XPCOMUtils.defineLazyServiceGetter(this, "gSerializationHelper", + "@mozilla.org/network/serialization-helper;1", + "nsISerializationHelper"); // define a js object to implement nsITreeView function pageInfoTreeView(treeid, copycol) @@ -881,6 +886,8 @@ function makePreview(row) var newImage = new Image; newImage.id = "thepreviewimage"; + let loadingPrincipalString = gSerializationHelper.serializeToString(gDocInfo.principal); + newImage.setAttribute("loadingprincipal", loadingPrincipalString); var physWidth = 0, physHeight = 0; var width = 0, height = 0; @@ -928,6 +935,7 @@ function makePreview(row) else if (item.HTMLVideoElement && isProtocolAllowed) { newImage = document.createElementNS("http://www.w3.org/1999/xhtml", "video"); newImage.id = "thepreviewimage"; + newImage.setAttribute("loadingprincipal", loadingPrincipalString); newImage.src = url; newImage.controls = true; width = physWidth = item.videoWidth; @@ -939,6 +947,7 @@ function makePreview(row) else if (item.HTMLAudioElement && isProtocolAllowed) { newImage = new Audio; newImage.id = "thepreviewimage"; + newImage.setAttribute("loadingprincipal", loadingPrincipalString); newImage.src = url; newImage.controls = true; isAudio = true; diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index 48f7991..f932742 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -3367,6 +3367,15 @@ nsContentUtils::LoadImage(nsIURI* aURI, nsINode* aContext, NS_PRECONDITION(aLoadingPrincipal, "Must have a principal"); NS_PRECONDITION(aRequest, "Null out param"); + // If the image is in a chrome document and the image node has been assigned a + // "loadingprincipal" attribute, we should use that principal instead. + if (IsSystemPrincipal(aLoadingPrincipal) && aContext->IsContent()) { + nsContentPolicyType contentPolicyType; + GetContentPolicyTypeForUIImageLoading(aContext->AsContent(), + &aLoadingPrincipal, contentPolicyType); + aContentPolicyType = (int32_t) contentPolicyType; + } + imgLoader* imgLoader = GetImgLoaderForDocument(aLoadingDocument); if (!imgLoader) { // nothing we can do here @@ -9879,25 +9888,45 @@ nsContentUtils::GetContentPolicyTypeForUIImageLoading(nsIContent* aLoadingNode, { // Use the serialized loadingPrincipal from the image element. Fall back // to mContent's principal (SystemPrincipal) if not available. - aContentPolicyType = nsIContentPolicy::TYPE_INTERNAL_IMAGE; nsCOMPtr<nsIPrincipal> loadingPrincipal = aLoadingNode->NodePrincipal(); - nsAutoString imageLoadingPrincipal; - aLoadingNode->GetAttr(kNameSpaceID_None, nsGkAtoms::loadingprincipal, - imageLoadingPrincipal); - if (!imageLoadingPrincipal.IsEmpty()) { - nsCOMPtr<nsISupports> serializedPrincipal; - NS_DeserializeObject(NS_ConvertUTF16toUTF8(imageLoadingPrincipal), - getter_AddRefs(serializedPrincipal)); - loadingPrincipal = do_QueryInterface(serializedPrincipal); - - if (loadingPrincipal) { - // Set the content policy type to TYPE_INTERNAL_IMAGE_FAVICON for - // indicating it's a favicon loading. - aContentPolicyType = nsIContentPolicy::TYPE_INTERNAL_IMAGE_FAVICON; - } else { - // Fallback if the deserialization is failed. - loadingPrincipal = aLoadingNode->NodePrincipal(); + if (IsSystemPrincipal(loadingPrincipal)) { + aContentPolicyType = nsIContentPolicy::TYPE_INTERNAL_IMAGE; + nsAutoString imageLoadingPrincipal; + aLoadingNode->GetAttr(kNameSpaceID_None, nsGkAtoms::loadingprincipal, + imageLoadingPrincipal); + if (!imageLoadingPrincipal.IsEmpty()) { + nsCOMPtr<nsISupports> serializedPrincipal; + NS_DeserializeObject(NS_ConvertUTF16toUTF8(imageLoadingPrincipal), + getter_AddRefs(serializedPrincipal)); + loadingPrincipal = do_QueryInterface(serializedPrincipal); + + if (loadingPrincipal) { + // Set the content policy type to TYPE_INTERNAL_IMAGE_FAVICON for + // indicating it's a favicon loading. + aContentPolicyType = nsIContentPolicy::TYPE_INTERNAL_IMAGE_FAVICON; + } else { + // Fallback if the deserialization is failed. + loadingPrincipal = aLoadingNode->NodePrincipal(); + } } } loadingPrincipal.forget(aLoadingPrincipal); } + +/* static */ void +nsContentUtils::ApplyCustomLoadPrincipalToChannel(Element* aElement, nsIChannel* aChannel) +{ + nsCOMPtr<nsIPrincipal> loadingPrincipal = aElement->NodePrincipal(); + if (loadingPrincipal && nsContentUtils::IsSystemPrincipal(loadingPrincipal)) { + nsContentPolicyType dummyContentPolicyType; + nsContentUtils::GetContentPolicyTypeForUIImageLoading( + aElement, getter_AddRefs(loadingPrincipal), dummyContentPolicyType); + NeckoOriginAttributes neckoAttrs; + neckoAttrs.InheritFromDocToNecko( + BasePrincipal::Cast(loadingPrincipal)->OriginAttributesRef()); + nsCOMPtr<nsILoadInfo> loadInfo = aChannel->GetLoadInfo(); + if (loadInfo) { + Unused << loadInfo->SetOriginAttributes(neckoAttrs); + } + } +} diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index 3c7d9eb..08c5cbf 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -2746,6 +2746,13 @@ public: nsIPrincipal** aLoadingPrincipal, nsContentPolicyType& aContentPolicyType); + /** + * If aElement has a "loadprincipal" attribute, apply the origin attributes + * to the loadInfo belonging to aChannel. + */ + static void + ApplyCustomLoadPrincipalToChannel(Element* aElement, nsIChannel* aChannel); + private: static bool InitializeEventTable(); diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp index 2f4f73f..37deffc 100644 --- a/dom/html/HTMLMediaElement.cpp +++ b/dom/html/HTMLMediaElement.cpp @@ -586,6 +586,8 @@ public: return; } + nsContentUtils::ApplyCustomLoadPrincipalToChannel(aElement, channel); + // The listener holds a strong reference to us. This creates a // reference cycle, once we've set mChannel, which is manually broken // in the listener's OnStartRequest method after it is finished with diff --git a/dom/media/MediaResource.cpp b/dom/media/MediaResource.cpp index d36783b..a8f600f 100644 --- a/dom/media/MediaResource.cpp +++ b/dom/media/MediaResource.cpp @@ -833,6 +833,8 @@ ChannelMediaResource::RecreateChannel() loadFlags); NS_ENSURE_SUCCESS(rv, rv); + nsContentUtils::ApplyCustomLoadPrincipalToChannel(element, mChannel); + // We have cached the Content-Type, which should not change. Give a hint to // the channel to avoid a sniffing failure, which would be expected because we // are probably seeking in the middle of the bitstream, and sniffing relies

1 0

[tor/master] Fix GCC 7 -Wimplicit-fallthrough warnings (32 bit)
by nickm＠torproject.org 31 May '17

31 May '17

commit 1763aa058b08a1c594b378ba2314fc5c6eaadb34 Author: Andreas Stieger <astieger(a)suse.com> Date: Wed May 31 11:54:11 2017 +0200 Fix GCC 7 -Wimplicit-fallthrough warnings (32 bit) Add magic comments recognized by default -Wimplicit-fallthrough=3 Follow-up to e5f464, fixes Ticket 22446 for 32 bit. --- src/ext/ed25519/donna/modm-donna-32bit.h | 48 ++++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/ext/ed25519/donna/modm-donna-32bit.h b/src/ext/ed25519/donna/modm-donna-32bit.h index 5f36df6..0ef9e58 100644 --- a/src/ext/ed25519/donna/modm-donna-32bit.h +++ b/src/ext/ed25519/donna/modm-donna-32bit.h @@ -385,14 +385,14 @@ sub256_modm_batch(bignum256modm out, const bignum256modm a, const bignum256modm size_t i = 0; bignum256modm_element_t carry = 0; switch (limbsize) { - case 8: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; - case 7: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; - case 6: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; - case 5: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; - case 4: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; - case 3: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; - case 2: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; - case 1: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; + case 8: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; /* Falls through. */ + case 7: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; /* Falls through. */ + case 6: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; /* Falls through. */ + case 5: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; /* Falls through. */ + case 4: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; /* Falls through. */ + case 3: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; /* Falls through. */ + case 2: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; /* Falls through. */ + case 1: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; /* Falls through. */ case 0: default: out[i] = (a[i] - b[i]) - carry; } @@ -403,14 +403,14 @@ sub256_modm_batch(bignum256modm out, const bignum256modm a, const bignum256modm static int lt256_modm_batch(const bignum256modm a, const bignum256modm b, size_t limbsize) { switch (limbsize) { - case 8: if (a[8] > b[8]) return 0; if (a[8] < b[8]) return 1; - case 7: if (a[7] > b[7]) return 0; if (a[7] < b[7]) return 1; - case 6: if (a[6] > b[6]) return 0; if (a[6] < b[6]) return 1; - case 5: if (a[5] > b[5]) return 0; if (a[5] < b[5]) return 1; - case 4: if (a[4] > b[4]) return 0; if (a[4] < b[4]) return 1; - case 3: if (a[3] > b[3]) return 0; if (a[3] < b[3]) return 1; - case 2: if (a[2] > b[2]) return 0; if (a[2] < b[2]) return 1; - case 1: if (a[1] > b[1]) return 0; if (a[1] < b[1]) return 1; + case 8: if (a[8] > b[8]) return 0; if (a[8] < b[8]) return 1; /* Falls through. */ + case 7: if (a[7] > b[7]) return 0; if (a[7] < b[7]) return 1; /* Falls through. */ + case 6: if (a[6] > b[6]) return 0; if (a[6] < b[6]) return 1; /* Falls through. */ + case 5: if (a[5] > b[5]) return 0; if (a[5] < b[5]) return 1; /* Falls through. */ + case 4: if (a[4] > b[4]) return 0; if (a[4] < b[4]) return 1; /* Falls through. */ + case 3: if (a[3] > b[3]) return 0; if (a[3] < b[3]) return 1; /* Falls through. */ + case 2: if (a[2] > b[2]) return 0; if (a[2] < b[2]) return 1; /* Falls through. */ + case 1: if (a[1] > b[1]) return 0; if (a[1] < b[1]) return 1; /* Falls through. */ case 0: if (a[0] > b[0]) return 0; if (a[0] < b[0]) return 1; } return 0; @@ -420,14 +420,14 @@ lt256_modm_batch(const bignum256modm a, const bignum256modm b, size_t limbsize) static int lte256_modm_batch(const bignum256modm a, const bignum256modm b, size_t limbsize) { switch (limbsize) { - case 8: if (a[8] > b[8]) return 0; if (a[8] < b[8]) return 1; - case 7: if (a[7] > b[7]) return 0; if (a[7] < b[7]) return 1; - case 6: if (a[6] > b[6]) return 0; if (a[6] < b[6]) return 1; - case 5: if (a[5] > b[5]) return 0; if (a[5] < b[5]) return 1; - case 4: if (a[4] > b[4]) return 0; if (a[4] < b[4]) return 1; - case 3: if (a[3] > b[3]) return 0; if (a[3] < b[3]) return 1; - case 2: if (a[2] > b[2]) return 0; if (a[2] < b[2]) return 1; - case 1: if (a[1] > b[1]) return 0; if (a[1] < b[1]) return 1; + case 8: if (a[8] > b[8]) return 0; if (a[8] < b[8]) return 1; /* Falls through. */ + case 7: if (a[7] > b[7]) return 0; if (a[7] < b[7]) return 1; /* Falls through. */ + case 6: if (a[6] > b[6]) return 0; if (a[6] < b[6]) return 1; /* Falls through. */ + case 5: if (a[5] > b[5]) return 0; if (a[5] < b[5]) return 1; /* Falls through. */ + case 4: if (a[4] > b[4]) return 0; if (a[4] < b[4]) return 1; /* Falls through. */ + case 3: if (a[3] > b[3]) return 0; if (a[3] < b[3]) return 1; /* Falls through. */ + case 2: if (a[2] > b[2]) return 0; if (a[2] < b[2]) return 1; /* Falls through. */ + case 1: if (a[1] > b[1]) return 0; if (a[1] < b[1]) return 1; /* Falls through. */ case 0: if (a[0] > b[0]) return 0; if (a[0] < b[0]) return 1; } return 1;

1 0

[support-portal/master] Push 3 answers to misc.txt
by colin＠torproject.org 31 May '17

31 May '17

commit 4c4189ffe0eb14654f196410158cf0917b5ac02f Author: Colin Childs <colin(a)torproject.org> Date: Tue May 30 22:26:38 2017 -0500 Push 3 answers to misc.txt --- plain/misc.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plain/misc.txt b/plain/misc.txt index 38e35c3..26e0bf2 100644 --- a/plain/misc.txt +++ b/plain/misc.txt @@ -49,10 +49,10 @@ Q. How do I report something wrong on the website? A. Q. I'm having a problem updating/using Vidalia. -A. +A. Vidalia is no longer maintained or supported. A large portion of the features Vidalia offered have now been integrated into the Tor Browser itself. Q. Why can't I use Vidalia anymore? -A. +A. Vidalia is no longer maintained or supported. A large portion of the features Vidalia offered have now been integrated into the Tor Browser itself. Q. What is a .onion? A. @@ -76,5 +76,7 @@ Q. Do any VoIP applications work with Tor? A. Q. Can I change the number of hops Tor uses? -A. +A. Right now the path length is hard-coded at 3 plus the number of nodes in your path that are sensitive. That is, in normal cases it's 3, but for example if you're accessing an onion service or a ".exit" address it could be 4. + +We don't want to encourage people to use paths longer than this as it increases load on the network without (as far as we can tell) providing any more security. Also, using paths longer than 3 could harm anonymity, first because it makes "denial of security"[http://freehaven.net/anonbib/#ccs07-doa] attacks easier, and second because it could act as an identifier if only a small number of users have the same path length as you.

1 0

[support-portal/master] Push two answers to torbrowserfaq.txt
by colin＠torproject.org 31 May '17

31 May '17

commit 068bfab663b8e273737f9a4069ee354184472047 Author: Colin Childs <colin(a)torproject.org> Date: Tue May 30 22:19:38 2017 -0500 Push two answers to torbrowserfaq.txt --- plain/torbrowserfaq.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plain/torbrowserfaq.txt b/plain/torbrowserfaq.txt index a90284c..09fda58 100644 --- a/plain/torbrowserfaq.txt +++ b/plain/torbrowserfaq.txt @@ -124,12 +124,6 @@ A. Please see the NoScript FAQ at https://noscript.net/faq. If you believe this Q. I'm having a problem with HTTPSEverywhere A. Please see the HTTPS-Everywhere FAQ at https://www.eff.org/https-everywhere/faq. If you believe this is a Tor Browser issue, please let us know at <tk>.. -Q. Why should I use Tor Browser? Why can't I use Tor + Firefox or Tor + Chrome? -A. - -Q. Can you get rid of all the captchas? -A. - Q. I can download Tor Browser but when I launch it, the connection fails. A. @@ -196,3 +190,9 @@ Until we get there, feel free to leave JavaScript on or off depending on your se Q. Will my network admin be able to tell im using the Tor Browser? A. + +Q. Can you get rid of all the captchas? +A. Unfortunately, we are not able to remove CAPTCHAs from websites. The best thing to do in these cases is to contact the website owners, and inform them that their CAPTCHAs are preventing users such as yourself from using their services. + +Q. Why should I use Tor Browser? Why can't I use Tor + Firefox or Tor + Chrome? +A. Tor does not protect all of your computer's Internet traffic when you run it. Tor only protects your applications that are properly configured to send their Internet traffic through Tor. To avoid problems with Tor configuration, we strongly recommend you use the Tor Browser. It is pre-configured to protect your privacy and anonymity on the web as long as you're browsing with Tor Browser itself. Almost any other web browser configuration is likely to be unsafe to use with Tor.

1 0

[tor/master] take some of the suggestions from cypherpunks on #6892
by arma＠torproject.org 30 May '17

30 May '17

commit c36145899879265e588a4eb76be5abb50e34075f Author: Roger Dingledine <arma(a)torproject.org> Date: Tue May 30 14:17:49 2017 -0400 take some of the suggestions from cypherpunks on #6892 --- doc/torify.1.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/doc/torify.1.txt b/doc/torify.1.txt index 614e3f6..7e49081 100644 --- a/doc/torify.1.txt +++ b/doc/torify.1.txt @@ -17,12 +17,10 @@ SYNOPSIS DESCRIPTION ----------- -**torify** is a simple wrapper that -calls torsocks with a tor-specific +**torify** is a simple wrapper that calls torsocks with a tor-specific configuration file. -It is provided for backward compatibility; probably instead you should -just use torsocks. +It is provided for backward compatibility; instead you should use torsocks. WARNING -------

1 0