September 2015 - tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Update keys for mikeperry.
by gk＠torproject.org 18 Sep '15

18 Sep '15

commit b85282d99813e05a2a1a2883c12301aeaff85044 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Sep 17 16:12:08 2015 -0700 Update keys for mikeperry. --- gitian/gpg/mikeperry.gpg | Bin 15716 -> 21696 bytes gitian/gpg/torbrowser.gpg | Bin 18844 -> 18952 bytes gitian/gpg/torbutton.gpg | Bin 49582 -> 55562 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/mikeperry.gpg b/gitian/gpg/mikeperry.gpg index 7f14ee3..8615796 100644 Binary files a/gitian/gpg/mikeperry.gpg and b/gitian/gpg/mikeperry.gpg differ diff --git a/gitian/gpg/torbrowser.gpg b/gitian/gpg/torbrowser.gpg index dc44e33..d1033d4 100644 Binary files a/gitian/gpg/torbrowser.gpg and b/gitian/gpg/torbrowser.gpg differ diff --git a/gitian/gpg/torbutton.gpg b/gitian/gpg/torbutton.gpg index b60a95e..e4a03dd 100644 Binary files a/gitian/gpg/torbutton.gpg and b/gitian/gpg/torbutton.gpg differ

1 0

[tor-browser/tor-browser-38.3.0esr-5.0-2] fixup! Bug #13670.1: Isolate favicon requests by first party
by gk＠torproject.org 18 Sep '15

18 Sep '15

commit c15e86cd0f082d63d37fddff1efc35a428cb8eca Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Sep 9 06:06:43 2015 -0700 fixup! Bug #13670.1: Isolate favicon requests by first party --- browser/base/content/tabbrowser.xml | 3 ++- dom/base/ThirdPartyUtil.cpp | 26 ++++++++++++++++---------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml index 49d4207..6033b71 100644 --- a/browser/base/content/tabbrowser.xml +++ b/browser/base/content/tabbrowser.xml @@ -5042,7 +5042,7 @@ class="tab-throbber" role="presentation" layer="true" /> - <xul:image xbl:inherits="src=image,fadein,pinned,selected,busy,crashed,firstparty" + <xul:image xbl:inherits="src=image,fadein,pinned,selected,busy,crashed" anonid="tab-icon-image" class="tab-icon-image" validate="never" @@ -5292,6 +5292,7 @@ aMenuitem.setAttribute("busy", aTab.getAttribute("busy")); aMenuitem.removeAttribute("image"); } else { + aMenuitem.setAttribute("firstparty", aTab.getAttribute("firstparty")); aMenuitem.setAttribute("image", aTab.getAttribute("image")); aMenuitem.removeAttribute("busy"); } diff --git a/dom/base/ThirdPartyUtil.cpp b/dom/base/ThirdPartyUtil.cpp index 5cffc71..618d55b 100644 --- a/dom/base/ThirdPartyUtil.cpp +++ b/dom/base/ThirdPartyUtil.cpp @@ -594,16 +594,22 @@ ThirdPartyUtil::GetFirstPartyURIInternal(nsIChannel *aChannel, // to a particular web site should be assigned that site's first party. if (aNode && aNode->IsElement() && aNode->OwnerDoc() && nsContentUtils::IsChromeDoc(aNode->OwnerDoc())) { - nsString firstparty; - aNode->AsElement()->GetAttribute(NS_LITERAL_STRING("firstparty"), firstparty); - if (!firstparty.IsEmpty()) { - nsCOMPtr<nsIURI> tempURI; - rv = NS_NewURI(getter_AddRefs(tempURI), firstparty); - if (rv != NS_OK) { - return rv; - } else { - NS_ADDREF(*aOutput = tempURI); - return NS_OK; + nsTArray<nsINode*> nodeAncestors; + nsContentUtils::GetAncestors(aNode, nodeAncestors); + for (nsINode* nodeAncestor : nodeAncestors) { + if (nodeAncestor->IsElement()) { + nsString firstparty; + nodeAncestor->AsElement()->GetAttribute(NS_LITERAL_STRING("firstparty"), firstparty); + if (!firstparty.IsEmpty()) { + nsCOMPtr<nsIURI> tempURI; + rv = NS_NewURI(getter_AddRefs(tempURI), firstparty); + if (rv != NS_OK) { + return rv; + } else { + NS_ADDREF(*aOutput = tempURI); + return NS_OK; + } + } } } }

1 0

