June 2021 - tor-commits - lists.torproject.org

[torbutton/master] Merge remote-tracking branch 'richardgl/40039_rev'
by sysrqb＠torproject.org 21 Jun '21

21 Jun '21

commit d841a699f7048607230f7b15036f9a8c6a055527 Merge: cc73f75d 0e79e26f Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Jun 17 15:54:36 2021 +0000 Merge remote-tracking branch 'richardgl/40039_rev' chrome/skin/tor-circuit-display.css | 1 + 1 file changed, 1 insertion(+)

1 0

[tor-browser-build/master] Update/refresh torbrowser keyring
by sysrqb＠torproject.org 21 Jun '21

21 Jun '21

commit 80e97dcd720810b66b2ce21d61c111e96541ffbc Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jun 21 21:40:39 2021 +0000 Update/refresh torbrowser keyring --- keyring/torbrowser.gpg | Bin 12262 -> 14048 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/torbrowser.gpg b/keyring/torbrowser.gpg index b23cae3..31c3596 100644 Binary files a/keyring/torbrowser.gpg and b/keyring/torbrowser.gpg differ

1 0

[tor-browser-build/master] Update/refresh torbutton keyring
by sysrqb＠torproject.org 21 Jun '21

21 Jun '21

commit f10b12c344a646b76238fd228f6799f249245b2b Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jun 21 21:38:48 2021 +0000 Update/refresh torbutton keyring --- keyring/torbutton.gpg | Bin 140731 -> 144154 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/torbutton.gpg b/keyring/torbutton.gpg index a925b14..32e6d4c 100644 Binary files a/keyring/torbutton.gpg and b/keyring/torbutton.gpg differ

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] Bug 40475: Include clearing CORS preflight cache
by sysrqb＠torproject.org 21 Jun '21

21 Jun '21

commit 9c9884c27d5a1ee93dde9d78eda6df5707e816f8 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sun Jun 6 20:32:23 2021 +0000 Bug 40475: Include clearing CORS preflight cache --- netwerk/protocol/http/nsCORSListenerProxy.cpp | 5 +++++ netwerk/protocol/http/nsCORSListenerProxy.h | 1 + netwerk/protocol/http/nsHttpHandler.cpp | 2 ++ 3 files changed, 8 insertions(+) diff --git a/netwerk/protocol/http/nsCORSListenerProxy.cpp b/netwerk/protocol/http/nsCORSListenerProxy.cpp index 76870e6cea3f..d9b658af881b 100644 --- a/netwerk/protocol/http/nsCORSListenerProxy.cpp +++ b/netwerk/protocol/http/nsCORSListenerProxy.cpp @@ -346,6 +346,11 @@ void nsCORSListenerProxy::Shutdown() { sPreflightCache = nullptr; } +/* static */ +void nsCORSListenerProxy::Clear() { + sPreflightCache->Clear(); +} + nsCORSListenerProxy::nsCORSListenerProxy(nsIStreamListener* aOuter, nsIPrincipal* aRequestingPrincipal, bool aWithCredentials) diff --git a/netwerk/protocol/http/nsCORSListenerProxy.h b/netwerk/protocol/http/nsCORSListenerProxy.h index 8c0df2e0ff28..3f76be33f209 100644 --- a/netwerk/protocol/http/nsCORSListenerProxy.h +++ b/netwerk/protocol/http/nsCORSListenerProxy.h @@ -54,6 +54,7 @@ class nsCORSListenerProxy final : public nsIStreamListener, NS_DECL_NSITHREADRETARGETABLESTREAMLISTENER static void Shutdown(); + static void Clear(); [[nodiscard]] nsresult Init(nsIChannel* aChannel, DataURIHandling aAllowDataURI); diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp index d5e2c61dbec9..c6cb95ca7fcc 100644 --- a/netwerk/protocol/http/nsHttpHandler.cpp +++ b/netwerk/protocol/http/nsHttpHandler.cpp @@ -10,6 +10,7 @@ #include "prsystem.h" #include "AltServiceChild.h" +#include "nsCORSListenerProxy.h" #include "nsError.h" #include "nsHttp.h" #include "nsHttpHandler.h" @@ -2290,6 +2291,7 @@ nsHttpHandler::Observe(nsISupports* subject, const char* topic, mAltSvcCache->ClearAltServiceMappings(); } } + nsCORSListenerProxy::Clear(); } else if (!strcmp(topic, NS_NETWORK_LINK_TOPIC)) { nsAutoCString converted = NS_ConvertUTF16toUTF8(data); if (!strcmp(converted.get(), NS_NETWORK_LINK_DATA_CHANGED)) {

