- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-115.0esrbase-13.0-1] fixup! Bug 23247: Communicating security expectations for .onion
by ma1 (＠ma1) 13 Jul '23

13 Jul '23

ma1 pushed to branch tor-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 82c31751 by cypherpunks1 at 2023-07-12T16:18:15-08:00 fixup! Bug 23247: Communicating security expectations for .onion Bug 41399: Enable brotli encoding for http onions - - - - - 1 changed file: - netwerk/protocol/http/HttpBaseChannel.cpp Changes: ===================================== netwerk/protocol/http/HttpBaseChannel.cpp ===================================== @@ -340,6 +340,7 @@ void HttpBaseChannel::AddClassificationFlags(uint32_t aClassificationFlags, static bool isSecureOrTrustworthyURL(nsIURI* aURI) { return aURI->SchemeIs("https") || + nsMixedContentBlocker::IsPotentiallyTrustworthyOnion(aURI) || (StaticPrefs::network_http_encoding_trustworthy_is_https() && nsMixedContentBlocker::IsPotentiallyTrustworthyLoopbackURL(aURI)); } @@ -366,7 +367,6 @@ nsresult HttpBaseChannel::Init(nsIURI* aURI, uint32_t aCaps, // Construct connection info object nsAutoCString host; int32_t port = -1; - bool isHTTPS = isSecureOrTrustworthyURL(mURI); nsresult rv = mURI->GetAsciiHost(host); if (NS_FAILED(rv)) return rv; @@ -395,7 +395,7 @@ nsresult HttpBaseChannel::Init(nsIURI* aURI, uint32_t aCaps, if (NS_FAILED(rv)) return rv; rv = gHttpHandler->AddStandardRequestHeaders( - &mRequestHead, isHTTPS, aContentPolicyType, + &mRequestHead, isSecureOrTrustworthyURL(mURI), aContentPolicyType, nsContentUtils::ShouldResistFingerprinting(this)); if (NS_FAILED(rv)) return rv; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/82c3175… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/82c3175… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-spec][main] Bug 31161: Document Android signing key creation/usage
by boklm (＠boklm) 13 Jul '23

13 Jul '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-spec Commits: 2b940775 by Matthew Finkel at 2023-07-13T10:14:42+02:00 Bug 31161: Document Android signing key creation/usage - - - - - 2 changed files: - + processes/APKSigning - processes/KeyGeneration Changes: ===================================== processes/APKSigning ===================================== @@ -0,0 +1,29 @@ +Signing Tor Browser for Android on a Linux machine +================================================== + +Signing +------- + +1) Ensure pkcs11 configuration file is available + +# Create a file containing the Provider arguments +- cat > /tmp/pkcs11_java.cfg << EOF +name = OpenSC-PKCS11 +description = SunPKCS11 via OpenSC +library = /usr/lib/x86_64-linux-gnu/opensc-pkcs11.so +slotListIndex = 0 +EOF + +2) Test the configuration file with `keytool` and confirm it can access the smartcard +- keytool -providerClass sun.security.pkcs11.SunPKCS11 \ + -providerArg /tmp/pkcs11_java.cfg -keystore NONE \ + -storetype PKCS11 -list + + +3) Signing the exectuable(s): + +- path/to/apksigner sign --verbose --provider-class sun.security.pkcs11.SunPKCS11 \ + --provider-arg pkcs11_java.cfg --ks NONE --ks-type PKCS11 \ + --debuggable-apk-permitted=false \ + --out tor-browser-${VERSION}-android-${arch}-multi-qa.apk \ + tor-browser-${VERSION}-android-${arch}-multi-unsigned.apk ===================================== processes/KeyGeneration ===================================== @@ -100,3 +100,71 @@ certtool r CertificateSigningRequest.certSigningRequest security add-certificates ~/developerID_application.cer security find-identity + + +APK Signing Key +=============== + +These instructions are for a Nitrokey, as described in +https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/26536 + +Software needed: +---------------- + +1) Android SDK build tools + + - Latest (at time of writing): + - https://developer.android.com/studio?hl=i#downloads + - https://dl.google.com/android/repository/commandlinetools-linux-6609375_lat… + - 89f308315e041c93a37a79e0627c47f21d5c5edbe5e80ea8dc0aac8a649e0e92 + +Installation +------------ + +1) Requirements + +- for the signing: sudo apt-get install nitrokey-app opensc-pkcs11 opensc openjdk-8-jdk + - https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/26536#n… + +`nitrokey-app` should automatically detect the nitrokey if it is connected +Debian Stretch provides version 0.6.3-1. + + $ nitrokey-app + +Expect: "Application started successfully." + + +Key Generation +-------------- + +1) Generate 4096-bit RSA key pair + + $ openssl genrsa -out secretkey.pem -aes128 -rand /dev/urandom 4096 + +2) Create CSR + + $ openssl req -new -key secretkey.pem -out request.pem -subj "/CN=Tor Browser/O=The Tor Project/L=Seattle/ST=WA/C=US" + +3) Generate certificate (Google Play requires minimum expiratation date of 22 October 2033 + # If you plan to publish your apps on Google Play, the key you use to sign + # your app must have a validity period ending after 22 October 2033. Google + # Play enforces this requirement to ensure that users can seamlessly + # upgrade apps when new versions are available. + # https://developer.android.com/studio/publish/app-signing#considerations + + $ openssl x509 -req -days 5475 -in request.pem -signkey secretkey.pem -out certificate.pem -extfile openssl.cnf -extensions usr_cert + +4) Export secret key and certificate in PKCS12 + + $ openssl pkcs12 -export -out secret_and_certificate.p12 -in certificate.pem -inkey secretkey.pem -aes128 + +5) Extract RSA public key + + $ openssl rsa -in secretkey.pem -pubout -out publickey.pem + +Install private signing key on Nitrokey +--------------------------------------- + +- pkcs15-init --delete-objects privkey,pubkey,chain \ + --id 3 --store-private-key secret_and_certificate.p12 \ + --format pkcs12 --auth-id 3 --verify-pin View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-spec/-/commit/2b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-spec/-/commit/2b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.0esrbase-13.0-1] Bug 41092: Add a RemoteSettings JSON dump for query-stripping
by ma1 (＠ma1) 12 Jul '23

12 Jul '23

ma1 pushed to branch base-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 0a89389f by cypherpunks1 at 2023-07-13T00:40:56+02:00 Bug 41092: Add a RemoteSettings JSON dump for query-stripping - - - - - 2 changed files: - services/settings/static-dumps/main/moz.build - + services/settings/static-dumps/main/query-stripping.json Changes: ===================================== services/settings/static-dumps/main/moz.build ===================================== @@ -5,6 +5,7 @@ FINAL_TARGET_FILES.defaults.settings.main += [ "doh-config.json", "doh-providers.json", + "query-stripping.json", ] if CONFIG["MOZ_BUILD_APP"] == "browser": ===================================== services/settings/static-dumps/main/query-stripping.json ===================================== @@ -0,0 +1,44 @@ +{ + "data": [ + { + "schema": 1678379807899, + "allowList": [], + "stripList": [ + "gclid", + "dclid", + "msclkid", + "_openstat", + "yclid", + "wickedid", + "twclid", + "_hsenc", + "__hssc", + "__hstc", + "__hsfp", + "hsctatracking", + "wbraid", + "gbraid", + "ysclid" + ], + "id": "85078bad-f31e-4d93-bb8a-81088b25d6dd", + "last_modified": 1678736907773 + }, + { + "schema": 1649695008608, + "allowList": [], + "stripList": [ + "mc_eid", + "oly_anon_id", + "oly_enc_id", + "__s", + "vero_id", + "_hsenc", + "mkt_tok", + "fbclid" + ], + "id": "76495cfc-fac9-4079-9b5f-9ff0784484de", + "last_modified": 1649762862679 + } + ], + "timestamp": 1678736907773 +} View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0a89389… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0a89389… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.0esrbase-13.0-1] Bug 33955: When copying an image only copy the image contents to the clipboard
by richard (＠richard) 12 Jul '23

12 Jul '23

richard pushed to branch base-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 53c25feb by cypherpunks1 at 2023-07-12T22:21:16+00:00 Bug 33955: When copying an image only copy the image contents to the clipboard - - - - - 2 changed files: - browser/base/content/browser-context.inc - dom/base/nsCopySupport.cpp Changes: ===================================== browser/base/content/browser-context.inc ===================================== @@ -219,7 +219,7 @@ #ifdef CONTEXT_COPY_IMAGE_CONTENTS <menuitem id="context-copyimage-contents" data-l10n-id="main-context-menu-image-copy" - oncommand="goDoCommand('cmd_copyImage');"/> + oncommand="goDoCommand('cmd_copyImageContents');"/> #endif <menuitem id="context-copyimage" data-l10n-id="main-context-menu-image-copy-link" ===================================== dom/base/nsCopySupport.cpp ===================================== @@ -503,7 +503,7 @@ nsresult nsCopySupport::ImageCopy(nsIImageLoadingContent* aImageElement, trans->SetReferrerInfo(referrerInfo); } -#ifdef XP_WIN +#if defined(XP_WIN) && !defined(BASE_BROWSER_VERSION) rv = AppendImagePromise(trans, imgRequest, aImageElement); NS_ENSURE_SUCCESS(rv, rv); #endif View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/53c25fe… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/53c25fe… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.0esrbase-13.0-1] Bug 33955: When copying an image only copy the image contents to the clipboard
by richard (＠richard) 12 Jul '23

12 Jul '23

richard pushed to branch tor-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 1fde2e0f by cypherpunks1 at 2023-07-12T22:20:31+00:00 Bug 33955: When copying an image only copy the image contents to the clipboard - - - - - 2 changed files: - browser/base/content/browser-context.inc - dom/base/nsCopySupport.cpp Changes: ===================================== browser/base/content/browser-context.inc ===================================== @@ -219,7 +219,7 @@ #ifdef CONTEXT_COPY_IMAGE_CONTENTS <menuitem id="context-copyimage-contents" data-l10n-id="main-context-menu-image-copy" - oncommand="goDoCommand('cmd_copyImage');"/> + oncommand="goDoCommand('cmd_copyImageContents');"/> #endif <menuitem id="context-copyimage" data-l10n-id="main-context-menu-image-copy-link" ===================================== dom/base/nsCopySupport.cpp ===================================== @@ -503,7 +503,7 @@ nsresult nsCopySupport::ImageCopy(nsIImageLoadingContent* aImageElement, trans->SetReferrerInfo(referrerInfo); } -#ifdef XP_WIN +#if defined(XP_WIN) && !defined(BASE_BROWSER_VERSION) rv = AppendImagePromise(trans, imgRequest, aImageElement); NS_ENSURE_SUCCESS(rv, rv); #endif View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1fde2e0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1fde2e0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.0esrbase-13.0-1] 2 commits: fixup! Firefox preference overrides.
by ma1 (＠ma1) 12 Jul '23

12 Jul '23

ma1 pushed to branch tor-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 44eff978 by cypherpunks1 at 2023-07-12T14:35:28+00:00 fixup! Firefox preference overrides. Bug 41092: Enable URL query stripping to protect against cross-site tracking - - - - - 9740e17d by cypherpunks1 at 2023-07-12T14:35:28+00:00 Bug 41092: Add a RemoteSettings JSON dump for query-stripping - - - - - 3 changed files: - browser/app/profile/001-base-profile.js - services/settings/static-dumps/main/moz.build - + services/settings/static-dumps/main/query-stripping.json Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -505,6 +505,11 @@ pref("corroborator.enabled", false); // stop using .textContent. pref("intl.multilingual.liveReload", false); +// Enable URL query stripping to protect against cross-site tracking (tor-browser#41092) +pref("privacy.query_stripping.enabled", true); +pref("privacy.query_stripping.enabled.pbmode", true); +pref("privacy.query_stripping.strip_on_share.enabled", true); + #ifdef XP_WIN // prefs to disable jump-list entries in the taskbar on Windows (see bug #12885) // this pref changes the app's set AUMID to be dependent on the profile path, rather than ===================================== services/settings/static-dumps/main/moz.build ===================================== @@ -5,6 +5,7 @@ FINAL_TARGET_FILES.defaults.settings.main += [ "doh-config.json", "doh-providers.json", + "query-stripping.json", ] if CONFIG["MOZ_BUILD_APP"] == "browser": ===================================== services/settings/static-dumps/main/query-stripping.json ===================================== @@ -0,0 +1,44 @@ +{ + "data": [ + { + "schema": 1678379807899, + "allowList": [], + "stripList": [ + "gclid", + "dclid", + "msclkid", + "_openstat", + "yclid", + "wickedid", + "twclid", + "_hsenc", + "__hssc", + "__hstc", + "__hsfp", + "hsctatracking", + "wbraid", + "gbraid", + "ysclid" + ], + "id": "85078bad-f31e-4d93-bb8a-81088b25d6dd", + "last_modified": 1678736907773 + }, + { + "schema": 1649695008608, + "allowList": [], + "stripList": [ + "mc_eid", + "oly_anon_id", + "oly_enc_id", + "__s", + "vero_id", + "_hsenc", + "mkt_tok", + "fbclid" + ], + "id": "76495cfc-fac9-4079-9b5f-9ff0784484de", + "last_modified": 1649762862679 + } + ], + "timestamp": 1678736907773 +} View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/5b4fa6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/5b4fa6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.0esrbase-13.0-1] Bug 41791: Omit the source URL when copying page contents to the clipboard
by richard (＠richard) 12 Jul '23

12 Jul '23

richard pushed to branch base-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 6c9e419d by cypherpunks1 at 2023-07-12T14:29:21+00:00 Bug 41791: Omit the source URL when copying page contents to the clipboard - - - - - 2 changed files: - dom/base/nsCopySupport.cpp - widget/windows/nsDataObj.cpp Changes: ===================================== dom/base/nsCopySupport.cpp ===================================== @@ -284,6 +284,7 @@ static nsresult CreateTransferable( NS_ENSURE_SUCCESS(rv, rv); } +#if !defined(BASE_BROWSER_VERSION) // Try and get source URI of the items that are being dragged nsIURI* uri = aDocument.GetDocumentURI(); if (uri) { @@ -304,6 +305,7 @@ static nsresult CreateTransferable( NS_ENSURE_SUCCESS(rv, rv); } } +#endif } else { if (!aEncodedDocumentWithContext.mSerializationForTextUnicode.IsEmpty()) { // Add the unicode DataFlavor to the transferable ===================================== widget/windows/nsDataObj.cpp ===================================== @@ -520,11 +520,13 @@ nsDataObj::nsDataObj(nsIURI* uri) m_enumFE = new CEnumFormatEtc(); m_enumFE->AddRef(); +#if !defined(BASE_BROWSER_VERSION) if (uri) { // A URI was obtained, so pass this through to the DataObject // so it can create a SourceURL for CF_HTML flavour uri->GetSpec(mSourceURL); } +#endif } //----------------------------------------------------- // destruction @@ -1978,6 +1980,7 @@ nsresult nsDataObj ::BuildPlatformHTML(const char* inOurHTML, *outPlatformHTML = nullptr; nsDependentCString inHTMLString(inOurHTML); +#if !defined(BASE_BROWSER_VERSION) // Do we already have mSourceURL from a drag? if (mSourceURL.IsEmpty()) { nsAutoString url; @@ -1985,6 +1988,7 @@ nsresult nsDataObj ::BuildPlatformHTML(const char* inOurHTML, AppendUTF16toUTF8(url, mSourceURL); } +#endif constexpr auto kStartHTMLPrefix = "Version:0.9\r\nStartHTML:"_ns; constexpr auto kEndHTMLPrefix = "\r\nEndHTML:"_ns; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6c9e419… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6c9e419… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.0esrbase-13.0-1] Bug 41791: Omit the source URL when copying page contents to the clipboard
by richard (＠richard) 12 Jul '23

12 Jul '23

richard pushed to branch tor-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 5b4fa6e2 by cypherpunks1 at 2023-07-12T14:27:48+00:00 Bug 41791: Omit the source URL when copying page contents to the clipboard - - - - - 2 changed files: - dom/base/nsCopySupport.cpp - widget/windows/nsDataObj.cpp Changes: ===================================== dom/base/nsCopySupport.cpp ===================================== @@ -284,6 +284,7 @@ static nsresult CreateTransferable( NS_ENSURE_SUCCESS(rv, rv); } +#if !defined(BASE_BROWSER_VERSION) // Try and get source URI of the items that are being dragged nsIURI* uri = aDocument.GetDocumentURI(); if (uri) { @@ -304,6 +305,7 @@ static nsresult CreateTransferable( NS_ENSURE_SUCCESS(rv, rv); } } +#endif } else { if (!aEncodedDocumentWithContext.mSerializationForTextUnicode.IsEmpty()) { // Add the unicode DataFlavor to the transferable ===================================== widget/windows/nsDataObj.cpp ===================================== @@ -520,11 +520,13 @@ nsDataObj::nsDataObj(nsIURI* uri) m_enumFE = new CEnumFormatEtc(); m_enumFE->AddRef(); +#if !defined(BASE_BROWSER_VERSION) if (uri) { // A URI was obtained, so pass this through to the DataObject // so it can create a SourceURL for CF_HTML flavour uri->GetSpec(mSourceURL); } +#endif } //----------------------------------------------------- // destruction @@ -1978,6 +1980,7 @@ nsresult nsDataObj ::BuildPlatformHTML(const char* inOurHTML, *outPlatformHTML = nullptr; nsDependentCString inHTMLString(inOurHTML); +#if !defined(BASE_BROWSER_VERSION) // Do we already have mSourceURL from a drag? if (mSourceURL.IsEmpty()) { nsAutoString url; @@ -1985,6 +1988,7 @@ nsresult nsDataObj ::BuildPlatformHTML(const char* inOurHTML, AppendUTF16toUTF8(url, mSourceURL); } +#endif constexpr auto kStartHTMLPrefix = "Version:0.9\r\nStartHTML:"_ns; constexpr auto kEndHTMLPrefix = "\r\nEndHTML:"_ns; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5b4fa6e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5b4fa6e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.5] Bug 40889: Add mullvad sha256sums URL to...
by richard (＠richard) 12 Jul '23

12 Jul '23

richard pushed to branch maint-12.5 at The Tor Project / Applications / tor-browser-build Commits: 8140af32 by Nicolas Vigier at 2023-07-12T13:56:25+00:00 Bug 40889: Add mullvad sha256sums URL to download-unsigned-sha256sums-gpg-signatures-from-people-tpo - - - - - 2 changed files: - + keyring/jb.gpg - tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo Changes: ===================================== keyring/jb.gpg ===================================== Binary files /dev/null and b/keyring/jb.gpg differ ===================================== tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo ===================================== @@ -3,16 +3,24 @@ set -e script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) source "$script_dir/functions" -for builder in $tb_builders +for builder in $tb_builders jb do - for file in sha256sums-unsigned-build.txt.asc sha256sums-unsigned-build.incrementals.txt.asc + for file in sha256sums-unsigned-build.txt sha256sums-unsigned-build.incrementals.txt do tmpfile=$(mktemp) chmod 644 "$tmpfile" - for url in \ - "https://people.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_ve…" \ - "https://tb-build-04.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" \ - "https://tb-build-05.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" + if test "$builder" = 'jb'; then + file="$file.gpg" + urls=("https://cdn.devmole.eu/hashes//$SIGNING_PROJECTNAME/$tbb_version-build$tbb_…") + else + file="$file.asc" + urls=( \ + "https://people.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_ve…" \ + "https://tb-build-04.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" \ + "https://tb-build-05.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" \ + ) + fi + for url in "${urls[@]}" do if wget -q -O "$tmpfile" "$url"; then mv "$tmpfile" "$signed_version_dir/$file-$builder" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40889: Add mullvad sha256sums URL to...
by richard (＠richard) 12 Jul '23