[tor-browser/tor-browser-38.3.0esr-5.5-1] fixup! Bug #13670.1: Isolate favicon requests by first party
by gk＠torproject.org 18 Sep '15

18 Sep '15

commit 0a287d3bcce4d9e75d1f77af355c19b9292a23c0 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Sep 9 06:06:43 2015 -0700 fixup! Bug #13670.1: Isolate favicon requests by first party --- browser/base/content/tabbrowser.xml | 3 ++- dom/base/ThirdPartyUtil.cpp | 26 ++++++++++++++++---------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml index 49d4207..6033b71 100644 --- a/browser/base/content/tabbrowser.xml +++ b/browser/base/content/tabbrowser.xml @@ -5042,7 +5042,7 @@ class="tab-throbber" role="presentation" layer="true" /> - <xul:image xbl:inherits="src=image,fadein,pinned,selected,busy,crashed,firstparty" + <xul:image xbl:inherits="src=image,fadein,pinned,selected,busy,crashed" anonid="tab-icon-image" class="tab-icon-image" validate="never" @@ -5292,6 +5292,7 @@ aMenuitem.setAttribute("busy", aTab.getAttribute("busy")); aMenuitem.removeAttribute("image"); } else { + aMenuitem.setAttribute("firstparty", aTab.getAttribute("firstparty")); aMenuitem.setAttribute("image", aTab.getAttribute("image")); aMenuitem.removeAttribute("busy"); } diff --git a/dom/base/ThirdPartyUtil.cpp b/dom/base/ThirdPartyUtil.cpp index 5cffc71..618d55b 100644 --- a/dom/base/ThirdPartyUtil.cpp +++ b/dom/base/ThirdPartyUtil.cpp @@ -594,16 +594,22 @@ ThirdPartyUtil::GetFirstPartyURIInternal(nsIChannel *aChannel, // to a particular web site should be assigned that site's first party. if (aNode && aNode->IsElement() && aNode->OwnerDoc() && nsContentUtils::IsChromeDoc(aNode->OwnerDoc())) { - nsString firstparty; - aNode->AsElement()->GetAttribute(NS_LITERAL_STRING("firstparty"), firstparty); - if (!firstparty.IsEmpty()) { - nsCOMPtr<nsIURI> tempURI; - rv = NS_NewURI(getter_AddRefs(tempURI), firstparty); - if (rv != NS_OK) { - return rv; - } else { - NS_ADDREF(*aOutput = tempURI); - return NS_OK; + nsTArray<nsINode*> nodeAncestors; + nsContentUtils::GetAncestors(aNode, nodeAncestors); + for (nsINode* nodeAncestor : nodeAncestors) { + if (nodeAncestor->IsElement()) { + nsString firstparty; + nodeAncestor->AsElement()->GetAttribute(NS_LITERAL_STRING("firstparty"), firstparty); + if (!firstparty.IsEmpty()) { + nsCOMPtr<nsIURI> tempURI; + rv = NS_NewURI(getter_AddRefs(tempURI), firstparty); + if (rv != NS_OK) { + return rv; + } else { + NS_ADDREF(*aOutput = tempURI); + return NS_OK; + } + } } } }

1 0

[tor-browser-bundle/master] Importing stable changelog
by gk＠torproject.org 18 Sep '15

18 Sep '15

commit f35e7155b0837a3a300df9414d5112860188c105 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 18 08:26:41 2015 +0000 Importing stable changelog --- Bundle-Data/Docs/ChangeLog.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 083c339..9f78ac4 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 5.5a2 -- August 26 2015 +Tor Browser 5.5a2 -- August 28 2015 * All Platforms: * Update Firefox to 38.2.1esr * Update NoScript to 2.6.9.36 @@ -6,6 +6,13 @@ Tor Browser 5.5a2 -- August 26 2015 * Linux * Bug 16860: Avoid duplicate desktop icons on Gnome and Unity +Tor Browser 5.0.2 -- August 27 2015 + * All Platforms + * Update Firefox to 38.2.1esr + * Update NoScript to 2.6.9.36 + * Linux + * Bug 16860: Avoid duplicate icons on Unity and Gnome + Tor Browser 5.0.1 -- August 18 2015 * All Platforms * Bug 16771: Fix crash on some websites due to blob URIs

1 0

[tor-browser/tor-browser-38.3.0esr-5.0-2] fixup! Bug #15502. Isolate blob, mediasource & mediastream URLs to first party
by gk＠torproject.org 18 Sep '15

18 Sep '15