1 0

[tor-browser-spec/master] fixup! Upgrade quickstart from Idea to Proposal
by sysrqb＠torproject.org 21 Jun '21

21 Jun '21

commit 2b790522de5b25dda59b225a06754c749e8e4551 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jun 21 17:56:25 2021 +0000 fixup! Upgrade quickstart from Idea to Proposal --- proposals/106-quickstart.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/106-quickstart.txt b/proposals/106-quickstart.txt index 2fb5294..12da042 100644 --- a/proposals/106-quickstart.txt +++ b/proposals/106-quickstart.txt @@ -1,4 +1,4 @@ -Filename: xxx-quickstart.txt +Filename: 106-quickstart.txt Title: Tor Browser Quickstart Author: antonela Created: 09-Sep-2020

1 0

[tor-browser-spec/master] Upgrade quickstart from Idea to Proposal
by sysrqb＠torproject.org 21 Jun '21

21 Jun '21

commit 060b12824d03226e67472d29d7474001646de9db Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jun 21 17:54:14 2021 +0000 Upgrade quickstart from Idea to Proposal --- proposals/{ideas/xxx-quickstart.txt => 106-quickstart.txt} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/ideas/xxx-quickstart.txt b/proposals/106-quickstart.txt similarity index 99% rename from proposals/ideas/xxx-quickstart.txt rename to proposals/106-quickstart.txt index 395b8c4..2fb5294 100644 --- a/proposals/ideas/xxx-quickstart.txt +++ b/proposals/106-quickstart.txt @@ -2,7 +2,7 @@ Filename: xxx-quickstart.txt Title: Tor Browser Quickstart Author: antonela Created: 09-Sep-2020 -Status: Draft +Status: Open Target: Tor Browser 10.5 1. Introduction

1 0

[snowflake/main] Store net.Addr in clientIDAddrMap
by cohosh＠torproject.org 21 Jun '21

21 Jun '21