12 Jul '23

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 3c23c8a8 by Nicolas Vigier at 2023-07-07T11:46:30+02:00 Bug 40889: Add mullvad sha256sums URL to download-unsigned-sha256sums-gpg-signatures-from-people-tpo - - - - - 2 changed files: - + keyring/jb.gpg - tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo Changes: ===================================== keyring/jb.gpg ===================================== Binary files /dev/null and b/keyring/jb.gpg differ ===================================== tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo ===================================== @@ -3,16 +3,24 @@ set -e script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) source "$script_dir/functions" -for builder in $tb_builders +for builder in $tb_builders jb do - for file in sha256sums-unsigned-build.txt.asc sha256sums-unsigned-build.incrementals.txt.asc + for file in sha256sums-unsigned-build.txt sha256sums-unsigned-build.incrementals.txt do tmpfile=$(mktemp) chmod 644 "$tmpfile" - for url in \ - "https://people.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_ve…" \ - "https://tb-build-04.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" \ - "https://tb-build-05.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" + if test "$builder" = 'jb'; then + file="$file.gpg" + urls=("https://cdn.devmole.eu/hashes//$SIGNING_PROJECTNAME/$tbb_version-build$tbb_…") + else + file="$file.asc" + urls=( \ + "https://people.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_ve…" \ + "https://tb-build-04.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" \ + "https://tb-build-05.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" \ + ) + fi + for url in "${urls[@]}" do if wget -q -O "$tmpfile" "$url"; then mv "$tmpfile" "$signed_version_dir/$file-$builder" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.0esrbase-13.0-1] Bug 41854: Allow overriding download spam protection.
by richard (＠richard) 11 Jul '23