commit 5e73e452d5fbf32cb4a38a09e2a79bc28f23afeb Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Sep 17 15:13:52 2015 -0700 fixup! Bug #15502. Isolate blob, mediasource & mediastream URLs to first party --- dom/base/ThirdPartyUtil.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dom/base/ThirdPartyUtil.cpp b/dom/base/ThirdPartyUtil.cpp index 6f0a358..5cffc71 100644 --- a/dom/base/ThirdPartyUtil.cpp +++ b/dom/base/ThirdPartyUtil.cpp @@ -41,7 +41,8 @@ nsresult ThirdPartyUtil::GetFirstPartyHost(nsIChannel* aChannel, nsIDocument* aDocument, nsACString& aResult) { if (!gThirdPartyUtilService) { - CallGetService(THIRDPARTYUTIL_CONTRACTID, &gThirdPartyUtilService); + nsresult rv = CallGetService(THIRDPARTYUTIL_CONTRACTID, &gThirdPartyUtilService); + NS_ENSURE_SUCCESS(rv, rv); } nsCOMPtr<nsIURI> isolationURI; nsresult rv = gThirdPartyUtilService->GetFirstPartyIsolationURI(aChannel, aDocument, getter_AddRefs(isolationURI));

1 0

[tor-browser/tor-browser-38.3.0esr-5.5-1] fixup! Bug #15502. Isolate blob, mediasource & mediastream URLs to first party
by gk＠torproject.org 18 Sep '15

18 Sep '15

commit e9de860b1e090eb56ce324f0baebc587a7ada374 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Sep 17 15:13:52 2015 -0700 fixup! Bug #15502. Isolate blob, mediasource & mediastream URLs to first party --- dom/base/ThirdPartyUtil.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dom/base/ThirdPartyUtil.cpp b/dom/base/ThirdPartyUtil.cpp index 6f0a358..5cffc71 100644 --- a/dom/base/ThirdPartyUtil.cpp +++ b/dom/base/ThirdPartyUtil.cpp @@ -41,7 +41,8 @@ nsresult ThirdPartyUtil::GetFirstPartyHost(nsIChannel* aChannel, nsIDocument* aDocument, nsACString& aResult) { if (!gThirdPartyUtilService) { - CallGetService(THIRDPARTYUTIL_CONTRACTID, &gThirdPartyUtilService); + nsresult rv = CallGetService(THIRDPARTYUTIL_CONTRACTID, &gThirdPartyUtilService); + NS_ENSURE_SUCCESS(rv, rv); } nsCOMPtr<nsIURI> isolationURI; nsresult rv = gThirdPartyUtilService->GetFirstPartyIsolationURI(aChannel, aDocument, getter_AddRefs(isolationURI));

1 0

[tor-browser-bundle/maint-5.0] Bump gitian tag due to key expiration.
by mikeperry＠torproject.org 18 Sep '15

18 Sep '15

commit ca0f563c6da3a6ce496b034eb432e86289e05d9c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Sep 17 16:26:42 2015 -0700 Bump gitian tag due to key expiration. --- gitian/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index f2d59d5..24f26ae 100755 --- a/gitian/versions +++ b/gitian/versions @@ -33,7 +33,7 @@ GO_X_CRYPTO_TAG=4ed45ec682102c643324fae5dff8dab085b6c300 GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844 OBFS4_TAG=obfs4proxy-0.0.5 -GITIAN_TAG=tor-browser-builder-3.x-8 +GITIAN_TAG=tor-browser-builder-3.x-8-gpgsux OPENSSL_VER=1.0.1p GMP_VER=5.1.3

1 0

[tor-browser-bundle/maint-5.0] Update keys for mikeperry.
by mikeperry＠torproject.org 18 Sep '15

18 Sep '15

commit 496972c5deda6cc34124047552777d95498b7edb Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Sep 17 16:12:08 2015 -0700 Update keys for mikeperry. --- gitian/gpg/mikeperry.gpg | Bin 15716 -> 21696 bytes gitian/gpg/torbrowser.gpg | Bin 18844 -> 18952 bytes gitian/gpg/torbutton.gpg | Bin 49582 -> 55562 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/mikeperry.gpg b/gitian/gpg/mikeperry.gpg index 7f14ee3..8615796 100644 Binary files a/gitian/gpg/mikeperry.gpg and b/gitian/gpg/mikeperry.gpg differ diff --git a/gitian/gpg/torbrowser.gpg b/gitian/gpg/torbrowser.gpg index dc44e33..d1033d4 100644 Binary files a/gitian/gpg/torbrowser.gpg and b/gitian/gpg/torbrowser.gpg differ diff --git a/gitian/gpg/torbutton.gpg b/gitian/gpg/torbutton.gpg index b60a95e..e4a03dd 100644 Binary files a/gitian/gpg/torbutton.gpg and b/gitian/gpg/torbutton.gpg differ

