February 2020 - tor-commits - lists.torproject.org

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 09 Feb '20

09 Feb '20

commit c7195dd1f4debce87fae2dc9a0277b6976a8ab77 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 9 15:15:16 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- de/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/de/LC_MESSAGES/bridgedb.po b/de/LC_MESSAGES/bridgedb.po index d66161622c..4595e99b42 100644 --- a/de/LC_MESSAGES/bridgedb.po +++ b/de/LC_MESSAGES/bridgedb.po @@ -5,6 +5,7 @@ # Translators: # Christian Kaindl <crisscross.kaindl(a)outlook.de>, 2015 # trantor <clucko3(a)gmail.com>, 2014 +# Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2020 # Emma Peel, 2019 # Ettore Atalan <atalanttore(a)googlemail.com>, 2014 # jschfr <hello(a)janschoefer.com>, 2015 @@ -27,8 +28,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-02-04 10:59-0800\n" -"PO-Revision-Date: 2020-02-05 01:11+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2020-02-09 14:49+0000\n" +"Last-Translator: Curtis Baltimore <curtisbaltimore(a)protonmail.com>\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -309,7 +310,7 @@ msgid "" "empty and write \"get transport obfs4\" in the email's message body. Please note\n" "that you must send the email using an address from one of the following email\n" "providers: %s or %s." -msgstr "" +msgstr "Eine weitere Möglichkeit, Brücken zu erhalten, ist das Senden einer E-Mail an %s.\nLass den E-Mail Betreff leer und schreibe \"get transport obfs4\" in den\nTextkörper des E-Mail. Bitte beachte, dass du die E-Mail mit einer Adresse\naus einer der folgenden E-Mail-Anbieter senden musst:\n%s oder %s." #: bridgedb/strings.py:117 msgid "My bridges don't work! I need help!"

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 09 Feb '20

09 Feb '20

commit 5a9c95df1fdde4ae3bcc59e73413e84032cae2a6 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 9 11:45:14 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- sv/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po index 0de85fb35b..bbfebadc72 100644 --- a/sv/LC_MESSAGES/bridgedb.po +++ b/sv/LC_MESSAGES/bridgedb.po @@ -20,7 +20,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-02-04 10:59-0800\n" -"PO-Revision-Date: 2020-02-09 06:08+0000\n" +"PO-Revision-Date: 2020-02-09 11:34+0000\n" "Last-Translator: Jonatan Nyberg\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -302,7 +302,7 @@ msgid "" "empty and write \"get transport obfs4\" in the email's message body. Please note\n" "that you must send the email using an address from one of the following email\n" "providers: %s or %s." -msgstr "Ett annat sätt att få broar är att skicka ett e-postmeddelande till %s. Lämna ämnet för e-postmeddelandet\ntomt och skriv \"get transport obfs4\" i e-postmeddelandets meddelandekropp. Observera\natt du måste skicka e-postmeddelandet med en adress från ett av följande e-postmeddelande-\nleverantörer: %s eller %s." +msgstr "Ett annat sätt att få broar är att skicka ett e-postmeddelande till %s. Lämna ämnet för e-postmeddelandet\ntomt och skriv \"get transport obfs4\" i e-postmeddelandet. Observera\natt du måste skicka e-postmeddelandet med en adress från ett av följande e-postmeddelande-\nleverantörer: %s eller %s." #: bridgedb/strings.py:117 msgid "My bridges don't work! I need help!"

1 0