11 Jul '23

richard pushed to branch base-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 84e468a9 by hackademix at 2023-07-11T22:19:11+00:00 Bug 41854: Allow overriding download spam protection. - - - - - 4 changed files: - browser/components/downloads/DownloadSpamProtection.sys.mjs - toolkit/components/downloads/DownloadCore.sys.mjs - toolkit/components/downloads/DownloadIntegration.sys.mjs - uriloader/exthandler/nsExternalHelperAppService.cpp Changes: ===================================== browser/components/downloads/DownloadSpamProtection.sys.mjs ===================================== @@ -94,8 +94,9 @@ class WindowSpamProtection { * Add a blocked download to the spamList or increment the count of an * existing blocked download, then notify listeners about this. * @param {String} url + * @param {DownloadSpamEnabler} enabler */ - addDownloadSpam(url) { + addDownloadSpam(url, enabler) { this._blocking = true; // Start listening on registered downloads views, if any exist. this._maybeAddViews(); @@ -109,7 +110,7 @@ class WindowSpamProtection { } // Otherwise, create a new DownloadSpam object for the URL, add it to the // spamList, and open the downloads panel. - let downloadSpam = new DownloadSpam(url); + let downloadSpam = new DownloadSpam(url, enabler); this.spamList.add(downloadSpam); this._downloadSpamForUrl.set(url, downloadSpam); this._notifyDownloadSpamAdded(downloadSpam); @@ -193,6 +194,39 @@ class WindowSpamProtection { } } +/** + * Helper to grant a certain principal permission for automatic downloads + * and to clear its download spam messages from the UI + */ +class DownloadSpamEnabler{ + /** + * Constructs a DownloadSpamEnabler object + * @param {nsIPrincipal} principal + * @param {DownloadSpamProtection} downloadSpamProtection + */ + constructor(principal, downloadSpamProtection) { + this.principal = principal; + this.downloadSpamProtection = downloadSpamProtection; + } + /** + * Allows a DownloadSpam item + * @param {DownloadSpam} downloadSpam + */ + allow(downloadSpam) { + const pm = Services.perms; + pm.addFromPrincipal( + this.principal, + "automatic-download", + pm.ALLOW_ACTION, + pm.EXPIRE_SESSION + ); + downloadSpam.hasBlockedData = downloadSpam.hasPartialData = false; + const {url} = downloadSpam.source; + for (let window of lazy.BrowserWindowTracker.orderedWindows) { + this.downloadSpamProtection.removeDownloadSpamForWindow(url, window); + } + } +} /** * Responsible for detecting events related to downloads spam and notifying the * relevant window's WindowSpamProtection object. This is a singleton object, @@ -210,9 +244,11 @@ export class DownloadSpamProtection { * download was blocked. This is invoked when a download is blocked by * nsExternalAppHandler::IsDownloadSpam * @param {String} url - * @param {Window} window + * @param {nsILoadInfo} loadInfo */ - update(url, window) { + update(url, loadInfo) { + loadInfo = loadInfo.QueryInterface(Ci.nsILoadInfo); + const window = loadInfo.browsingContext.topChromeWindow; if (window == null) { lazy.DownloadsCommon.log( "Download spam blocked in a non-chrome window. URL: ", @@ -226,7 +262,7 @@ export class DownloadSpamProtection { let wsp = this._forWindowMap.get(window) ?? new WindowSpamProtection(window); this._forWindowMap.set(window, wsp); - wsp.addDownloadSpam(url); + wsp.addDownloadSpam(url, new DownloadSpamEnabler(loadInfo.triggeringPrincipal, this)); } /** @@ -285,8 +321,9 @@ export class DownloadSpamProtection { * @extends Download */ class DownloadSpam extends Download { - constructor(url) { + constructor(url, downloadSpamEnabler) { super(); + this._downloadSpamEnabler = downloadSpamEnabler; this.hasBlockedData = true; this.stopped = true; this.error = new DownloadError({ @@ -297,4 +334,13 @@ class DownloadSpam extends Download { this.source = { url }; this.blockedDownloadsCount = 1; } + + /** + * Allows the principal which triggered this download to perform automatic downloads + * and clears the UI from messages reporting this download spam + */ + allow() { + this._downloadSpamEnabler.allow(this); + this._notifyChange(); + } } ===================================== toolkit/components/downloads/DownloadCore.sys.mjs ===================================== @@ -713,6 +713,10 @@ Download.prototype = { } this._promiseUnblock = (async () => { + if (this.allow) { + this.allow(); + return; + } try { await IOUtils.move(this.target.partFilePath, this.target.path); await this.target.refresh(); @@ -721,7 +725,6 @@ Download.prototype = { this._promiseUnblock = null; throw ex; } - this.succeeded = true; this.hasBlockedData = false; this._notifyChange(); @@ -951,7 +954,9 @@ Download.prototype = { await this._promiseCanceled; } // Ask the saver object to remove any partial data. - await this.saver.removeData(); + if (this.saver) { + await this.saver.removeData(); + } // For completeness, clear the number of bytes transferred. if (this.currentBytes != 0 || this.hasPartialData) { this.currentBytes = 0; ===================================== toolkit/components/downloads/DownloadIntegration.sys.mjs ===================================== @@ -1162,7 +1162,7 @@ var DownloadObserver = { DownloadIntegration._initializeDownloadSpamProtection(); DownloadIntegration.downloadSpamProtection.update( aData, - aSubject.topChromeWindow + aSubject ); } break; ===================================== uriloader/exthandler/nsExternalHelperAppService.cpp ===================================== @@ -1907,13 +1907,11 @@ bool nsExternalAppHandler::IsDownloadSpam(nsIChannel* aChannel) { if (capability == nsIPermissionManager::PROMPT_ACTION) { nsCOMPtr<nsIObserverService> observerService = mozilla::services::GetObserverService(); - RefPtr<BrowsingContext> browsingContext; - loadInfo->GetBrowsingContext(getter_AddRefs(browsingContext)); nsAutoCString cStringURI; loadInfo->TriggeringPrincipal()->GetPrePath(cStringURI); observerService->NotifyObservers( - browsingContext, "blocked-automatic-download", + loadInfo, "blocked-automatic-download", NS_ConvertASCIItoUTF16(cStringURI.get()).get()); // FIXME: In order to escape memory leaks, currently we cancel blocked // downloads. This is temporary solution, because download data should be View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/84e468a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/84e468a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.0esrbase-13.0-1] Bug 41854: Allow overriding download spam protection.
by richard (＠richard) 11 Jul '23

11 Jul '23

richard pushed to branch tor-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 5d4adde4 by hackademix at 2023-07-11T21:46:55+00:00 Bug 41854: Allow overriding download spam protection. - - - - - 4 changed files: - browser/components/downloads/DownloadSpamProtection.sys.mjs - toolkit/components/downloads/DownloadCore.sys.mjs - toolkit/components/downloads/DownloadIntegration.sys.mjs - uriloader/exthandler/nsExternalHelperAppService.cpp Changes: ===================================== browser/components/downloads/DownloadSpamProtection.sys.mjs ===================================== @@ -94,8 +94,9 @@ class WindowSpamProtection { * Add a blocked download to the spamList or increment the count of an * existing blocked download, then notify listeners about this. * @param {String} url + * @param {DownloadSpamEnabler} enabler */ - addDownloadSpam(url) { + addDownloadSpam(url, enabler) { this._blocking = true; // Start listening on registered downloads views, if any exist. this._maybeAddViews(); @@ -109,7 +110,7 @@ class WindowSpamProtection { } // Otherwise, create a new DownloadSpam object for the URL, add it to the // spamList, and open the downloads panel. - let downloadSpam = new DownloadSpam(url); + let downloadSpam = new DownloadSpam(url, enabler); this.spamList.add(downloadSpam); this._downloadSpamForUrl.set(url, downloadSpam); this._notifyDownloadSpamAdded(downloadSpam); @@ -193,6 +194,39 @@ class WindowSpamProtection { } } +/** + * Helper to grant a certain principal permission for automatic downloads + * and to clear its download spam messages from the UI + */ +class DownloadSpamEnabler{ + /** + * Constructs a DownloadSpamEnabler object + * @param {nsIPrincipal} principal + * @param {DownloadSpamProtection} downloadSpamProtection + */ + constructor(principal, downloadSpamProtection) { + this.principal = principal; + this.downloadSpamProtection = downloadSpamProtection; + } + /** + * Allows a DownloadSpam item + * @param {DownloadSpam} downloadSpam + */ + allow(downloadSpam) { + const pm = Services.perms; + pm.addFromPrincipal( + this.principal, + "automatic-download", + pm.ALLOW_ACTION, + pm.EXPIRE_SESSION + ); + downloadSpam.hasBlockedData = downloadSpam.hasPartialData = false; + const {url} = downloadSpam.source; + for (let window of lazy.BrowserWindowTracker.orderedWindows) { + this.downloadSpamProtection.removeDownloadSpamForWindow(url, window); + } + } +} /** * Responsible for detecting events related to downloads spam and notifying the * relevant window's WindowSpamProtection object. This is a singleton object, @@ -210,9 +244,11 @@ export class DownloadSpamProtection { * download was blocked. This is invoked when a download is blocked by * nsExternalAppHandler::IsDownloadSpam * @param {String} url - * @param {Window} window + * @param {nsILoadInfo} loadInfo */ - update(url, window) { + update(url, loadInfo) { + loadInfo = loadInfo.QueryInterface(Ci.nsILoadInfo); + const window = loadInfo.browsingContext.topChromeWindow; if (window == null) { lazy.DownloadsCommon.log( "Download spam blocked in a non-chrome window. URL: ", @@ -226,7 +262,7 @@ export class DownloadSpamProtection { let wsp = this._forWindowMap.get(window) ?? new WindowSpamProtection(window); this._forWindowMap.set(window, wsp); - wsp.addDownloadSpam(url); + wsp.addDownloadSpam(url, new DownloadSpamEnabler(loadInfo.triggeringPrincipal, this)); } /** @@ -285,8 +321,9 @@ export class DownloadSpamProtection { * @extends Download */ class DownloadSpam extends Download { - constructor(url) { + constructor(url, downloadSpamEnabler) { super(); + this._downloadSpamEnabler = downloadSpamEnabler; this.hasBlockedData = true; this.stopped = true; this.error = new DownloadError({ @@ -297,4 +334,13 @@ class DownloadSpam extends Download { this.source = { url }; this.blockedDownloadsCount = 1; } + + /** + * Allows the principal which triggered this download to perform automatic downloads + * and clears the UI from messages reporting this download spam + */ + allow() { + this._downloadSpamEnabler.allow(this); + this._notifyChange(); + } } ===================================== toolkit/components/downloads/DownloadCore.sys.mjs ===================================== @@ -713,6 +713,10 @@ Download.prototype = { } this._promiseUnblock = (async () => { + if (this.allow) { + this.allow(); + return; + } try { await IOUtils.move(this.target.partFilePath, this.target.path); await this.target.refresh(); @@ -721,7 +725,6 @@ Download.prototype = { this._promiseUnblock = null; throw ex; } - this.succeeded = true; this.hasBlockedData = false; this._notifyChange(); @@ -951,7 +954,9 @@ Download.prototype = { await this._promiseCanceled; } // Ask the saver object to remove any partial data. - await this.saver.removeData(); + if (this.saver) { + await this.saver.removeData(); + } // For completeness, clear the number of bytes transferred. if (this.currentBytes != 0 || this.hasPartialData) { this.currentBytes = 0; ===================================== toolkit/components/downloads/DownloadIntegration.sys.mjs ===================================== @@ -1162,7 +1162,7 @@ var DownloadObserver = { DownloadIntegration._initializeDownloadSpamProtection(); DownloadIntegration.downloadSpamProtection.update( aData, - aSubject.topChromeWindow + aSubject ); } break; ===================================== uriloader/exthandler/nsExternalHelperAppService.cpp ===================================== @@ -1907,13 +1907,11 @@ bool nsExternalAppHandler::IsDownloadSpam(nsIChannel* aChannel) { if (capability == nsIPermissionManager::PROMPT_ACTION) { nsCOMPtr<nsIObserverService> observerService = mozilla::services::GetObserverService(); - RefPtr<BrowsingContext> browsingContext; - loadInfo->GetBrowsingContext(getter_AddRefs(browsingContext)); nsAutoCString cStringURI; loadInfo->TriggeringPrincipal()->GetPrePath(cStringURI); observerService->NotifyObservers( - browsingContext, "blocked-automatic-download", + loadInfo, "blocked-automatic-download", NS_ConvertASCIItoUTF16(cStringURI.get()).get()); // FIXME: In order to escape memory leaks, currently we cancel blocked // downloads. This is temporary solution, because download data should be View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5d4adde… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5d4adde… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.0esrbase-13.0-1] 25 commits: fixup! Bug 40933: Add tor-launcher functionality
by richard (＠richard) 11 Jul '23

11 Jul '23

richard pushed to branch tor-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 1492a00d by Pier Angelo Vendrame at 2023-07-11T21:38:01+00:00 fixup! Bug 40933: Add tor-launcher functionality Switched to ES modules for this commit. - - - - - 60a28f46 by Pier Angelo Vendrame at 2023-07-11T21:38:01+00:00 fixup! Bug 40933: Add tor-launcher functionality Implemented a function for getting GETINFO net/listeners/socks. - - - - - 168a3899 by Pier Angelo Vendrame at 2023-07-11T21:38:01+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Remove unused assets. - - - - - 5bea8348 by Pier Angelo Vendrame at 2023-07-11T21:38:01+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Remove part of the about:tor additions from the torbutton commit to move them to a commit on their own. - - - - - e089589f by Kathleen Brade at 2023-07-11T21:38:01+00:00 Bug 7494: Create local home page for TBB. - - - - - fa669b81 by Pier Angelo Vendrame at 2023-07-11T21:38:01+00:00 fixup! Bug 7494: Create local home page for TBB. Removed unused mobile CSS - - - - - 448ac064 by Pier Angelo Vendrame at 2023-07-11T21:38:01+00:00 fixup! Bug 7494: Create local home page for TBB. Moved aboutTor.xhtml to its new location and make it use more modern IPC mechanisms. - - - - - 1aeaceb8 by Pier Angelo Vendrame at 2023-07-11T21:38:01+00:00 fixup! Bug 7494: Create local home page for TBB. First step toward IPC modernizartion (WIP). - - - - - 1865d68c by Pier Angelo Vendrame at 2023-07-11T21:38:01+00:00 fixup! Bug 7494: Create local home page for TBB. Populate the page with real data. - - - - - 8d33aa91 by Pier Angelo Vendrame at 2023-07-11T21:38:01+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Do not send data to about:tor on Torbutton anymore. - - - - - ec0f4a89 by Pier Angelo Vendrame at 2023-07-11T21:38:01+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Move the Tor checking functions from torbutton.js to its file. Also, rework the file a little bit, to make it an ES module, and import the file directly, instead of using XPCOM. - - - - - 61c0fed5 by Pier Angelo Vendrame at 2023-07-11T21:38:01+00:00 fixup! Bug 7494: Create local home page for TBB. Get the TorCheckService by importing the module, instead of using XPCOM. - - - - - ee3f0a7f by Pier Angelo Vendrame at 2023-07-11T21:38:01+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Continued to rework TorCheckService. Use a ConsoleAPI logger instead of the old Torbutton logger. Reworked the local check, to delegate TorProtocolService to get the listeners, and then improved the rest of the function, in general. Finally, changed the topic name, and notify observers whenever the status change, also if suddenly the check succeeded. - - - - - 2a10a930 by Pier Angelo Vendrame at 2023-07-11T21:38:01+00:00 fixup! Bug 7494: Create local home page for TBB. If we know that TorCheckService already failed, or that we are invoked by an observer, do not wait for the test again, but show the result immediately. If it changes, the observer will trigger another page update. - - - - - 9fcb8789 by Pier Angelo Vendrame at 2023-07-11T21:38:01+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Reworked the remote check of TorCheckService. - - - - - 1ed38c58 by Pier Angelo Vendrame at 2023-07-11T21:38:01+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Move the check service to the about:tor commit. - - - - - 983b1f77 by Pier Angelo Vendrame at 2023-07-11T21:38:01+00:00 fixup! Bug 7494: Create local home page for TBB. Move TorCheckService here, since it is used only for about:tor. Move here also the check for the TOR_DEFAULT_HOMEPAGE variable. - - - - - 3173b2c0 by Pier Angelo Vendrame at 2023-07-11T21:38:01+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Stop customizing the about dialog in the Torbutton commit. - - - - - 71a828ca by Pier Angelo Vendrame at 2023-07-11T21:38:01+00:00 fixup! Bug 2176: Rebrand Firefox to TorBrowser Customize the about dialog in the branding commit. This actually depends on the strings commit, but maybe we could move it to earlier in the patchset. - - - - - 993f3151 by Pier Angelo Vendrame at 2023-07-11T21:38:01+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 41842: Remove the logic to remove cookies|protected-*json Removed the function that deleted some cookie JSON preference file. The function was introduced in torbutton@2dfa0e0c9cff7cfad93664e0b0b6cdc05b24b7f2 in 2019. However, since we have had a watershed release, we don't need it anymore. And because of the 12.0 watershed, we do not need to mess up with some these preferences anymore. - - - - - 4f033ea0 by Pier Angelo Vendrame at 2023-07-11T21:38:01+00:00 fixup! Bug 40933: Add tor-launcher functionality Bug 41842: Stop migrating torrc: we have not written control/socks ports to it for years! - - - - - e75aa843 by Pier Angelo Vendrame at 2023-07-11T21:38:01+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 41845: Do not force pref values for non-PBM users anymore. A preference cleanup function will be added later, when we finish removing all the torbutton stuff. - - - - - 7943e632 by Pier Angelo Vendrame at 2023-07-11T21:38:01+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Add default values for preferencs in the logger. I anticipated the removal of the old defaults, since the logger is going away with another MR, but the cleanup function was already in this one. - - - - - a5366a9a by Pier Angelo Vendrame at 2023-07-11T21:38:01+00:00 fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js Remove the defaults for the old preferences we are deleting. - - - - - cda83a31 by Pier Angelo Vendrame at 2023-07-11T21:38:01+00:00 fixup! Bug 41435: Add a Tor Browser migration function Bug 41845: Clear user values for the prefs we decided not to force anymore. Also, remove some old Torbutton preferences. - - - - - 30 changed files: - browser/app/profile/000-tor-browser.js - browser/base/content/aboutDialog.xhtml - toolkit/torbutton/chrome/skin/aboutDialog.css → browser/base/content/aboutDialogTor.css - browser/base/jar.mn - browser/components/BrowserGlue.sys.mjs - + browser/components/abouttor/AboutTorChild.sys.mjs - + browser/components/abouttor/AboutTorParent.sys.mjs - + browser/components/abouttor/HomepageOverride.sys.mjs - + browser/components/abouttor/TorCheckService.sys.mjs - toolkit/torbutton/chrome/skin/aboutTor.css → browser/components/abouttor/content/aboutTor.css - + browser/components/abouttor/content/aboutTor.js - + browser/components/abouttor/content/aboutTor.xhtml - toolkit/torbutton/chrome/skin/banner-warning.svg → browser/components/abouttor/content/banner-warning.svg - toolkit/torbutton/chrome/skin/dax-logo.svg → browser/components/abouttor/content/dax-logo.svg - + browser/components/abouttor/jar.mn - + browser/components/abouttor/moz.build - browser/components/moz.build - docshell/base/nsAboutRedirector.cpp - toolkit/components/tor-launcher/TorBootstrapRequest.jsm → toolkit/components/tor-launcher/TorBootstrapRequest.sys.mjs - toolkit/components/tor-launcher/TorLauncherUtil.jsm → toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs - toolkit/components/tor-launcher/TorMonitorService.jsm → toolkit/components/tor-launcher/TorMonitorService.sys.mjs - toolkit/components/tor-launcher/TorParsers.jsm → toolkit/components/tor-launcher/TorParsers.sys.mjs - toolkit/components/tor-launcher/TorProcess.jsm → toolkit/components/tor-launcher/TorProcess.sys.mjs - toolkit/components/tor-launcher/TorProtocolService.jsm → toolkit/components/tor-launcher/TorProtocolService.sys.mjs - toolkit/components/tor-launcher/TorStartupService.jsm → toolkit/components/tor-launcher/TorStartupService.sys.mjs - toolkit/components/tor-launcher/components.conf - toolkit/components/tor-launcher/moz.build - toolkit/themes/shared/desktop-jar.inc.mn - toolkit/torbutton/chrome/skin/about-wordmark.png → toolkit/themes/shared/illustrations/about-wordmark.png - − toolkit/torbutton/chrome/content/aboutTor/aboutTor-content.js The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a884f3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a884f3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-bundle-testsuite][main] Bug 40075: Move nightly builds from tb-build-01 to tb-build-06
by richard (＠richard) 11 Jul '23

11 Jul '23

richard pushed to branch main at The Tor Project / Applications / tor-browser-bundle-testsuite Commits: 1d3428d9 by Nicolas Vigier at 2023-07-05T18:22:14+02:00 Bug 40075: Move nightly builds from tb-build-01 to tb-build-06 - - - - - 3 changed files: - config/tb-build-01.torproject.org → config/tb-build-06.torproject.org - rbm-config/tb-build-01.torproject.org.rbm.local.conf → rbm-config/tb-build-06.torproject.org.rbm.local.conf - tools/tb-build-01-start-nightly-build → tools/tb-build-06-start-nightly-build Changes: ===================================== config/tb-build-01.torproject.org → config/tb-build-06.torproject.org ===================================== @@ -36,7 +36,7 @@ my $testsuite = TBBTestSuite::TestSuite::TorBrowserBuild->new({ tbb_version => $tbb_version, publish_dir => "$builds_dir_root/tor-browser-builds/$tbb_version", publish_url => "https://nightlies.tbb.torproject.org/nightly-builds/tor-browser-builds/$tbb…", - rbm_local_conf => "$FindBin::Bin/rbm-config/tb-build-01.torproject.org.rbm.local.conf", + rbm_local_conf => "$FindBin::Bin/rbm-config/tb-build-06.torproject.org.rbm.local.conf", make_clean => 1, }); @@ -56,7 +56,7 @@ my %res = ( 'pierov(a)torproject.org', 'richard(a)torproject.org', ], - 'email-from' => 'Tor Browser Nightly Builds <tb-builder(a)tb-build-01.torproject.org>', + 'email-from' => 'Tor Browser Nightly Builds <tb-builder(a)tb-build-06.torproject.org>', 'test_post' => $run_rsync, ); %res; ===================================== rbm-config/tb-build-01.torproject.org.rbm.local.conf → rbm-config/tb-build-06.torproject.org.rbm.local.conf ===================================== ===================================== tools/tb-build-01-start-nightly-build → tools/tb-build-06-start-nightly-build ===================================== @@ -2,7 +2,7 @@ set -e function getlock { - lockfile=/run/lock/tb-build-01-start-nightly-build.lock + lockfile=/run/lock/tb-build-06-start-nightly-build.lock if test -f $lockfile then old_pid=$(cat $lockfile) @@ -25,7 +25,7 @@ today_version=$(date '+tbb-nightly.%Y.%m.%d') cd /home/tb-builder/tor-browser-bundle-testsuite export RBM_NO_DEBUG=1 -./tbb-testsuite --config=tb-build-01.torproject.org "$@" +./tbb-testsuite --config=tb-build-06.torproject.org "$@" # Archive today's build archive_dir=~/tor-browser-builds-archive/"$today_version" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-bundle-testsuite… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-bundle-testsuite… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.0esrbase-13.0-1] fixup! Bug 41698: Reword the recommendation badges in about:addons
by ma1 (＠ma1) 11 Jul '23

11 Jul '23

ma1 pushed to branch base-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser Commits: eba10c40 by hackademix at 2023-07-11T16:45:09+02:00 fixup! Bug 41698: Reword the recommendation badges in about:addons - - - - - 3 changed files: - toolkit/content/widgets/moz-support-link/moz-support-link.mjs - toolkit/mozapps/extensions/content/aboutaddons.html - toolkit/mozapps/extensions/content/aboutaddons.js Changes: ===================================== toolkit/content/widgets/moz-support-link/moz-support-link.mjs ===================================== @@ -52,6 +52,23 @@ export default class MozSupportLink extends HTMLAnchorElement { this.setAttribute("target", "_blank"); this.addEventListener("click", this); if (!this.getAttribute("data-l10n-id")) { + const fixupL10nId = this.getAttribute("data-basebrowser-l10n-fixup"); + if (fixupL10nId) { + document.l10n.formatValue(fixupL10nId).then(title => { + this.setAttribute("title", title); + // NOTE: Mozilla adds identical aria-label and title attributes. This is + // generally bad practice because this link has no text content, so the + // title alone will already act as the accessible name. + // Normally setting both aria-label and title will lead to the title being + // used as the accessible description, but since they are identical + // the LocalAccessible::Description method will make an exception and keep + // the description empty. + // Since this component is outside of our fork's control, we follow the + // same practice just in case Mozilla ever adds some text content. + this.setAttribute("aria-label", title); + }); + return; + } document.l10n.setAttributes(this, "moz-support-link-text"); } document.l10n.translateFragment(this); ===================================== toolkit/mozapps/extensions/content/aboutaddons.html ===================================== @@ -359,6 +359,7 @@ is="moz-support-link" support-page="add-on-badges" utm-content="promoted-addon-badge" + data-basebrowser-l10n-fixup="basebrowser-addon-badge-recommended" hidden > </a> @@ -376,6 +377,7 @@ is="moz-support-link" support-page="add-on-badges" utm-content="promoted-addon-badge" + data-basebrowser-l10n-fixup="basebrowser-addon-badge-verified" hidden > </a> ===================================== toolkit/mozapps/extensions/content/aboutaddons.js ===================================== @@ -4220,29 +4220,6 @@ async function initialize() { ); } } - - // At the moment we need to do this, because Weblate still does not support - // attributes in Fluent. - const [recommended, verified] = await document.l10n.formatValues([ - { id: "basebrowser-addon-badge-recommended" }, - { id: "basebrowser-addon-badge-verified" }, - ]); - - importTemplate("card"); - _templates.card.content - .querySelector(".addon-badge-recommended") - .setAttribute("title", recommended); - _templates.card.content - .querySelector(".addon-badge-verified") - .setAttribute("title", verified); - - // We also update any template copy that has already been created. - for (const badge of document.querySelectorAll(".addon-badge-recommended")) { - badge.setAttribute("title", recommended); - } - for (const badge of document.querySelectorAll(".addon-badge-verified")) { - badge.setAttribute("title", verified); - } } window.promiseInitialized = new Promise(resolve => { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/eba10c4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/eba10c4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.0esrbase-13.0-1] fixup! Bug 40069: Add helpers for message passing with extensions
by Pier Angelo Vendrame (＠pierov) 11 Jul '23

11 Jul '23

Pier Angelo Vendrame pushed to branch base-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 95d711c9 by Pier Angelo Vendrame at 2023-07-11T16:41:03+02:00 fixup! Bug 40069: Add helpers for message passing with extensions Bug 41877: Fix the NoScript message passing function - - - - - 1 changed file: - toolkit/components/extensions/ExtensionParent.sys.mjs Changes: ===================================== toolkit/components/extensions/ExtensionParent.sys.mjs ===================================== @@ -2274,7 +2274,7 @@ async function torSendExtensionMessage(extensionId, message) { // pages listening to browser.runtime.onMessage. const result = await ProxyMessenger.conduit.castRuntimeMessage("messenger", { extensionId, - holder: new StructuredCloneHolder(message), + holder: new StructuredCloneHolder("torSendExtensionMessage", null, message), firstResponse: true, sender: { id: extensionId, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/95d711c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/95d711c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.0esrbase-13.0-1] fixup! Bug 41698: Reword the recommendation badges in about:addons
by ma1 (＠ma1) 11 Jul '23

11 Jul '23

ma1 pushed to branch tor-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser Commits: a884f352 by hackademix at 2023-07-11T15:48:11+02:00 fixup! Bug 41698: Reword the recommendation badges in about:addons - - - - - 3 changed files: - toolkit/content/widgets/moz-support-link/moz-support-link.mjs - toolkit/mozapps/extensions/content/aboutaddons.html - toolkit/mozapps/extensions/content/aboutaddons.js Changes: ===================================== toolkit/content/widgets/moz-support-link/moz-support-link.mjs ===================================== @@ -52,6 +52,23 @@ export default class MozSupportLink extends HTMLAnchorElement { this.setAttribute("target", "_blank"); this.addEventListener("click", this); if (!this.getAttribute("data-l10n-id")) { + const fixupL10nId = this.getAttribute("data-basebrowser-l10n-fixup"); + if (fixupL10nId) { + document.l10n.formatValue(fixupL10nId).then(title => { + this.setAttribute("title", title); + // NOTE: Mozilla adds identical aria-label and title attributes. This is + // generally bad practice because this link has no text content, so the + // title alone will already act as the accessible name. + // Normally setting both aria-label and title will lead to the title being + // used as the accessible description, but since they are identical + // the LocalAccessible::Description method will make an exception and keep + // the description empty. + // Since this component is outside of our fork's control, we follow the + // same practice just in case Mozilla ever adds some text content. + this.setAttribute("aria-label", title); + }); + return; + } document.l10n.setAttributes(this, "moz-support-link-text"); } document.l10n.translateFragment(this); ===================================== toolkit/mozapps/extensions/content/aboutaddons.html ===================================== @@ -359,6 +359,7 @@ is="moz-support-link" support-page="add-on-badges" utm-content="promoted-addon-badge" + data-basebrowser-l10n-fixup="basebrowser-addon-badge-recommended" hidden > </a> @@ -376,6 +377,7 @@ is="moz-support-link" support-page="add-on-badges" utm-content="promoted-addon-badge" + data-basebrowser-l10n-fixup="basebrowser-addon-badge-verified" hidden > </a> ===================================== toolkit/mozapps/extensions/content/aboutaddons.js ===================================== @@ -4220,29 +4220,6 @@ async function initialize() { ); } } - - // At the moment we need to do this, because Weblate still does not support - // attributes in Fluent. - const [recommended, verified] = await document.l10n.formatValues([ - { id: "basebrowser-addon-badge-recommended" }, - { id: "basebrowser-addon-badge-verified" }, - ]); - - importTemplate("card"); - _templates.card.content - .querySelector(".addon-badge-recommended") - .setAttribute("title", recommended); - _templates.card.content - .querySelector(".addon-badge-verified") - .setAttribute("title", verified); - - // We also update any template copy that has already been created. - for (const badge of document.querySelectorAll(".addon-badge-recommended")) { - badge.setAttribute("title", recommended); - } - for (const badge of document.querySelectorAll(".addon-badge-verified")) { - badge.setAttribute("title", verified); - } } window.promiseInitialized = new Promise(resolve => { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a884f35… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a884f35… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.0esrbase-13.0-1] fixup! Bug 40069: Add helpers for message passing with extensions
by Pier Angelo Vendrame (＠pierov) 11 Jul '23

11 Jul '23

Pier Angelo Vendrame pushed to branch tor-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser Commits: e431eb45 by Pier Angelo Vendrame at 2023-07-11T12:17:35+02:00 fixup! Bug 40069: Add helpers for message passing with extensions Bug 41877: Fix the NoScript message passing function - - - - - 1 changed file: - toolkit/components/extensions/ExtensionParent.sys.mjs Changes: ===================================== toolkit/components/extensions/ExtensionParent.sys.mjs ===================================== @@ -2274,7 +2274,7 @@ async function torSendExtensionMessage(extensionId, message) { // pages listening to browser.runtime.onMessage. const result = await ProxyMessenger.conduit.castRuntimeMessage("messenger", { extensionId, - holder: new StructuredCloneHolder(message), + holder: new StructuredCloneHolder("torSendExtensionMessage", null, message), firstResponse: true, sender: { id: extensionId, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e431eb4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e431eb4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40895: Update go_vendor_sha256sum for lyrebird in nightly
by richard (＠richard) 06 Jul '23

06 Jul '23

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: af4a370f by Nicolas Vigier at 2023-07-06T20:03:30+00:00 Bug 40895: Update go_vendor_sha256sum for lyrebird in nightly - - - - - 1 changed file: - projects/lyrebird/config Changes: ===================================== projects/lyrebird/config ===================================== @@ -17,7 +17,7 @@ targets: version: '[% c("abbrev") %]' tag_gpg_id: 0 var: - go_vendor_sha256sum: d95d1fa8ce3904b76395b20ef169e8ef2b039fa485764b74739bb6290631537d + go_vendor_sha256sum: 8e9a5fd52f5a3a2b2b891389a224fcfc83b6c081658161bf40882b23fb58834c steps: build: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.5] Bug 40894: Fix format of keyring/boklm.gpg
by richard (＠richard) 06 Jul '23

06 Jul '23

richard pushed to branch maint-12.5 at The Tor Project / Applications / tor-browser-build Commits: 16785a1b by Nicolas Vigier at 2023-07-06T19:52:01+00:00 Bug 40894: Fix format of keyring/boklm.gpg In #40871 I incorrectly set `keyring/boklm.gpg` in format `GPG keybox database version 1`, instead of `PGP/GPG key public ring (v4)`. This was fixed with: gpg --no-default-keyring --keyring ./keyring/boklm.gpg --export > ./keyring/boklm-2.gpg mv ./keyring/boklm-2.gpg ./keyring/boklm.gpg - - - - - 1 changed file: - keyring/boklm.gpg Changes: ===================================== keyring/boklm.gpg ===================================== Binary files a/keyring/boklm.gpg and b/keyring/boklm.gpg differ View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40894: Fix format of keyring/boklm.gpg
by richard (＠richard) 06 Jul '23

06 Jul '23

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 6e2c33ed by Nicolas Vigier at 2023-07-04T12:11:47+02:00 Bug 40894: Fix format of keyring/boklm.gpg In #40871 I incorrectly set `keyring/boklm.gpg` in format `GPG keybox database version 1`, instead of `PGP/GPG key public ring (v4)`. This was fixed with: gpg --no-default-keyring --keyring ./keyring/boklm.gpg --export > ./keyring/boklm-2.gpg mv ./keyring/boklm-2.gpg ./keyring/boklm.gpg - - - - - 1 changed file: - keyring/boklm.gpg Changes: ===================================== keyring/boklm.gpg ===================================== Binary files a/keyring/boklm.gpg and b/keyring/boklm.gpg differ View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.0esrbase-13.0-1] Bug 41834: Hide "Can't Be Removed - learn more" menu line for uninstallable add-ons
by ma1 (＠ma1) 06 Jul '23

06 Jul '23

ma1 pushed to branch base-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser Commits: e4fae18a by hackademix at 2023-07-06T15:46:27+02:00 Bug 41834: Hide "Can't Be Removed - learn more" menu line for uninstallable add-ons - - - - - 1 changed file: - toolkit/mozapps/extensions/content/aboutaddons.js Changes: ===================================== toolkit/mozapps/extensions/content/aboutaddons.js ===================================== @@ -1492,8 +1492,9 @@ class AddonOptions extends HTMLElement { el.disabled = false; el.hidden = false; document.l10n.setAttributes(el, "remove-addon-button"); - } else if (addon.isBuiltin) { - // Likely the built-in themes, can't be removed, that's fine. + } else if (true || addon.isBuiltin) { + // Just hide the uninstall button for any "special" add-on + // which can't be removed (tor-browser#41834) el.hidden = true; } else { // Likely sideloaded, mention that it can't be removed with a link. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e4fae18… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e4fae18… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.0esrbase-13.0-1] Bug 41834: Hide "Can't Be Removed - learn more" menu line for uninstallable add-ons
by ma1 (＠ma1) 06 Jul '23

06 Jul '23

ma1 pushed to branch tor-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser Commits: b06f6190 by hackademix at 2023-07-06T00:10:24+02:00 Bug 41834: Hide "Can't Be Removed - learn more" menu line for uninstallable add-ons - - - - - 1 changed file: - toolkit/mozapps/extensions/content/aboutaddons.js Changes: ===================================== toolkit/mozapps/extensions/content/aboutaddons.js ===================================== @@ -1492,8 +1492,9 @@ class AddonOptions extends HTMLElement { el.disabled = false; el.hidden = false; document.l10n.setAttributes(el, "remove-addon-button"); - } else if (addon.isBuiltin) { - // Likely the built-in themes, can't be removed, that's fine. + } else if (true || addon.isBuiltin) { + // Just hide the uninstall button for any "special" add-on + // which can't be removed (tor-browser#41834) el.hidden = true; } else { // Likely sideloaded, mention that it can't be removed with a link. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b06f619… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b06f619… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag base-browser-115.0esrbase-13.0-1-build1
by richard (＠richard) 05 Jul '23

05 Jul '23

richard pushed new tag base-browser-115.0esrbase-13.0-1-build1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch base-browser-115.0esrbase-13.0-1
by richard (＠richard) 05 Jul '23

05 Jul '23

richard pushed new branch base-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… You're receiving this email because of your account on gitlab.torproject.org.

1 0