- tbb-commits - lists.torproject.org

[torbutton/master] Bug 30577: Add Fundraising Banner
by gk＠torproject.org 02 Jul '19

02 Jul '19

commit 676f9b37aa8a74c4fb0e2d624d7e4b2a73082352 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Jul 1 12:08:29 2019 +0200 Bug 30577: Add Fundraising Banner --- src/chrome/content/aboutTor/aboutTor-content.js | 19 ++++++ src/chrome/content/aboutTor/aboutTor.xhtml | 13 ++++ src/chrome/content/torbutton.js | 17 +++++ src/chrome/locale/en-US/aboutTor.dtd | 3 + src/chrome/skin/aboutTor.css | 83 ++++++++++++++++++++++++ src/chrome/skin/icon_monthly_donors.png | Bin 0 -> 3093 bytes src/defaults/preferences/preferences.js | 1 + 7 files changed, 136 insertions(+) diff --git a/src/chrome/content/aboutTor/aboutTor-content.js b/src/chrome/content/aboutTor/aboutTor-content.js index 2b65dbcf..d4399624 100644 --- a/src/chrome/content/aboutTor/aboutTor-content.js +++ b/src/chrome/content/aboutTor/aboutTor-content.js @@ -24,6 +24,7 @@ let { bindPrefAndInit, show_torbrowser_manual } = Cu.import("resource://torbutto var AboutTorListener = { kAboutTorLoadedMessage: "AboutTor:Loaded", kAboutTorChromeDataMessage: "AboutTor:ChromeData", + kAboutTorHideDonationBanner: "AboutTor:HideDonationBanner", get isAboutTor() { return content.document.documentURI.toLowerCase() == "about:tor"; @@ -58,6 +59,22 @@ var AboutTorListener = { } }, + setupBannerClosing: function () { + let that = this; + let closer = content.document.getElementById("donation-banner-closer"); + closer.addEventListener("click", function () { + sendAsyncMessage(that.kAboutTorHideDonationBanner); + }); + + bindPrefAndInit("extensions.torbutton.donation_banner_countdown3", + countdown => { + if (content.document && content.document.body) { + content.document.body.setAttribute( + "show-donation-banner", countdown > 0); + } + }); + }, + onPageLoad: function() { // Arrange to update localized text and links. bindPrefAndInit("intl.locale.requested", aNewVal => { @@ -66,6 +83,8 @@ var AboutTorListener = { } }); + this.setupBannerClosing(); + // Add message and event listeners. addMessageListener(this.kAboutTorChromeDataMessage, this); addEventListener("pagehide", this, false); diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 4736f653..106bd936 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -34,6 +34,19 @@ window.addEventListener("pageshow", function() { </script> </head> <body dir="&locale.dir;"> + <div id="donation-banner"> + <div></div> + <div id="donation-banner-message"> + <div id="donation-banner-icon"></div> + <div>&aboutTor.donationBanner3.line1; + <a href="https://donate.torproject.org/monthly-giving"> + &aboutTor.donationBanner3.line2; + </a> + </div> + </div> + <div id="donation-banner-closer">×</div> + </div> + <div class="torcontent-container"> <div id="torbrowser-info"> <div id="torbrowser-version"/> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 53fe4fc9..f0456a3e 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -22,6 +22,7 @@ const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion" const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck"; const k_tb_tor_check_failed_topic = "Torbutton:TorCheckFailed"; +const k_tb_donation_banner_countdown = "extensions.torbutton.donation_banner_countdown3"; var m_tb_prefs = Services.prefs; @@ -217,6 +218,14 @@ function torbutton_init_toolbutton() } } +// Show the donation banner a finite number of times. +function torbutton_donation_banner_countdown() { + let count = m_tb_prefs.getIntPref(k_tb_donation_banner_countdown, 0); + if (count > 0) { + m_tb_prefs.setIntPref(k_tb_donation_banner_countdown, count - 1); + } +} + function torbutton_is_mobile() { return Services.appinfo.OS === "Android"; } @@ -329,6 +338,10 @@ function torbutton_init() { // Add about:tor IPC message listener. window.messageManager.addMessageListener("AboutTor:Loaded", torbutton_abouttor_message_handler); + window.messageManager.addMessageListener("AboutTor:HideDonationBanner", + torbutton_abouttor_message_handler); + + torbutton_donation_banner_countdown(); setupPreferencesForMobile(); @@ -444,6 +457,10 @@ var torbutton_abouttor_message_handler = { aMessage.target.messageManager.sendAsyncMessage("AboutTor:ChromeData", this.getChromeData(true)); break; + case "AboutTor:HideDonationBanner": + torbutton_log(5, "message AboutTor:HideDonationBanner received"); + m_tb_prefs.setIntPref(k_tb_donation_banner_countdown, 0); + break; } }, diff --git a/src/chrome/locale/en-US/aboutTor.dtd b/src/chrome/locale/en-US/aboutTor.dtd index c4273ad2..5757fae4 100644 --- a/src/chrome/locale/en-US/aboutTor.dtd +++ b/src/chrome/locale/en-US/aboutTor.dtd @@ -30,3 +30,6 @@ <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> <!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> <!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> + +<!ENTITY aboutTor.donationBanner3.line1 "Automatic monthly donations keep Tor strong."> +<!ENTITY aboutTor.donationBanner3.line2 "Become a Defender of Privacy today."> diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index baa92b42..09f6208d 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -137,6 +137,12 @@ body:not([showmanual]) .showForManual { margin-top: 10vh; } +/* Reducing this on mobile to avoid vertical overflow + * on small screens when showing donation banner */ +body[mobile] #bottom { + margin-top: 3vh; +} + #bottom p { font-size: 10px; text-align: start; @@ -304,6 +310,83 @@ body:not([showmanual]) .showForManual { border-radius: 50px 50px 0 0; } +/* Donation Banner + * While this banner is present, we need to + * offset the elements normally at the top of + * the window. + */ + +#donation-banner { + display: flex; + align-items: stretch; + background-color: white; + color: var(--abouttor-bg-toron-color); + font-size: 16px; + height: 70px; + justify-content: center; + left: 0px; + right: 0px; + top: 0px; + position: absolute; + transform: translateY(-70px); + transition: transform 200ms; + z-index: 1; + padding-right:38px; +} + +body[mobile] #donation-banner { + font-size: 14px; +} + +body[show-donation-banner="true"] #donation-banner { + transform: translateY(0px); + transition: transform 0ms; +} + +#donation-banner-message { + align-items: center; + display: flex; + justify-content: center; +} + +#donation-banner-message a { + color: var(--abouttor-bg-toron-color); +} + +#donation-banner-icon { + background: url('chrome://torbutton/skin/icon_monthly_donors.png') no-repeat center center; + background-size: contain; + background-position: bottom; + height: 56px; + margin: 14px 16px 0px 16px; + width: 65px; +} + +#donation-banner-closer { + display: flex; + align-items: center; + font-size: 20px; + height: 22px; + justify-content: center; + margin: 4px; + padding: 4px; + position: absolute; + offset-inline-end: 0px; + top: 0px; + width: 22px; + -moz-user-select: none; +} + +#donation-banner-closer:hover { + background-color: gray; + cursor: pointer; +} + +body[show-donation-banner="true"] #onboarding-overlay-button-container, +body[show-donation-banner="true"] .torcontent-container { + margin-top: 72px; +} + /* * Mobile specific css */ diff --git a/src/chrome/skin/icon_monthly_donors.png b/src/chrome/skin/icon_monthly_donors.png new file mode 100644 index 00000000..9505f471 Binary files /dev/null and b/src/chrome/skin/icon_monthly_donors.png differ diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index e5d66d55..3a2cdcd3 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -6,6 +6,7 @@ pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglo pref("extensions.torbutton.display_circuit", true); pref("extensions.torbutton(a)torproject.org.description", "chrome://torbutton/locale/torbutton.properties"); pref("extensions.torbutton.updateNeeded", false); +pref("extensions.torbutton.donation_banner_countdown3", 4); // Tor check and proxy prefs pref("extensions.torbutton.test_enabled",true);

1 0

[torbutton/master] Merge remote-tracking branch 'acat/30577+2'
by gk＠torproject.org 02 Jul '19

02 Jul '19

commit 1f05efdb50291d26e7e52d07f3bddabf86ee7796 Merge: a13b6c87 676f9b37 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 2 10:51:12 2019 +0000 Merge remote-tracking branch 'acat/30577+2' src/chrome/content/aboutTor/aboutTor-content.js | 19 ++++++ src/chrome/content/aboutTor/aboutTor.xhtml | 13 ++++ src/chrome/content/torbutton.js | 17 +++++ src/chrome/locale/en-US/aboutTor.dtd | 3 + src/chrome/skin/aboutTor.css | 83 ++++++++++++++++++++++++ src/chrome/skin/icon_monthly_donors.png | Bin 0 -> 3093 bytes src/defaults/preferences/preferences.js | 1 + 7 files changed, 136 insertions(+)

1 0

[tor-browser/tor-browser-60.7.0esr-8.5-1] Bug 1552627 - pt 2, r=dveditz
by gk＠torproject.org 02 Jul '19

02 Jul '19

commit cb68eb598242fd211bf032e704069ea453f57c05 Author: Gijs Kruitbosch <gijskruitbosch(a)gmail.com> Date: Mon May 20 06:19:51 2019 +0000 Bug 1552627 - pt 2, r=dveditz Depends on D31722 Differential Revision: https://phabricator.services.mozilla.com/D31723 --HG-- extra : moz-landing-system : lando --- modules/libpref/init/all.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 4257bc55742c..7cded5261c17 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -1628,6 +1628,9 @@ pref("network.protocol-handler.external.hcp", false); pref("network.protocol-handler.external.vbscript", false); pref("network.protocol-handler.external.javascript", false); pref("network.protocol-handler.external.data", false); +pref("network.protocol-handler.external.ie.http", false); +pref("network.protocol-handler.external.iehistory", false); +pref("network.protocol-handler.external.ierss", false); pref("network.protocol-handler.external.ms-help", false); pref("network.protocol-handler.external.res", false); pref("network.protocol-handler.external.shell", false);

1 0

[tor-browser/tor-browser-60.7.0esr-8.5-1] Bug 1549833, r=valentin
by gk＠torproject.org 02 Jul '19

02 Jul '19

commit e0c4aa5835df2a0ea4c2555872fc467649e2cc49 Author: Gijs Kruitbosch <gijskruitbosch(a)gmail.com> Date: Tue May 7 23:23:30 2019 +0100 Bug 1549833, r=valentin Differential Revision: https://phabricator.services.mozilla.com//D30285 --HG-- extra : rebase_source : dcd2ecd154c5423143f449f52411eda32c61a972 --- modules/libpref/init/all.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 9dc30b8efe44..4257bc55742c 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -1629,6 +1629,7 @@ pref("network.protocol-handler.external.vbscript", false); pref("network.protocol-handler.external.javascript", false); pref("network.protocol-handler.external.data", false); pref("network.protocol-handler.external.ms-help", false); +pref("network.protocol-handler.external.res", false); pref("network.protocol-handler.external.shell", false); pref("network.protocol-handler.external.vnd.ms.radio", false); #ifdef XP_MACOSX

1 0

[tor-browser/tor-browser-60.7.0esr-9.0-1] Bug 1552627 - pt 2, r=dveditz
by gk＠torproject.org 02 Jul '19

02 Jul '19

commit 0be8d76933ec1e36553f1bfaffb261169757fa77 Author: Gijs Kruitbosch <gijskruitbosch(a)gmail.com> Date: Mon May 20 06:19:51 2019 +0000 Bug 1552627 - pt 2, r=dveditz Depends on D31722 Differential Revision: https://phabricator.services.mozilla.com/D31723 --HG-- extra : moz-landing-system : lando --- modules/libpref/init/all.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index dfcd043cac75..7793f3c201b6 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -1631,6 +1631,9 @@ pref("network.protocol-handler.external.hcp", false); pref("network.protocol-handler.external.vbscript", false); pref("network.protocol-handler.external.javascript", false); pref("network.protocol-handler.external.data", false); +pref("network.protocol-handler.external.ie.http", false); +pref("network.protocol-handler.external.iehistory", false); +pref("network.protocol-handler.external.ierss", false); pref("network.protocol-handler.external.ms-help", false); pref("network.protocol-handler.external.res", false); pref("network.protocol-handler.external.shell", false);

1 0

[tor-browser/tor-browser-60.7.0esr-9.0-1] Bug 1549833, r=valentin
by gk＠torproject.org 02 Jul '19

02 Jul '19

commit 35560e850f9dbf29e18895b3e55ad9b4e684cd24 Author: Gijs Kruitbosch <gijskruitbosch(a)gmail.com> Date: Tue May 7 23:23:30 2019 +0100 Bug 1549833, r=valentin Differential Revision: https://phabricator.services.mozilla.com//D30285 --HG-- extra : rebase_source : dcd2ecd154c5423143f449f52411eda32c61a972 --- modules/libpref/init/all.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 5b1d0a1c8972..dfcd043cac75 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -1632,6 +1632,7 @@ pref("network.protocol-handler.external.vbscript", false); pref("network.protocol-handler.external.javascript", false); pref("network.protocol-handler.external.data", false); pref("network.protocol-handler.external.ms-help", false); +pref("network.protocol-handler.external.res", false); pref("network.protocol-handler.external.shell", false); pref("network.protocol-handler.external.vnd.ms.radio", false); #ifdef XP_MACOSX

1 0

[tor-browser-build/maint-8.5] Remove four default bridges.
by gk＠torproject.org 02 Jul '19

02 Jul '19

commit 0b95a1414db6e4a8be0ddd47fdeec5b9fd16c6de Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Jul 1 14:11:37 2019 -0700 Remove four default bridges. The operator wants to reduce the maintenance burden and eliminate the risk of seeing both entry and exit traffic. This fixes <https://bugs.torproject.org/31055>. --- .../Bundle-Data/PTConfigs/bridge_prefs.js | 27 +++++++++------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index 61fdba1..4eb4644 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -2,22 +2,17 @@ pref("extensions.torlauncher.default_bridge_recommended_type", "obfs4"); // Default bridges. -pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED"); -pref("extensions.torlauncher.default_bridge.obfs3.2", "obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A"); - -pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=2"); -pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); -/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.6"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); +/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.4"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-build/master] Remove four default bridges.
by gk＠torproject.org 02 Jul '19

02 Jul '19

commit e26e91bef8bd8d04d79bdd69f087efd808bc925d Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Jul 1 14:11:37 2019 -0700 Remove four default bridges. The operator wants to reduce the maintenance burden and eliminate the risk of seeing both entry and exit traffic. This fixes <https://bugs.torproject.org/31055>. --- .../Bundle-Data/PTConfigs/bridge_prefs.js | 27 +++++++++------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index 61fdba1..4eb4644 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -2,22 +2,17 @@ pref("extensions.torlauncher.default_bridge_recommended_type", "obfs4"); // Default bridges. -pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED"); -pref("extensions.torlauncher.default_bridge.obfs3.2", "obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A"); - -pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=2"); -pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); -/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.6"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); +/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.4"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_28119_v6'
by boklm＠torproject.org 01 Jul '19

01 Jul '19

commit 99f739a2b2bde7e81d9f6a974efbdd2eca1b7947 Merge: 419b0be d226510 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jul 1 19:21:55 2019 +0200 Merge remote-tracking branch 'gk/bug_28119_v6' Makefile | 15 +++++++++ projects/android-toolchain/build | 8 ++--- projects/firefox/mozconfig-android-aarch64 | 50 ++++++++++++++++++++++++++++++ projects/release/build | 3 ++ projects/release/config | 10 ++++++ projects/rust/config | 4 +++ projects/tor-browser/build.android | 9 ++++-- rbm.conf | 14 ++++++++- 8 files changed, 104 insertions(+), 9 deletions(-)

1 0

[tor-browser-build/master] Bug 28119: Tor Browser for aarch64
by boklm＠torproject.org 01 Jul '19

01 Jul '19

commit d226510faec5480997adcdc3c1c6aee1952d92e5 Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 31 13:01:30 2019 +0000 Bug 28119: Tor Browser for aarch64 Thanks to boklm for help with this patch. --- Makefile | 15 +++++++++ projects/android-toolchain/build | 8 ++--- projects/firefox/mozconfig-android-aarch64 | 50 ++++++++++++++++++++++++++++++ projects/release/build | 3 ++ projects/release/config | 10 ++++++ projects/rust/config | 4 +++ projects/tor-browser/build.android | 9 ++++-- rbm.conf | 14 ++++++++- 8 files changed, 104 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 285b49d..94a26f6 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,9 @@ release-android-armv7: submodule-update release-android-x86: submodule-update $(rbm) build release --target release --target torbrowser-android-x86 +release-android-aarch64: submodule-update + $(rbm) build release --target release --target torbrowser-android-aarch64 + release-linux-x86_64: submodule-update $(rbm) build release --target release --target torbrowser-linux-x86_64 @@ -41,6 +44,9 @@ alpha-android-armv7: submodule-update alpha-android-x86: submodule-update $(rbm) build release --target alpha --target torbrowser-android-x86 +alpha-android-aarch64: submodule-update + $(rbm) build release --target alpha --target torbrowser-android-aarch64 + alpha-linux-x86_64: submodule-update $(rbm) build release --target alpha --target torbrowser-linux-x86_64 @@ -71,6 +77,9 @@ nightly-android-armv7: submodule-update nightly-android-x86: submodule-update $(rbm) build release --target nightly --target torbrowser-android-x86 +nightly-android-aarch64: submodule-update + $(rbm) build release --target nightly --target torbrowser-android-aarch64 + nightly-linux-x86_64: submodule-update $(rbm) build release --target nightly --target torbrowser-linux-x86_64 @@ -101,6 +110,9 @@ alpha_nightly-android-armv7: submodule-update alpha_nightly-android-x86: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-android-x86 +alpha_nightly-android-aarch64: submodule-update + $(rbm) build release --target alpha_nightly --target torbrowser-android-aarch64 + alpha_nightly-linux-x86_64: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-linux-x86_64 @@ -128,6 +140,9 @@ testbuild-android-armv7: submodule-update testbuild-android-x86: submodule-update $(rbm) build release --target testbuild --target torbrowser-android-x86 +testbuild-android-aarch64: submodule-update + $(rbm) build release --target testbuild --target torbrowser-android-aarch64 + testbuild-linux-x86_64: submodule-update $(rbm) build release --target testbuild --target torbrowser-linux-x86_64 diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index 9fe40f7..e0f59a9 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -18,11 +18,9 @@ cd $NDK_HOME mv android-ndk-r15c/* . rm -fR android-ndk-r15c -# The architectures we support -archs="arm x86" -for arch in $archs; do - ./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api") %] --arch $arch --install-dir=./$arch -done +./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api_armv7") %] --arch arm --install-dir=./arm +./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api_x86") %] --arch x86 --install-dir=./x86 +./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api_aarch64") %] --arch arm64 --install-dir=./arm64 # Tool Archives cd $SDK_HOME diff --git a/projects/firefox/mozconfig-android-aarch64 b/projects/firefox/mozconfig-android-aarch64 new file mode 100644 index 0000000..2a9eb67 --- /dev/null +++ b/projects/firefox/mozconfig-android-aarch64 @@ -0,0 +1,50 @@ +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-aarch64-linux-android +mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" +export MOZILLA_OFFICIAL=1 + +ac_add_options --enable-optimize +ac_add_options --enable-official-branding + +ac_add_options --enable-application=mobile/android +ac_add_options --target=aarch64-linux-android +ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk +ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux +ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.1/bin/gradle +ac_add_options --with-android-version=21 + +# Android NDK does not contain llvm-config so set clang path in options +ac_add_options --with-libclang-path=/var/tmp/dist/android-toolchain/android-ndk/arm64/lib64 +ac_add_options --with-clang-path=/var/tmp/dist/android-toolchain/android-ndk/arm64/bin/clang + +ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser +ac_add_options --with-l10n-base=/var/tmp/dist/locales + +# We do not use Tor Launcher on Android: +ac_add_options --disable-tor-launcher + +if [ -z "${TB_BUILD_WITH_UPDATER}" ]; then +# Because Google Play will likely be the primary distribution medium, +# we disable updating and rely on Google Play by default. The +# Developer Policy explicitly prohibits in-app updating: +# An app distributed via Google Play may not modify, replace, or +# update itself using any method other than Google Plays update +# mechanism. +# https://play.google.com/about/privacy-security-deception/malicious-behavior/ + + ac_add_options --disable-tor-browser-update + ac_add_options --disable-signmar + ac_add_options --disable-verify-mar +fi + +ac_add_options --enable-strip +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --disable-rust-debug +ac_add_options --disable-maintenance-service +ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc + +ac_add_options --without-google-play-services + +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme diff --git a/projects/release/build b/projects/release/build index af9d673..3e930e0 100644 --- a/projects/release/build +++ b/projects/release/build @@ -10,6 +10,9 @@ mkdir -p "$destdir" [% IF c("var/torbrowser-android-x86") -%] mv [% c('input_files_by_name/android-x86') %]/* "$destdir"/ [% END -%] +[% IF c("var/torbrowser-android-aarch64") -%] + mv [% c('input_files_by_name/android-aarch64') %]/* "$destdir"/ +[% END -%] [% IF c("var/torbrowser-windows-i686") -%] mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/ diff --git a/projects/release/config b/projects/release/config index ddb17d1..1623083 100644 --- a/projects/release/config +++ b/projects/release/config @@ -24,6 +24,9 @@ targets: torbrowser-android-x86: var: torbrowser-android-x86: 1 + torbrowser-android-aarch64: + var: + torbrowser-android-aarch64: 1 torbrowser-linux-x86_64: var: torbrowser-linux-x86_64: 1 @@ -117,6 +120,13 @@ input_files: - '[% c("var/build_target") %]' - torbrowser-android-x86 + - name: android-aarch64 + project: tor-browser + enable: '[% c("var/torbrowser-android-aarch64") %]' + target: + - '[% c("var/build_target") %]' + - torbrowser-android-aarch64 + - name: linux-x86_64 project: tor-browser enable: '[% c("var/torbrowser-linux-x86_64") %]' diff --git a/projects/rust/config b/projects/rust/config index 2ed48c0..d784d39 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -30,6 +30,10 @@ targets: var: configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=i686-linux-android --set=target.i686-linux-android.cc=$ANDROID_NDK_HOME/x86/bin/i686-linux-android-gcc + android-aarch64: + var: + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=aarch64-linux-android --set=target.aarch64-linux-android.cc=$ANDROID_NDK_HOME/arm64/bin/aarch64-linux-android-gcc + linux: var: rust_arch: x86_64 diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android index be36abc..b90c8b9 100644 --- a/projects/tor-browser/build.android +++ b/projects/tor-browser/build.android @@ -24,13 +24,16 @@ zip -d $apk lib/\* zip_src => [ 'lib/x86/*' ], zip_args => '$apk', }) %] -[% END %] - -[% IF c("var/android-armv7") %] +[% ELSIF c("var/android-armv7") %] [% c('zip', { zip_src => [ 'lib/armeabi-v7a/*' ], zip_args => '$apk', }) %] +[% ELSIF c("var/android-aarch64") %] + [% c('zip', { + zip_src => [ 'lib/arm64-v8a/*' ], + zip_args => '$apk', + }) %] [% END %] rm -fR lib diff --git a/rbm.conf b/rbm.conf index 657ce31..62a19a6 100644 --- a/rbm.conf +++ b/rbm.conf @@ -190,12 +190,24 @@ targets: var: android-x86: 1 osname: android-x86 + torbrowser-android-aarch64: + - android-aarch64 + - android + android-aarch64: + arch: aarch64 + var: + android-aarch64: 1 + osname: android-aarch64 android: var: android: 1 compiler: android-toolchain # API 16 is the minimum we currently support for Tor Browser on Android - android_min_api: 16 + android_min_api: '[% GET c("var/android_min_api_" _ c("arch")) %]' + # API 21 is the minimum we currently support for arm64 on Android + android_min_api_aarch64: 21 + android_min_api_armv7: 16 + android_min_api_x86: 16 snowflake: 0 container: suite: stretch

1 0

[tor-browser-build/master] Bug 30549: Add script to remove expired and revoked sub-keys from a keyring file
by gk＠torproject.org 01 Jul '19

01 Jul '19

commit 419b0bef89047450a88292ea34bb8ef1e746bbea Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jul 1 16:02:54 2019 +0200 Bug 30549: Add script to remove expired and revoked sub-keys from a keyring file The tools/keyring/drop-expired-sub-keys script can be used to drop all expired and revoked sub-keys from a keyring. We also add the script tools/keyring/list-all-keyrings which can be used to list all the keys included in all the keyring files, to make it easier to review if any key needs to be removed. --- tools/keyring/README | 29 +++++++++++++++++++++++++++++ tools/keyring/drop-expired-sub-keys | 22 ++++++++++++++++++++++ tools/keyring/list-all-keyrings | 10 ++++++++++ 3 files changed, 61 insertions(+) diff --git a/tools/keyring/README b/tools/keyring/README new file mode 100644 index 0000000..ffbb2a8 --- /dev/null +++ b/tools/keyring/README @@ -0,0 +1,29 @@ +The keyring/ directory contains some gpg keyring files that we use +during the build to verify gpg signatures on downloaded files, or git +tags. In order to be able to continue to use a git tag even after the +key or sub-key that signed it expired (which is common when one is +rotating sub-keys frequently), we configured gpg to ignore key expirations +when verifying git tag signatures. However this also means that we should +make sure that our keyring files do not contain expired keys or subkeys +that are not supposed to be used anymore. + +This directory contains some scripts that can help clean the keyring +files. + +The complete process for cleaning keyring files starts with: + + - Run `list-all-keyrings` to see if we include any expired key or sub-key. + +Then for each expired key or sub-key: + + - Check if the expiration is expected, and do nothing in that case. + + - Check if the owner of that key or sub-key extended it, and in that + case add the updated key or sub-key. + + - If a key is not needed anymore (but other keys in the keyring are + still needed), remove it with `gpg --delete-keys <key>`. + + - If a sub-key is not needed anymore, but the main key still contains + at least one other valid sub-key, use `drop-expired-sub-keys` to + remove the expired sub-key. diff --git a/tools/keyring/drop-expired-sub-keys b/tools/keyring/drop-expired-sub-keys new file mode 100755 index 0000000..e7bbe50 --- /dev/null +++ b/tools/keyring/drop-expired-sub-keys @@ -0,0 +1,22 @@ +#!/bin/bash + +# Drop expired and revoked sub-keys from a keyring file +# +# usage: drop-expired-sub-keys <keyring-file> +# +# Note: this script only handles the case where all expired and revoked +# sub-keys should be removed, so it cannot be used in the cases where +# some of the expired sub-keys need to be kept. It is also only handling +# one small part of the process to clean the keyring files and is not +# supposed to be run on all keyring files. +# +# See the README file for the complete process for cleaning keyring files. + +set -e +keyring="$1" +test -f "$keyring" +tmpfile=$(mktemp) +gpg --no-auto-check-trustdb --no-default-keyring --keyring "$keyring" --armor --export-options export-clean --export-filter 'drop-subkey=expired -t || revoked -t' --export > "$tmpfile" +rm -f "$keyring" +gpg --no-auto-check-trustdb --trust-model always --no-default-keyring --keyring "$keyring" --import "$tmpfile" +rm -f "$tmpfile" diff --git a/tools/keyring/list-all-keyrings b/tools/keyring/list-all-keyrings new file mode 100755 index 0000000..2d053c4 --- /dev/null +++ b/tools/keyring/list-all-keyrings @@ -0,0 +1,10 @@ +#!/bin/sh + +# List all keys included in our keyring files, including expired sub-keys. + +set -e +cd $(dirname "$0")/../.. +for keyring in ./keyring/*.gpg +do + gpg --no-auto-check-trustdb --list-options show-unusable-subkeys,show-keyring --no-default-keyring --list-keys --keyring "$keyring" +done

1 0

[torbutton/maint-2.1] Bug 31041: stop syncing network.cookie.lifetimePolicy
by gk＠torproject.org 01 Jul '19

01 Jul '19

commit 4cec079c058d5756a47f9d661b7aea7a95d31076 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Jul 1 14:51:15 2019 +0200 Bug 31041: stop syncing network.cookie.lifetimePolicy Also browser.download.manager.retention, since it's not used anymore in the browser. --- src/chrome/content/torbutton.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 53fe4fc9..971d3023 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1527,14 +1527,6 @@ function torbutton_update_disk_prefs() { // Third party abuse. Leave it off for now. //m_tb_prefs.setBoolPref("browser.cache.offline.enable", !mode); - if (mode) { - m_tb_prefs.setIntPref("network.cookie.lifetimePolicy", 2); - m_tb_prefs.setIntPref("browser.download.manager.retention", 1); - } else { - m_tb_prefs.setIntPref("network.cookie.lifetimePolicy", 0); - m_tb_prefs.setIntPref("browser.download.manager.retention", 2); - } - // Force prefs to be synced to disk Services.prefs.savePrefFile(null); }

1 0

[torbutton/master] Bug 31041: stop syncing network.cookie.lifetimePolicy
by gk＠torproject.org 01 Jul '19

01 Jul '19

commit a13b6c870afa18ac1c7747aa928f89b5706a9f44 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Jul 1 14:51:15 2019 +0200 Bug 31041: stop syncing network.cookie.lifetimePolicy Also browser.download.manager.retention, since it's not used anymore in the browser. --- src/chrome/content/torbutton.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 53fe4fc9..971d3023 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1527,14 +1527,6 @@ function torbutton_update_disk_prefs() { // Third party abuse. Leave it off for now. //m_tb_prefs.setBoolPref("browser.cache.offline.enable", !mode); - if (mode) { - m_tb_prefs.setIntPref("network.cookie.lifetimePolicy", 2); - m_tb_prefs.setIntPref("browser.download.manager.retention", 1); - } else { - m_tb_prefs.setIntPref("network.cookie.lifetimePolicy", 0); - m_tb_prefs.setIntPref("browser.download.manager.retention", 2); - } - // Force prefs to be synced to disk Services.prefs.savePrefFile(null); }

1 0

[tor-browser-build/master] Fold in stable Changelog
by gk＠torproject.org 01 Jul '19

01 Jul '19

commit 80c4d17b1976ee06e2c4c553f9a4f42d7122f314 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jul 1 11:36:27 2019 +0000 Fold in stable Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index b03054b..37e89a2 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -5,6 +5,17 @@ Tor Browser 9.0a3 -- June 24 2019 * Bug 29904: NoScript blocks MP4 on higher security levels * Bug 30624+29043+29647: Prevent XSS protection from freezing the browser +Tor Browser 8.5.3 -- June 21 2019 + * All platforms + * Pick up fix for Mozilla's bug 1560192 + +Tor Browser 8.5.2 -- June 19 2019 + * All platforms + * Pick up fix for Mozilla's bug 1544386 + * Update NoScript to 10.6.3 + * Bug 29904: NoScript blocks MP4 on higher security levels + * Bug 30624+29043+29647: Prevent XSS protection from freezing the browser + Tor Browser 9.0a2 -- June 11 2019 * All platforms * Update Torbutton to 2.2

1 0

[tor-browser-build/master] Bug 30863: Fix tor-android-service and tor-onion-proxy-library filenames
by gk＠torproject.org 26 Jun '19

26 Jun '19

commit a27f6be9a921119cb5e7869da9b891c359651bda Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jun 12 12:03:54 2019 +0200 Bug 30863: Fix tor-android-service and tor-onion-proxy-library filenames --- projects/tor-android-service/config | 2 +- projects/tor-onion-proxy-library/config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 2290c6e..ec0d4b0 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' git_hash: d9b049c8cee225b4e7bb6f0191093f543d0f9f65 git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1 diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index 9db33bd..0f24402 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' git_hash: 27df20a5cb107a009db009df4aaef000a6e78e2e git_url: https://github.com/sisbell/Tor_Onion_Proxy_Library.git git_submodule: 1

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_30863'
by gk＠torproject.org 26 Jun '19

26 Jun '19

commit b4414487740039152a8fa62dde5d8ea13aa34cb2 Merge: 343b8bc a27f6be Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 26 12:18:28 2019 +0000 Merge remote-tracking branch 'boklm/bug_30863' projects/tor-android-service/config | 2 +- projects/tor-onion-proxy-library/config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

1 0

[tor-browser/tor-browser-60.7.0esr-9.0-1] Bug 1544386 part 1 - Call ElementAccessHasExtraIndexedProperty instead of ArrayPrototypeHasIndexedProperty when inlining array natives. r=tcampbell a=lizzard
by gk＠torproject.org 20 Jun '19

20 Jun '19

commit 84dcecbb38bfda010f1c093f6c74776363e05593 Author: Jan de Mooij <jdemooij(a)mozilla.com> Date: Mon Jun 17 20:26:56 2019 -0700 Bug 1544386 part 1 - Call ElementAccessHasExtraIndexedProperty instead of ArrayPrototypeHasIndexedProperty when inlining array natives. r=tcampbell a=lizzard This simplifies the code a bit because ElementAccessHasExtraIndexedProperty checks for length-overflow and sparse-indexes so the callers don't have to do that anymore. Differential Revision: https://phabricator.services.mozilla.com/D29486 --HG-- extra : amend_source : 545208ea4a5e0646837959eace9b527620a8f7ba --- js/src/jit/MCallOptimize.cpp | 21 +++++---------------- js/src/jit/MIR.cpp | 9 --------- js/src/jit/MIR.h | 2 -- 3 files changed, 5 insertions(+), 27 deletions(-) diff --git a/js/src/jit/MCallOptimize.cpp b/js/src/jit/MCallOptimize.cpp index 6f4764313b93..fe10f48b0323 100644 --- a/js/src/jit/MCallOptimize.cpp +++ b/js/src/jit/MCallOptimize.cpp @@ -673,9 +673,10 @@ IonBuilder::InliningResult IonBuilder::inlineArrayPopShift( return InliningStatus_NotInlined; } + // Watch out for extra indexed properties on the object or its prototype. bool hasIndexedProperty; MOZ_TRY_VAR(hasIndexedProperty, - ArrayPrototypeHasIndexedProperty(this, script())); + ElementAccessHasExtraIndexedProperty(this, obj)); if (hasIndexedProperty) { trackOptimizationOutcome(TrackedOutcome::ProtoIndexedProps); return InliningStatus_NotInlined; @@ -775,16 +776,10 @@ IonBuilder::InliningResult IonBuilder::inlineArrayPush(CallInfo& callInfo) { if (!thisTypes) return InliningStatus_NotInlined; const Class* clasp = thisTypes->getKnownClass(constraints()); if (clasp != &ArrayObject::class_) return InliningStatus_NotInlined; - if (thisTypes->hasObjectFlags( - constraints(), - OBJECT_FLAG_SPARSE_INDEXES | OBJECT_FLAG_LENGTH_OVERFLOW)) { - trackOptimizationOutcome(TrackedOutcome::ArrayBadFlags); - return InliningStatus_NotInlined; - } bool hasIndexedProperty; MOZ_TRY_VAR(hasIndexedProperty, - ArrayPrototypeHasIndexedProperty(this, script())); + ElementAccessHasExtraIndexedProperty(this, obj)); if (hasIndexedProperty) { trackOptimizationOutcome(TrackedOutcome::ProtoIndexedProps); return InliningStatus_NotInlined; @@ -903,17 +898,11 @@ IonBuilder::InliningResult IonBuilder::inlineArraySlice(CallInfo& callInfo) { const Class* clasp = thisTypes->getKnownClass(constraints()); if (clasp != &ArrayObject::class_) return InliningStatus_NotInlined; - if (thisTypes->hasObjectFlags( - constraints(), - OBJECT_FLAG_SPARSE_INDEXES | OBJECT_FLAG_LENGTH_OVERFLOW)) { - trackOptimizationOutcome(TrackedOutcome::ArrayBadFlags); - return InliningStatus_NotInlined; - } - // Watch out for indexed properties on the prototype. + // Watch out for extra indexed properties on the object or its prototype. bool hasIndexedProperty; MOZ_TRY_VAR(hasIndexedProperty, - ArrayPrototypeHasIndexedProperty(this, script())); + ElementAccessHasExtraIndexedProperty(this, obj)); if (hasIndexedProperty) { trackOptimizationOutcome(TrackedOutcome::ProtoIndexedProps); return InliningStatus_NotInlined; diff --git a/js/src/jit/MIR.cpp b/js/src/jit/MIR.cpp index 4d37c264ae18..87b78b24e09b 100644 --- a/js/src/jit/MIR.cpp +++ b/js/src/jit/MIR.cpp @@ -5671,15 +5671,6 @@ AbortReasonOr<bool> PrototypeHasIndexedProperty(IonBuilder* builder, return false; } -// Whether Array.prototype, or an object on its proto chain, has an indexed -// property. -AbortReasonOr<bool> jit::ArrayPrototypeHasIndexedProperty(IonBuilder* builder, - JSScript* script) { - if (JSObject* proto = script->global().maybeGetArrayPrototype()) - return PrototypeHasIndexedProperty(builder, proto); - return true; -} - // Whether obj or any of its prototypes have an indexed property. AbortReasonOr<bool> jit::TypeCanHaveExtraIndexedProperties( IonBuilder* builder, TemporaryTypeSet* types) { diff --git a/js/src/jit/MIR.h b/js/src/jit/MIR.h index 85b8afff445c..b45eaba68222 100644 --- a/js/src/jit/MIR.h +++ b/js/src/jit/MIR.h @@ -12575,8 +12575,6 @@ bool PropertyWriteNeedsTypeBarrier(TempAllocator& alloc, PropertyName* name, MDefinition** pvalue, bool canModify, MIRType implicitType = MIRType::None); -AbortReasonOr<bool> ArrayPrototypeHasIndexedProperty(IonBuilder* builder, - JSScript* script); AbortReasonOr<bool> TypeCanHaveExtraIndexedProperties(IonBuilder* builder, TemporaryTypeSet* types);

1 0

[tor-browser/tor-browser-60.7.0esr-9.0-1] Bug 1560192 - Clean up prompt open calls in Prompter.jsm. r=Gijs, a=pascalc
by gk＠torproject.org 20 Jun '19

20 Jun '19

commit b512c194bccfab64c3d27065b4d2e535f53ba979 Author: Johann Hofmann <jhofmann(a)mozilla.com> Date: Wed Jun 19 21:59:18 2019 +0000 Bug 1560192 - Clean up prompt open calls in Prompter.jsm. r=Gijs, a=pascalc Differential Revision: https://phabricator.services.mozilla.com/D35371 --HG-- extra : source : bfd88bfc61c42a09475da8749b2218f540e4592c --- browser/modules/RemotePrompt.jsm | 14 +++++++++----- toolkit/components/prompts/src/nsPrompter.js | 18 +++++++++--------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/browser/modules/RemotePrompt.jsm b/browser/modules/RemotePrompt.jsm index 45755c2446fc..f94052410d5c 100644 --- a/browser/modules/RemotePrompt.jsm +++ b/browser/modules/RemotePrompt.jsm @@ -23,10 +23,14 @@ var RemotePrompt = { receiveMessage(message) { switch (message.name) { case "Prompt:Open": - if (message.data.uri) { - this.openModalWindow(message.data, message.target); - } else { + const COMMON_DIALOG = "chrome://global/content/commonDialog.xul"; + const SELECT_DIALOG = "chrome://global/content/selectDialog.xul"; + + if (message.data.tabPrompt) { this.openTabPrompt(message.data, message.target); + } else { + let uri = (message.data.promptType == "select") ? SELECT_DIALOG : COMMON_DIALOG; + this.openModalWindow(uri, message.data, message.target); } break; } @@ -90,13 +94,13 @@ var RemotePrompt = { } }, - openModalWindow(args, browser) { + openModalWindow(uri, args, browser) { let window = browser.ownerGlobal; try { PromptUtils.fireDialogEvent(window, "DOMWillOpenModalDialog", browser); let bag = PromptUtils.objectToPropBag(args); - Services.ww.openWindow(window, args.uri, "_blank", + Services.ww.openWindow(window, uri, "_blank", "centerscreen,chrome,modal,titlebar", bag); PromptUtils.propBagToObject(bag, args); diff --git a/toolkit/components/prompts/src/nsPrompter.js b/toolkit/components/prompts/src/nsPrompter.js index bf76cd8b2078..77a65b25b100 100644 --- a/toolkit/components/prompts/src/nsPrompter.js +++ b/toolkit/components/prompts/src/nsPrompter.js @@ -430,7 +430,7 @@ function openTabPrompt(domWin, tabPrompt, args) { } } -function openRemotePrompt(domWin, args, tabPrompt) { +function openRemotePrompt(domWin, args) { let docShell = domWin.QueryInterface(Ci.nsIInterfaceRequestor) .getInterface(Ci.nsIDocShell); let messageManager = docShell.QueryInterface(Ci.nsIInterfaceRequestor) @@ -438,7 +438,7 @@ function openRemotePrompt(domWin, args, tabPrompt) { .messageManager; let inPermitUnload = docShell.contentViewer && docShell.contentViewer.inPermitUnload; - let eventDetail = Cu.cloneInto({tabPrompt, inPermitUnload}, domWin); + let eventDetail = Cu.cloneInto({tabPrompt: args.tabPrompt, inPermitUnload}, domWin); PromptUtils.fireDialogEvent(domWin, "DOMWillOpenModalDialog", null, eventDetail); let winUtils = domWin.QueryInterface(Ci.nsIInterfaceRequestor) @@ -536,7 +536,8 @@ ModalPrompter.prototype = { if (allowTabModal && this.domWin) { if (Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT) { - openRemotePrompt(this.domWin, args, true); + args.tabPrompt = true; + openRemotePrompt(this.domWin, args); return; } @@ -548,17 +549,16 @@ ModalPrompter.prototype = { } // If we can't do a tab modal prompt, fallback to using a window-modal dialog. - const COMMON_DIALOG = "chrome://global/content/commonDialog.xul"; - const SELECT_DIALOG = "chrome://global/content/selectDialog.xul"; - - let uri = (args.promptType == "select") ? SELECT_DIALOG : COMMON_DIALOG; - if (Services.appinfo.processType === Services.appinfo.PROCESS_TYPE_CONTENT) { - args.uri = uri; + args.tabPrompt = false; openRemotePrompt(this.domWin, args); return; } + const COMMON_DIALOG = "chrome://global/content/commonDialog.xul"; + const SELECT_DIALOG = "chrome://global/content/selectDialog.xul"; + + let uri = (args.promptType == "select") ? SELECT_DIALOG : COMMON_DIALOG; let propBag = PromptUtils.objectToPropBag(args); openModalWindow(this.domWin, uri, propBag); PromptUtils.propBagToObject(propBag, args);

1 0

[tor-browser/tor-browser-60.7.0esr-9.0-1] Bug 30575: Don't allow enterprise policies in Tor Browser
by gk＠torproject.org 20 Jun '19

20 Jun '19

commit 9d582e62e32ee8143fd638744f2f5f0f49c28ca3 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 7 11:49:06 2019 +0000 Bug 30575: Don't allow enterprise policies in Tor Browser --- .../enterprisepolicies/EnterprisePolicies.js | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/browser/components/enterprisepolicies/EnterprisePolicies.js b/browser/components/enterprisepolicies/EnterprisePolicies.js index 20cc33628f2a..4bab7d000ab0 100644 --- a/browser/components/enterprisepolicies/EnterprisePolicies.js +++ b/browser/components/enterprisepolicies/EnterprisePolicies.js @@ -78,20 +78,10 @@ EnterprisePoliciesManager.prototype = { _xpcom_factory: EnterprisePoliciesFactory, _initialize() { - let provider = this._chooseProvider(); - - if (!provider) { - this.status = Ci.nsIEnterprisePolicies.INACTIVE; - return; - } - - if (provider.failed) { - this.status = Ci.nsIEnterprisePolicies.FAILED; - return; - } - - this.status = Ci.nsIEnterprisePolicies.ACTIVE; - this._activatePolicies(provider.policies); + // We don't want to have any enterprise policies in Tor Browser enabled as + // those can affect proxy settings etc. See: e.g. #30575. + this.status = Ci.nsIEnterprisePolicies.INACTIVE; + return; }, _chooseProvider() {

1 0

[tor-browser-build/master] Pick up the second chemspill as well
by gk＠torproject.org 20 Jun '19

20 Jun '19

commit 343b8bc4e9208e9b412cfb9227fa26449bc8458a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 20 14:08:48 2019 +0000 Pick up the second chemspill as well --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- rbm.conf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 9d548cd..20c5b0f 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 851cc5e..b03054b 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,6 +1,6 @@ -Tor Browser 9.0a3 -- June 20 2019 +Tor Browser 9.0a3 -- June 24 2019 * All platforms - * Pick up fix for Mozilla's bug 1544386 + * Pick up fixes for Mozilla's bug 1544386 and 1560192 * Update NoScript to 10.6.3 * Bug 29904: NoScript blocks MP4 on higher security levels * Bug 30624+29043+29647: Prevent XSS protection from freezing the browser diff --git a/rbm.conf b/rbm.conf index 8e90615..657ce31 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.0a3' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 9.0a2 project_name: tor-browser

1 0

[tor-browser/tor-browser-60.7.0esr-9.0-2] Bug 1560192 - Clean up prompt open calls in Prompter.jsm. r=Gijs, a=pascalc
by gk＠torproject.org 20 Jun '19

20 Jun '19

commit df852fdc7f75aa7edddbaf1b54eea3484a552414 Author: Johann Hofmann <jhofmann(a)mozilla.com> Date: Wed Jun 19 21:59:18 2019 +0000 Bug 1560192 - Clean up prompt open calls in Prompter.jsm. r=Gijs, a=pascalc Differential Revision: https://phabricator.services.mozilla.com/D35371 --HG-- extra : source : bfd88bfc61c42a09475da8749b2218f540e4592c --- browser/modules/RemotePrompt.jsm | 14 +++++++++----- toolkit/components/prompts/src/nsPrompter.js | 18 +++++++++--------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/browser/modules/RemotePrompt.jsm b/browser/modules/RemotePrompt.jsm index 45755c2446fc..f94052410d5c 100644 --- a/browser/modules/RemotePrompt.jsm +++ b/browser/modules/RemotePrompt.jsm @@ -23,10 +23,14 @@ var RemotePrompt = { receiveMessage(message) { switch (message.name) { case "Prompt:Open": - if (message.data.uri) { - this.openModalWindow(message.data, message.target); - } else { + const COMMON_DIALOG = "chrome://global/content/commonDialog.xul"; + const SELECT_DIALOG = "chrome://global/content/selectDialog.xul"; + + if (message.data.tabPrompt) { this.openTabPrompt(message.data, message.target); + } else { + let uri = (message.data.promptType == "select") ? SELECT_DIALOG : COMMON_DIALOG; + this.openModalWindow(uri, message.data, message.target); } break; } @@ -90,13 +94,13 @@ var RemotePrompt = { } }, - openModalWindow(args, browser) { + openModalWindow(uri, args, browser) { let window = browser.ownerGlobal; try { PromptUtils.fireDialogEvent(window, "DOMWillOpenModalDialog", browser); let bag = PromptUtils.objectToPropBag(args); - Services.ww.openWindow(window, args.uri, "_blank", + Services.ww.openWindow(window, uri, "_blank", "centerscreen,chrome,modal,titlebar", bag); PromptUtils.propBagToObject(bag, args); diff --git a/toolkit/components/prompts/src/nsPrompter.js b/toolkit/components/prompts/src/nsPrompter.js index bf76cd8b2078..77a65b25b100 100644 --- a/toolkit/components/prompts/src/nsPrompter.js +++ b/toolkit/components/prompts/src/nsPrompter.js @@ -430,7 +430,7 @@ function openTabPrompt(domWin, tabPrompt, args) { } } -function openRemotePrompt(domWin, args, tabPrompt) { +function openRemotePrompt(domWin, args) { let docShell = domWin.QueryInterface(Ci.nsIInterfaceRequestor) .getInterface(Ci.nsIDocShell); let messageManager = docShell.QueryInterface(Ci.nsIInterfaceRequestor) @@ -438,7 +438,7 @@ function openRemotePrompt(domWin, args, tabPrompt) { .messageManager; let inPermitUnload = docShell.contentViewer && docShell.contentViewer.inPermitUnload; - let eventDetail = Cu.cloneInto({tabPrompt, inPermitUnload}, domWin); + let eventDetail = Cu.cloneInto({tabPrompt: args.tabPrompt, inPermitUnload}, domWin); PromptUtils.fireDialogEvent(domWin, "DOMWillOpenModalDialog", null, eventDetail); let winUtils = domWin.QueryInterface(Ci.nsIInterfaceRequestor) @@ -536,7 +536,8 @@ ModalPrompter.prototype = { if (allowTabModal && this.domWin) { if (Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT) { - openRemotePrompt(this.domWin, args, true); + args.tabPrompt = true; + openRemotePrompt(this.domWin, args); return; } @@ -548,17 +549,16 @@ ModalPrompter.prototype = { } // If we can't do a tab modal prompt, fallback to using a window-modal dialog. - const COMMON_DIALOG = "chrome://global/content/commonDialog.xul"; - const SELECT_DIALOG = "chrome://global/content/selectDialog.xul"; - - let uri = (args.promptType == "select") ? SELECT_DIALOG : COMMON_DIALOG; - if (Services.appinfo.processType === Services.appinfo.PROCESS_TYPE_CONTENT) { - args.uri = uri; + args.tabPrompt = false; openRemotePrompt(this.domWin, args); return; } + const COMMON_DIALOG = "chrome://global/content/commonDialog.xul"; + const SELECT_DIALOG = "chrome://global/content/selectDialog.xul"; + + let uri = (args.promptType == "select") ? SELECT_DIALOG : COMMON_DIALOG; let propBag = PromptUtils.objectToPropBag(args); openModalWindow(this.domWin, uri, propBag); PromptUtils.propBagToObject(propBag, args);

1 0

[tor-browser-build/maint-8.5] A Changelog would be good as well
by gk＠torproject.org 20 Jun '19

20 Jun '19

commit 9024841d836d737b2372a6535e3cf2d9761c46cd Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 20 04:26:32 2019 +0000 A Changelog would be good as well --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++++ rbm.conf | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 317bb1f..8763d44 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,7 @@ +Tor Browser 8.5.3 -- June 21 2019 + * All platforms + * Pick up fix for Mozilla's bug 1560192 + Tor Browser 8.5.2 -- June 19 2019 * All platforms * Pick up fix for Mozilla's bug 1544386 diff --git a/rbm.conf b/rbm.conf index 6c60049..060686b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '8.5.3' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.5.1 - 8.5.2

1 0

[tor-browser-build/maint-8.5] Release prep for 8.5.3
by gk＠torproject.org 20 Jun '19

20 Jun '19

commit aaff2ce4348a6511ba672286bbb6619a2fc50dde Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 20 04:15:37 2019 +0000 Release prep for 8.5.3 --- projects/firefox/config | 2 +- rbm.conf | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index e95ccbd..be222a5 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index 651bf98..6c60049 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.5.2' + torbrowser_version: '8.5.3' torbrowser_build: 'build1' torbrowser_incremental_from: - 8.5.1 + - 8.5.2 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-60.7.0esr-8.5-2] Bug 1560192 - Clean up prompt open calls in Prompter.jsm. r=Gijs, a=pascalc
by gk＠torproject.org 20 Jun '19

20 Jun '19

commit e7f025ee58e2ba638fd9e5eae549bdc2b3644ccc Author: Johann Hofmann <jhofmann(a)mozilla.com> Date: Wed Jun 19 21:59:18 2019 +0000 Bug 1560192 - Clean up prompt open calls in Prompter.jsm. r=Gijs, a=pascalc Differential Revision: https://phabricator.services.mozilla.com/D35371 --HG-- extra : source : bfd88bfc61c42a09475da8749b2218f540e4592c --- browser/modules/RemotePrompt.jsm | 14 +++++++++----- toolkit/components/prompts/src/nsPrompter.js | 18 +++++++++--------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/browser/modules/RemotePrompt.jsm b/browser/modules/RemotePrompt.jsm index 45755c2446fc..f94052410d5c 100644 --- a/browser/modules/RemotePrompt.jsm +++ b/browser/modules/RemotePrompt.jsm @@ -23,10 +23,14 @@ var RemotePrompt = { receiveMessage(message) { switch (message.name) { case "Prompt:Open": - if (message.data.uri) { - this.openModalWindow(message.data, message.target); - } else { + const COMMON_DIALOG = "chrome://global/content/commonDialog.xul"; + const SELECT_DIALOG = "chrome://global/content/selectDialog.xul"; + + if (message.data.tabPrompt) { this.openTabPrompt(message.data, message.target); + } else { + let uri = (message.data.promptType == "select") ? SELECT_DIALOG : COMMON_DIALOG; + this.openModalWindow(uri, message.data, message.target); } break; } @@ -90,13 +94,13 @@ var RemotePrompt = { } }, - openModalWindow(args, browser) { + openModalWindow(uri, args, browser) { let window = browser.ownerGlobal; try { PromptUtils.fireDialogEvent(window, "DOMWillOpenModalDialog", browser); let bag = PromptUtils.objectToPropBag(args); - Services.ww.openWindow(window, args.uri, "_blank", + Services.ww.openWindow(window, uri, "_blank", "centerscreen,chrome,modal,titlebar", bag); PromptUtils.propBagToObject(bag, args); diff --git a/toolkit/components/prompts/src/nsPrompter.js b/toolkit/components/prompts/src/nsPrompter.js index bf76cd8b2078..77a65b25b100 100644 --- a/toolkit/components/prompts/src/nsPrompter.js +++ b/toolkit/components/prompts/src/nsPrompter.js @@ -430,7 +430,7 @@ function openTabPrompt(domWin, tabPrompt, args) { } } -function openRemotePrompt(domWin, args, tabPrompt) { +function openRemotePrompt(domWin, args) { let docShell = domWin.QueryInterface(Ci.nsIInterfaceRequestor) .getInterface(Ci.nsIDocShell); let messageManager = docShell.QueryInterface(Ci.nsIInterfaceRequestor) @@ -438,7 +438,7 @@ function openRemotePrompt(domWin, args, tabPrompt) { .messageManager; let inPermitUnload = docShell.contentViewer && docShell.contentViewer.inPermitUnload; - let eventDetail = Cu.cloneInto({tabPrompt, inPermitUnload}, domWin); + let eventDetail = Cu.cloneInto({tabPrompt: args.tabPrompt, inPermitUnload}, domWin); PromptUtils.fireDialogEvent(domWin, "DOMWillOpenModalDialog", null, eventDetail); let winUtils = domWin.QueryInterface(Ci.nsIInterfaceRequestor) @@ -536,7 +536,8 @@ ModalPrompter.prototype = { if (allowTabModal && this.domWin) { if (Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT) { - openRemotePrompt(this.domWin, args, true); + args.tabPrompt = true; + openRemotePrompt(this.domWin, args); return; } @@ -548,17 +549,16 @@ ModalPrompter.prototype = { } // If we can't do a tab modal prompt, fallback to using a window-modal dialog. - const COMMON_DIALOG = "chrome://global/content/commonDialog.xul"; - const SELECT_DIALOG = "chrome://global/content/selectDialog.xul"; - - let uri = (args.promptType == "select") ? SELECT_DIALOG : COMMON_DIALOG; - if (Services.appinfo.processType === Services.appinfo.PROCESS_TYPE_CONTENT) { - args.uri = uri; + args.tabPrompt = false; openRemotePrompt(this.domWin, args); return; } + const COMMON_DIALOG = "chrome://global/content/commonDialog.xul"; + const SELECT_DIALOG = "chrome://global/content/selectDialog.xul"; + + let uri = (args.promptType == "select") ? SELECT_DIALOG : COMMON_DIALOG; let propBag = PromptUtils.objectToPropBag(args); openModalWindow(this.domWin, uri, propBag); PromptUtils.propBagToObject(propBag, args);

1 0

[tor-browser-build/master] Actually pick up the new tor-browser tag
by gk＠torproject.org 18 Jun '19

18 Jun '19

commit 0e00aa1e032441c8f447ff1b4d708074cd25f392 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 18 14:04:13 2019 +0000 Actually pick up the new tor-browser tag --- projects/firefox/config | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 073487c..9d548cd 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index d82bbad..8e90615 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.0a3' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 9.0a2 project_name: tor-browser

1 0