commit 6634f2bec9ea7c538a819619d003db4ea2947a60 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Sat Jun 19 11:16:38 2021 -0400 Store net.Addr in clientIDAddrMap This fixes a stats collection bug where we were converting client addresses between a string and net.Addr using the clientAddr function multiple times, resulting in an empty string for all addresses. --- server/lib/http.go | 2 +- server/lib/snowflake.go | 2 +- server/lib/turbotunnel.go | 15 ++++---- server/lib/turbotunnel_test.go | 84 +++++++++++++++++++++++------------------- 4 files changed, 57 insertions(+), 46 deletions(-) diff --git a/server/lib/http.go b/server/lib/http.go index c612422..3dff45c 100644 --- a/server/lib/http.go +++ b/server/lib/http.go @@ -138,7 +138,7 @@ func turbotunnelMode(conn net.Conn, addr net.Addr, pconn *turbotunnel.QueuePacke // recent WebSocket connection that has had to do with a session, at the // time the session is established, is the IP address that should be // credited for the entire KCP session. - clientIDAddrMap.Set(clientID, addr.String()) + clientIDAddrMap.Set(clientID, addr) var wg sync.WaitGroup wg.Add(2) diff --git a/server/lib/snowflake.go b/server/lib/snowflake.go index 319acd8..48c6d9e 100644 --- a/server/lib/snowflake.go +++ b/server/lib/snowflake.go @@ -181,7 +181,7 @@ func (l *SnowflakeListener) acceptStreams(conn *kcp.UDPSession) error { } return err } - l.QueueConn(&SnowflakeClientConn{Conn: stream, address: clientAddr(addr)}) + l.QueueConn(&SnowflakeClientConn{Conn: stream, address: addr}) } } diff --git a/server/lib/turbotunnel.go b/server/lib/turbotunnel.go index bb16fa3..741992d 100644 --- a/server/lib/turbotunnel.go +++ b/server/lib/turbotunnel.go @@ -1,12 +1,13 @@ package lib import ( + "net" "sync" "git.torproject.org/pluggable-transports/snowflake.git/common/turbotunnel" ) -// clientIDMap is a fixed-capacity mapping from ClientIDs to address strings. +// clientIDMap is a fixed-capacity mapping from ClientIDs to a net.Addr. // Adding a new entry using the Set method causes the oldest existing entry to // be forgotten. // @@ -23,7 +24,7 @@ type clientIDMap struct { // entries is a circular buffer of (ClientID, addr) pairs. entries []struct { clientID turbotunnel.ClientID - addr string + addr net.Addr } // oldest is the index of the oldest member of the entries buffer, the // one that will be overwritten at the next call to Set. @@ -38,7 +39,7 @@ func newClientIDMap(capacity int) *clientIDMap { return &clientIDMap{ entries: make([]struct { clientID turbotunnel.ClientID - addr string + addr net.Addr }, capacity), oldest: 0, current: make(map[turbotunnel.ClientID]int), @@ -48,7 +49,7 @@ func newClientIDMap(capacity int) *clientIDMap { // Set adds a mapping from clientID to addr, replacing any previous mapping for // clientID. It may also cause the clientIDMap to forget at most one other // mapping, the oldest one. -func (m *clientIDMap) Set(clientID turbotunnel.ClientID, addr string) { +func (m *clientIDMap) Set(clientID turbotunnel.ClientID, addr net.Addr) { m.lock.Lock() defer m.lock.Unlock() if len(m.entries) == 0 { @@ -73,13 +74,13 @@ func (m *clientIDMap) Set(clientID turbotunnel.ClientID, addr string) { // Get returns a previously stored mapping. The second return value indicates // whether clientID was actually present in the map. If it is false, then the -// returned address string will be "". -func (m *clientIDMap) Get(clientID turbotunnel.ClientID) (string, bool) { +// returned address will be nil. +func (m *clientIDMap) Get(clientID turbotunnel.ClientID) (net.Addr, bool) { m.lock.Lock() defer m.lock.Unlock() if i, ok := m.current[clientID]; ok { return m.entries[i].addr, true } else { - return "", false + return nil, false } } diff --git a/server/lib/turbotunnel_test.go b/server/lib/turbotunnel_test.go index ba4cf60..85404af 100644 --- a/server/lib/turbotunnel_test.go +++ b/server/lib/turbotunnel_test.go @@ -2,6 +2,7 @@ package lib import ( "encoding/binary" + "net" "testing" "git.torproject.org/pluggable-transports/snowflake.git/common/turbotunnel" @@ -19,7 +20,7 @@ func TestClientIDMap(t *testing.T) { expectGet := func(m *clientIDMap, clientID turbotunnel.ClientID, expectedAddr string, expectedOK bool) { t.Helper() addr, ok := m.Get(clientID) - if addr != expectedAddr || ok != expectedOK { + if (ok && addr.String() != expectedAddr) || ok != expectedOK { t.Errorf("expected (%+q, %v), got (%+q, %v)", expectedAddr, expectedOK, addr, ok) } } @@ -32,6 +33,15 @@ func TestClientIDMap(t *testing.T) { } } + // Convert a string to a net.Addr + ip := func(addr string) net.Addr { + ret, err := net.ResolveIPAddr("ip", addr) + if err != nil { + t.Errorf("received error: %s", err.Error()) + } + return ret + } + // Zero-capacity map can't remember anything. { m := newClientIDMap(0) @@ -39,12 +49,12 @@ func TestClientIDMap(t *testing.T) { expectGet(m, id(0), "", false) expectGet(m, id(1234), "", false) - m.Set(id(0), "A") + m.Set(id(0), ip("1.1.1.1")) expectSize(m, 0) expectGet(m, id(0), "", false) expectGet(m, id(1234), "", false) - m.Set(id(1234), "A") + m.Set(id(1234), ip("1.1.1.1")) expectSize(m, 0) expectGet(m, id(0), "", false) expectGet(m, id(1234), "", false) @@ -56,60 +66,60 @@ func TestClientIDMap(t *testing.T) { expectGet(m, id(0), "", false) expectGet(m, id(1), "", false) - m.Set(id(0), "A") + m.Set(id(0), ip("1.1.1.1")) expectSize(m, 1) - expectGet(m, id(0), "A", true) + expectGet(m, id(0), "1.1.1.1", true) expectGet(m, id(1), "", false) - m.Set(id(1), "B") // forgets the (0, "A") entry + m.Set(id(1), ip("1.1.1.2")) // forgets the (0, "1.1.1.1") entry expectSize(m, 1) expectGet(m, id(0), "", false) - expectGet(m, id(1), "B", true) + expectGet(m, id(1), "1.1.1.2", true) - m.Set(id(1), "C") // forgets the (1, "B") entry + m.Set(id(1), ip("1.1.1.3")) // forgets the (1, "1.1.1.2") entry expectSize(m, 1) expectGet(m, id(0), "", false) - expectGet(m, id(1), "C", true) + expectGet(m, id(1), "1.1.1.3", true) } { m := newClientIDMap(5) - m.Set(id(0), "A") - m.Set(id(1), "B") - m.Set(id(2), "C") - m.Set(id(0), "D") // shadows the (0, "D") entry - m.Set(id(3), "E") + m.Set(id(0), ip("1.1.1.1")) + m.Set(id(1), ip("1.1.1.2")) + m.Set(id(2), ip("1.1.1.3")) + m.Set(id(0), ip("1.1.1.4")) // shadows the (0, "1.1.1.1") entry + m.Set(id(3), ip("1.1.1.5")) expectSize(m, 4) - expectGet(m, id(0), "D", true) - expectGet(m, id(1), "B", true) - expectGet(m, id(2), "C", true) - expectGet(m, id(3), "E", true) + expectGet(m, id(0), "1.1.1.4", true) + expectGet(m, id(1), "1.1.1.2", true) + expectGet(m, id(2), "1.1.1.3", true) + expectGet(m, id(3), "1.1.1.5", true) expectGet(m, id(4), "", false) - m.Set(id(4), "F") // forgets the (0, "A") entry but should preserve (0, "D") + m.Set(id(4), ip("1.1.1.6")) // forgets the (0, "1.1.1.1") entry but should preserve (0, "1.1.1.4") expectSize(m, 5) - expectGet(m, id(0), "D", true) - expectGet(m, id(1), "B", true) - expectGet(m, id(2), "C", true) - expectGet(m, id(3), "E", true) - expectGet(m, id(4), "F", true) - - m.Set(id(5), "G") // forgets the (1, "B") entry - m.Set(id(0), "H") // forgets the (2, "C") entry and shadows (0, "D") + expectGet(m, id(0), "1.1.1.4", true) + expectGet(m, id(1), "1.1.1.2", true) + expectGet(m, id(2), "1.1.1.3", true) + expectGet(m, id(3), "1.1.1.5", true) + expectGet(m, id(4), "1.1.1.6", true) + + m.Set(id(5), ip("1.1.1.7")) // forgets the (1, "1.1.1.2") entry + m.Set(id(0), ip("1.1.1.8")) // forgets the (2, "1.1.1.3") entry and shadows (0, "1.1.1.4") expectSize(m, 4) - expectGet(m, id(0), "H", true) + expectGet(m, id(0), "1.1.1.8", true) expectGet(m, id(1), "", false) expectGet(m, id(2), "", false) - expectGet(m, id(3), "E", true) - expectGet(m, id(4), "F", true) - expectGet(m, id(5), "G", true) - - m.Set(id(0), "I") // forgets the (0, "D") entry and shadows (0, "H") - m.Set(id(0), "J") // forgets the (3, "E") entry and shadows (0, "I") - m.Set(id(0), "K") // forgets the (4, "F") entry and shadows (0, "J") - m.Set(id(0), "L") // forgets the (5, "G") entry and shadows (0, "K") + expectGet(m, id(3), "1.1.1.5", true) + expectGet(m, id(4), "1.1.1.6", true) + expectGet(m, id(5), "1.1.1.7", true) + + m.Set(id(0), ip("1.1.1.9")) // forgets the (0, "1.1.1.4") entry and shadows (0, "1.1.1.8") + m.Set(id(0), ip("1.1.1.10")) // forgets the (3, "1.1.1.5") entry and shadows (0, "1.1.1.9") + m.Set(id(0), ip("1.1.1.11")) // forgets the (4, "1.1.1.6") entry and shadows (0, "1.1.1.10") + m.Set(id(0), ip("1.1.1.12")) // forgets the (5, "1.1.1.7") entry and shadows (0, "1.1.1.11") expectSize(m, 1) - expectGet(m, id(0), "L", true) + expectGet(m, id(0), "1.1.1.12", true) expectGet(m, id(1), "", false) expectGet(m, id(2), "", false) expectGet(m, id(3), "", false)

1 0

[community/master] Update onions.ini
by gus＠torproject.org 21 Jun '21

21 Jun '21

commit 521089ae5e95083699ffdd35ba9ad1bd78009b74 Author: Srijan-Sriv <79690889+Srijan-Sriv(a)users.noreply.github.com> Date: Mon Jun 21 18:46:03 2021 +0530 Update onions.ini --- databags/onions.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/databags/onions.ini b/databags/onions.ini index 105263f..2f2f749 100644 --- a/databags/onions.ini +++ b/databags/onions.ini @@ -19,7 +19,7 @@ image = /static/images/onions/png/bbc.png label = BBC [facebook] -link = https://facebookcorewwwi.onion +link = https://facebookwkhpilnemxj7asaniu7vnjjbiltxjqhye3mhbshg7kx5tfyd.onion image = /static/images/onions/png/facebook.png label = Facebook

1 0

[tpo/master] Add new Tor Browser version 10.0.18
by sysrqb＠torproject.org 21 Jun '21

21 Jun '21

commit 87c8e613bd5941da7362b9d5139b024339fce7f7 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jun 21 13:37:40 2021 +0000 Add new Tor Browser version 10.0.18 --- databags/versions.ini | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/databags/versions.ini b/databags/versions.ini index af968b82..b1d61dd4 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -1,15 +1,15 @@ [torbrowser-stable] -version = 10.0.17 -win32 = 0.4.5.8 +version = 10.0.18 +win32 = 0.4.5.9 [torbrowser-android-stable] -version = 10.0.16 +version = 10.0.18 [torbrowser-win-stable] -version = 10.0.17 +version = 10.0.18 [torbrowser-linux-stable] -version = 10.0.17 +version = 10.0.18 [torbrowser-alpha] version = 10.5a16

1 0

[donate-static/master] Fix footer links 404'ing from relative path
by gus＠torproject.org 21 Jun '21

21 Jun '21

commit 5521d021d5530894d6a87af01e460ac42994aaf7 Author: kez <kez(a)torproject.org> Date: Thu Jun 17 14:22:11 2021 -0400 Fix footer links 404'ing from relative path --- templates/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/footer.html b/templates/footer.html index 97d1488e..a8b7d54e 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -42,7 +42,7 @@ <li{% if this.is_child_of(item.path) %} class="nav-item active" {% else %} class="nav-item"{% endif %}> {% set link = site.get(item.path) %} {% if link %} - <a class="nav-link text-light" href="{{ item.path|url(alt=this.alt) }}"> + <a class="nav-link text-light" href="/{{ item.path|url(alt=this.alt) }}"> {% else %} {% set local = bag('links', this.alt, id) %} {% if local %}

1 0