[translation/tor-launcher-network-settings_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed
by translation＠torproject.org 09 Feb '20

09 Feb '20

commit 7edc54096ce810934ca9cfa2cc340327d8fc9c93 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 9 10:52:52 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- sv-SE/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv-SE/network-settings.dtd b/sv-SE/network-settings.dtd index 07ecc473f2..64e7dd5bc0 100644 --- a/sv-SE/network-settings.dtd +++ b/sv-SE/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Klicka på "Anslut" för att ansluta till Tor."> -<!ENTITY torSettings.configurePrompt "Klicka "Konfigurera" för att justera nätverks inställningar ifall du är i ett land som censurerar Tor( som Egypten, Kina och Turkiet) eller ifall du ansluter från ett privat nätverk som kräver en proxy."> +<!ENTITY torSettings.configurePrompt "Klicka på "Konfigurera" för att justera nätverksinställningar om du är i ett land som censurerar Tor (som Egypten, Kina eller Turkiet) eller om du ansluter från ett privat nätverk som kräver en proxy."> <!ENTITY torSettings.configure "Konfigurera"> <!ENTITY torSettings.connect "Anslut">

1 0

[translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
by translation＠torproject.org 09 Feb '20

09 Feb '20

commit 99a30fb393b7264fbdb6b96ea278e530ce5024a3 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 9 10:52:45 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- sv-SE/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sv-SE/network-settings.dtd b/sv-SE/network-settings.dtd index a31aa5766c..05823dfa41 100644 --- a/sv-SE/network-settings.dtd +++ b/sv-SE/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Klicka på "Anslut" för att ansluta till Tor."> -<!ENTITY torSettings.configurePrompt "Klicka "Konfigurera" för att justera nätverks inställningar ifall du är i ett land som censurerar Tor( som Egypten, Kina och Turkiet) eller ifall du ansluter från ett privat nätverk som kräver en proxy."> +<!ENTITY torSettings.configurePrompt "Klicka på "Konfigurera" för att justera nätverksinställningar om du är i ett land som censurerar Tor (som Egypten, Kina eller Turkiet) eller om du ansluter från ett privat nätverk som kräver en proxy."> <!ENTITY torSettings.configure "Konfigurera"> <!ENTITY torSettings.connect "Anslut"> @@ -26,7 +26,7 @@ <!ENTITY torsettings.optional "Valfritt"> <!ENTITY torsettings.useProxy.checkbox "Jag använder en proxy för att ansluta till internet"> -<!ENTITY torsettings.useProxy.type "Proxy-typ"> +<!ENTITY torsettings.useProxy.type "Proxytyp"> <!ENTITY torsettings.useProxy.type.placeholder "Välj en proxytyp"> <!ENTITY torsettings.useProxy.address "Adress"> <!ENTITY torsettings.useProxy.address.placeholder "IP-adress eller värdnamn">

1 0

[translation/torbutton-aboutdialogdtd_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-aboutdialogdtd_completed
by translation＠torproject.org 09 Feb '20

09 Feb '20

commit d2316a724fff3355b16a8f906e58266a573129cf Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 9 06:21:29 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-aboutdial… --- sv-SE/aboutdialog.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv-SE/aboutdialog.dtd b/sv-SE/aboutdialog.dtd index c556fcf2a3..9a2c95c5a0 100644 --- a/sv-SE/aboutdialog.dtd +++ b/sv-SE/aboutdialog.dtd @@ -15,5 +15,5 @@  <!ENTITY bottomLinks.grow "Hjälp Tor-nätverket växa!">  -<!ENTITY bottomLinks.license "Licens information"> +<!ENTITY bottomLinks.license "Licensinformation"> <!ENTITY tor.TrademarkStatement "'Tor' och 'Onion-logotypen' är registerade varumärken av Tor Project, Inc.">

1 0

[translation/torbutton-aboutdialogdtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-aboutdialogdtd
by translation＠torproject.org 09 Feb '20

09 Feb '20

commit c966633424b65891ba6e3e9e26b7501e8a1e7991 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 9 06:21:23 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-aboutdial… --- sv-SE/aboutdialog.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv-SE/aboutdialog.dtd b/sv-SE/aboutdialog.dtd index c556fcf2a3..9a2c95c5a0 100644 --- a/sv-SE/aboutdialog.dtd +++ b/sv-SE/aboutdialog.dtd @@ -15,5 +15,5 @@  <!ENTITY bottomLinks.grow "Hjälp Tor-nätverket växa!">  -<!ENTITY bottomLinks.license "Licens information"> +<!ENTITY bottomLinks.license "Licensinformation"> <!ENTITY tor.TrademarkStatement "'Tor' och 'Onion-logotypen' är registerade varumärken av Tor Project, Inc.">

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 09 Feb '20

09 Feb '20

commit 37abe99bfb3369a28c530d9d461346748edcdcff Author: Translation commit bot <translation(a)torproject.org> Date: Sun Feb 9 06:15:16 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- sv/LC_MESSAGES/bridgedb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po index 2c15fa27f8..0de85fb35b 100644 --- a/sv/LC_MESSAGES/bridgedb.po +++ b/sv/LC_MESSAGES/bridgedb.po @@ -8,7 +8,7 @@ # Gabor Sebastiani, 2014 # Jacob Andersson <jacob.c.andersson(a)protonmail.com>, 2018 # Jonatan Nyberg, 2017 -# Jonatan Nyberg, 2018-2019 +# Jonatan Nyberg, 2018-2020 # Peter Michanek <peter(a)michanek.se>, 2015 # Petomatick <petomatick(a)hotmail.com>, 2011 # ph AA, 2015 @@ -20,8 +20,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-02-04 10:59-0800\n" -"PO-Revision-Date: 2020-02-05 01:11+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2020-02-09 06:08+0000\n" +"Last-Translator: Jonatan Nyberg\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -302,7 +302,7 @@ msgid "" "empty and write \"get transport obfs4\" in the email's message body. Please note\n" "that you must send the email using an address from one of the following email\n" "providers: %s or %s." -msgstr "" +msgstr "Ett annat sätt att få broar är att skicka ett e-postmeddelande till %s. Lämna ämnet för e-postmeddelandet\ntomt och skriv \"get transport obfs4\" i e-postmeddelandets meddelandekropp. Observera\natt du måste skicka e-postmeddelandet med en adress från ett av följande e-postmeddelande-\nleverantörer: %s eller %s." #: bridgedb/strings.py:117 msgid "My bridges don't work! I need help!"

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 08 Feb '20

08 Feb '20

commit 778852907033388755ec78cc6c0de425e079381f Author: Translation commit bot <translation(a)torproject.org> Date: Sat Feb 8 16:45:27 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+tr.po | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/contents+tr.po b/contents+tr.po index a76227fdab..bf302929a2 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -1682,11 +1682,14 @@ msgid "" "This can cost anywhere between $3.00/month and thousands per month, " "depending on your provider, hardware configuration, and bandwidth usage." msgstr "" +"Bunun maliyeti, hizmet sağlayıcınıza, donanım yapılandırmanıza ve bant " +"genişliği kullanımınıza göre ayda 3 ile binlerce USD arasında olabilir." #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) msgid "Many VPS providers will not allow you to run exit relays." msgstr "" +"Çoğu VPS hizmeti sağlayıcısı çıkış aktarıcıları işletmenize izin vermez." #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) @@ -1694,6 +1697,8 @@ msgid "" "You must follow the VPS provider's terms of service, or risk having your " "account disabled." msgstr "" +"VPS hizmeti sağlayıcısının hizmet koşullarına uygun davranmalısınız yoksa " +"hesabınız devre dışı bırakılabilir." #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) @@ -1702,6 +1707,10 @@ msgid "" " relays, please see this list maintained by the Tor community: " "[GoodBadISPs](/relay/community-resources/good-bad-isps)." msgstr "" +"Tor aktarıcıları işletilmesine izin veren barındırma hizmeti sağlayıcıları " +"ve ilkeleri hakkında ayrıntılı bilgi almak için Tor topluluğu tarafından " +"güncellenen şu listeye bakabilirsiniz: [GoodBadISPs](/relay/community-" +"resources/good-bad-isps)." #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) @@ -1712,6 +1721,8 @@ msgstr "## Bir barındırma hizmeti seçerken sorulacak sorular" #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) msgid "* How much monthly traffic is included? Is bandwidth \"unmetered\"?" msgstr "" +"* Aylık kullanılabilecek trafik miktarı nedir? Bant genişliği \"ölçülmüyor\"" +" mu?" #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) @@ -1719,6 +1730,8 @@ msgid "" "* Does the hoster provide IPv6 connectivity? It is recommended, but not " "required." msgstr "" +"* Barındırma hizmeti sağlayıcısı IPv6 bağlantısı sunuyor mu? Bu özellik " +"önerilir ancak şart değildir." #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) @@ -1726,6 +1739,8 @@ msgid "" "* What virtualization / hypervisor (if any) does the provider use? Anything " "but OpenVZ should be fine." msgstr "" +"Hizmet sağlayıcının altyapısında (kullanıyorsa) hangi sanallaştırma çözümü " +"kullanılıyor? OpenVZ dışındaki seçenekler uygundur." #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) @@ -1733,6 +1748,8 @@ msgid "" "* Does the hoster start to throttle bandwidth after a certain amount of " "traffic?" msgstr "" +"* Barındırma hizmeti sağlayıcısı belirli bir trafik miktarı aşıldığında hızı" +" yavaşlatıyor mu?" #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body)

1 0

[snowflake/master] Remove local LAN address ICE candidates
by arlo＠torproject.org 08 Feb '20

08 Feb '20

commit 0fae4ee8ea487c3b4384217e193e5b9a9088e7de Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Jan 31 00:17:50 2020 -0500 Remove local LAN address ICE candidates Unfortunately, the "public" RTCIceTransportPolicy was removed. https://developer.mozilla.org/en-US/docs/Web/API/RTCConfiguration#RTCIceTra… Trac: 19026 --- client/lib/lib_test.go | 35 +++++++++++++++++++++------ client/lib/rendezvous.go | 63 ++++++++++++++++++++++++++++++++++++++++++++---- client/snowflake.go | 3 ++- client/torrc-localhost | 1 + 4 files changed, 89 insertions(+), 13 deletions(-) diff --git a/client/lib/lib_test.go b/client/lib/lib_test.go index 91a9809..adfc9ec 100644 --- a/client/lib/lib_test.go +++ b/client/lib/lib_test.go @@ -288,7 +288,7 @@ func TestSnowflakeClient(t *testing.T) { fakeOffer := deserializeSessionDescription(`{"type":"offer","sdp":"test"}`) Convey("Construct BrokerChannel with no front domain", func() { - b, err := NewBrokerChannel("test.broker", "", transport) + b, err := NewBrokerChannel("test.broker", "", transport, false) So(b.url, ShouldNotBeNil) So(err, ShouldBeNil) So(b.url.Path, ShouldResemble, "test.broker") @@ -296,7 +296,7 @@ func TestSnowflakeClient(t *testing.T) { }) Convey("Construct BrokerChannel *with* front domain", func() { - b, err := NewBrokerChannel("test.broker", "front", transport) + b, err := NewBrokerChannel("test.broker", "front", transport, false) So(b.url, ShouldNotBeNil) So(err, ShouldBeNil) So(b.url.Path, ShouldResemble, "test.broker") @@ -305,7 +305,7 @@ func TestSnowflakeClient(t *testing.T) { }) Convey("BrokerChannel.Negotiate responds with answer", func() { - b, err := NewBrokerChannel("test.broker", "", transport) + b, err := NewBrokerChannel("test.broker", "", transport, false) So(err, ShouldBeNil) answer, err := b.Negotiate(fakeOffer) So(err, ShouldBeNil) @@ -315,7 +315,8 @@ func TestSnowflakeClient(t *testing.T) { Convey("BrokerChannel.Negotiate fails with 503", func() { b, err := NewBrokerChannel("test.broker", "", - &MockTransport{http.StatusServiceUnavailable, []byte("\n")}) + &MockTransport{http.StatusServiceUnavailable, []byte("\n")}, + false) So(err, ShouldBeNil) answer, err := b.Negotiate(fakeOffer) So(err, ShouldNotBeNil) @@ -325,7 +326,8 @@ func TestSnowflakeClient(t *testing.T) { Convey("BrokerChannel.Negotiate fails with 400", func() { b, err := NewBrokerChannel("test.broker", "", - &MockTransport{http.StatusBadRequest, []byte("\n")}) + &MockTransport{http.StatusBadRequest, []byte("\n")}, + false) So(err, ShouldBeNil) answer, err := b.Negotiate(fakeOffer) So(err, ShouldNotBeNil) @@ -335,7 +337,8 @@ func TestSnowflakeClient(t *testing.T) { Convey("BrokerChannel.Negotiate fails with large read", func() { b, err := NewBrokerChannel("test.broker", "", - &MockTransport{http.StatusOK, make([]byte, 100001, 100001)}) + &MockTransport{http.StatusOK, make([]byte, 100001, 100001)}, + false) So(err, ShouldBeNil) answer, err := b.Negotiate(fakeOffer) So(err, ShouldNotBeNil) @@ -345,7 +348,7 @@ func TestSnowflakeClient(t *testing.T) { Convey("BrokerChannel.Negotiate fails with unexpected error", func() { b, err := NewBrokerChannel("test.broker", "", - &MockTransport{123, []byte("")}) + &MockTransport{123, []byte("")}, false) So(err, ShouldBeNil) answer, err := b.Negotiate(fakeOffer) So(err, ShouldNotBeNil) @@ -353,4 +356,22 @@ func TestSnowflakeClient(t *testing.T) { So(err.Error(), ShouldResemble, BrokerErrorUnexpected) }) }) + + Convey("Strip", t, func() { + const offerStart = `{"type":"offer","sdp":"v=0\r\no=- 4358805017720277108 2 IN IP4 8.8.8.8\r\ns=-\r\nt=0 0\r\na=group:BUNDLE data\r\na=msid-semantic: WMS\r\nm=application 56688 DTLS/SCTP 5000\r\nc=IN IP4 8.8.8.8\r\n` + const goodCandidate = `a=candidate:3769337065 1 udp 2122260223 8.8.8.8 56688 typ host generation 0 network-id 1 network-cost 50\r\n` + const offerEnd = `a=ice-ufrag:aMAZ\r\na=ice-pwd:jcHb08Jjgrazp2dzjdrvPPvV\r\na=ice-options:trickle\r\na=fingerprint:sha-256 C8:88:EE:B9:E7:02:2E:21:37:ED:7A:D1:EB:2B:A3:15:A2:3B:5B:1C:3D:D4:D5:1F:06:CF:52:40:03:F8:DD:66\r\na=setup:actpass\r\na=mid:data\r\na=sctpmap:5000 webrtc-datachannel 1024\r\n"}` + + offer := offerStart + goodCandidate + + `a=candidate:3769337065 1 udp 2122260223 192.168.0.100 56688 typ host generation 0 network-id 1 network-cost 50\r\n` + // IsLocal IPv4 + `a=candidate:3769337065 1 udp 2122260223 fdf8:f53b:82e4::53 56688 typ host generation 0 network-id 1 network-cost 50\r\n` + // IsLocal IPv6 + `a=candidate:3769337065 1 udp 2122260223 0.0.0.0 56688 typ host generation 0 network-id 1 network-cost 50\r\n` + // IsUnspecified IPv4 + `a=candidate:3769337065 1 udp 2122260223 :: 56688 typ host generation 0 network-id 1 network-cost 50\r\n` + // IsUnspecified IPv6 + `a=candidate:3769337065 1 udp 2122260223 127.0.0.1 56688 typ host generation 0 network-id 1 network-cost 50\r\n` + // IsLoopback IPv4 + `a=candidate:3769337065 1 udp 2122260223 ::1 56688 typ host generation 0 network-id 1 network-cost 50\r\n` + // IsLoopback IPv6 + offerEnd + + So(stripLocalAddresses(offer), ShouldEqual, offerStart+goodCandidate+offerEnd) + }) + } diff --git a/client/lib/rendezvous.go b/client/lib/rendezvous.go index d117ebc..bd8ff00 100644 --- a/client/lib/rendezvous.go +++ b/client/lib/rendezvous.go @@ -14,9 +14,12 @@ import ( "io" "io/ioutil" "log" + "net" "net/http" "net/url" + "regexp" + "github.com/pion/sdp" "github.com/pion/webrtc" ) @@ -31,9 +34,10 @@ const ( type BrokerChannel struct { // The Host header to put in the HTTP request (optional and may be // different from the host name in URL). - Host string - url *url.URL - transport http.RoundTripper // Used to make all requests. + Host string + url *url.URL + transport http.RoundTripper // Used to make all requests. + keepLocalAddresses bool } // We make a copy of DefaultTransport because we want the default Dial @@ -48,7 +52,7 @@ func CreateBrokerTransport() http.RoundTripper { // Construct a new BrokerChannel, where: // |broker| is the full URL of the facilitating program which assigns proxies // to clients, and |front| is the option fronting domain. -func NewBrokerChannel(broker string, front string, transport http.RoundTripper) (*BrokerChannel, error) { +func NewBrokerChannel(broker string, front string, transport http.RoundTripper, keepLocalAddresses bool) (*BrokerChannel, error) { targetURL, err := url.Parse(broker) if err != nil { return nil, err @@ -63,6 +67,7 @@ func NewBrokerChannel(broker string, front string, transport http.RoundTripper) } bc.transport = transport + bc.keepLocalAddresses = keepLocalAddresses return bc, nil } @@ -76,6 +81,41 @@ func limitedRead(r io.Reader, limit int64) ([]byte, error) { return p, err } +// Stolen from https://github.com/golang/go/pull/30278 +func IsLocal(ip net.IP) bool { + if ip4 := ip.To4(); ip4 != nil { + // Local IPv4 addresses are defined in https://tools.ietf.org/html/rfc1918 + return ip4[0] == 10 || + (ip4[0] == 172 && ip4[1]&0xf0 == 16) || + (ip4[0] == 192 && ip4[1] == 168) + } + // Local IPv6 addresses are defined in https://tools.ietf.org/html/rfc4193 + return len(ip) == net.IPv6len && ip[0]&0xfe == 0xfc +} + +// Removes local LAN address ICE candidates +func stripLocalAddresses(str string) string { + re := regexp.MustCompile(`a=candidate:.*?\\r\\n`) + return re.ReplaceAllStringFunc(str, func(s string) string { + t := s[len("a=candidate:") : len(s)-len("\\r\\n")] + var ice sdp.ICECandidate + err := ice.Unmarshal(t) + if err != nil { + return s + } + if ice.Typ == "host" { + ip := net.ParseIP(ice.Address) + if ip == nil { + return s + } + if IsLocal(ip) || ip.IsUnspecified() || ip.IsLoopback() { + return "" + } + } + return s + }) +} + // Roundtrip HTTP POST using WebRTC SessionDescriptions. // // Send an SDP offer to the broker, which assigns a proxy and responds @@ -84,7 +124,20 @@ func (bc *BrokerChannel) Negotiate(offer *webrtc.SessionDescription) ( *webrtc.SessionDescription, error) { log.Println("Negotiating via BrokerChannel...\nTarget URL: ", bc.Host, "\nFront URL: ", bc.url.Host) - data := bytes.NewReader([]byte(serializeSessionDescription(offer))) + str := serializeSessionDescription(offer) + // Ideally, we could specify an `RTCIceTransportPolicy` that would handle + // this for us. However, "public" was removed from the draft spec. + // See https://developer.mozilla.org/en-US/docs/Web/API/RTCConfiguration#RTCIceTra… + // + // FIXME: We are stripping local addresses from the JSON serialized string, + // which is expedient but unsatisfying. We could advocate upstream to + // implement a non-standard ICE transport policy, or to somehow alter + // APIs to avoid adding the undesirable candidates or a method to filter + // them from the marshalled session description. + if !bc.keepLocalAddresses { + str = stripLocalAddresses(str) + } + data := bytes.NewReader([]byte(str)) // Suffix with broker's client registration handler. clientURL := bc.url.ResolveReference(&url.URL{Path: "client"}) request, err := http.NewRequest("POST", clientURL.String(), data) diff --git a/client/snowflake.go b/client/snowflake.go index edcbd4a..7cf8a9d 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -90,6 +90,7 @@ func main() { frontDomain := flag.String("front", "", "front domain") logFilename := flag.String("log", "", "name of log file") logToStateDir := flag.Bool("logToStateDir", false, "resolve the log file relative to tor's pt state dir") + keepLocalAddresses := flag.Bool("keepLocalAddresses", false, "keep local LAN address ICE candidates") max := flag.Int("max", DefaultSnowflakeCapacity, "capacity for number of multiplexed WebRTC peers") flag.Parse() @@ -133,7 +134,7 @@ func main() { snowflakes := sf.NewPeers(*max) // Use potentially domain-fronting broker to rendezvous. - broker, err := sf.NewBrokerChannel(*brokerURL, *frontDomain, sf.CreateBrokerTransport()) + broker, err := sf.NewBrokerChannel(*brokerURL, *frontDomain, sf.CreateBrokerTransport(), *keepLocalAddresses) if err != nil { log.Fatalf("parsing broker URL: %v", err) } diff --git a/client/torrc-localhost b/client/torrc-localhost index 7d539fb..9afb033 100644 --- a/client/torrc-localhost +++ b/client/torrc-localhost @@ -3,5 +3,6 @@ DataDirectory datadir ClientTransportPlugin snowflake exec ./client \ -url http://localhost:8080/ \ +-keepLocalAddresses Bridge snowflake 0.0.3.0:1

1 0

[snowflake/master] Unmarshal the SDP to filter attributes
by arlo＠torproject.org 08 Feb '20

08 Feb '20

commit 846473b3549c264245354a3117d87b96a945f287 Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Feb 7 15:39:44 2020 -0500 Unmarshal the SDP to filter attributes Instead of string manipulation. --- client/lib/lib_test.go | 18 +++++++------- client/lib/rendezvous.go | 64 ++++++++++++++++++++++++++++-------------------- 2 files changed, 46 insertions(+), 36 deletions(-) diff --git a/client/lib/lib_test.go b/client/lib/lib_test.go index adfc9ec..b413508 100644 --- a/client/lib/lib_test.go +++ b/client/lib/lib_test.go @@ -358,17 +358,17 @@ func TestSnowflakeClient(t *testing.T) { }) Convey("Strip", t, func() { - const offerStart = `{"type":"offer","sdp":"v=0\r\no=- 4358805017720277108 2 IN IP4 8.8.8.8\r\ns=-\r\nt=0 0\r\na=group:BUNDLE data\r\na=msid-semantic: WMS\r\nm=application 56688 DTLS/SCTP 5000\r\nc=IN IP4 8.8.8.8\r\n` - const goodCandidate = `a=candidate:3769337065 1 udp 2122260223 8.8.8.8 56688 typ host generation 0 network-id 1 network-cost 50\r\n` - const offerEnd = `a=ice-ufrag:aMAZ\r\na=ice-pwd:jcHb08Jjgrazp2dzjdrvPPvV\r\na=ice-options:trickle\r\na=fingerprint:sha-256 C8:88:EE:B9:E7:02:2E:21:37:ED:7A:D1:EB:2B:A3:15:A2:3B:5B:1C:3D:D4:D5:1F:06:CF:52:40:03:F8:DD:66\r\na=setup:actpass\r\na=mid:data\r\na=sctpmap:5000 webrtc-datachannel 1024\r\n"}` + const offerStart = "v=0\r\no=- 4358805017720277108 2 IN IP4 8.8.8.8\r\ns=-\r\nt=0 0\r\na=group:BUNDLE data\r\na=msid-semantic: WMS\r\nm=application 56688 DTLS/SCTP 5000\r\nc=IN IP4 8.8.8.8\r\n" + const goodCandidate = "a=candidate:3769337065 1 udp 2122260223 8.8.8.8 56688 typ host generation 0 network-id 1 network-cost 50\r\n" + const offerEnd = "a=ice-ufrag:aMAZ\r\na=ice-pwd:jcHb08Jjgrazp2dzjdrvPPvV\r\na=ice-options:trickle\r\na=fingerprint:sha-256 C8:88:EE:B9:E7:02:2E:21:37:ED:7A:D1:EB:2B:A3:15:A2:3B:5B:1C:3D:D4:D5:1F:06:CF:52:40:03:F8:DD:66\r\na=setup:actpass\r\na=mid:data\r\na=sctpmap:5000 webrtc-datachannel 1024\r\n" offer := offerStart + goodCandidate + - `a=candidate:3769337065 1 udp 2122260223 192.168.0.100 56688 typ host generation 0 network-id 1 network-cost 50\r\n` + // IsLocal IPv4 - `a=candidate:3769337065 1 udp 2122260223 fdf8:f53b:82e4::53 56688 typ host generation 0 network-id 1 network-cost 50\r\n` + // IsLocal IPv6 - `a=candidate:3769337065 1 udp 2122260223 0.0.0.0 56688 typ host generation 0 network-id 1 network-cost 50\r\n` + // IsUnspecified IPv4 - `a=candidate:3769337065 1 udp 2122260223 :: 56688 typ host generation 0 network-id 1 network-cost 50\r\n` + // IsUnspecified IPv6 - `a=candidate:3769337065 1 udp 2122260223 127.0.0.1 56688 typ host generation 0 network-id 1 network-cost 50\r\n` + // IsLoopback IPv4 - `a=candidate:3769337065 1 udp 2122260223 ::1 56688 typ host generation 0 network-id 1 network-cost 50\r\n` + // IsLoopback IPv6 + "a=candidate:3769337065 1 udp 2122260223 192.168.0.100 56688 typ host generation 0 network-id 1 network-cost 50\r\n" + // IsLocal IPv4 + "a=candidate:3769337065 1 udp 2122260223 fdf8:f53b:82e4::53 56688 typ host generation 0 network-id 1 network-cost 50\r\n" + // IsLocal IPv6 + "a=candidate:3769337065 1 udp 2122260223 0.0.0.0 56688 typ host generation 0 network-id 1 network-cost 50\r\n" + // IsUnspecified IPv4 + "a=candidate:3769337065 1 udp 2122260223 :: 56688 typ host generation 0 network-id 1 network-cost 50\r\n" + // IsUnspecified IPv6 + "a=candidate:3769337065 1 udp 2122260223 127.0.0.1 56688 typ host generation 0 network-id 1 network-cost 50\r\n" + // IsLoopback IPv4 + "a=candidate:3769337065 1 udp 2122260223 ::1 56688 typ host generation 0 network-id 1 network-cost 50\r\n" + // IsLoopback IPv6 offerEnd So(stripLocalAddresses(offer), ShouldEqual, offerStart+goodCandidate+offerEnd) diff --git a/client/lib/rendezvous.go b/client/lib/rendezvous.go index bd8ff00..190df66 100644 --- a/client/lib/rendezvous.go +++ b/client/lib/rendezvous.go @@ -17,7 +17,6 @@ import ( "net" "net/http" "net/url" - "regexp" "github.com/pion/sdp" "github.com/pion/webrtc" @@ -95,25 +94,40 @@ func IsLocal(ip net.IP) bool { // Removes local LAN address ICE candidates func stripLocalAddresses(str string) string { - re := regexp.MustCompile(`a=candidate:.*?\\r\\n`) - return re.ReplaceAllStringFunc(str, func(s string) string { - t := s[len("a=candidate:") : len(s)-len("\\r\\n")] - var ice sdp.ICECandidate - err := ice.Unmarshal(t) - if err != nil { - return s - } - if ice.Typ == "host" { - ip := net.ParseIP(ice.Address) - if ip == nil { - return s - } - if IsLocal(ip) || ip.IsUnspecified() || ip.IsLoopback() { - return "" + var desc sdp.SessionDescription + err := desc.Unmarshal([]byte(str)) + if err != nil { + return str + } + for _, m := range desc.MediaDescriptions { + attrs := make([]sdp.Attribute, 0) + for _, a := range m.Attributes { + if a.IsICECandidate() { + ice, err := a.ToICECandidate() + if err != nil { + attrs = append(attrs, a) + continue + } + if ice.Typ == "host" { + ip := net.ParseIP(ice.Address) + if ip == nil { + attrs = append(attrs, a) + continue + } + if IsLocal(ip) || ip.IsUnspecified() || ip.IsLoopback() { + continue + } + } } + attrs = append(attrs, a) } - return s - }) + m.Attributes = attrs + } + bts, err := desc.Marshal() + if err != nil { + return str + } + return string(bts) } // Roundtrip HTTP POST using WebRTC SessionDescriptions. @@ -124,20 +138,16 @@ func (bc *BrokerChannel) Negotiate(offer *webrtc.SessionDescription) ( *webrtc.SessionDescription, error) { log.Println("Negotiating via BrokerChannel...\nTarget URL: ", bc.Host, "\nFront URL: ", bc.url.Host) - str := serializeSessionDescription(offer) // Ideally, we could specify an `RTCIceTransportPolicy` that would handle // this for us. However, "public" was removed from the draft spec. // See https://developer.mozilla.org/en-US/docs/Web/API/RTCConfiguration#RTCIceTra… - // - // FIXME: We are stripping local addresses from the JSON serialized string, - // which is expedient but unsatisfying. We could advocate upstream to - // implement a non-standard ICE transport policy, or to somehow alter - // APIs to avoid adding the undesirable candidates or a method to filter - // them from the marshalled session description. if !bc.keepLocalAddresses { - str = stripLocalAddresses(str) + offer = &webrtc.SessionDescription{ + Type: offer.Type, + SDP: stripLocalAddresses(offer.SDP), + } } - data := bytes.NewReader([]byte(str)) + data := bytes.NewReader([]byte(serializeSessionDescription(offer))) // Suffix with broker's client registration handler. clientURL := bc.url.ResolveReference(&url.URL{Path: "client"}) request, err := http.NewRequest("POST", clientURL.String(), data)

1 0