1 0

[tor-browser-bundle/maint-5.0] Bump browser to build 2.
by mikeperry＠torproject.org 18 Sep '15

18 Sep '15

commit f182615a6825601ad0ddb6879eabff64db49754d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Sep 17 14:28:33 2015 -0700 Bump browser to build 2. Also clean up changelog a bit. --- Bundle-Data/Docs/ChangeLog.txt | 9 +++++---- gitian/versions | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 095968f..ade00f3 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -7,18 +7,19 @@ Tor Browser 5.0.3 -- September 22 2015 * Bug 16797: brandShorterName is missing from brand.properties * Bug 14429: Make sure the automatic resizing is disabled * Translation updates - * Bug 7446: Torbutton should not fix up .onion domains + * Bug 7446: Tor Browser should not "fix up" .onion domains (or any domains) * Bug 16837: Disable Firefox Hotfix updates - * Bug 16855: Allow blobs to be download on first-party pages + * Bug 16855: Allow blobs to be download on first-party pages (fixes mega.nz) * Bug 16781: Allow saving pdf files in built-in pdf viewer * Bug 16842: Restore Media tab on Page information dialog * Bug 16727: Disable about:healthreport page * Bug 16783: Normalize NoScript default whitelist - * Bug 16775: Fix preferences dialog with slider set to "High" + * Bug 16775: Fix preferences dialog with security slider set to "High" * Bug 13579: Update download progress bar automatically - * Bug 15646: Prevent keyboard layout fingerprinting in KeyboardEvent + * Bug 15646: Reduce keyboard layout fingerprinting in KeyboardEvent * Bug 17046: Event.timeStamp should not reveal startup time * Bug 16872: Fix warnings when opening about:downloads + * Bug 17097: Fix intermittent crashes when using the print dialog * Windows * Bug 16906: Fix Mingw-w64 compilation breakage * OS X diff --git a/gitian/versions b/gitian/versions index deecc7f..f2d59d5 100755 --- a/gitian/versions +++ b/gitian/versions @@ -8,7 +8,7 @@ FIREFOX_VERSION=38.3.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-2-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-2-build2 TOR_TAG=tor-0.2.6.10 TORLAUNCHER_TAG=0.2.7.7 TORBUTTON_TAG=1.9.3.4

1 0

[tor-browser/tor-browser-38.3.0esr-5.5-1] fixup! Bug #5742: API allows you to get the url bar URI for a channel or nsIDocument.
by mikeperry＠torproject.org 18 Sep '15

18 Sep '15

commit baca89fcad30603ccac4a2fe1f51ab3f0d0b8518 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Sep 17 12:46:45 2015 -0700 fixup! Bug #5742: API allows you to get the url bar URI for a channel or nsIDocument. --- dom/base/ThirdPartyUtil.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dom/base/ThirdPartyUtil.cpp b/dom/base/ThirdPartyUtil.cpp index e8ec06c..6f0a358 100644 --- a/dom/base/ThirdPartyUtil.cpp +++ b/dom/base/ThirdPartyUtil.cpp @@ -648,13 +648,17 @@ ThirdPartyUtil::GetFirstPartyURIInternal(nsIChannel *aChannel, if (aDoc->GetWindow()) { aDoc->GetWindow()->GetTop(getter_AddRefs(top)); - top->GetDocument(getter_AddRefs(topDDoc)); - - nsCOMPtr<nsIDocument> topDoc(do_QueryInterface(topDDoc)); - docURI = topDoc->GetOriginalURI(); - if (docURI) { - // Give us a mutable URI and also addref - rv = NS_EnsureSafeToReturn(docURI, aOutput); + if (top) { + top->GetDocument(getter_AddRefs(topDDoc)); + + nsCOMPtr<nsIDocument> topDoc(do_QueryInterface(topDDoc)); + if (topDoc) { + docURI = topDoc->GetOriginalURI(); + if (docURI) { + // Give us a mutable URI and also addref + rv = NS_EnsureSafeToReturn(docURI, aOutput); + } + } } } else { // XXX: Chrome callers (such as NoScript) can end up here

1 0