tbb-commits November 2020

tbb-commits@lists.torproject.org

3 participants
399 discussions

[tor-browser/tor-browser-83.0b1-10.0-1] Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware
by sysrqb＠torproject.org 04 Nov '20

04 Nov '20

commit 49685688c006f3050f64c091563eded4466ef9ad Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Nov 4 15:58:22 2020 +0100 Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware --- .../main/java/org/mozilla/geckoview/WebRequest.java | 18 ++++++++++++++++++ widget/android/WebExecutorSupport.cpp | 10 ++++++++++ 2 files changed, 28 insertions(+) diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java index 7e3aa285c5be..18f56abeec43 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java @@ -49,6 +49,11 @@ public class WebRequest extends WebMessage { */ public final @Nullable String referrer; + /** + * The value of the origin of this request. + */ + public final @Nullable String origin; + @Retention(RetentionPolicy.SOURCE) @IntDef({CACHE_MODE_DEFAULT, CACHE_MODE_NO_STORE, CACHE_MODE_RELOAD, CACHE_MODE_NO_CACHE, @@ -110,6 +115,7 @@ public class WebRequest extends WebMessage { method = builder.mMethod; cacheMode = builder.mCacheMode; referrer = builder.mReferrer; + origin = builder.mOrigin; if (builder.mBody != null) { body = builder.mBody.asReadOnlyBuffer(); @@ -126,6 +132,7 @@ public class WebRequest extends WebMessage { /* package */ String mMethod = "GET"; /* package */ int mCacheMode = CACHE_MODE_DEFAULT; /* package */ String mReferrer; + /* package */ String mOrigin; /** * Construct a Builder instance with the specified URI. @@ -205,6 +212,17 @@ public class WebRequest extends WebMessage { return this; } + /** + * Set the origin URI. + * + * @param origin A URI String + * @return This Builder instance. + */ + public @NonNull Builder origin(final @Nullable String origin) { + mOrigin = origin; + return this; + } + /** * @return A {@link WebRequest} constructed with the values from this Builder instance. */ diff --git a/widget/android/WebExecutorSupport.cpp b/widget/android/WebExecutorSupport.cpp index f9f4262fb50c..bb639740f013 100644 --- a/widget/android/WebExecutorSupport.cpp +++ b/widget/android/WebExecutorSupport.cpp @@ -390,6 +390,16 @@ nsresult WebExecutorSupport::CreateStreamLoader( MOZ_ASSERT(cookieJarSettings); nsCOMPtr<nsILoadInfo> loadInfo = channel->LoadInfo(); + + RefPtr<nsIURI> originUri; + const auto origin = req->Origin(); + if (origin) { + rv = NS_NewURI(getter_AddRefs(originUri), origin->ToString()); + NS_ENSURE_SUCCESS(rv, NS_ERROR_MALFORMED_URI); + OriginAttributes attrs = loadInfo->GetOriginAttributes(); + attrs.SetFirstPartyDomain(true, originUri); + loadInfo->SetOriginAttributes(attrs); + } loadInfo->SetCookieJarSettings(cookieJarSettings); // setup http/https specific things

1 0

[tor-browser/tor-browser-82.0-10.0-1] Merge remote-tracking branch 'acatgl/40171' into tor-browser-82.0-10.0-1
by sysrqb＠torproject.org 04 Nov '20

04 Nov '20

commit fb38615ac2ab7345dffba2b3ecef110ba47fba7c Merge: 9f748e44a9d2 9d609e98a6ea Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Nov 4 21:40:47 2020 +0000 Merge remote-tracking branch 'acatgl/40171' into tor-browser-82.0-10.0-1 .../main/java/org/mozilla/geckoview/WebRequest.java | 18 ++++++++++++++++++ widget/android/WebExecutorSupport.cpp | 10 ++++++++++ 2 files changed, 28 insertions(+)

1 0

[tor-browser/tor-browser-82.0-10.0-1] Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware
by sysrqb＠torproject.org 04 Nov '20

04 Nov '20

commit 9d609e98a6ea20a3a4f01c86ee3a53a2a7f33f47 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Nov 4 15:58:22 2020 +0100 Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware --- .../main/java/org/mozilla/geckoview/WebRequest.java | 18 ++++++++++++++++++ widget/android/WebExecutorSupport.cpp | 10 ++++++++++ 2 files changed, 28 insertions(+) diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java index 7e3aa285c5be..18f56abeec43 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java @@ -49,6 +49,11 @@ public class WebRequest extends WebMessage { */ public final @Nullable String referrer; + /** + * The value of the origin of this request. + */ + public final @Nullable String origin; + @Retention(RetentionPolicy.SOURCE) @IntDef({CACHE_MODE_DEFAULT, CACHE_MODE_NO_STORE, CACHE_MODE_RELOAD, CACHE_MODE_NO_CACHE, @@ -110,6 +115,7 @@ public class WebRequest extends WebMessage { method = builder.mMethod; cacheMode = builder.mCacheMode; referrer = builder.mReferrer; + origin = builder.mOrigin; if (builder.mBody != null) { body = builder.mBody.asReadOnlyBuffer(); @@ -126,6 +132,7 @@ public class WebRequest extends WebMessage { /* package */ String mMethod = "GET"; /* package */ int mCacheMode = CACHE_MODE_DEFAULT; /* package */ String mReferrer; + /* package */ String mOrigin; /** * Construct a Builder instance with the specified URI. @@ -205,6 +212,17 @@ public class WebRequest extends WebMessage { return this; } + /** + * Set the origin URI. + * + * @param origin A URI String + * @return This Builder instance. + */ + public @NonNull Builder origin(final @Nullable String origin) { + mOrigin = origin; + return this; + } + /** * @return A {@link WebRequest} constructed with the values from this Builder instance. */ diff --git a/widget/android/WebExecutorSupport.cpp b/widget/android/WebExecutorSupport.cpp index dc428e34c10c..60ab02c03354 100644 --- a/widget/android/WebExecutorSupport.cpp +++ b/widget/android/WebExecutorSupport.cpp @@ -383,6 +383,16 @@ nsresult WebExecutorSupport::CreateStreamLoader( MOZ_ASSERT(cookieJarSettings); nsCOMPtr<nsILoadInfo> loadInfo = channel->LoadInfo(); + + RefPtr<nsIURI> originUri; + const auto origin = req->Origin(); + if (origin) { + rv = NS_NewURI(getter_AddRefs(originUri), origin->ToString()); + NS_ENSURE_SUCCESS(rv, NS_ERROR_MALFORMED_URI); + OriginAttributes attrs = loadInfo->GetOriginAttributes(); + attrs.SetFirstPartyDomain(true, originUri); + loadInfo->SetOriginAttributes(attrs); + } loadInfo->SetCookieJarSettings(cookieJarSettings); // setup http/https specific things

1 0

[tor-browser/tor-browser-83.0b1-10.0-1] fixup! Bug 40091: Load HTTPS Everywhere as a builtin addon in desktop
by sysrqb＠torproject.org 04 Nov '20

04 Nov '20

commit 49173da07b4f36b503fb1203c0dfb701e44cf376 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Nov 4 20:57:18 2020 +0000 fixup! Bug 40091: Load HTTPS Everywhere as a builtin addon in desktop Fixes #40137: Built-in https-everywhere storage is not migrated to idb --- toolkit/components/extensions/Extension.jsm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/toolkit/components/extensions/Extension.jsm b/toolkit/components/extensions/Extension.jsm index 54c8478a686b..8c5b79055186 100644 --- a/toolkit/components/extensions/Extension.jsm +++ b/toolkit/components/extensions/Extension.jsm @@ -212,6 +212,7 @@ const LOGGER_ID_BASE = "addons.webextension."; const UUID_MAP_PREF = "extensions.webextensions.uuids"; const LEAVE_STORAGE_PREF = "extensions.webextensions.keepStorageOnUninstall"; const LEAVE_UUID_PREF = "extensions.webextensions.keepUuidOnUninstall"; +const PERSISTENT_EXTENSIONS = new Set(["https-everywhere-eff(a)eff.org"]); const COMMENT_REGEXP = new RegExp( String.raw` @@ -358,7 +359,8 @@ var ExtensionAddonObserver = { ); } - if (!Services.prefs.getBoolPref(LEAVE_STORAGE_PREF, false)) { + if (!Services.prefs.getBoolPref(LEAVE_STORAGE_PREF, false) && + !PERSISTENT_EXTENSIONS.has(addon.id)) { // Clear browser.storage.local backends. AsyncShutdown.profileChangeTeardown.addBlocker( `Clear Extension Storage ${addon.id} (File Backend)`, @@ -406,7 +408,8 @@ var ExtensionAddonObserver = { ExtensionPermissions.removeAll(addon.id); - if (!Services.prefs.getBoolPref(LEAVE_UUID_PREF, false)) { + if (!Services.prefs.getBoolPref(LEAVE_UUID_PREF, false) && + !PERSISTENT_EXTENSIONS.has(addon.id)) { // Clear the entry in the UUID map UUIDMap.remove(addon.id); } @@ -2516,7 +2519,8 @@ class Extension extends ExtensionData { ); } else if ( this.startupReason === "ADDON_INSTALL" && - !Services.prefs.getBoolPref(LEAVE_STORAGE_PREF, false) + !Services.prefs.getBoolPref(LEAVE_STORAGE_PREF, false) && + !PERSISTENT_EXTENSIONS.has(this.id) ) { // If the extension has been just installed, set it as migrated, // because there will not be any data to migrate.

1 0

[tor-browser/tor-browser-78.4.0esr-10.5-1] fixup! Bug 40091: Load HTTPS Everywhere as a builtin addon in desktop
by sysrqb＠torproject.org 04 Nov '20

04 Nov '20

commit fe77759e2e3227344bb7dec64cf58fccd596c497 Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Oct 29 22:03:28 2020 +0100 fixup! Bug 40091: Load HTTPS Everywhere as a builtin addon in desktop Fixes #40137: Built-in https-everywhere storage is not migrated to idb --- toolkit/components/extensions/Extension.jsm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/toolkit/components/extensions/Extension.jsm b/toolkit/components/extensions/Extension.jsm index 876e636be3db..7dbd888b1710 100644 --- a/toolkit/components/extensions/Extension.jsm +++ b/toolkit/components/extensions/Extension.jsm @@ -211,6 +211,7 @@ const LOGGER_ID_BASE = "addons.webextension."; const UUID_MAP_PREF = "extensions.webextensions.uuids"; const LEAVE_STORAGE_PREF = "extensions.webextensions.keepStorageOnUninstall"; const LEAVE_UUID_PREF = "extensions.webextensions.keepUuidOnUninstall"; +const PERSISTENT_EXTENSIONS = new Set(["https-everywhere-eff(a)eff.org"]); const COMMENT_REGEXP = new RegExp( String.raw` @@ -331,7 +332,10 @@ var ExtensionAddonObserver = { return; } - if (!Services.prefs.getBoolPref(LEAVE_STORAGE_PREF, false)) { + if ( + !Services.prefs.getBoolPref(LEAVE_STORAGE_PREF, false) && + !PERSISTENT_EXTENSIONS.has(addon.id) + ) { // Clear browser.storage.local backends. AsyncShutdown.profileChangeTeardown.addBlocker( `Clear Extension Storage ${addon.id} (File Backend)`, @@ -384,7 +388,10 @@ var ExtensionAddonObserver = { ExtensionPermissions.removeAll(addon.id); - if (!Services.prefs.getBoolPref(LEAVE_UUID_PREF, false)) { + if ( + !Services.prefs.getBoolPref(LEAVE_UUID_PREF, false) && + !PERSISTENT_EXTENSIONS.has(addon.id) + ) { // Clear the entry in the UUID map UUIDMap.remove(addon.id); } @@ -2474,7 +2481,8 @@ class Extension extends ExtensionData { ); } else if ( this.startupReason === "ADDON_INSTALL" && - !Services.prefs.getBoolPref(LEAVE_STORAGE_PREF, false) + !Services.prefs.getBoolPref(LEAVE_STORAGE_PREF, false) && + !PERSISTENT_EXTENSIONS.has(this.id) ) { // If the extension has been just installed, set it as migrated, // because there will not be any data to migrate.

1 0

[tor-browser/tor-browser-78.4.0esr-10.5-1] Merge remote-tracking branch 'acatgl/40137' into tor-browser-78.4.0esr-10.5-1
by sysrqb＠torproject.org 04 Nov '20

04 Nov '20

commit 0f1ea47ff08d81d50195b509aabaea0fc9188e51 Merge: f5157a69e88c fe77759e2e32 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Nov 4 20:57:18 2020 +0000 Merge remote-tracking branch 'acatgl/40137' into tor-browser-78.4.0esr-10.5-1 toolkit/components/extensions/Extension.jsm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)

1 0

[torbutton/master] fixup! Bug 40013: End of year 2020 Fundraising campaign
by sysrqb＠torproject.org 04 Nov '20

04 Nov '20

commit 983c073b337eac1bbdcaac7134811f93a5d97daa Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Oct 30 12:53:08 2020 +0100 fixup! Bug 40013: End of year 2020 Fundraising campaign --- chrome/content/aboutTor/aboutTor.xhtml | 1 + chrome/skin/aboutTor.css | 31 +++++++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/chrome/content/aboutTor/aboutTor.xhtml b/chrome/content/aboutTor/aboutTor.xhtml index 3a242a36..25267fc3 100644 --- a/chrome/content/aboutTor/aboutTor.xhtml +++ b/chrome/content/aboutTor/aboutTor.xhtml @@ -49,6 +49,7 @@ </div> <div id="eoy2020_1"> <p id="eoy2020_resist">&aboutTor.ey2020.resistsurveillance;</p> + <p id="eoy2020_match"><a href="https://blog.torproject.org/friends-of-tor-match-2020">&aboutTor.ey2020.donationmatch;</a></p> </div> <div id="eoy2020_3"> <a id="eoy2020_donate" href="https://www.torproject.org/donate/donate-usetor-default">&aboutTor.donationBanner.buttonA;</a> diff --git a/chrome/skin/aboutTor.css b/chrome/skin/aboutTor.css index 223a5c73..e6f5c4ee 100644 --- a/chrome/skin/aboutTor.css +++ b/chrome/skin/aboutTor.css @@ -362,6 +362,11 @@ body[eoy2020] .torcontent-logo { display: none!important; } +#eoy2020_1 { + width: 70%; + background: #000; +} + #eoy2020_3 { padding-top: 10px; padding-bottom: 30px; @@ -376,14 +381,36 @@ body[eoy2020] .torcontent-logo { text-align: left; color: white; font-family: "TerminalGrotesque", monospace; - font-size: 25px; - width: 70%; + font-size: 27px; + padding: 9px 0; } #eoy2020_resist:dir(rtl) { text-align: right; } +#eoy2020_match { + font-size: 16px; + padding: 0 0 20px 0; + font-family: "Courier New", monospace; + font-weight: bold; + text-align: left; +} + +#eoy2020_match a { + color: #9D4AE8; + text-decoration: unset; +} + +#eoy2020_match a:hover { + color: #4DFB00; + text-decoration: unset; +} + +#eoy2020_match:dir(rtl) { + text-align: right; +} + #eoy2020_useamask { line-height: 53px; text-align: left;

1 0

[torbutton/master] Merge remote-tracking branch 'acatgl/40022+1'
by sysrqb＠torproject.org 04 Nov '20

04 Nov '20

commit b0739b02caacea311d54192d22005aaa88505b11 Merge: 86c73f63 983c073b Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Nov 4 20:23:06 2020 +0000 Merge remote-tracking branch 'acatgl/40022+1' chrome/content/aboutTor/aboutTor.xhtml | 1 + chrome/skin/aboutTor.css | 31 +++++++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-)

1 0

[torbutton/master] fixup! Bug 40013: End of year 2020 Fundraising campaign
by sysrqb＠torproject.org 03 Nov '20

03 Nov '20

commit 86c73f63b9524b30a9e87018a5f2ecbaec0fd047 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Nov 3 22:49:36 2020 +0000 fixup! Bug 40013: End of year 2020 Fundraising campaign Bug 40022: EOY November Update - Matching --- chrome/locale/en-US/aboutTor.dtd | 1 + 1 file changed, 1 insertion(+) diff --git a/chrome/locale/en-US/aboutTor.dtd b/chrome/locale/en-US/aboutTor.dtd index 13e2d8a2..00c8256d 100644 --- a/chrome/locale/en-US/aboutTor.dtd +++ b/chrome/locale/en-US/aboutTor.dtd @@ -33,3 +33,4 @@  <!ENTITY aboutTor.ey2020.useamask "Use a mask, use Tor."> <!ENTITY aboutTor.ey2020.resistsurveillance "Resist the surveillance pandemic."> +<!ENTITY aboutTor.ey2020.donationmatch "Your donation will be matched by Friends of Tor.">

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits November 2020