- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-52.6.0esr-8.0-2] Revert "Bug 18619: If indexedDB disabled, use in-memory db for asyncStorage.js"
by gk＠torproject.org 20 Feb '18

20 Feb '18

commit 8ee6fdadea2a79524f1b9b9427d4daf0362a074f Author: Georg Koppen <gk(a)torproject.org> Date: Tue Feb 20 10:15:47 2018 +0000 Revert "Bug 18619: If indexedDB disabled, use in-memory db for asyncStorage.js" This reverts commit dcd2db035018a6e5466dcd27eb630dfd08995c71. We don't need this patch anymore as we are relying on IndexedDB being disabled in Private Browsing Mode (PBM) and properly isolated in non-PBM. --- devtools/shared/async-storage.js | 38 ++++++-------------------------------- 1 file changed, 6 insertions(+), 32 deletions(-) diff --git a/devtools/shared/async-storage.js b/devtools/shared/async-storage.js index 31ad22a8f666..0d260fc5ad5a 100644 --- a/devtools/shared/async-storage.js +++ b/devtools/shared/async-storage.js @@ -43,32 +43,6 @@ "use strict"; const Promise = require("promise"); -const prefs = require("sdk/preferences/service"); - -// Substitute memory-only "database" when "dom.indexedDB.enabled" is false. -// Match the API and behavior of the indexedDB-based version. -const memoryDB = function () { - let dbMap = new Map(); - if (prefs.get('dom.indexedDB.enabled', true)) { - return {}; // We won't use a memory db. - } - return { - getItem : k => { - let value = dbMap.get(k); - // Match the behavior of indexedDB-based implementation - // when an item is not present. - if (value === undefined) { - value = null; - } - return Promise.resolve(value); - }, - setItem : (k, v) => Promise.resolve(dbMap.set(k, v)), - removeItem : k => Promise.resolve(dbMap.delete(k)), - clear : () => Promise.resolve(dbMap.clear()), - length : () => Promise.resolve(dbMap.size), - key : n => Promise.resolve(Array.from(dbMap.keys())[n]) - }; -}(); const DBNAME = "devtools-async-storage"; const DBVERSION = 1; @@ -206,9 +180,9 @@ function key(n) { }); } -exports.getItem = memoryDB.getItem || getItem; -exports.setItem = memoryDB.setItem || setItem; -exports.removeItem = memoryDB.removeItem || removeItem; -exports.clear = memoryDB.clear || clear; -exports.length = memoryDB.length || length; -exports.key = memoryDB.key || key; +exports.getItem = getItem; +exports.setItem = setItem; +exports.removeItem = removeItem; +exports.clear = clear; +exports.length = length; +exports.key = key;

1 0

[tor-browser/tor-browser-52.6.0esr-8.0-2] Bug 22794: Don't open AF_INET/AF_INET6 sockets when AF_LOCAL is configured
by gk＠torproject.org 19 Feb '18

19 Feb '18

commit eafaa94a613a326bd13234540fe88b86451ee3e9 Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Feb 1 16:20:42 2018 -0800 Bug 22794: Don't open AF_INET/AF_INET6 sockets when AF_LOCAL is configured The initialization path for the SOCKS proxy in firefox involves creating a generic AF_INET socket, and then replacing it if the actual configuration requires something else (either AF_INET6 or AF_LOCAL). With syscall filtering configured to return an error in the event of AF_INET or AF_INET6 socket creation, this initialization path fails. We would like this capability so that we can prevent firefox from making network requests outside of the Tor proxy. This patch adds a check in the initial socket creation path to see if the SOCKS proxy host begins with file:// with the assumption that such URIs point to a UNIX Domain Socket (on Linux+macOS only). In that case, we create an AF_LOCAL socket rather than the requested type. A similar check for Windows already exists to determine if the proxy is actually a named pipe. In the subsequent replacing step no work occurs as the passed in socket matches the type we need, so no changes need to be made there. NOTE: With this change there is still a one-time request for an AF_INET6 socket that occurs. This code path exists to determine whether the system supports IPv6; if socket(AF_INET6...) fails then it is assumed that the system does not. However, this check only affects code that is unreachable when using AF_LOCAL sockets so it seems safe to leave as it is. However, this does mean that Tor Browser will still be incompatible with seccomp policies which kill the calling thread in the event of a socket(AF_INET6,...) call. --- netwerk/socket/nsSOCKSSocketProvider.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/netwerk/socket/nsSOCKSSocketProvider.cpp b/netwerk/socket/nsSOCKSSocketProvider.cpp index c62534f7bf3d..bcae1234f486 100644 --- a/netwerk/socket/nsSOCKSSocketProvider.cpp +++ b/netwerk/socket/nsSOCKSSocketProvider.cpp @@ -43,6 +43,14 @@ nsSOCKSSocketProvider::CreateV5(nsISupports *aOuter, REFNSIID aIID, void **aResu return rv; } +#if defined(XP_UNIX) +bool +static IsUNIXDomainSocketPath(const nsACString& aPath) +{ + return StringBeginsWith(aPath, NS_LITERAL_CSTRING("file://")); +} +#endif + NS_IMETHODIMP nsSOCKSSocketProvider::NewSocket(int32_t family, const char *host, @@ -62,6 +70,13 @@ nsSOCKSSocketProvider::NewSocket(int32_t family, sock = CreateNamedPipeLayer(); } else #endif +#if defined(XP_UNIX) + nsAutoCString proxyHost; + proxy->GetHost(proxyHost); + if(IsUNIXDomainSocketPath(proxyHost)) { + family = AF_LOCAL; + } +#endif { sock = PR_OpenTCPSocket(family); if (!sock) {

1 0

[tor-browser/tor-browser-52.6.0esr-8.0-2] Bug 19910: Rip out optimistic data socks handshake variant (#3875)
by gk＠torproject.org 19 Feb '18

19 Feb '18

commit 67fa1e520d8cfc420f5bdee4b53b8310df18a977 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Feb 14 10:39:42 2018 -0500 Bug 19910: Rip out optimistic data socks handshake variant (#3875) This has been shown to cause problems with STARTTLS in XMPP (used in Tor Messenger) and with Tor Launcher's Moat client. A replacement will be added to the Tor daemon itself via bug 5915 (Write patch to make socks handshakes succeed instantly). --- netwerk/base/nsSocketTransport2.cpp | 44 ++++++++----------------------------- netwerk/base/nsSocketTransport2.h | 4 +--- netwerk/socket/nsSOCKSIOLayer.cpp | 3 +-- 3 files changed, 11 insertions(+), 40 deletions(-) diff --git a/netwerk/base/nsSocketTransport2.cpp b/netwerk/base/nsSocketTransport2.cpp index 4399465fe534..1bfd1fc91525 100644 --- a/netwerk/base/nsSocketTransport2.cpp +++ b/netwerk/base/nsSocketTransport2.cpp @@ -1983,26 +1983,7 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags) // Update poll timeout in case it was changed mPollTimeout = mTimeouts[TIMEOUT_READ_WRITE]; } - // Tor 3875: Use optimistic data with SOCKS. - // To accomplish this, two new states were added that are only used with - // SOCKS connections: - // STATE_SENDINGGET - The SOCKS handshake has proceeded to the - // "sent connect" state; now it is okay to - // optimistically send some application data (e.g., - // an HTTP GET request). - // STATE_SENTGET - Optimistic data has been sent; make a second call - // to PR_ConnectContinue() to allow the SOCKS - // handshake to finish. - else if (mState == STATE_SENDINGGET) { - if ((mPollFlags & PR_POLL_WRITE) && (outFlags & ~PR_POLL_READ)) { - mOutput.OnSocketReady(NS_OK); // Allow application data to be sent. - } - mPollTimeout = mTimeouts[TIMEOUT_READ_WRITE]; - mPollFlags = (PR_POLL_EXCEPT | PR_POLL_READ); - mState = STATE_SENTGET; // Wait for SOCKS handshake response. - } - else if (((mState == STATE_CONNECTING) || (mState = STATE_SENTGET)) && - !gIOService->IsNetTearingDown()) { + else if ((mState == STATE_CONNECTING) && !gIOService->IsNetTearingDown()) { // We do not need to do PR_ConnectContinue when we are already // shutting down. @@ -2026,14 +2007,7 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags) Telemetry::PRCONNECTCONTINUE_BLOCKING_TIME_OFFLINE); } - bool isUsingSocks = mProxyTransparent && !mProxyHost.IsEmpty(); - if (status == PR_SUCCESS && mState == STATE_CONNECTING) { - OnSocketConnected(); - if (isUsingSocks) { - mState = STATE_SENDINGGET; - } - } - else if (status == PR_SUCCESS && mState == STATE_SENTGET) { + if (status == PR_SUCCESS) { // // we are connected! // @@ -2060,17 +2034,17 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags) // If the connect is still not ready, then continue polling... // if ((PR_WOULD_BLOCK_ERROR == code) || (PR_IN_PROGRESS_ERROR == code)) { - if (mState != STATE_SENTGET) { - // Set up the select flags for connect... - mPollFlags = (PR_POLL_EXCEPT | PR_POLL_WRITE); - // Update poll timeout in case it was changed - mPollTimeout = mTimeouts[TIMEOUT_CONNECT]; - } + // Set up the select flags for connect... + mPollFlags = (PR_POLL_EXCEPT | PR_POLL_WRITE); + // Update poll timeout in case it was changed + mPollTimeout = mTimeouts[TIMEOUT_CONNECT]; } // // The SOCKS proxy rejected our request. Find out why. // - else if (PR_UNKNOWN_ERROR == code && isUsingSocks) { + else if (PR_UNKNOWN_ERROR == code && + mProxyTransparent && + !mProxyHost.IsEmpty()) { code = PR_GetOSError(); mCondition = ErrorAccordingToNSPR(code); } diff --git a/netwerk/base/nsSocketTransport2.h b/netwerk/base/nsSocketTransport2.h index b4baed233ff1..7c85ccdc409f 100644 --- a/netwerk/base/nsSocketTransport2.h +++ b/netwerk/base/nsSocketTransport2.h @@ -201,9 +201,7 @@ private: STATE_IDLE, STATE_RESOLVING, STATE_CONNECTING, - STATE_TRANSFERRING, - STATE_SENDINGGET, - STATE_SENTGET + STATE_TRANSFERRING }; // Safer way to get and automatically release PRFileDesc objects. diff --git a/netwerk/socket/nsSOCKSIOLayer.cpp b/netwerk/socket/nsSOCKSIOLayer.cpp index a21dfa4a5a11..5429637c1c3a 100644 --- a/netwerk/socket/nsSOCKSIOLayer.cpp +++ b/netwerk/socket/nsSOCKSIOLayer.cpp @@ -83,8 +83,7 @@ public: void SetConnectTimeout(PRIntervalTime to); PRStatus DoHandshake(PRFileDesc *fd, int16_t oflags = -1); int16_t GetPollFlags() const; - bool IsConnected() const { return (mState == SOCKS_CONNECTED || - mState == SOCKS5_READ_CONNECT_RESPONSE_TOP); } + bool IsConnected() const { return mState == SOCKS_CONNECTED; } void ForgetFD() { mFD = nullptr; } void SetNamedPipeFD(PRFileDesc *fd) { mFD = fd; }

1 0

[tor-browser/tor-browser-52.6.0esr-8.0-2] Bug 22614: Make e10s/non-e10s Tor Browsers indistinguishable
by gk＠torproject.org 19 Feb '18

19 Feb '18

commit a91cf5fa9be89c32948f72b87819ff08c43a360e Author: Fernando Fernandez Mancera <ffmancera(a)riseup.net> Date: Fri Feb 2 11:38:01 2018 +0100 Bug 22614: Make e10s/non-e10s Tor Browsers indistinguishable e10s in its current form probably brings some fingerprinting risks with it. E.g. users of accessibility tools (not only those users) won't have e10s enabled on windows and macOS. In order to solve this issue "dom.disable_window_showModalDialog" is set to "true". --- browser/app/profile/000-tor-browser.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index ca27504e4b7d..eb26de046874 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -181,7 +181,8 @@ pref("dom.maxHardwareConcurrency", 1); // Bug 21675: Spoof single-core cpu pref("dom.w3c_touch_events.enabled", 0); // Bug 10286: Always disable Touch API // Disable randomised Firefox HTTP cache decay user test groups (Bug: 13575) pref("browser.cache.frecency_experiment", -1); - +// Make e10s/non-e10s Tor Browsers indistinguishable (Bug: 22614) +pref("dom.disable_window_showModalDialog", true); // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation

1 0

[tor-browser/tor-browser-52.6.0esr-8.0-2] Bug 1005640 - Flush StringBundle cache when app-locales change. r=valentin
by gk＠torproject.org 19 Feb '18

19 Feb '18

commit 0445d514609fd71e1aad90f67af8355825cda929 Author: Zibi Braniecki <gandalf(a)mozilla.com> Date: Tue Apr 18 01:03:05 2017 -0700 Bug 1005640 - Flush StringBundle cache when app-locales change. r=valentin StringBundle caches bundles, so when language chain changes we should flush the cache to enable new strings to be loaded. This also affects localized prefs like intl.accept_languages. Then in HttpHandler we have to mark the value as dirty so that next time it's called it actually recalculates using flushed string bundle with the new locale. MozReview-Commit-ID: DKWEDUli4yH --HG-- extra : rebase_source : 75ecc4204deca066d7492d1494492a91685f36be This fixes bug 22659 on our side. --- intl/strres/nsStringBundle.cpp | 4 +++- netwerk/protocol/http/nsHttpHandler.cpp | 34 +++++++++++++++++++-------------- netwerk/protocol/http/nsHttpHandler.h | 3 ++- 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/intl/strres/nsStringBundle.cpp b/intl/strres/nsStringBundle.cpp index ab840a469a4c..a763ba228b66 100644 --- a/intl/strres/nsStringBundle.cpp +++ b/intl/strres/nsStringBundle.cpp @@ -529,6 +529,7 @@ nsStringBundleService::Init() os->AddObserver(this, "profile-do-change", true); os->AddObserver(this, "chrome-flush-caches", true); os->AddObserver(this, "xpcom-category-entry-added", true); + os->AddObserver(this, "intl:app-locales-changed", true); } // instantiate the override service, if there is any. @@ -546,7 +547,8 @@ nsStringBundleService::Observe(nsISupports* aSubject, { if (strcmp("memory-pressure", aTopic) == 0 || strcmp("profile-do-change", aTopic) == 0 || - strcmp("chrome-flush-caches", aTopic) == 0) + strcmp("chrome-flush-caches", aTopic) == 0 || + strcmp("intl:app-locales-changed", aTopic) == 0) { flushBundleCache(); } diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp index 4276c7144eb3..21ce43d35fd5 100644 --- a/netwerk/protocol/http/nsHttpHandler.cpp +++ b/netwerk/protocol/http/nsHttpHandler.cpp @@ -203,6 +203,7 @@ nsHttpHandler::nsHttpHandler() , mProduct("Gecko") , mCompatFirefoxEnabled(false) , mUserAgentIsDirty(true) + , mAcceptLanguagesIsDirty(true) , mPromptTempRedirect(true) , mEnablePersistentHttpsCaching(false) , mDoNotTrackEnabled(false) @@ -466,8 +467,13 @@ nsHttpHandler::AddStandardRequestHeaders(nsHttpRequestHead *request, bool isSecu // Add the "Accept-Language" header. This header is also exposed to the // service worker. + if (mAcceptLanguagesIsDirty) { + rv = SetAcceptLanguages(); + MOZ_ASSERT(NS_SUCCEEDED(rv)); + } + + // Add the "Accept-Language" header if (!mAcceptLanguages.IsEmpty()) { - // Add the "Accept-Language" header rv = request->SetHeader(nsHttp::Accept_Language, mAcceptLanguages, false, nsHttpHeaderArray::eVarietyRequestOverride); @@ -1484,16 +1490,10 @@ nsHttpHandler::PrefsChanged(nsIPrefBranch *prefs, const char *pref) // if (PREF_CHANGED(INTL_ACCEPT_LANGUAGES)) { - nsCOMPtr<nsIPrefLocalizedString> pls; - prefs->GetComplexValue(INTL_ACCEPT_LANGUAGES, - NS_GET_IID(nsIPrefLocalizedString), - getter_AddRefs(pls)); - if (pls) { - nsXPIDLString uval; - pls->ToString(getter_Copies(uval)); - if (uval) - SetAcceptLanguages(NS_ConvertUTF16toUTF8(uval).get()); - } + // We don't want to set the new accept languages here since + // this pref is a complex type and it may be racy with flushing + // string resources. + mAcceptLanguagesIsDirty = true; } // @@ -1870,12 +1870,18 @@ PrepareAcceptLanguages(const char *i_AcceptLanguages, nsACString &o_AcceptLangua } nsresult -nsHttpHandler::SetAcceptLanguages(const char *aAcceptLanguages) +nsHttpHandler::SetAcceptLanguages() { + mAcceptLanguagesIsDirty = false; + + const nsAdoptingCString& acceptLanguages = + Preferences::GetLocalizedCString(INTL_ACCEPT_LANGUAGES); + nsAutoCString buf; - nsresult rv = PrepareAcceptLanguages(aAcceptLanguages, buf); - if (NS_SUCCEEDED(rv)) + nsresult rv = PrepareAcceptLanguages(acceptLanguages.get(), buf); + if (NS_SUCCEEDED(rv)) { mAcceptLanguages.Assign(buf); + } return rv; } diff --git a/netwerk/protocol/http/nsHttpHandler.h b/netwerk/protocol/http/nsHttpHandler.h index 155740f3d223..bb30afc500f8 100644 --- a/netwerk/protocol/http/nsHttpHandler.h +++ b/netwerk/protocol/http/nsHttpHandler.h @@ -393,7 +393,7 @@ private: void PrefsChanged(nsIPrefBranch *prefs, const char *pref); nsresult SetAccept(const char *); - nsresult SetAcceptLanguages(const char *); + nsresult SetAcceptLanguages(); nsresult SetAcceptEncodings(const char *, bool mIsSecure); nsresult InitConnectionMgr(); @@ -497,6 +497,7 @@ private: nsCString mUserAgent; nsXPIDLCString mUserAgentOverride; bool mUserAgentIsDirty; // true if mUserAgent should be rebuilt + bool mAcceptLanguagesIsDirty; bool mPromptTempRedirect;

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_24341'
by gk＠torproject.org 19 Feb '18

19 Feb '18

commit 166edadb8ea5bae52fa582952402d9e89e564a8d Merge: 86ea671 946d493 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Feb 19 15:03:26 2018 +0000 Merge remote-tracking branch 'boklm/bug_24341' projects/common/runc-config.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)

1 0

[tor-browser-build/master] Bug 24341: update platform.arch to avoid error with some runc versions
by gk＠torproject.org 19 Feb '18

19 Feb '18

commit 946d493f800fa39fadba61fa0440a35074d0bbd5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Nov 17 23:14:39 2017 +0100 Bug 24341: update platform.arch to avoid error with some runc versions The runc versions after this commit: https://github.com/opencontainers/runc/commit/1cd050244e004bc9940787f888b45… and before this commit: https://github.com/opencontainers/runc/commit/e1146182a8cebb5a6133a9e298a5e… cannot run containers where platform.arch is set to anything else than amd64 when running on amd64. The platform.arch is not used for anything so we can set it to amd64 in all cases to avoid the error with that runc version. --- projects/common/runc-config.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/projects/common/runc-config.json b/projects/common/runc-config.json index 7a88805..e75c13d 100644 --- a/projects/common/runc-config.json +++ b/projects/common/runc-config.json @@ -2,11 +2,7 @@ "ociVersion": "1.0.0[% IF !c("var_p/runc_spec100") %]-rc1[% END %]", "platform": { "os": "linux", -[% IF c("var/container/arch") == 'i386' -%] - "arch": "386" -[% ELSE -%] - "arch": "[% c("var/container/arch") %]" -[% END -%] + "arch": "amd64" }, "process": { "terminal": [% IF c("interactive") %]true[% ELSE %]false[% END %],

1 0

[tor-browser-build/master] Bug 24614: Bump meek tag for moat feature
by gk＠torproject.org 19 Feb '18

19 Feb '18

commit 86ea671920a69772ee7adb4a168f06cbd4b21168 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Feb 19 12:12:54 2018 +0000 Bug 24614: Bump meek tag for moat feature --- projects/meek/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/meek/config b/projects/meek/config index 46f4ec9..f58fbd1 100644 --- a/projects/meek/config +++ b/projects/meek/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.25 +version: 0.29 git_url: https://git.torproject.org/pluggable-transports/meek.git git_hash: '[% c("version") %]' tag_gpg_id: 1

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_25020'
by gk＠torproject.org 19 Feb '18

19 Feb '18

commit 1c625c1dcbfbb1ca0b40d965c081b3f5a8f84046 Merge: 3d47438 b2201eb Author: Georg Koppen <gk(a)torproject.org> Date: Mon Feb 19 12:09:30 2018 +0000 Merge remote-tracking branch 'boklm/bug_25020' projects/tor-browser/build | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tor-browser-build/master] Bug 25020: add a tbb_version.json file
by gk＠torproject.org 19 Feb '18

19 Feb '18

commit b2201eb2571c885f45bd6632e483310b169759dc Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Feb 8 14:55:10 2018 +0100 Bug 25020: add a tbb_version.json file Add a tbb_version.json file containing informations about the installed bundle. --- projects/tor-browser/build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 59fbda5..655e157 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -198,6 +198,8 @@ echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/00 [% c("var/touch") %] defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults +# create tbb_version.json file for #25020 +echo '{"version":"[% c("var/torbrowser_version") %]","architecture":"[% c("var/mar_osname") %]","channel":"[% c("var/channel") %]","locale":"en-US"}' > ../tbb_verson.json popd # Prepare our language packs for using the proper search engines and embed @@ -327,6 +329,8 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ [% c("var/touch") %] defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults + # create tbb_version.json file for #25020 + echo '{"version":"[% c("var/torbrowser_version") %]","architecture":"[% c("var/mar_osname") %]","channel":"[% c("var/channel") %]","locale":"[% lang %]"}' > ../tbb_verson.json popd # Set the update.locale (it is used to replace %LOCALE% within

1 0

[tor-browser-build/master] Bug 25178: re-enable windows-x86_64 build in 'make testbuild'
by gk＠torproject.org 19 Feb '18

19 Feb '18

commit 707cf3d03024780124ab9cda854244ca2ffbccaf Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Feb 8 15:42:20 2018 +0100 Bug 25178: re-enable windows-x86_64 build in 'make testbuild' --- projects/release/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/release/config b/projects/release/config index 61c6175..e48fb01 100644 --- a/projects/release/config +++ b/projects/release/config @@ -29,7 +29,7 @@ targets: torbrowser-windows-i686: 1 torbrowser-windows-x86_64: var: - torbrowser-windows-x86_64: '[% c("var/alpha") || c("var/nightly") %]' + torbrowser-windows-x86_64: '[% ! c("var/release") %]' torbrowser-osx-x86_64: var: torbrowser-osx-x86_64: 1

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_25178'
by gk＠torproject.org 19 Feb '18

19 Feb '18

commit 3d47438b84102e6831c0905764cb96d479e4580a Merge: 729ad3b 707cf3d Author: Georg Koppen <gk(a)torproject.org> Date: Mon Feb 19 12:06:56 2018 +0000 Merge remote-tracking branch 'boklm/bug_25178' projects/release/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor-browser-build/master] Bug 25266: PT config should include full names of executable files
by boklm＠torproject.org 16 Feb '18

16 Feb '18

commit 729ad3b42b612829301a1231879296a77c95a35c Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Feb 15 15:56:28 2018 +0000 Bug 25266: PT config should include full names of executable files Tor Launcher's Moat client implementation uses Mozilla's Subprocess.jsm module to start the meek client, and that module requires a complete file path including the .exe suffix. For consistency, we now include the .exe suffix everywhere. --- .../Bundle-Data/PTConfigs/windows/torrc-defaults-appendix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix b/projects/tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix index 2c1b636..94d7fd9 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix +++ b/projects/tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix @@ -1,8 +1,8 @@ ## fteproxy configuration -ClientTransportPlugin fte exec TorBrowser\Tor\PluggableTransports\fteproxy --managed +ClientTransportPlugin fte exec TorBrowser\Tor\PluggableTransports\fteproxy.exe --managed ## obfs4proxy configuration -ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\Tor\PluggableTransports\obfs4proxy +ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\Tor\PluggableTransports\obfs4proxy.exe ## meek configuration -ClientTransportPlugin meek exec TorBrowser\Tor\PluggableTransports\terminateprocess-buffer TorBrowser\Tor\PluggableTransports\meek-client-torbrowser -- TorBrowser\Tor\PluggableTransports\meek-client +ClientTransportPlugin meek exec TorBrowser\Tor\PluggableTransports\terminateprocess-buffer.exe TorBrowser\Tor\PluggableTransports\meek-client-torbrowser.exe -- TorBrowser\Tor\PluggableTransports\meek-client.exe

1 0

[tor-browser-build/master] Bug 23384: Add user mikeperry on build-sunet-a.torproject.net
by boklm＠torproject.org 10 Feb '18

10 Feb '18

commit 468b6c290e3450c2d62c89b06f68cf84e5abd8bc Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Feb 10 10:10:54 2018 +0100 Bug 23384: Add user mikeperry on build-sunet-a.torproject.net --- tools/ansible/roles/tbb-team/defaults/main.yml | 1 + tools/ansible/roles/tbb-team/files/mikeperry.pub | 1 + 2 files changed, 2 insertions(+) diff --git a/tools/ansible/roles/tbb-team/defaults/main.yml b/tools/ansible/roles/tbb-team/defaults/main.yml index cf54157..dd92149 100644 --- a/tools/ansible/roles/tbb-team/defaults/main.yml +++ b/tools/ansible/roles/tbb-team/defaults/main.yml @@ -4,3 +4,4 @@ tbb_team_members: - brade - gk - mcs + - mikeperry diff --git a/tools/ansible/roles/tbb-team/files/mikeperry.pub b/tools/ansible/roles/tbb-team/files/mikeperry.pub new file mode 100644 index 0000000..277f539 --- /dev/null +++ b/tools/ansible/roles/tbb-team/files/mikeperry.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6R7SmJ88cNencqZTtUmU8cpVpOJCzEklXNIBF4y44ZO2QY9iqJdbC2vuMV68/XUP1G9rz1BOTvyyO3T4/KlvRlHiQEMOy2FObc5znVOAshEqSm450AjGAjpOClV+EpJrvd7LqGIcR6/rLZym7P4aYHkUW/C5DEvyQZUmiCnFSUv8Zh2PFOATP4Veyi0PbJvEPZ73n9QZXDq4mERa1dvwBnGIlXJwKdf3U0Eyx1rZe8OIMY9Rpn+Gq3iuk+1u4SCMiUQGNJ1diG/t40leXlhN3N2cIEBUISpPtwpmTw988UwKneKCXsdi6Dhu2XWoSHpsQrjPDmh9vbpi2yLvlgGv2Q== user@remote

1 0

[tor-browser-build/master] Bug 24995: include git hash in tor --version
by gk＠torproject.org 05 Feb '18

05 Feb '18

commit c873b63900021e29f7ac01c92145e91a7cb64fff Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jan 24 16:44:20 2018 +0100 Bug 24995: include git hash in tor --version --- projects/tor/build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor/build b/projects/tor/build index 14ba58e..f6b507f 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -58,6 +58,8 @@ openssldir=/var/tmp/dist/openssl [% END %] cd /var/tmp/build/[% project %]-[% c('version') %] +# add git hash to micro-revision.i for #24995 +echo '"[% c("abbrev", { abbrev_length => 16 }) %]"' > micro-revision.i ./autogen.sh find -type f -print0 | xargs -0 [% c("var/touch") %] ./configure --disable-asciidoc --with-libevent-dir="$libeventdir" --with-openssl-dir="$openssldir" \

1 0

[tor-launcher/master] Bug 25089: Special characters not escaped in proxy password
by gk＠torproject.org 05 Feb '18

05 Feb '18

commit fa8590a497b492f6da62bbf7009735a17e17ec21 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Feb 2 10:59:55 2018 -0500 Bug 25089: Special characters not escaped in proxy password Modify the _strEscape() function to enclose strings in double quotes when they contain a '#' character. --- src/components/tl-protocol.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index a89b84d..ab33bd3 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -1,4 +1,4 @@ -// Copyright (c) 2017, The Tor Project, Inc. +// Copyright (c) 2018, The Tor Project, Inc. // See LICENSE for licensing information. // TODO: Some code came from torbutton.js (pull in copyright and license?) // @@ -1046,8 +1046,8 @@ TorProtocolService.prototype = // Returns the new string. _strEscape: function(aStr) { - // Just return if all characters are printable ASCII excluding SP and " - const kSafeCharRE = /^[\x21\x23-\x7E]*$/; + // Just return if all characters are printable ASCII excluding SP, ", and # + const kSafeCharRE = /^[\x21\x24-\x7E]*$/; if (!aStr || kSafeCharRE.test(aStr)) return aStr;

1 0

[tor-browser/tor-browser-52.6.0esr-8.0-2] Bug 13575: Disable randomised Firefox HTTP cache decay user tests.
by gk＠torproject.org 02 Feb '18

02 Feb '18

commit f6d6512bf85d964fa5a470f2528042c527523a34 Author: Fernando Fernandez Mancera <ffmancera(a)riseup.net> Date: Sat Jan 20 21:54:00 2018 +0100 Bug 13575: Disable randomised Firefox HTTP cache decay user tests. Mozilla's experiment shouldn't be collecting any data on our users. If "browser.cache.frecency_experiment" is not set in firefox.js to "-1" it will default to "0" and then it is randomised between "1" and "4" inclusive, setting different HTTP cache decay times for the four groups. --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 1302d2e2d6be..ca27504e4b7d 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -179,6 +179,9 @@ pref("media.webspeech.synth.enabled", false); // Bug 10283: Disable SpeechSynthe pref("dom.webaudio.enabled", false); // Bug 13017: Disable Web Audio API pref("dom.maxHardwareConcurrency", 1); // Bug 21675: Spoof single-core cpu pref("dom.w3c_touch_events.enabled", 0); // Bug 10286: Always disable Touch API +// Disable randomised Firefox HTTP cache decay user test groups (Bug: 13575) +pref("browser.cache.frecency_experiment", -1); + // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation

1 0

[tor-browser-build/master] Fold in stable Changelog
by gk＠torproject.org 02 Feb '18

02 Feb '18

commit e15653dc249011b6448e585d96e6f0aef3f1f262 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 2 08:17:35 2018 +0000 Fold in stable Changelog --- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 5ee6e37..d591af5 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -21,6 +21,57 @@ Tor Browser 8.0a1 -- January 23 2018 * Bug 23892: Include Firefox and Tor debug files in final build directory * Bug 24842: include libasan.so.2 and libubsan.so.0 in debug builds +Tor Browser 7.5 -- January 23 2018 + * All Platforms + * Update Firefox to 52.6.0esr + * Update Tor to 0.3.2.9 + * Update OpenSSL to 1.0.2n + * Update Torbutton to 1.9.8.5 + * Bug 21847: Update copy for security slider + * Bug 21245: Add da translation to Torbutton and keep track of it + * Bug 24702: Remove Mozilla text from banner + * Bug 10573: Replace deprecated nsILocalFile with nsIFile (code clean-up) + * Translations update + * Update Tor Launcher to 0.2.14.3 + * Bug 23262: Implement integrated progress bar + * Bug 23261: implement configuration portion of new Tor Launcher UI + * Bug 24623: Revise "country that censors Tor" text + * Bug 24624: tbb-logo.svg may cause network access + * Bug 23240: Retrieve current bootstrap progress before showing progress bar + * Bug 24428: Bootstrap error message sometimes lost + * Bug 22232: Add README on use of bootstrap status messages + * Bug 10573: Replace deprecated nsILocalFile with nsIFile (code clean-up) + * Translations update + * Update HTTPS Everywhere to 2018.1.11 + * Update NoScript to 5.1.8.3 + * Bug 23104: CSS line-height reveals the platform Tor Browser is running on + * Bug 24398: Plugin-container process exhausts memory + * Bug 22501: Requests via javascript: violate FPI + * Bug 24756: Add noisebridge01 obfs4 bridge configuration + * Windows + * Bug 16010: Enable content sandboxing on Windows + * Bug 23230: Fix build error on Windows 64 + * OS X + * Bug 24566: Avoid white flashes when opening dialogs in Tor Browser + * Bug 23025: Add some hardening flags to macOS build + * Linux + * Bug 23970: Make "Print to File" work with sandboxing enabled + * Bug 23016: "Print to File" is broken on some non-english Linux systems + * Bug 10089: Set middlemouse.contentLoadURL to false by default + * Bug 18101: Suppress upload file dialog proxy bypass (linux part) + * Android + * Bug 22084: Spoof network information API + * Build System + * All Platforms + * Switch from gitian/tor-browser-bundle to rbm/tor-browser-build + * Windows + * Bug 22563: Update mingw-w64 to fix W^X violations + * Bug 20929: Bump GCC version to 5.4.0 + * Linux + * Bug 20929: Bump GCC version to 5.4.0 + * Bug 23892: Include Firefox and Tor debug files in final build directory + * Bug 24842: include libasan.so.2 and libubsan.so.0 in debug builds + Tor Browser 7.5a10 -- December 19 2017 * All Platforms * Update Tor to 0.3.2.7-rc

1 0

[tor-browser-build/maint-7.5] Bump rbm to latest master
by gk＠torproject.org 02 Feb '18

02 Feb '18

commit e0641719c6f52109a25304dbe438e3139d6e14f1 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 2 07:22:04 2018 +0000 Bump rbm to latest master --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index 5c89374..7494edc 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 5c89374df7957238a9565c0b938ee3f30f880438 +Subproject commit 7494edc6d2556c511c213823a6549410ba75f73b

1 0

[torbutton/master] Bug 25016: Remove 2017 donation banner
by gk＠torproject.org 02 Feb '18

02 Feb '18

commit 1cf0f11380c6f9fddf2fef54966390801ba7a2b1 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Jan 24 20:37:49 2018 -0800 Bug 25016: Remove 2017 donation banner The campaign is finished, so we can remove the banner. I'm leaving in the strings in case we want to use some of them next year. --- src/chrome/content/aboutTor/aboutTor-content.js | 5 -- src/chrome/content/aboutTor/aboutTor.xhtml | 19 +--- src/chrome/content/aboutTor/donation_banner.js | 105 ---------------------- src/chrome/content/aboutTor/onion-hand.png | Bin 69055 -> 0 bytes src/chrome/content/torbutton.js | 4 +- src/chrome/skin/donation_banner.css | 113 ----------------------- src/modules/donation-banner.js | 115 ------------------------ 7 files changed, 2 insertions(+), 359 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor-content.js b/src/chrome/content/aboutTor/aboutTor-content.js index 95e8abd..ec515bb 100644 --- a/src/chrome/content/aboutTor/aboutTor-content.js +++ b/src/chrome/content/aboutTor/aboutTor-content.js @@ -105,11 +105,6 @@ var AboutTorListener = { else body.removeAttribute("showmanual"); - if (aData.bannerData) - body.setAttribute("banner-data", aData.bannerData); - else - body.removeAttribute("banner-data"); - // Setting body.initialized="yes" displays the body, which must be done // at this point because our remaining initialization depends on elements // being visible so that their size and position are accurate. diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 0fca4b9..7ae4b8b 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -21,8 +21,6 @@ <title>&aboutTor.title;</title> <link rel="stylesheet" type="text/css" media="all" href="resource://torbutton/chrome/skin/aboutTor.css"/> - <link rel="stylesheet" type="text/css" media="all" - href="resource://torbutton/chrome/skin/donation_banner.css"/> <script type="text/javascript;version=1.7"> <![CDATA[ window.addEventListener("pageshow", function() { @@ -33,21 +31,6 @@ window.addEventListener("pageshow", function() { </script> </head> <body dir="&locale.dir;"> - <div id="banner"> - <div id="banner-contents-container"> - <div id="banner-tagline"><span></span></div> - <div id="banner-slogan"><span></span></div> - <a id="banner-donate-button-link" - href="https://www.torproject.org/donate/donate-pdr-tbb"> - <div id="banner-donate-button"> - <div id="banner-donate-button-inner"> - <span></span> - </div> - </div> - </a> - </div> - </div> - <div id="banner-spacer"></div> <div id="torstatus" class="top"> <div id="torstatus-version"/> <div id="torstatus-image"/> @@ -129,6 +112,6 @@ window.addEventListener("pageshow", function() { <p>&aboutTor.footer.label; <a href="&aboutTor.learnMore.link;">&aboutTor.learnMore.label;</a></p> </div> - <script src="resource://torbutton/chrome/content/aboutTor/donation_banner.js"></script> + </body> </html> diff --git a/src/chrome/content/aboutTor/donation_banner.js b/src/chrome/content/aboutTor/donation_banner.js deleted file mode 100644 index 85f6af1..0000000 --- a/src/chrome/content/aboutTor/donation_banner.js +++ /dev/null @@ -1,105 +0,0 @@ -/* jshint esnext:true */ - -let sel = selector => document.querySelector(selector); - -// Shrink the font size if the text in the given element is overflowing. -let fitTextInElement = function (element) { - element.style.fontSize = "8px"; - let defaultWidth = element.scrollWidth, - defaultHeight = element.scrollHeight; - let bestSize; - for (let testSize = 8; testSize <= 40; testSize += 0.5) { - element.style.fontSize = `${testSize}px`; - if (element.scrollWidth <= defaultWidth && - element.scrollHeight <= defaultHeight) { - bestSize = testSize; - } else { - break; - } - } - element.style.fontSize = `${bestSize}px`; -}; - -// Increase padding at end to "squeeze" text, until just before -// it gets squeezed so much that it gets longer vertically. -let avoidWidows = function (element) { - element.style.paddingRight = "0px"; - let originalWidth = element.scrollWidth; - let originalHeight = element.scrollHeight; - let bestPadding; - for (let testPadding = 0; testPadding < originalWidth; testPadding += 0.5) { - element.style.paddingRight = `${testPadding}px`; - if (element.scrollHeight <= originalHeight) { - bestPadding = testPadding; - } else { - break; - } - } - element.style.paddingRight = `${bestPadding}px`; - if (window.getComputedStyle(element).direction === "rtl") { - element.style.paddingLeft = element.style.paddingRight; - element.style.paddingRight = "0px"; - } -}; - -// Resize the text inside banner to fit. -let updateTextSizes = function () { - fitTextInElement(sel("#banner-tagline")); - fitTextInElement(sel("#banner-slogan")); - fitTextInElement(sel("#banner-donate-button-inner")); - avoidWidows(sel("#banner-tagline span")); -}; - -// Returns a random integer x, such that 0 <= x < max -let randomInteger = max => Math.floor(max * Math.random()); - -// The main donation banner function. -let runDonationBanner = function ({ taglines, slogan, mozilla, donate, shortLocale }) { - try { - sel("#banner-tagline span").innerText = taglines[randomInteger(taglines.length)]; - sel("#banner-slogan span").innerText = slogan; - let donateButtonText = sel("#banner-donate-button-inner span"); - let rtl = window.getComputedStyle(donateButtonText).direction === "rtl"; - donateButtonText.innerHTML = donate + " " + (rtl ? "◀" : "▶"); - sel("#banner").style.display = "flex"; - sel("#banner-spacer").style.display = "block"; - addEventListener("resize", updateTextSizes); - updateTextSizes(); - // Add a suffix corresponding to locale so we can send user - // to a correctly-localized donation page via redirect. - sel("#banner-donate-button-link").href += "-" + shortLocale; - sel("#torstatus-image").style.display = "none"; - } catch (e) { - // Something went wrong. - console.error(e); - sel("#banner").style.display = "none"; - sel("#bannerSpacer").style.display = "none"; - sel("#torstatus-image").style.display = "block"; - } -}; - -// Calls callback(attributeValue) when the specified attribute changes on -// target. Returns a zero-arg function that stops observing. -let observeAttribute = function (target, attributeName, callback) { - let observer = new MutationObserver(mutations => { - mutations.forEach(mutation => { - if (mutation.type === "attributes" && - mutation.attributeName === attributeName) { - callback(target.getAttribute(attributeName)); - } - }); - }); - observer.observe(target, { attributes: true }); - return () => observer.disconnect(); -}; - -// Start the donation banner if "toron" has been set to "yes". -let stopObserving = observeAttribute(document.body, "toron", value => { - stopObserving(); - if (value === "yes") { - let bannerDataJSON = document.body.getAttribute("banner-data"); - if (bannerDataJSON && bannerDataJSON.length > 0) { - runDonationBanner(JSON.parse(bannerDataJSON)); - } - } -}); diff --git a/src/chrome/content/aboutTor/onion-hand.png b/src/chrome/content/aboutTor/onion-hand.png deleted file mode 100644 index 00a5a41..0000000 Binary files a/src/chrome/content/aboutTor/onion-hand.png and /dev/null differ diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 9abc1c5..64aa5b0 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -13,7 +13,6 @@ let { showDialog } = Cu.import("resource://torbutton/modules/utils.js", {}); let { unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {}); let SecurityPrefs = Cu.import("resource://torbutton/modules/security-prefs.js", {}); let { bindPrefAndInit, observe } = Cu.import("resource://torbutton/modules/utils.js", {}); -let { bannerData } = Cu.import("resource://torbutton/modules/donation-banner.js", {}); const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion"; const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; @@ -451,8 +450,7 @@ var torbutton_abouttor_message_handler = { torOn: torbutton_tor_check_ok(), updateNeeded: torbutton_update_is_needed(), showManual: torbutton_show_torbrowser_manual(), - toolbarButtonXPos: torbutton_get_toolbarbutton_xpos(), - bannerData: bannerData(), + toolbarButtonXPos: torbutton_get_toolbarbutton_xpos() }; }, diff --git a/src/chrome/skin/donation_banner.css b/src/chrome/skin/donation_banner.css deleted file mode 100644 index dd9d7be..0000000 --- a/src/chrome/skin/donation_banner.css +++ /dev/null @@ -1,113 +0,0 @@ -#banner { - -khtml-user-select: none; /* Konqueror */ - -moz-user-select: none; /* Firefox */ - -ms-user-select: none; /* Internet Explorer/Edge */ - -webkit-touch-callout: none; /* iOS Safari */ - -webkit-user-select: none; /* Chrome/Safari/Opera */ - display: none; - height: 150px; - justify-content: center; - left: 0px; - margin-top: 0px; - min-width: 900px; - opacity: 1; - position: absolute; - user-select: none; - width: 100%; - z-index: 1; -} -#banner:before { - background-color: #406; - background-image: url('resource://torbutton/chrome/content/aboutTor/onion-hand.png'); - background-position: center; - background-size: cover; - content: ""; - height: 150px; - left: 0px; - position: absolute; - top: 0px; - width: 100%; -} -#banner:-moz-dir(rtl):before { - transform: scaleX(-1); -} -#banner-contents-container { - align-items: center; - height: 100%; - max-width: 700px; - position: relative; - width: 700px; -} -#banner-tagline { - align-items: center; - bottom: 60px; - color: white; - display: flex; - font-family: monospace; - font-size: 8px; - font-weight: bold; - left: 85px; - position: absolute; - right: 0px; - text-align: start; - text-transform: uppercase; - top: 10px; -} -#banner-tagline:-moz-dir(rtl) { - left: 0px; - right: 85px; -} -#banner-slogan { - align-items: center; - bottom: 30px; - color: #f8f8a0; - display: flex; - font-family: monospace; - font-weight: bold; - left: 85px; - position: absolute; - right: 285px; - text-align: start; - top: 90px; - white-space: nowrap; -} -#banner-slogan:-moz-dir(rtl) { - left: 285px; - right: 85px; -} -#banner-donate-button { - background-color: #13a513; - border: 0px; - bottom: 10px; - color: #fbf7ef; - font-family: sans-serif; - font-size: 12px; - font-weight: bold; - left: 430px; - letter-spacing: -0.00em; - position: absolute; - right: 0px; - top: 100px; -} -#banner-donate-button:-moz-dir(rtl) { - left: 0px; - right: 430px; -} -#banner-donate-button:hover { - background-color: #38bc38; -} -#banner-donate-button-inner { - bottom: 6px; - display: flex; - justify-content: center; - left: 8px; - position: absolute; - right: 8px; - top: 6px; -} -#banner-spacer { - display: none; - height: 150px; - position: relative; - top: 0; -} diff --git a/src/modules/donation-banner.js b/src/modules/donation-banner.js deleted file mode 100644 index 6c205fe..0000000 --- a/src/modules/donation-banner.js +++ /dev/null @@ -1,115 +0,0 @@ -/* jshint esversion:6 */ - -const Cu = Components.utils; - -// ### Import Mozilla Services -Cu.import("resource://gre/modules/Services.jsm"); - -// A list of locales for which the banner has been translated. -const kBannerLocales = [ - "de", - "en", - "es", - "fa", - "fr", - "it", - "nl", - "pl", - "pt", - "ru", - "sv", - "tr", -]; - -// A list of donation page locales (at least redirects should exist). -const kDonationPageLocales = [ - "ar", - "de", - "en", - "es", - "fa", - "fr", - "it", - "ja", - "ko", - "nl", - "pl", - "pt", - "ru", - "tr", - "vi", - "zh", -]; - -const kPropertiesURL = "chrome://torbutton/locale/aboutTor.properties"; -const gStringBundle = Services.strings.createBundle(kPropertiesURL); - -// Check if we should show the banner, depends on -// browser locale, current date, and how many times -// we have already shown the banner. -const shouldShowBanner = function (shortLocale) { - try { - // If our override test pref is true, then just show the banner regardless. - if (Services.prefs.prefHasUserValue("extensions.torbutton.testBanner") && - Services.prefs.getBoolPref("extensions.torbutton.testBanner") === true) { - return true; - } - // Don't show a banner if update is needed. - let updateNeeded = Services.prefs.getBoolPref("extensions.torbutton.updateNeeded"); - if (updateNeeded) { - return false; - } - // Only show banner when we have that locale and if a donation redirect exists. - if (kBannerLocales.indexOf(shortLocale) === -1 || - kDonationPageLocales.indexOf(shortLocale) === -1) { - return false; - } - // Only show banner between 2017 Oct 23 and 2018 Jan 25. - let now = new Date(); - let start = new Date(2017, 9, 23); - let end = new Date(2018, 0, 26); - let shownCountPref = "extensions.torbutton.donation_banner2017.shown_count"; - if (now < start || now > end) { - // Clean up pref if not in use. - Services.prefs.clearUserPref(shownCountPref); - return false; - } - // Only show banner 50 times. - let count = 0; - if (Services.prefs.prefHasUserValue(shownCountPref)) { - count = Services.prefs.getIntPref(shownCountPref); - } - if (count >= 50) { - return false; - } - Services.prefs.setIntPref(shownCountPref, count+1); - return true; - } catch (e) { - return false; - } -}; - -// Read data needed for displaying banner on page. -var bannerData = function () { - // Read short locale. - let locale = Services.prefs.getCharPref("general.useragent.locale"); - let shortLocale = locale.match(/[a-zA-Z]+/)[0].toLowerCase(); - if (!shouldShowBanner(shortLocale)) { - return null; - } - // Load tag lines. - let taglines = []; - for (let index = 0; index < 5; ++index) { - let tagline = gStringBundle.GetStringFromName( - "aboutTor.donationBanner.tagline" + (index + 1)); - taglines.push(tagline); - } - // Read slogan, mozilla, and donate button text. - let slogan = gStringBundle.GetStringFromName("aboutTor.donationBanner.slogan"); - let mozilla = gStringBundle.GetStringFromName("aboutTor.donationBanner.mozilla"); - let donate = gStringBundle.GetStringFromName("aboutTor.donationBanner.donate"); - return JSON.stringify({ taglines, slogan, mozilla, donate, shortLocale }); -}; - -// Export utility functions for external use. -var EXPORTED_SYMBOLS = ["bannerData"];

1 0

[torbutton/master] Merge remote-tracking branch 'arthur/25016'
by gk＠torproject.org 02 Feb '18

02 Feb '18

commit f96a293d146d3dc54f8ecfaa1d3dfc669bf4198d Merge: f860499 1cf0f11 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 2 08:11:02 2018 +0000 Merge remote-tracking branch 'arthur/25016' src/chrome/content/aboutTor/aboutTor-content.js | 5 -- src/chrome/content/aboutTor/aboutTor.xhtml | 19 +--- src/chrome/content/aboutTor/donation_banner.js | 105 ---------------------- src/chrome/content/aboutTor/onion-hand.png | Bin 69055 -> 0 bytes src/chrome/content/torbutton.js | 4 +- src/chrome/skin/donation_banner.css | 113 ----------------------- src/modules/donation-banner.js | 115 ------------------------ 7 files changed, 2 insertions(+), 359 deletions(-)

1 0

[tor-browser-build/master] Bump rbm to latest master
by gk＠torproject.org 02 Feb '18

02 Feb '18

commit 58dd3596db905fc741e4dc945b26b382180b74b8 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 2 07:22:04 2018 +0000 Bump rbm to latest master --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index 5c89374..7494edc 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 5c89374df7957238a9565c0b938ee3f30f880438 +Subproject commit 7494edc6d2556c511c213823a6549410ba75f73b

1 0

[rbm/master] Bug 24931: fix the build_log_append option
by gk＠torproject.org 02 Feb '18

02 Feb '18

commit 476391e2c8a808acec3b6c6429dddd9f6280d783 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jan 18 13:58:20 2018 +0100 Bug 24931: fix the build_log_append option Fix a regression introduced by #24361. --- lib/RBM.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/RBM.pm b/lib/RBM.pm index 73b7d6c..3b19ca9 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -1035,6 +1035,7 @@ sub build_run { if ($build_log ne '-') { my $append = project_config($project, "build_log_append", $options); $build_log = rbm_path($build_log); + unlink $build_log unless $append; make_path(dirname($build_log)); my $now = localtime; path($build_log)->append_utf8("Starting build: $now\n");

1 0

[rbm/master] Merge remote-tracking branch 'boklm/bug_24931'
by gk＠torproject.org 02 Feb '18

02 Feb '18

commit 7494edc6d2556c511c213823a6549410ba75f73b Merge: b83c74c 476391e Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 2 07:13:42 2018 +0000 Merge remote-tracking branch 'boklm/bug_24931' lib/RBM.pm | 1 + 1 file changed, 1 insertion(+)

1 0

[tor-browser-build/master] Bug 25111: Don't compile Yasm on our own anymore for Windows Tor Browser
by gk＠torproject.org 02 Feb '18

02 Feb '18

commit 57f544ca8590b00b609b62132aeb2ae7abfa7779 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Feb 1 13:10:08 2018 +0100 Bug 25111: Don't compile Yasm on our own anymore for Windows Tor Browser --- projects/firefox/build | 4 ---- projects/firefox/config | 3 --- projects/yasm/build | 14 -------------- projects/yasm/config | 12 ------------ 4 files changed, 33 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 81d4d1c..051d573 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -12,10 +12,6 @@ # compiler setup so that mingw is first in the PATH. export LD_LIBRARY_PATH=$hgccdir/lib64 export PATH=$hgccdir/bin:$PATH - - # Firefox ESR52 needs Yasm >= 1.2.0 which Ubuntu Precise does not ship. - tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/yasm') %] - export PATH="/var/tmp/dist/yasm/bin:$PATH" [% END -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] distdir=/var/tmp/dist/[% project %] diff --git a/projects/firefox/config b/projects/firefox/config index 4157500..f19b8ac 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -94,8 +94,5 @@ input_files: - project: gcc name: gcc enable: '[% c("var/windows") %]' - - project: yasm - name: yasm - enable: '[% c("var/windows") %]' - filename: STL_win64.patch enable: '[% c("var/windows-x86_64") %]' diff --git a/projects/yasm/build b/projects/yasm/build deleted file mode 100644 index c11924c..0000000 --- a/projects/yasm/build +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir=/var/tmp/dist/[% project %] -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf $rootdir/[% c('input_files_by_name/yasm') %] -cd /var/tmp/build/yasm-[% c("version") %] -./configure --prefix="$distdir" -make -j[% c("buildconf/num_procs") %] -make install -cd /var/tmp/dist -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/yasm/config b/projects/yasm/config deleted file mode 100644 index 12d009b..0000000 --- a/projects/yasm/config +++ /dev/null @@ -1,12 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 1.2.0 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -var: - container: - use_container: 1 - -input_files: - - project: container-image - - URL: 'https://www.tortall.net/projects/yasm/releases/yasm-[% c("version") %].tar.gz' - name: yasm - sha256sum: 768ffab457b90a20a6d895c39749adb547c1b7cb5c108e84b151a838a23ccf31

1 0