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

[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation＠torproject.org 28 Apr '20

28 Apr '20

commit 127837fdab1f9f6cba87ec4f46c1af046b1680e6 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 28 07:21:23 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- zh-CN/torbutton.properties | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/zh-CN/torbutton.properties b/zh-CN/torbutton.properties index 69279ea8f8..f5f1178e7c 100644 --- a/zh-CN/torbutton.properties +++ b/zh-CN/torbutton.properties @@ -69,22 +69,22 @@ onionServices.errorPage.onionSite=洋葱站点 # LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with # an error code, e.g., 0xF3. # Tor SOCKS error 0xF0: -onionServices.descNotFound.pageTitle=Problem Loading Onionsite -onionServices.descNotFound.header=Onionsite Not Found -onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +onionServices.descNotFound.pageTitle=洋葱页加载问题 +onionServices.descNotFound.header=找不到洋葱页面 +onionServices.descNotFound=最有可能的原因是该洋葱页面已下线。联系洋葱页面管理员。 onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client. # Tor SOCKS error 0xF1: -onionServices.descInvalid.pageTitle=Problem Loading Onionsite -onionServices.descInvalid.header=Onionsite Cannot Be Reached +onionServices.descInvalid.pageTitle=洋葱页加载问题 +onionServices.descInvalid.header=洋葱页面不可达 onionServices.descInvalid=The onionsite is unreachable due an internal error. onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed. # Tor SOCKS error 0xF2: -onionServices.introFailed.pageTitle=Problem Loading Onionsite +onionServices.introFailed.pageTitle=洋葱页加载问题 onionServices.introFailed.header=Onionsite Has Disconnected -onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +onionServices.introFailed=最有可能的原因是该洋葱页面已下线。联系洋葱页面管理员。 onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running. # Tor SOCKS error 0xF3: -onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite +onionServices.rendezvousFailed.pageTitle=洋葱页加载问题 onionServices.rendezvousFailed.header=Unable to Connect to Onionsite onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later. onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection. @@ -99,12 +99,12 @@ onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator. onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked. # Tor SOCKS error 0xF6: -onionServices.badAddress.pageTitle=Problem Loading Onionsite +onionServices.badAddress.pageTitle=洋葱页加载问题 onionServices.badAddress.header=Invalid Onionsite Address onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly. onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid. # Tor SOCKS error 0xF7: -onionServices.introTimedOut.pageTitle=Problem Loading Onionsite +onionServices.introTimedOut.pageTitle=洋葱页加载问题 onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection. onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 28 Apr '20

28 Apr '20

commit 2a9ef323c575153fccea082c88d2381ebdd42db4 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 28 07:20:14 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+zh-CN.po | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 9adc00c0e3..e0ba6d7a45 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -1,3 +1,4 @@ +# # Translators: # MD Rights <psychi2009(a)gmail.com>, 2019 # erinm, 2019 @@ -998,7 +999,7 @@ msgid "" "After checking the checkbox \"Tor is censored in my country,\" choose " "\"Provide a bridge I know\" and enter each bridge address on a separate " "line." -msgstr "" +msgstr "勾选“Tor在我的国家收到审查”的复选框后，并在“提供一个我所知道的网桥”处输入网桥地址，每个网桥单独一行。" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -2054,7 +2055,7 @@ msgstr "Tor 浏览器安卓版是唯一受Tor 项目官方支持与开发的移 #: (content/mobile-tor/contents+en.lrtopic.body) msgid "" "It is like the desktop Tor Browser, but for your Android mobile device." -msgstr "" +msgstr "这就像桌面版Tor 浏览器，却是面向你的安卓移动设备。" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2067,7 +2068,7 @@ msgstr "" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "### DOWNLOADING AND INSTALLATION" -msgstr "" +msgstr "### 下载和安装" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2093,7 +2094,7 @@ msgstr "" #: (content/mobile-tor/contents+en.lrtopic.body) msgid "" "It is very risky to download Tor Browser outside of these three platforms." -msgstr "" +msgstr "在这三个平台以外下载Tor 浏览器是十分危险的。" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2203,7 +2204,7 @@ msgstr "" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "### RUNNING TOR BROWSER FOR ANDROID FOR THE FIRST TIME" -msgstr "" +msgstr "### 首次运行安卓版Tor 浏览器" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2243,7 +2244,7 @@ msgstr "" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "#### Configure" -msgstr "" +msgstr "#### 配置" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2335,7 +2336,7 @@ msgstr "" msgid "" "With the \"Select a bridge\" option, you will have two options: \"obfs4\" " "and \"meek-azure\"." -msgstr "" +msgstr "在“选择一个网桥”选项下，你有两个选择：obfs4和meek-azure。" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2403,7 +2404,7 @@ msgstr "" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "Clicking on this button will provide you with a new identity." -msgstr "" +msgstr "点击这个按钮会给你一个新身份。" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2411,12 +2412,12 @@ msgid "" "Unlike in Tor Browser for Desktop, the \"NEW IDENTITY\" button in Tor " "Browser for Android does not prevent your subsequent browser activity from " "being linkable to what you were doing before." -msgstr "" +msgstr "不同于桌面版Tor 浏览器，安卓版Tor 浏览器的“新身份”按钮不能防止你后续的浏览器行为与之前的操作相关联。" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "Selecting it will only change your Tor circuit." -msgstr "" +msgstr "点击这个仅会改变你的Tor链路。" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body)

1 0

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

28 Apr '20

commit 43e563c87fd9a4cfb3b7c1ac5ced68f22d4e47a7 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 28 07:15:14 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- zh_CN/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/LC_MESSAGES/bridgedb.po b/zh_CN/LC_MESSAGES/bridgedb.po index 99de4ac5b2..8ef00d8927 100644 --- a/zh_CN/LC_MESSAGES/bridgedb.po +++ b/zh_CN/LC_MESSAGES/bridgedb.po @@ -23,7 +23,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-04-09 14:45-0700\n" -"PO-Revision-Date: 2020-04-20 06:40+0000\n" +"PO-Revision-Date: 2020-04-28 07:00+0000\n" "Last-Translator: Scott Rhodes <starring169(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -403,7 +403,7 @@ msgid "" "Add these bridges to your Tor Browser by opening your browser\n" "preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n" "bridge\" field." -msgstr "" +msgstr "打开你的浏览器偏好以添加这些网桥到你的Tor 浏览器中，点击“Tor”，然后将它们填入“提供一个网桥”一栏中。" #: bridgedb/strings.py:173 msgid "(Request unobfuscated Tor bridges.)"

1 0

[torspec/master] Prop 311: Add design for reachability circuits
by teor＠torproject.org 28 Apr '20

28 Apr '20

commit f12126bd8ab9a8068aacc015edc085286dd587a9 Author: teor <teor(a)torproject.org> Date: Tue Apr 28 13:40:30 2020 +1000 Prop 311: Add design for reachability circuits Update 4.2.3. Separate IPv4 and IPv6 Reachability Flags. Add a detailed design for checking cells on reachability self-test circuits. --- proposals/311-relay-ipv6-reachability.txt | 44 +++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/proposals/311-relay-ipv6-reachability.txt b/proposals/311-relay-ipv6-reachability.txt index fd131e1..c23703e 100644 --- a/proposals/311-relay-ipv6-reachability.txt +++ b/proposals/311-relay-ipv6-reachability.txt @@ -331,6 +331,50 @@ Ticket: #24404 Testing relays (and bridges) will record reachability separately for IPv4 and IPv6 ORPorts, based on the ORPort that the test circuit was received on. + Here is a reliable way to do reachability self-tests for each ORPort: + + 1. Check for create cells on inbound ORPort connections + + Check for a cell on any IPv4 and any IPv6 ORPort. (We can't know which + listener(s) correspond to the advertised ORPorts, particularly when using + NAT.) Make sure the cell was received on an inbound OR connection. + + 2. Check for created cells from testing circuits on outbound OR connections + + Check for a returned created cell on our IPv4 and IPv6 self-test circuits. + Make sure those circuits were on outbound OR connections. + + By combining these tests, we confirm that we can: + * reach our own ORPorts with testing circuits, + * send and receive cells via inbound OR connections to our own ORPorts, + and + * send and receive cells via outbound OR connections to other relays' + ORPorts. + + Once we validate the created cell, we have confirmed that the final remote + relay has our private keys. Therefore, this test reliably detects ORPort + reachability. + + There is one exception: when another relay on the network is using the same + keys. + + Duplicate keys are only possible if a relay's private keys have been copied + to another relay. That's either a misconfiguration, or a security issue. + Directory authorities ensure that only one relay with each key is included + in the consensus. + + If a relay was set up using a copy of another relay's keys, then its + reachability self-tests might connect to that other relay. (If the second + hop in a testing circuit has an existing OR connection to the other relay.) + + Relays could test if the inbound create cells they receive, match the + create cells that they have sent on self-test circuits. + + But this seems like unnecessary complexity, because duplicate keys are + rare. At best, it would provide a warning for some operators who have + accidentally duplicated their keys. (But it doesn't provide any extra + security, because operators can disable self-tests using AssumeReachable.) + 4.2.4. No Changes to DirPort Reachability We do not propose any changes to relay IPv4 DirPort reachability checks at

1 0

[torspec/master] Prop 312: Clarify torrc Address option
by teor＠torproject.org 28 Apr '20

28 Apr '20

commit 2e67ae1c70436b949f5d23a67ba24a03b845defc Author: teor <teor(a)torproject.org> Date: Tue Apr 28 13:20:11 2020 +1000 Prop 312: Clarify torrc Address option Clarify section 3.2.1. Make the Address torrc Option Support IPv6. The list of possible configurations was incorrect. --- proposals/312-relay-auto-ipv6-addr.txt | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/proposals/312-relay-auto-ipv6-addr.txt b/proposals/312-relay-auto-ipv6-addr.txt index ba2ffcc..d78f95d 100644 --- a/proposals/312-relay-auto-ipv6-addr.txt +++ b/proposals/312-relay-auto-ipv6-addr.txt @@ -267,17 +267,28 @@ Ticket: #33073 multiple IPv4 or IPv6 addresses are returned, the first public address from each family should be used. - We should also support the following combinations: - A. IPv4 Address / hostname (for IPv6 only), - B. IPv6 Address / hostname (for IPv4 only), - C. IPv4 Address only / try to guess IPv6, then check its reachability - (see section 4.3.1 in [Proposal 311: Relay IPv6 Reachability]), and - D. IPv6 Address only / guess IPv4, then its reachability must succeed. - There are also similar configurations where a hostname is configured, but it - only provides IPv4 or IPv6 addresses. - - Combination C is the most common legacy configuration. We want to - support the following outcomes for legacy configurations: + We should support the following combinations of address literals and + hostnames: + + Legacy configurations: + A. No configured Address option + B. Address IPv4 literal + C. Address hostname (use IPv4 and IPv6 DNS addresses) + + New configurations: + D. Address IPv6 literal + E. Address IPv4 literal / Address IPv6 literal + F. Address hostname / Address hostname (use IPv4 and IPv6 DNS addresses) + G. Address IPv4 literal / Address hostname (only use IPv6 DNS addresses) + H. Address hostname (only use IPv4 DNS addresses) / Address IPv6 literal + + If we can't find an IPv4 or IPv6 address using the configured Address + options: + No IPv4: guess IPv4, and its reachability must succeed. + No IPv6: guess IPv6, publish if reachability succeeds. + + Combinations A and B are the most common legacy configurations. We want to + support the following outcomes for all legacy configurations: * automatic upgrades to guessed and reachable IPv6 addresses, * continuing to operate on IPv4 when the IPv6 address can't be guessed, and

1 0

[snowflake/master] Eliminate separate WebRTCPeer.Connect method.
by dcf＠torproject.org 28 Apr '20

28 Apr '20

commit 32207d6f06c9254b3229f8e3161b80fd7f5df645 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Apr 24 00:05:06 2020 -0600 Eliminate separate WebRTCPeer.Connect method. Do it as a side effect of NewWebRTCPeer. Remove WebRTCPeer tests as they currently require invasively modifying internal fields at different stages of construction. --- client/lib/interfaces.go | 4 -- client/lib/lib_test.go | 100 ----------------------------------------------- client/lib/rendezvous.go | 4 +- client/lib/webrtc.go | 13 ++++-- 4 files changed, 10 insertions(+), 111 deletions(-) diff --git a/client/lib/interfaces.go b/client/lib/interfaces.go index e551c4d..fa0bfbe 100644 --- a/client/lib/interfaces.go +++ b/client/lib/interfaces.go @@ -5,10 +5,6 @@ import ( "net" ) -type Connector interface { - Connect() error -} - // Interface for catching Snowflakes. (aka the remote dialer) type Tongue interface { Catch() (*WebRTCPeer, error) diff --git a/client/lib/lib_test.go b/client/lib/lib_test.go index 41d9cf9..ebcf284 100644 --- a/client/lib/lib_test.go +++ b/client/lib/lib_test.go @@ -6,35 +6,12 @@ import ( "io/ioutil" "net" "net/http" - "sync" "testing" "git.torproject.org/pluggable-transports/snowflake.git/common/util" - "github.com/pion/webrtc/v2" . "github.com/smartystreets/goconvey/convey" ) -type MockDataChannel struct { - destination bytes.Buffer - done chan bool -} - -func (m *MockDataChannel) Send(data []byte) error { - m.destination.Write(data) - m.done <- true - return nil -} - -func (*MockDataChannel) Close() error { return nil } - -type MockResponse struct{} - -func (m *MockResponse) Read(p []byte) (int, error) { - p = []byte(`{"type":"answer","sdp":"fake"}`) - return 0, nil -} -func (m *MockResponse) Close() error { return nil } - type MockTransport struct { statusOverride int body []byte @@ -74,10 +51,6 @@ func (f FakePeers) Collect() (*WebRTCPeer, error) { return &WebRTCPeer{}, nil } func (f FakePeers) Pop() *WebRTCPeer { return nil } func (f FakePeers) Melted() <-chan struct{} { return nil } -const sampleSDP = `"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\na=candidate:3769337065 1 udp 2122260223 8.8.8.8 56688 typ host generation 0 network-id 1 network-cost 50\r\na=candidate:2921887769 1 tcp 1518280447 8.8.8.8 35441 typ host tcptype passive generation 0 network-id 1 network-cost 50\r\na=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 sampleAnswer = `{"type":"answer","sdp":` + sampleSDP + `}` - func TestSnowflakeClient(t *testing.T) { Convey("Peers", t, func() { @@ -191,79 +164,6 @@ func TestSnowflakeClient(t *testing.T) { Handler(socks, snowflakes) So(socks.rejected, ShouldEqual, true) }) - - Convey("WebRTC Connection", func() { - c := NewWebRTCPeer(nil, nil) - So(c.buffer.Bytes(), ShouldEqual, nil) - - Convey("Can construct a WebRTCConn", func() { - s := NewWebRTCPeer(nil, nil) - So(s, ShouldNotBeNil) - So(s.offerChannel, ShouldNotBeNil) - So(s.answerChannel, ShouldNotBeNil) - s.Close() - }) - - Convey("Write buffers when datachannel is nil", func() { - c.Write([]byte("test")) - c.transport = nil - So(c.buffer.Bytes(), ShouldResemble, []byte("test")) - }) - - Convey("Write sends to datachannel when not nil", func() { - mock := new(MockDataChannel) - c.transport = mock - mock.done = make(chan bool, 1) - c.Write([]byte("test")) - <-mock.done - So(c.buffer.Bytes(), ShouldEqual, nil) - So(mock.destination.Bytes(), ShouldResemble, []byte("test")) - }) - - Convey("Exchange SDP sets remote description", func() { - c.offerChannel = make(chan *webrtc.SessionDescription, 1) - c.answerChannel = make(chan *webrtc.SessionDescription, 1) - - c.config = &webrtc.Configuration{} - c.pc, _ = webrtc.NewPeerConnection(*c.config) - offer, _ := c.pc.CreateOffer(nil) - err := c.pc.SetLocalDescription(offer) - So(err, ShouldBeNil) - - c.offerChannel <- nil - answer, err := util.DeserializeSessionDescription(sampleAnswer) - So(err, ShouldBeNil) - So(answer, ShouldNotBeNil) - c.answerChannel <- answer - err = c.exchangeSDP() - So(err, ShouldBeNil) - }) - - Convey("Exchange SDP keeps trying on nil answer", func(ctx C) { - var wg sync.WaitGroup - wg.Add(1) - - c.offerChannel = make(chan *webrtc.SessionDescription, 1) - c.answerChannel = make(chan *webrtc.SessionDescription, 1) - c.config = &webrtc.Configuration{} - c.pc, _ = webrtc.NewPeerConnection(*c.config) - offer, _ := c.pc.CreateOffer(nil) - c.pc.SetLocalDescription(offer) - - c.offerChannel <- nil - c.answerChannel <- nil - go func() { - err := c.exchangeSDP() - ctx.So(err, ShouldBeNil) - wg.Done() - }() - answer, err := util.DeserializeSessionDescription(sampleAnswer) - So(err, ShouldBeNil) - c.answerChannel <- answer - wg.Wait() - }) - - }) }) Convey("Dialers", t, func() { diff --git a/client/lib/rendezvous.go b/client/lib/rendezvous.go index 85e25d2..ca15d35 100644 --- a/client/lib/rendezvous.go +++ b/client/lib/rendezvous.go @@ -153,7 +153,5 @@ func NewWebRTCDialer(broker *BrokerChannel, iceServers []webrtc.ICEServer) *WebR func (w WebRTCDialer) Catch() (*WebRTCPeer, error) { // TODO: [#25591] Fetch ICE server information from Broker. // TODO: [#25596] Consider TURN servers here too. - connection := NewWebRTCPeer(w.webrtcConfig, w.BrokerChannel) - err := connection.Connect() - return connection, err + return NewWebRTCPeer(w.webrtcConfig, w.BrokerChannel) } diff --git a/client/lib/webrtc.go b/client/lib/webrtc.go index 19fd5c9..91b32e9 100644 --- a/client/lib/webrtc.go +++ b/client/lib/webrtc.go @@ -41,7 +41,7 @@ type WebRTCPeer struct { // Construct a WebRTC PeerConnection. func NewWebRTCPeer(config *webrtc.Configuration, - broker *BrokerChannel) *WebRTCPeer { + broker *BrokerChannel) (*WebRTCPeer, error) { connection := new(WebRTCPeer) { var buf [8]byte @@ -60,7 +60,13 @@ func NewWebRTCPeer(config *webrtc.Configuration, // Pipes remain the same even when DataChannel gets switched. connection.recvPipe, connection.writePipe = io.Pipe() - return connection + + err := connection.connect() + if err != nil { + connection.Close() + return nil, err + } + return connection, nil } // Read bytes from local SOCKS. @@ -113,8 +119,7 @@ func (c *WebRTCPeer) checkForStaleness() { } } -// As part of |Connector| interface. -func (c *WebRTCPeer) Connect() error { +func (c *WebRTCPeer) connect() error { log.Println(c.id, " connecting...") // TODO: When go-webrtc is more stable, it's possible that a new // PeerConnection won't need to be re-prepared each time.

1 0

[snowflake/master] Have util.{Serialize, Deserialize}SessionDescription return an error
by dcf＠torproject.org 28 Apr '20

28 Apr '20

commit b48fb781ee15cf033efc61496746a295dc0d63c7 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Apr 27 18:45:10 2020 -0600 Have util.{Serialize,Deserialize}SessionDescription return an error https://bugs.torproject.org/33897#comment:4 --- client/lib/lib_test.go | 11 ++++++++--- client/lib/rendezvous.go | 9 ++++++--- common/util/util.go | 33 ++++++++++++--------------------- 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/client/lib/lib_test.go b/client/lib/lib_test.go index 50a211d..41d9cf9 100644 --- a/client/lib/lib_test.go +++ b/client/lib/lib_test.go @@ -231,7 +231,8 @@ func TestSnowflakeClient(t *testing.T) { So(err, ShouldBeNil) c.offerChannel <- nil - answer := util.DeserializeSessionDescription(sampleAnswer) + answer, err := util.DeserializeSessionDescription(sampleAnswer) + So(err, ShouldBeNil) So(answer, ShouldNotBeNil) c.answerChannel <- answer err = c.exchangeSDP() @@ -256,7 +257,8 @@ func TestSnowflakeClient(t *testing.T) { ctx.So(err, ShouldBeNil) wg.Done() }() - answer := util.DeserializeSessionDescription(sampleAnswer) + answer, err := util.DeserializeSessionDescription(sampleAnswer) + So(err, ShouldBeNil) c.answerChannel <- answer wg.Wait() }) @@ -286,7 +288,10 @@ func TestSnowflakeClient(t *testing.T) { http.StatusOK, []byte(`{"type":"answer","sdp":"fake"}`), } - fakeOffer := util.DeserializeSessionDescription(`{"type":"offer","sdp":"test"}`) + fakeOffer, err := util.DeserializeSessionDescription(`{"type":"offer","sdp":"test"}`) + if err != nil { + panic(err) + } Convey("Construct BrokerChannel with no front domain", func() { b, err := NewBrokerChannel("test.broker", "", transport, false) diff --git a/client/lib/rendezvous.go b/client/lib/rendezvous.go index f236c47..85e25d2 100644 --- a/client/lib/rendezvous.go +++ b/client/lib/rendezvous.go @@ -96,7 +96,11 @@ func (bc *BrokerChannel) Negotiate(offer *webrtc.SessionDescription) ( SDP: util.StripLocalAddresses(offer.SDP), } } - data := bytes.NewReader([]byte(util.SerializeSessionDescription(offer))) + offerSDP, err := util.SerializeSessionDescription(offer) + if err != nil { + return nil, err + } + data := bytes.NewReader([]byte(offerSDP)) // Suffix with broker's client registration handler. clientURL := bc.url.ResolveReference(&url.URL{Path: "client"}) request, err := http.NewRequest("POST", clientURL.String(), data) @@ -119,8 +123,7 @@ func (bc *BrokerChannel) Negotiate(offer *webrtc.SessionDescription) ( if nil != err { return nil, err } - answer := util.DeserializeSessionDescription(string(body)) - return answer, nil + return util.DeserializeSessionDescription(string(body)) case http.StatusServiceUnavailable: return nil, errors.New(BrokerError503) case http.StatusBadRequest: diff --git a/common/util/util.go b/common/util/util.go index fa62fd7..ac254fa 100644 --- a/common/util/util.go +++ b/common/util/util.go @@ -2,43 +2,38 @@ package util import ( "encoding/json" - "log" + "errors" "net" "github.com/pion/sdp/v2" "github.com/pion/webrtc/v2" ) -func SerializeSessionDescription(desc *webrtc.SessionDescription) string { +func SerializeSessionDescription(desc *webrtc.SessionDescription) (string, error) { bytes, err := json.Marshal(*desc) - if nil != err { - log.Println(err) - return "" + if err != nil { + return "", err } - return string(bytes) + return string(bytes), nil } -func DeserializeSessionDescription(msg string) *webrtc.SessionDescription { +func DeserializeSessionDescription(msg string) (*webrtc.SessionDescription, error) { var parsed map[string]interface{} err := json.Unmarshal([]byte(msg), &parsed) - if nil != err { - log.Println(err) - return nil + if err != nil { + return nil, err } if _, ok := parsed["type"]; !ok { - log.Println("Cannot deserialize SessionDescription without type field.") - return nil + return nil, errors.New("cannot deserialize SessionDescription without type field") } if _, ok := parsed["sdp"]; !ok { - log.Println("Cannot deserialize SessionDescription without sdp field.") - return nil + return nil, errors.New("cannot deserialize SessionDescription without sdp field") } var stype webrtc.SDPType switch parsed["type"].(string) { default: - log.Println("Unknown SDP type") - return nil + return nil, errors.New("Unknown SDP type") case "offer": stype = webrtc.SDPTypeOffer case "pranswer": @@ -49,14 +44,10 @@ func DeserializeSessionDescription(msg string) *webrtc.SessionDescription { stype = webrtc.SDPTypeRollback } - if err != nil { - log.Println(err) - return nil - } return &webrtc.SessionDescription{ Type: stype, SDP: parsed["sdp"].(string), - } + }, nil } // Stolen from https://github.com/golang/go/pull/30278

1 0

[snowflake/master] Simplify WebRTCPeer.exchangeSDP.
by dcf＠torproject.org 28 Apr '20

28 Apr '20

commit 5787d5b8b0a78a27a12385fbeea7bb12f5b11fb1 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Apr 23 19:05:29 2020 -0600 Simplify WebRTCPeer.exchangeSDP. No need to run sendOfferToBroker in a goroutine. --- client/lib/webrtc.go | 45 ++++++++++++++------------------------------- 1 file changed, 14 insertions(+), 31 deletions(-) diff --git a/client/lib/webrtc.go b/client/lib/webrtc.go index cba2574..e4ac8e0 100644 --- a/client/lib/webrtc.go +++ b/client/lib/webrtc.go @@ -24,12 +24,11 @@ type WebRTCPeer struct { transport *webrtc.DataChannel broker *BrokerChannel - offerChannel chan *webrtc.SessionDescription - answerChannel chan *webrtc.SessionDescription - recvPipe *io.PipeReader - writePipe *io.PipeWriter - lastReceive time.Time - buffer bytes.Buffer + offerChannel chan *webrtc.SessionDescription + recvPipe *io.PipeReader + writePipe *io.PipeWriter + lastReceive time.Time + buffer bytes.Buffer closed bool @@ -53,7 +52,6 @@ func NewWebRTCPeer(config *webrtc.Configuration, connection.config = config connection.broker = broker connection.offerChannel = make(chan *webrtc.SessionDescription, 1) - connection.answerChannel = make(chan *webrtc.SessionDescription, 1) // Override with something that's not NullLogger to have real logging. connection.BytesLogger = &BytesNullLogger{} @@ -256,34 +254,22 @@ func (c *WebRTCPeer) establishDataChannel() error { return nil } -func (c *WebRTCPeer) sendOfferToBroker() { - if nil == c.broker { - return - } - offer := c.pc.LocalDescription() - answer, err := c.broker.Negotiate(offer) - if nil != err || nil == answer { - log.Printf("BrokerChannel Error: %s", err) - answer = nil - } - c.answerChannel <- answer -} - // exchangeSDP blocks until an SDP offer is available, sends it to the Broker, // then awaits the SDP answer. func (c *WebRTCPeer) exchangeSDP() error { <-c.offerChannel // Keep trying the same offer until a valid answer arrives. - var ok bool var answer *webrtc.SessionDescription - for nil == answer { - go c.sendOfferToBroker() - answer, ok = <-c.answerChannel // Blocks... - if !ok || nil == answer { - log.Printf("Failed to retrieve answer. Retrying in %v", ReconnectTimeout) - <-time.After(ReconnectTimeout) - answer = nil + for { + var err error + // Send offer to broker (blocks). + answer, err = c.broker.Negotiate(c.pc.LocalDescription()) + if err == nil { + break } + log.Printf("BrokerChannel Error: %s", err) + log.Printf("Failed to retrieve answer. Retrying in %v", ReconnectTimeout) + <-time.After(ReconnectTimeout) } log.Printf("Received Answer.\n") err := c.pc.SetRemoteDescription(*answer) @@ -299,9 +285,6 @@ func (c *WebRTCPeer) cleanup() { if nil != c.offerChannel { close(c.offerChannel) } - if nil != c.answerChannel { - close(c.answerChannel) - } // Close this side of the SOCKS pipe. if nil != c.writePipe { c.writePipe.Close()

1 0

[snowflake/master] Make WebRTCPeer.preparePeerConnection block.
by dcf＠torproject.org 28 Apr '20

28 Apr '20

commit 81d14ad33a21ac487cefb2912a32a72a7cc8ee39 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Apr 23 20:13:16 2020 -0600 Make WebRTCPeer.preparePeerConnection block. Formerly, preparePeerConnection set up a callback that sent into a channel, and exchangeSDP waited until it could receive from the channel. We can move the channel entirely into preparePeerConnection (having it not return until the callback has been called) and that way remove some shared state. --- client/lib/webrtc.go | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/client/lib/webrtc.go b/client/lib/webrtc.go index e4ac8e0..d489096 100644 --- a/client/lib/webrtc.go +++ b/client/lib/webrtc.go @@ -24,11 +24,10 @@ type WebRTCPeer struct { transport *webrtc.DataChannel broker *BrokerChannel - offerChannel chan *webrtc.SessionDescription - recvPipe *io.PipeReader - writePipe *io.PipeWriter - lastReceive time.Time - buffer bytes.Buffer + recvPipe *io.PipeReader + writePipe *io.PipeWriter + lastReceive time.Time + buffer bytes.Buffer closed bool @@ -51,7 +50,6 @@ func NewWebRTCPeer(config *webrtc.Configuration, } connection.config = config connection.broker = broker - connection.offerChannel = make(chan *webrtc.SessionDescription, 1) // Override with something that's not NullLogger to have real logging. connection.BytesLogger = &BytesNullLogger{} @@ -153,11 +151,12 @@ func (c *WebRTCPeer) preparePeerConnection() error { return err } // Prepare PeerConnection callbacks. + offerChannel := make(chan struct{}) // Allow candidates to accumulate until ICEGatheringStateComplete. pc.OnICECandidate(func(candidate *webrtc.ICECandidate) { if candidate == nil { log.Printf("WebRTC: Done gathering candidates") - c.offerChannel <- pc.LocalDescription() + close(offerChannel) } else { log.Printf("WebRTC: Got ICE candidate: %s", candidate.String()) } @@ -180,6 +179,7 @@ func (c *WebRTCPeer) preparePeerConnection() error { } log.Println("WebRTC: Set local description") + <-offerChannel // Wait for ICE candidate gathering to complete. log.Println("WebRTC: PeerConnection created.") return nil } @@ -254,10 +254,9 @@ func (c *WebRTCPeer) establishDataChannel() error { return nil } -// exchangeSDP blocks until an SDP offer is available, sends it to the Broker, -// then awaits the SDP answer. +// exchangeSDP sends the local SDP offer to the Broker and awaits the SDP +// answer. func (c *WebRTCPeer) exchangeSDP() error { - <-c.offerChannel // Keep trying the same offer until a valid answer arrives. var answer *webrtc.SessionDescription for { @@ -282,9 +281,6 @@ func (c *WebRTCPeer) exchangeSDP() error { // Close all channels and transports func (c *WebRTCPeer) cleanup() { - if nil != c.offerChannel { - close(c.offerChannel) - } // Close this side of the SOCKS pipe. if nil != c.writePipe { c.writePipe.Close()

1 0

[snowflake/master] Remove SnowflakeDataChannel interface.
by dcf＠torproject.org 28 Apr '20

28 Apr '20

commit 8caa737700d282dc7b174b4df3e514cc02bb0386 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Apr 24 14:41:19 2020 -0600 Remove SnowflakeDataChannel interface. Use *webrtc.DataChannel directly. --- client/lib/interfaces.go | 7 ------- client/lib/webrtc.go | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/client/lib/interfaces.go b/client/lib/interfaces.go index fa0bfbe..71426d6 100644 --- a/client/lib/interfaces.go +++ b/client/lib/interfaces.go @@ -1,7 +1,6 @@ package lib import ( - "io" "net" ) @@ -30,9 +29,3 @@ type SocksConnector interface { Reject() error net.Conn } - -// Interface for the Snowflake's transport. (Typically just webrtc.DataChannel) -type SnowflakeDataChannel interface { - io.Closer - Send([]byte) error -} diff --git a/client/lib/webrtc.go b/client/lib/webrtc.go index 91b32e9..cba2574 100644 --- a/client/lib/webrtc.go +++ b/client/lib/webrtc.go @@ -21,7 +21,7 @@ type WebRTCPeer struct { id string config *webrtc.Configuration pc *webrtc.PeerConnection - transport SnowflakeDataChannel // Holds the WebRTC DataChannel. + transport *webrtc.DataChannel broker *BrokerChannel offerChannel chan *webrtc.SessionDescription @@ -321,7 +321,7 @@ func (c *WebRTCPeer) cleanup() { if c.pc == nil { panic("DataChannel w/o PeerConnection, not good.") } - dataChannel.(*webrtc.DataChannel).Close() + dataChannel.Close() } else { c.lock.Unlock() }

1 0