March 2016 - tor-commits - lists.torproject.org

[tordnsel/master] rm asm flag
by arlo＠torproject.org 04 Mar '16

04 Mar '16

commit f70c637f67eb868e48aa51d42c130c568cdc9720 Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Mar 4 13:33:01 2016 -0800 rm asm flag --- tordnsel.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tordnsel.cabal b/tordnsel.cabal index 7e8d015..4f0b11f 100644 --- a/tordnsel.cabal +++ b/tordnsel.cabal @@ -83,4 +83,4 @@ Other-Modules: TorDNSEL.Config.Tests HS-Source-Dirs: src Includes: netinet/in.h, openssl/rand.h Extra-Libraries: crypto -GHC-Options: -fasm -Wall -Werror -fno-warn-missing-signatures +GHC-Options: -Wall -Werror -fno-warn-missing-signatures

1 0

[snowflake/master] use const LogTimeInterval
by serene＠torproject.org 04 Mar '16

04 Mar '16

commit 8a8273e972f8a0d9496da7f6af47e34899c07f14 Author: Serene Han <keroserene+git(a)gmail.com> Date: Sun Feb 28 13:16:12 2016 -0800 use const LogTimeInterval --- client/util.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/client/util.go b/client/util.go index fa04220..abefa04 100644 --- a/client/util.go +++ b/client/util.go @@ -5,6 +5,10 @@ import ( "time" ) +const ( + LogTimeInterval = 5 +) + type BytesInfo struct { outboundChan chan int inboundChan chan int @@ -33,18 +37,18 @@ func (b *BytesInfo) Log() { b.outbound += amount b.outEvents++ last := time.Now() - if time.Since(last) > time.Second*5 { + if time.Since(last) > time.Second*LogTimeInterval { last = time.Now() output() } case amount = <-b.inboundChan: b.inbound += amount b.inEvents++ - if time.Since(last) > time.Second*5 { + if time.Since(last) > time.Second*LogTimeInterval { last = time.Now() output() } - case <-time.After(time.Second * 5): + case <-time.After(time.Second * LogTimeInterval): if b.inEvents > 0 || b.outEvents > 0 { output() }

1 0

[snowflake/master] confirmation dialog on proxy close (close #23)
by serene＠torproject.org 04 Mar '16

04 Mar '16

commit d2e61e315c2bc34d28c5f0afeb982804b6abf1ba Author: Serene Han <keroserene+git(a)gmail.com> Date: Wed Mar 2 05:45:27 2016 -0800 confirmation dialog on proxy close (close #23) --- proxy/snowflake.coffee | 9 +++++++++ proxy/spec/snowflake.spec.coffee | 12 ++++++++++++ 2 files changed, 21 insertions(+) diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 0df1904..90150ad 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -44,6 +44,8 @@ MODE = WEBRTC_CONNECTING: 1 WEBRTC_READY: 2 +CONFIRMATION_MESSAGE = "You're currently serving a Tor user via Snowflake." + # Minimum viable snowflake for now - just 1 client. class Snowflake @@ -200,4 +202,11 @@ init = -> snowflake.setRelayAddr relayAddr snowflake.beginWebRTC() +# Notification of closing tab with active proxy. +# TODO: Opt-in/out parameter or cookie +window.onbeforeunload = -> + if MODE.WEBRTC_READY == snowflake.state + return CONFIRMATION_MESSAGE + null + window.onload = init if window diff --git a/proxy/spec/snowflake.spec.coffee b/proxy/spec/snowflake.spec.coffee index be1601b..f3fbae8 100644 --- a/proxy/spec/snowflake.spec.coffee +++ b/proxy/spec/snowflake.spec.coffee @@ -23,6 +23,7 @@ snowflake = ui: fakeUI broker: sendAnswer: -> + state: MODE.INIT describe 'Snowflake', -> @@ -58,3 +59,14 @@ describe 'Snowflake', -> s = new Snowflake(new FakeBroker(), fakeUI) s.makeProxyPair() expect(s.proxyPairs.length).toBe 2 + + it 'gives a dialog when closing, only while active', -> + snowflake.state = MODE.WEBRTC_READY + msg = window.onbeforeunload() + expect(snowflake.state).toBe MODE.WEBRTC_READY + expect(msg).toBe CONFIRMATION_MESSAGE + + snowflake.state = MODE.INIT + msg = window.onbeforeunload() + expect(snowflake.state).toBe MODE.INIT + expect(msg).toBe null

1 0

[snowflake/master] prepare IceServerList client flag (#24)
by serene＠torproject.org 04 Mar '16

04 Mar '16

commit 3ec771df01770d708bd5cc8c90156ee4c7e9cff6 Author: Serene Han <keroserene+git(a)gmail.com> Date: Thu Mar 3 22:51:10 2016 -0800 prepare IceServerList client flag (#24) --- client/snowflake.go | 3 +++ client/util.go | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/client/snowflake.go b/client/snowflake.go index 25ccfef..4af76e8 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -22,6 +22,7 @@ var ptInfo pt.ClientInfo // var logFile *os.File var brokerURL string var frontDomain string +var iceServers IceServerList // When a connection handler starts, +1 is written to this channel; when it // ends, -1 is written. @@ -109,6 +110,7 @@ func handler(conn *pt.SocksConn) error { // TODO: Make SOCKS acceptance more independent from WebRTC so they can // be more easily interchanged. + copyLoop(conn, remote) // <-remote.endChannel log.Println("----END---") @@ -161,6 +163,7 @@ func main() { webrtc.SetLoggingVerbosity(1) flag.StringVar(&brokerURL, "url", "", "URL of signaling broker") flag.StringVar(&frontDomain, "front", "", "front domain") + flag.Var(&iceServers, "ice", "comma-separated list of ICE servers") flag.Parse() logFile, err := os.OpenFile("snowflake.log", os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600) if err != nil { diff --git a/client/util.go b/client/util.go index abefa04..2a54f6a 100644 --- a/client/util.go +++ b/client/util.go @@ -1,7 +1,9 @@ package main import ( + "fmt" "log" + "strings" "time" ) @@ -9,6 +11,20 @@ const ( LogTimeInterval = 5 ) +type IceServerList []string + +func (i *IceServerList) String() string { + return fmt.Sprint(*i) +} + +func (i *IceServerList) Set(s string) error { + for _, server := range strings.Split(s, ",") { + // TODO: STUN / TURN url format validation? + *i = append(*i, server) + } + return nil +} + type BytesInfo struct { outboundChan chan int inboundChan chan int

1 0

[snowflake/master] provide IceServerList flag as variadic arg to webrtc Configuration (#24)
by serene＠torproject.org 04 Mar '16

04 Mar '16

commit 4e6bba559a77634c4dde38e6702e37bc4f364fd4 Author: Serene Han <keroserene+git(a)gmail.com> Date: Fri Mar 4 13:21:44 2016 -0800 provide IceServerList flag as variadic arg to webrtc Configuration (#24) --- client/snowflake.go | 3 +-- client/torrc | 3 ++- client/util.go | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/client/snowflake.go b/client/snowflake.go index 4af76e8..4287425 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -63,8 +63,7 @@ func dialWebRTC() (*webRTCConn, error) { // TODO: [#3] Fetch ICE server information from Broker. // TODO: [#18] Consider TURN servers here too. - config := webrtc.NewConfiguration( - webrtc.OptionIceServer("stun:stun.l.google.com:19302")) + config := webrtc.NewConfiguration(iceServers...) broker := NewBrokerChannel(brokerURL, frontDomain) if nil == broker { diff --git a/client/torrc b/client/torrc index 9af942b..c4af61f 100644 --- a/client/torrc +++ b/client/torrc @@ -3,6 +3,7 @@ DataDirectory datadir ClientTransportPlugin snowflake exec ./client \ -url https://snowflake-reg.appspot.com/ \ --front www.google.com +-front www.google.com \ +-ice stun:stun.l.google.com:19302 Bridge snowflake 0.0.3.0:1 diff --git a/client/util.go b/client/util.go index 2a54f6a..02132f2 100644 --- a/client/util.go +++ b/client/util.go @@ -2,6 +2,7 @@ package main import ( "fmt" + "github.com/keroserene/go-webrtc" "log" "strings" "time" @@ -11,7 +12,7 @@ const ( LogTimeInterval = 5 ) -type IceServerList []string +type IceServerList []webrtc.ConfigurationOption func (i *IceServerList) String() string { return fmt.Sprint(*i) @@ -20,7 +21,8 @@ func (i *IceServerList) String() string { func (i *IceServerList) Set(s string) error { for _, server := range strings.Split(s, ",") { // TODO: STUN / TURN url format validation? - *i = append(*i, server) + option := webrtc.OptionIceServer(server) + *i = append(*i, option) } return nil }

1 0

[snowflake/master] Use a channel to safely synchronize datachannel writes, (#12)
by serene＠torproject.org 04 Mar '16

04 Mar '16

commit c3ada1b54521927809b2ae67b45684dd412dc612 Author: Serene Han <keroserene+git(a)gmail.com> Date: Fri Feb 19 16:17:17 2016 -0800 Use a channel to safely synchronize datachannel writes, (#12) clean up ice candidate log message. still need to debug the copy loop break. --- client/client_test.go | 11 +++++++++-- client/snowflake.go | 54 ++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 47 insertions(+), 18 deletions(-) diff --git a/client/client_test.go b/client/client_test.go index 6ee36d9..85c2144 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -9,10 +9,12 @@ import ( type MockDataChannel struct { destination bytes.Buffer + done chan bool } func (m *MockDataChannel) Send(data []byte) { m.destination.Write(data) + m.done <- true } func (*MockDataChannel) Close() error { @@ -24,6 +26,7 @@ func TestConnect(t *testing.T) { Convey("WebRTC Connection", func() { c := new(webRTCConn) + c.BytesInfo = &BytesInfo{ inboundChan: make(chan int), outboundChan: make(chan int), inbound: 0, outbound: 0, inEvents: 0, outEvents: 0, @@ -31,15 +34,19 @@ func TestConnect(t *testing.T) { So(c.buffer.Bytes(), ShouldEqual, nil) Convey("SendData buffers when datachannel is nil", func() { - c.sendData([]byte("test")) + c.SendData([]byte("test")) c.snowflake = nil So(c.buffer.Bytes(), ShouldResemble, []byte("test")) }) Convey("SendData sends to datachannel when not nil", func() { mock := new(MockDataChannel) + mock.done = make(chan bool) + go c.SendLoop() + c.writeChannel = make(chan []byte) c.snowflake = mock - c.sendData([]byte("test")) + c.SendData([]byte("test")) + <-mock.done So(c.buffer.Bytes(), ShouldEqual, nil) So(mock.destination.Bytes(), ShouldResemble, []byte("test")) }) diff --git a/client/snowflake.go b/client/snowflake.go index eba68eb..d01ec5e 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -36,12 +36,15 @@ const ( func copyLoop(a, b net.Conn) { var wg sync.WaitGroup wg.Add(2) + // TODO fix the copy loop. go func() { io.Copy(b, a) + log.Println("copy loop b-a break") wg.Done() }() go func() { io.Copy(a, b) + log.Println("copy loop a-b break") wg.Done() }() wg.Wait() @@ -63,6 +66,7 @@ type webRTCConn struct { offerChannel chan *webrtc.SessionDescription answerChannel chan *webrtc.SessionDescription errorChannel chan error + writeChannel chan []byte recvPipe *io.PipeReader writePipe *io.PipeWriter buffer bytes.Buffer @@ -77,7 +81,7 @@ func (c *webRTCConn) Read(b []byte) (int, error) { } func (c *webRTCConn) Write(b []byte) (int, error) { - c.sendData(b) + c.SendData(b) return len(b), nil } @@ -133,9 +137,9 @@ func (c *webRTCConn) PreparePeerConnection() { } }() } + // Allow candidates to accumulate until OnIceComplete. pc.OnIceCandidate = func(candidate webrtc.IceCandidate) { - log.Printf("WebRTC: OnIceCandidate %s", candidate.Serialize()) - // Allow candidates to accumulate until OnIceComplete. + log.Printf(candidate.Candidate) } // TODO: This may soon be deprecated, consider OnIceGatheringStateChange. pc.OnIceComplete = func() { @@ -169,10 +173,11 @@ func (c *webRTCConn) EstablishDataChannel() error { // } // Flush the buffer, then enable datachannel. // TODO: Make this more safe - dc.Send(c.buffer.Bytes()) - log.Println("Flushed", c.buffer.Len(), "bytes") - c.buffer.Reset() + // dc.Send(c.buffer.Bytes()) + // log.Println("Flushed", c.buffer.Len(), "bytes") + // c.buffer.Reset() c.snowflake = dc + c.SendData(nil) } dc.OnClose = func() { // Disable the DataChannel as a write destination. @@ -180,7 +185,7 @@ func (c *webRTCConn) EstablishDataChannel() error { log.Println("WebRTC: DataChannel.OnClose") if nil != c.snowflake { c.snowflake = nil - // Only reset if this OnClose triggered + // Only reset if this OnClose was triggered remotely. c.Reset() } } @@ -247,21 +252,32 @@ func (c *webRTCConn) ReceiveAnswer() { }() } -func (c *webRTCConn) sendData(data []byte) { - c.BytesInfo.AddOutbound(len(data)) +func (c *webRTCConn) SendData(data []byte) { // Buffer the data in case datachannel isn't available yet. if nil == c.snowflake { log.Printf("Buffered %d bytes --> WebRTC", len(data)) c.buffer.Write(data) return } - // Otherwise, flush buffer if necessary. - for c.buffer.Len() > 0 { - c.snowflake.Send(c.buffer.Bytes()) - log.Println("Flushed", c.buffer.Len(), "bytes") - c.buffer.Reset() + go func() { + c.writeChannel <- data + }() +} + +// Expected in own goroutine. +func (c *webRTCConn) SendLoop() { + log.Println("send loop") + for data := range c.writeChannel { + // Flush buffer if necessary. + for c.buffer.Len() > 0 { + c.snowflake.Send(c.buffer.Bytes()) + log.Println("Flushed", c.buffer.Len(), "bytes") + c.buffer.Reset() + } + + c.BytesInfo.AddOutbound(len(data)) + c.snowflake.Send(data) } - c.snowflake.Send(data) } // WebRTC re-establishment loop. Expected in own goroutine. @@ -296,6 +312,7 @@ func dialWebRTC(config *webrtc.Configuration, broker *BrokerChannel) ( connection.broker = broker connection.offerChannel = make(chan *webrtc.SessionDescription) connection.answerChannel = make(chan *webrtc.SessionDescription) + connection.writeChannel = make(chan []byte) connection.errorChannel = make(chan error) connection.reset = make(chan struct{}) connection.BytesInfo = &BytesInfo{ @@ -308,6 +325,7 @@ func dialWebRTC(config *webrtc.Configuration, broker *BrokerChannel) ( connection.recvPipe, connection.writePipe = io.Pipe() go connection.ConnectLoop() + go connection.SendLoop() return connection, nil } @@ -317,8 +335,10 @@ func endWebRTC() { return } if nil != webrtcRemote.snowflake { + s := webrtcRemote.snowflake + webrtcRemote.snowflake = nil log.Printf("WebRTC: closing DataChannel") - webrtcRemote.snowflake.Close() + s.Close() } if nil != webrtcRemote.pc { log.Printf("WebRTC: closing PeerConnection") @@ -333,6 +353,7 @@ func handler(conn *pt.SocksConn) error { handlerChan <- -1 }() defer conn.Close() + log.Println("handler", conn) // TODO: [#3] Fetch ICE server information from Broker. // TODO: [#18] Consider TURN servers here too. @@ -357,6 +378,7 @@ func handler(conn *pt.SocksConn) error { } copyLoop(conn, remote) + log.Println("----END---") return nil }

1 0

[snowflake/master] add ReceiveAnswer test to client
by serene＠torproject.org 04 Mar '16

04 Mar '16

commit 26f5caf4047136004e155e70d8794264c58cd9e2 Author: Serene Han <keroserene+git(a)gmail.com> Date: Sat Feb 20 16:11:43 2016 -0800 add ReceiveAnswer test to client --- client/client_test.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/client/client_test.go b/client/client_test.go index 85c2144..14e9393 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -51,6 +51,17 @@ func TestConnect(t *testing.T) { So(mock.destination.Bytes(), ShouldResemble, []byte("test")) }) + Convey("Receive answer sets remote description", func() { + c.answerChannel = make(chan *webrtc.SessionDescription) + c.config = webrtc.NewConfiguration() + c.PreparePeerConnection() + c.ReceiveAnswer() + sdp := webrtc.DeserializeSessionDescription("test") + c.answerChannel <- sdp + So(c.pc.RemoteDescription(), ShouldEqual, sdp) + + }) + Convey("Receive answer fails on nil answer", func() { c.reset = make(chan struct{}) c.answerChannel = make(chan *webrtc.SessionDescription)

1 0

[snowflake/master] fix SendData channel syncing
by serene＠torproject.org 04 Mar '16

04 Mar '16

commit ef5cb162c04e0be3d1101a4278deda407b9b5e9f Author: Serene Han <keroserene+git(a)gmail.com> Date: Sun Feb 21 22:00:51 2016 -0800 fix SendData channel syncing --- client/snowflake.go | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/client/snowflake.go b/client/snowflake.go index d01ec5e..4e31f15 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -36,7 +36,7 @@ const ( func copyLoop(a, b net.Conn) { var wg sync.WaitGroup wg.Add(2) - // TODO fix the copy loop. + // TODO fix copy loop recovery go func() { io.Copy(b, a) log.Println("copy loop b-a break") @@ -168,24 +168,22 @@ func (c *webRTCConn) EstablishDataChannel() error { } dc.OnOpen = func() { log.Println("WebRTC: DataChannel.OnOpen") - // if nil != c.snowflake { - // panic("PeerConnection snowflake already exists.") - // } + if nil != c.snowflake { + panic("PeerConnection snowflake already exists.") + } // Flush the buffer, then enable datachannel. - // TODO: Make this more safe - // dc.Send(c.buffer.Bytes()) - // log.Println("Flushed", c.buffer.Len(), "bytes") - // c.buffer.Reset() + dc.Send(c.buffer.Bytes()) + log.Println("Flushed", c.buffer.Len(), "bytes") + c.buffer.Reset() c.snowflake = dc - c.SendData(nil) } dc.OnClose = func() { // Disable the DataChannel as a write destination. // Future writes will go to the buffer until a new DataChannel is available. log.Println("WebRTC: DataChannel.OnClose") + // Only reset if this OnClose was triggered remotely. if nil != c.snowflake { c.snowflake = nil - // Only reset if this OnClose was triggered remotely. c.Reset() } } @@ -253,15 +251,14 @@ func (c *webRTCConn) ReceiveAnswer() { } func (c *webRTCConn) SendData(data []byte) { + c.BytesInfo.AddOutbound(len(data)) // Buffer the data in case datachannel isn't available yet. if nil == c.snowflake { log.Printf("Buffered %d bytes --> WebRTC", len(data)) c.buffer.Write(data) return } - go func() { - c.writeChannel <- data - }() + c.writeChannel <- data } // Expected in own goroutine. @@ -274,8 +271,6 @@ func (c *webRTCConn) SendLoop() { log.Println("Flushed", c.buffer.Len(), "bytes") c.buffer.Reset() } - - c.BytesInfo.AddOutbound(len(data)) c.snowflake.Send(data) } } @@ -293,6 +288,8 @@ func (c *webRTCConn) ConnectLoop() { c.ReceiveAnswer() <-c.reset log.Println(" --- snowflake connection reset ---") + } else { + log.Println("WebRTC: Could not establish DataChannel.") } } } @@ -353,7 +350,7 @@ func handler(conn *pt.SocksConn) error { handlerChan <- -1 }() defer conn.Close() - log.Println("handler", conn) + log.Println("handler fired:", conn) // TODO: [#3] Fetch ICE server information from Broker. // TODO: [#18] Consider TURN servers here too. @@ -377,6 +374,8 @@ func handler(conn *pt.SocksConn) error { return err } + // TODO: Make SOCKS acceptance more independent from WebRTC so they can + // be more easily interchanged. copyLoop(conn, remote) log.Println("----END---") return nil

1 0

[snowflake/master] move webRTCConn into separate file
by serene＠torproject.org 04 Mar '16

04 Mar '16

commit f86f5b5b07d8b9409a58d85f3169e85446fd17e8 Author: Serene Han <keroserene+git(a)gmail.com> Date: Sun Feb 21 22:03:17 2016 -0800 move webRTCConn into separate file --- client/snowflake.go | 247 -------------------------------------------------- client/webrtc.go | 255 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 255 insertions(+), 247 deletions(-) diff --git a/client/snowflake.go b/client/snowflake.go index 4e31f15..cc7f547 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -3,10 +3,8 @@ package main import ( "bufio" - "bytes" "errors" "flag" - "fmt" "io" "log" "net" @@ -14,7 +12,6 @@ import ( "os/signal" "sync" "syscall" - "time" "git.torproject.org/pluggable-transports/goptlib.git" "github.com/keroserene/go-webrtc" @@ -57,250 +54,6 @@ type SnowflakeChannel interface { Close() error } -// Implements net.Conn interface -type webRTCConn struct { - config *webrtc.Configuration - pc *webrtc.PeerConnection - snowflake SnowflakeChannel // Interface holding the WebRTC DataChannel. - broker *BrokerChannel - offerChannel chan *webrtc.SessionDescription - answerChannel chan *webrtc.SessionDescription - errorChannel chan error - writeChannel chan []byte - recvPipe *io.PipeReader - writePipe *io.PipeWriter - buffer bytes.Buffer - reset chan struct{} - *BytesInfo -} - -var webrtcRemote *webRTCConn - -func (c *webRTCConn) Read(b []byte) (int, error) { - return c.recvPipe.Read(b) -} - -func (c *webRTCConn) Write(b []byte) (int, error) { - c.SendData(b) - return len(b), nil -} - -func (c *webRTCConn) Close() error { - // Data channel closed implicitly? - return c.pc.Close() -} - -func (c *webRTCConn) LocalAddr() net.Addr { - return nil -} - -func (c *webRTCConn) RemoteAddr() net.Addr { - return nil -} - -func (c *webRTCConn) SetDeadline(t time.Time) error { - return fmt.Errorf("SetDeadline not implemented") -} - -func (c *webRTCConn) SetReadDeadline(t time.Time) error { - return fmt.Errorf("SetReadDeadline not implemented") -} - -func (c *webRTCConn) SetWriteDeadline(t time.Time) error { - return fmt.Errorf("SetWriteDeadline not implemented") -} - -func (c *webRTCConn) PreparePeerConnection() { - if nil != c.pc { - c.pc.Close() - c.pc = nil - } - pc, err := webrtc.NewPeerConnection(c.config) - if err != nil { - log.Printf("NewPeerConnection: %s", err) - c.errorChannel <- err - } - // Prepare PeerConnection callbacks. - pc.OnNegotiationNeeded = func() { - log.Println("WebRTC: OnNegotiationNeeded") - go func() { - offer, err := pc.CreateOffer() - // TODO: Potentially timeout and retry if ICE isn't working. - if err != nil { - c.errorChannel <- err - return - } - err = pc.SetLocalDescription(offer) - if err != nil { - c.errorChannel <- err - return - } - }() - } - // Allow candidates to accumulate until OnIceComplete. - pc.OnIceCandidate = func(candidate webrtc.IceCandidate) { - log.Printf(candidate.Candidate) - } - // TODO: This may soon be deprecated, consider OnIceGatheringStateChange. - pc.OnIceComplete = func() { - log.Printf("WebRTC: OnIceComplete") - c.offerChannel <- pc.LocalDescription() - } - // This callback is not expected, as the Client initiates the creation - // of the data channel, not the remote peer. - pc.OnDataChannel = func(channel *webrtc.DataChannel) { - log.Println("OnDataChannel") - panic("Unexpected OnDataChannel!") - } - c.pc = pc - log.Println("WebRTC: PeerConnection created.") -} - -// Create a WebRTC DataChannel locally. -func (c *webRTCConn) EstablishDataChannel() error { - dc, err := c.pc.CreateDataChannel("snowflake", webrtc.Init{}) - // Triggers "OnNegotiationNeeded" on the PeerConnection, which will prepare - // an SDP offer while other goroutines operating on this struct handle the - // signaling. Eventually fires "OnOpen". - if err != nil { - log.Printf("CreateDataChannel: %s", err) - return err - } - dc.OnOpen = func() { - log.Println("WebRTC: DataChannel.OnOpen") - if nil != c.snowflake { - panic("PeerConnection snowflake already exists.") - } - // Flush the buffer, then enable datachannel. - dc.Send(c.buffer.Bytes()) - log.Println("Flushed", c.buffer.Len(), "bytes") - c.buffer.Reset() - c.snowflake = dc - } - dc.OnClose = func() { - // Disable the DataChannel as a write destination. - // Future writes will go to the buffer until a new DataChannel is available. - log.Println("WebRTC: DataChannel.OnClose") - // Only reset if this OnClose was triggered remotely. - if nil != c.snowflake { - c.snowflake = nil - c.Reset() - } - } - dc.OnMessage = func(msg []byte) { - c.BytesInfo.AddInbound(len(msg)) - n, err := c.writePipe.Write(msg) - if err != nil { - // TODO: Maybe shouldn't actually close. - log.Println("Error writing to SOCKS pipe") - c.writePipe.CloseWithError(err) - } - if n != len(msg) { - panic("short write") - } - } - log.Println("WebRTC: DataChannel created.") - return nil -} - -// Block until an offer is available, then send it to either -// the Broker or signal pipe. -func (c *webRTCConn) SendOffer() error { - select { - case offer := <-c.offerChannel: - if "" == brokerURL { - log.Printf("Please Copy & Paste the following to the peer:") - log.Printf("----------------") - fmt.Fprintln(logFile, "\n"+offer.Serialize()+"\n") - log.Printf("----------------") - return nil - } - // Otherwise, use Broker. - go func() { - log.Println("Sending offer via BrokerChannel...\nTarget URL: ", brokerURL, - "\nFront URL: ", frontDomain) - answer, err := c.broker.Negotiate(c.pc.LocalDescription()) - if nil != err || nil == answer { - log.Printf("BrokerChannel error: %s", err) - answer = nil - } - c.answerChannel <- answer - }() - case err := <-c.errorChannel: - c.pc.Close() - return err - } - return nil -} - -func (c *webRTCConn) ReceiveAnswer() { - go func() { - answer, ok := <-c.answerChannel - if !ok || nil == answer { - log.Printf("Failed to retrieve answer. Retrying in %d seconds", ReconnectTimeout) - <-time.After(time.Second * ReconnectTimeout) - c.Reset() - return - } - log.Printf("Received Answer:\n\n%s\n", answer.Sdp) - err := c.pc.SetRemoteDescription(answer) - if nil != err { - c.errorChannel <- err - } - }() -} - -func (c *webRTCConn) SendData(data []byte) { - c.BytesInfo.AddOutbound(len(data)) - // Buffer the data in case datachannel isn't available yet. - if nil == c.snowflake { - log.Printf("Buffered %d bytes --> WebRTC", len(data)) - c.buffer.Write(data) - return - } - c.writeChannel <- data -} - -// Expected in own goroutine. -func (c *webRTCConn) SendLoop() { - log.Println("send loop") - for data := range c.writeChannel { - // Flush buffer if necessary. - for c.buffer.Len() > 0 { - c.snowflake.Send(c.buffer.Bytes()) - log.Println("Flushed", c.buffer.Len(), "bytes") - c.buffer.Reset() - } - c.snowflake.Send(data) - } -} - -// WebRTC re-establishment loop. Expected in own goroutine. -func (c *webRTCConn) ConnectLoop() { - for { - log.Println("Establishing WebRTC connection...") - // TODO: When go-webrtc is more stable, it's possible that a new - // PeerConnection won't need to be re-prepared each time. - c.PreparePeerConnection() - err := c.EstablishDataChannel() - if err == nil { - c.SendOffer() - c.ReceiveAnswer() - <-c.reset - log.Println(" --- snowflake connection reset ---") - } else { - log.Println("WebRTC: Could not establish DataChannel.") - } - } -} - -func (c *webRTCConn) Reset() { - go func() { - c.reset <- struct{}{} // Attempt to negotiate a new datachannel.. - log.Println("WebRTC resetting...") - }() -} - // Initialize a WebRTC Connection. func dialWebRTC(config *webrtc.Configuration, broker *BrokerChannel) ( *webRTCConn, error) { diff --git a/client/webrtc.go b/client/webrtc.go new file mode 100644 index 0000000..b1e1628 --- /dev/null +++ b/client/webrtc.go @@ -0,0 +1,255 @@ +package main + +import ( + "bytes" + "fmt" + "github.com/keroserene/go-webrtc" + "io" + "log" + "net" + "time" +) + +// Implements net.Conn interface +type webRTCConn struct { + config *webrtc.Configuration + pc *webrtc.PeerConnection + snowflake SnowflakeChannel // Interface holding the WebRTC DataChannel. + broker *BrokerChannel + offerChannel chan *webrtc.SessionDescription + answerChannel chan *webrtc.SessionDescription + errorChannel chan error + writeChannel chan []byte + recvPipe *io.PipeReader + writePipe *io.PipeWriter + buffer bytes.Buffer + reset chan struct{} + *BytesInfo +} + +var webrtcRemote *webRTCConn + +func (c *webRTCConn) Read(b []byte) (int, error) { + return c.recvPipe.Read(b) +} + +func (c *webRTCConn) Write(b []byte) (int, error) { + c.SendData(b) + return len(b), nil +} + +func (c *webRTCConn) Close() error { + // Data channel closed implicitly? + return c.pc.Close() +} + +func (c *webRTCConn) LocalAddr() net.Addr { + return nil +} + +func (c *webRTCConn) RemoteAddr() net.Addr { + return nil +} + +func (c *webRTCConn) SetDeadline(t time.Time) error { + return fmt.Errorf("SetDeadline not implemented") +} + +func (c *webRTCConn) SetReadDeadline(t time.Time) error { + return fmt.Errorf("SetReadDeadline not implemented") +} + +func (c *webRTCConn) SetWriteDeadline(t time.Time) error { + return fmt.Errorf("SetWriteDeadline not implemented") +} + +func (c *webRTCConn) PreparePeerConnection() { + if nil != c.pc { + c.pc.Close() + c.pc = nil + } + pc, err := webrtc.NewPeerConnection(c.config) + if err != nil { + log.Printf("NewPeerConnection: %s", err) + c.errorChannel <- err + } + // Prepare PeerConnection callbacks. + pc.OnNegotiationNeeded = func() { + log.Println("WebRTC: OnNegotiationNeeded") + go func() { + offer, err := pc.CreateOffer() + // TODO: Potentially timeout and retry if ICE isn't working. + if err != nil { + c.errorChannel <- err + return + } + err = pc.SetLocalDescription(offer) + if err != nil { + c.errorChannel <- err + return + } + }() + } + // Allow candidates to accumulate until OnIceComplete. + pc.OnIceCandidate = func(candidate webrtc.IceCandidate) { + log.Printf(candidate.Candidate) + } + // TODO: This may soon be deprecated, consider OnIceGatheringStateChange. + pc.OnIceComplete = func() { + log.Printf("WebRTC: OnIceComplete") + c.offerChannel <- pc.LocalDescription() + } + // This callback is not expected, as the Client initiates the creation + // of the data channel, not the remote peer. + pc.OnDataChannel = func(channel *webrtc.DataChannel) { + log.Println("OnDataChannel") + panic("Unexpected OnDataChannel!") + } + c.pc = pc + log.Println("WebRTC: PeerConnection created.") +} + +// Create a WebRTC DataChannel locally. +func (c *webRTCConn) EstablishDataChannel() error { + dc, err := c.pc.CreateDataChannel("snowflake", webrtc.Init{}) + // Triggers "OnNegotiationNeeded" on the PeerConnection, which will prepare + // an SDP offer while other goroutines operating on this struct handle the + // signaling. Eventually fires "OnOpen". + if err != nil { + log.Printf("CreateDataChannel: %s", err) + return err + } + dc.OnOpen = func() { + log.Println("WebRTC: DataChannel.OnOpen") + if nil != c.snowflake { + panic("PeerConnection snowflake already exists.") + } + // Flush the buffer, then enable datachannel. + dc.Send(c.buffer.Bytes()) + log.Println("Flushed", c.buffer.Len(), "bytes") + c.buffer.Reset() + c.snowflake = dc + } + dc.OnClose = func() { + // Disable the DataChannel as a write destination. + // Future writes will go to the buffer until a new DataChannel is available. + log.Println("WebRTC: DataChannel.OnClose") + // Only reset if this OnClose was triggered remotely. + if nil != c.snowflake { + c.snowflake = nil + c.Reset() + } + } + dc.OnMessage = func(msg []byte) { + c.BytesInfo.AddInbound(len(msg)) + n, err := c.writePipe.Write(msg) + if err != nil { + // TODO: Maybe shouldn't actually close. + log.Println("Error writing to SOCKS pipe") + c.writePipe.CloseWithError(err) + } + if n != len(msg) { + panic("short write") + } + } + log.Println("WebRTC: DataChannel created.") + return nil +} + +// Block until an offer is available, then send it to either +// the Broker or signal pipe. +func (c *webRTCConn) SendOffer() error { + select { + case offer := <-c.offerChannel: + if "" == brokerURL { + log.Printf("Please Copy & Paste the following to the peer:") + log.Printf("----------------") + fmt.Fprintln(logFile, "\n"+offer.Serialize()+"\n") + log.Printf("----------------") + return nil + } + // Otherwise, use Broker. + go func() { + log.Println("Sending offer via BrokerChannel...\nTarget URL: ", brokerURL, + "\nFront URL: ", frontDomain) + answer, err := c.broker.Negotiate(c.pc.LocalDescription()) + if nil != err || nil == answer { + log.Printf("BrokerChannel error: %s", err) + answer = nil + } + c.answerChannel <- answer + }() + case err := <-c.errorChannel: + c.pc.Close() + return err + } + return nil +} + +func (c *webRTCConn) ReceiveAnswer() { + go func() { + answer, ok := <-c.answerChannel + if !ok || nil == answer { + log.Printf("Failed to retrieve answer. Retrying in %d seconds", ReconnectTimeout) + <-time.After(time.Second * ReconnectTimeout) + c.Reset() + return + } + log.Printf("Received Answer:\n\n%s\n", answer.Sdp) + err := c.pc.SetRemoteDescription(answer) + if nil != err { + c.errorChannel <- err + } + }() +} + +func (c *webRTCConn) SendData(data []byte) { + c.BytesInfo.AddOutbound(len(data)) + // Buffer the data in case datachannel isn't available yet. + if nil == c.snowflake { + log.Printf("Buffered %d bytes --> WebRTC", len(data)) + c.buffer.Write(data) + return + } + c.writeChannel <- data +} + +// Expected in own goroutine. +func (c *webRTCConn) SendLoop() { + log.Println("send loop") + for data := range c.writeChannel { + // Flush buffer if necessary. + for c.buffer.Len() > 0 { + c.snowflake.Send(c.buffer.Bytes()) + log.Println("Flushed", c.buffer.Len(), "bytes") + c.buffer.Reset() + } + c.snowflake.Send(data) + } +} + +// WebRTC re-establishment loop. Expected in own goroutine. +func (c *webRTCConn) ConnectLoop() { + for { + log.Println("Establishing WebRTC connection...") + // TODO: When go-webrtc is more stable, it's possible that a new + // PeerConnection won't need to be re-prepared each time. + c.PreparePeerConnection() + err := c.EstablishDataChannel() + if err == nil { + c.SendOffer() + c.ReceiveAnswer() + <-c.reset + log.Println(" --- snowflake connection reset ---") + } else { + log.Println("WebRTC: Could not establish DataChannel.") + } + } +} + +func (c *webRTCConn) Reset() { + go func() { + c.reset <- struct{}{} // Attempt to negotiate a new datachannel.. + log.Println("WebRTC resetting...") + }() +}

1 0

[snowflake/master] simplify client handler & dialWebRTC with independent webRTCConn constructor
by serene＠torproject.org 04 Mar '16

04 Mar '16

commit 3a7e0ea620107dd35f7cea3fac25dd3c8591b0c5 Author: Serene Han <keroserene+git(a)gmail.com> Date: Tue Feb 23 16:51:04 2016 -0800 simplify client handler & dialWebRTC with independent webRTCConn constructor --- client/client_test.go | 12 +++--- client/snowflake.go | 55 ++++++++++---------------- client/webrtc.go | 105 +++++++++++++++++++++++++++++++------------------- 3 files changed, 92 insertions(+), 80 deletions(-) diff --git a/client/client_test.go b/client/client_test.go index 14e9393..cad40de 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -33,19 +33,19 @@ func TestConnect(t *testing.T) { } So(c.buffer.Bytes(), ShouldEqual, nil) - Convey("SendData buffers when datachannel is nil", func() { - c.SendData([]byte("test")) + Convey("sendData buffers when datachannel is nil", func() { + c.sendData([]byte("test")) c.snowflake = nil So(c.buffer.Bytes(), ShouldResemble, []byte("test")) }) - Convey("SendData sends to datachannel when not nil", func() { + Convey("sendData sends to datachannel when not nil", func() { mock := new(MockDataChannel) mock.done = make(chan bool) go c.SendLoop() c.writeChannel = make(chan []byte) c.snowflake = mock - c.SendData([]byte("test")) + c.sendData([]byte("test")) <-mock.done So(c.buffer.Bytes(), ShouldEqual, nil) So(mock.destination.Bytes(), ShouldResemble, []byte("test")) @@ -55,7 +55,7 @@ func TestConnect(t *testing.T) { c.answerChannel = make(chan *webrtc.SessionDescription) c.config = webrtc.NewConfiguration() c.PreparePeerConnection() - c.ReceiveAnswer() + c.receiveAnswer() sdp := webrtc.DeserializeSessionDescription("test") c.answerChannel <- sdp So(c.pc.RemoteDescription(), ShouldEqual, sdp) @@ -65,7 +65,7 @@ func TestConnect(t *testing.T) { Convey("Receive answer fails on nil answer", func() { c.reset = make(chan struct{}) c.answerChannel = make(chan *webrtc.SessionDescription) - c.ReceiveAnswer() + c.receiveAnswer() c.answerChannel <- nil <-c.reset }) diff --git a/client/snowflake.go b/client/snowflake.go index cc7f547..29d263a 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -18,7 +18,8 @@ import ( ) var ptInfo pt.ClientInfo -var logFile *os.File + +// var logFile *os.File var brokerURL string var frontDomain string @@ -35,13 +36,13 @@ func copyLoop(a, b net.Conn) { wg.Add(2) // TODO fix copy loop recovery go func() { - io.Copy(b, a) - log.Println("copy loop b-a break") + written, err := io.Copy(b, a) + log.Println("copy loop b-a break", err, written) wg.Done() }() go func() { - io.Copy(a, b) - log.Println("copy loop a-b break") + written, err := io.Copy(a, b) + log.Println("copy loop a-b break", err, written) wg.Done() }() wg.Wait() @@ -55,27 +56,22 @@ type SnowflakeChannel interface { } // Initialize a WebRTC Connection. -func dialWebRTC(config *webrtc.Configuration, broker *BrokerChannel) ( - *webRTCConn, error) { - connection := new(webRTCConn) - connection.config = config - connection.broker = broker - connection.offerChannel = make(chan *webrtc.SessionDescription) - connection.answerChannel = make(chan *webrtc.SessionDescription) - connection.writeChannel = make(chan []byte) - connection.errorChannel = make(chan error) - connection.reset = make(chan struct{}) - connection.BytesInfo = &BytesInfo{ - inboundChan: make(chan int), outboundChan: make(chan int), - inbound: 0, outbound: 0, inEvents: 0, outEvents: 0, - } - go connection.BytesInfo.Log() +func dialWebRTC() (*webRTCConn, error) { + + // TODO: [#3] Fetch ICE server information from Broker. + // TODO: [#18] Consider TURN servers here too. + config := webrtc.NewConfiguration( + webrtc.OptionIceServer("stun:stun.l.google.com:19302")) - // Pipes remain the same even when DataChannel gets switched. - connection.recvPipe, connection.writePipe = io.Pipe() + broker := NewBrokerChannel(brokerURL, frontDomain) + if nil == broker { + return nil, errors.New("Failed to prepare BrokerChannel") + } + connection := NewWebRTCConnection(config, broker) go connection.ConnectLoop() go connection.SendLoop() + return connection, nil } @@ -105,16 +101,7 @@ func handler(conn *pt.SocksConn) error { defer conn.Close() log.Println("handler fired:", conn) - // TODO: [#3] Fetch ICE server information from Broker. - // TODO: [#18] Consider TURN servers here too. - config := webrtc.NewConfiguration( - webrtc.OptionIceServer("stun:stun.l.google.com:19302")) - broker := NewBrokerChannel(brokerURL, frontDomain) - if nil == broker { - conn.Reject() - return errors.New("Failed to prepare BrokerChannel") - } - remote, err := dialWebRTC(config, broker) + remote, err := dialWebRTC() if err != nil { conn.Reject() return err @@ -174,12 +161,12 @@ func readSignalingMessages(f *os.File) { } func main() { - var err error + // var err error webrtc.SetLoggingVerbosity(1) flag.StringVar(&brokerURL, "url", "", "URL of signaling broker") flag.StringVar(&frontDomain, "front", "", "front domain") flag.Parse() - logFile, err = os.OpenFile("snowflake.log", os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600) + logFile, err := os.OpenFile("snowflake.log", os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600) if err != nil { log.Fatal(err) } diff --git a/client/webrtc.go b/client/webrtc.go index b1e1628..89d1592 100644 --- a/client/webrtc.go +++ b/client/webrtc.go @@ -34,7 +34,7 @@ func (c *webRTCConn) Read(b []byte) (int, error) { } func (c *webRTCConn) Write(b []byte) (int, error) { - c.SendData(b) + c.sendData(b) return len(b), nil } @@ -63,7 +63,64 @@ func (c *webRTCConn) SetWriteDeadline(t time.Time) error { return fmt.Errorf("SetWriteDeadline not implemented") } -func (c *webRTCConn) PreparePeerConnection() { +func NewWebRTCConnection(config *webrtc.Configuration, + broker *BrokerChannel) *webRTCConn { + connection := new(webRTCConn) + connection.config = config + connection.broker = broker + connection.offerChannel = make(chan *webrtc.SessionDescription) + connection.answerChannel = make(chan *webrtc.SessionDescription) + connection.writeChannel = make(chan []byte) + connection.errorChannel = make(chan error) + connection.reset = make(chan struct{}) + + // Log every few seconds. + connection.BytesInfo = &BytesInfo{ + inboundChan: make(chan int), outboundChan: make(chan int), + inbound: 0, outbound: 0, inEvents: 0, outEvents: 0, + } + go connection.BytesInfo.Log() + + // Pipes remain the same even when DataChannel gets switched. + connection.recvPipe, connection.writePipe = io.Pipe() + + return connection +} + +// WebRTC re-establishment loop. Expected in own goroutine. +func (c *webRTCConn) ConnectLoop() { + for { + log.Println("Establishing WebRTC connection...") + // TODO: When go-webrtc is more stable, it's possible that a new + // PeerConnection won't need to be re-prepared each time. + c.preparePeerConnection() + err := c.establishDataChannel() + if err == nil { + c.sendOffer() + c.receiveAnswer() + <-c.reset + log.Println(" --- snowflake connection reset ---") + } else { + log.Println("WebRTC: Could not establish DataChannel.") + } + } +} + +// Expected in own goroutine. +func (c *webRTCConn) SendLoop() { + log.Println("send loop") + for data := range c.writeChannel { + // Flush buffer if necessary. + for c.buffer.Len() > 0 { + c.snowflake.Send(c.buffer.Bytes()) + log.Println("Flushed", c.buffer.Len(), "bytes") + c.buffer.Reset() + } + c.snowflake.Send(data) + } +} + +func (c *webRTCConn) preparePeerConnection() { if nil != c.pc { c.pc.Close() c.pc = nil @@ -110,7 +167,7 @@ func (c *webRTCConn) PreparePeerConnection() { } // Create a WebRTC DataChannel locally. -func (c *webRTCConn) EstablishDataChannel() error { +func (c *webRTCConn) establishDataChannel() error { dc, err := c.pc.CreateDataChannel("snowflake", webrtc.Init{}) // Triggers "OnNegotiationNeeded" on the PeerConnection, which will prepare // an SDP offer while other goroutines operating on this struct handle the @@ -158,13 +215,14 @@ func (c *webRTCConn) EstablishDataChannel() error { // Block until an offer is available, then send it to either // the Broker or signal pipe. -func (c *webRTCConn) SendOffer() error { +func (c *webRTCConn) sendOffer() error { + log.Println("sendOffer...") select { case offer := <-c.offerChannel: if "" == brokerURL { log.Printf("Please Copy & Paste the following to the peer:") log.Printf("----------------") - fmt.Fprintln(logFile, "\n"+offer.Serialize()+"\n") + log.Printf("\n" + offer.Serialize() + "\n") log.Printf("----------------") return nil } @@ -186,7 +244,7 @@ func (c *webRTCConn) SendOffer() error { return nil } -func (c *webRTCConn) ReceiveAnswer() { +func (c *webRTCConn) receiveAnswer() { go func() { answer, ok := <-c.answerChannel if !ok || nil == answer { @@ -203,7 +261,7 @@ func (c *webRTCConn) ReceiveAnswer() { }() } -func (c *webRTCConn) SendData(data []byte) { +func (c *webRTCConn) sendData(data []byte) { c.BytesInfo.AddOutbound(len(data)) // Buffer the data in case datachannel isn't available yet. if nil == c.snowflake { @@ -214,39 +272,6 @@ func (c *webRTCConn) SendData(data []byte) { c.writeChannel <- data } -// Expected in own goroutine. -func (c *webRTCConn) SendLoop() { - log.Println("send loop") - for data := range c.writeChannel { - // Flush buffer if necessary. - for c.buffer.Len() > 0 { - c.snowflake.Send(c.buffer.Bytes()) - log.Println("Flushed", c.buffer.Len(), "bytes") - c.buffer.Reset() - } - c.snowflake.Send(data) - } -} - -// WebRTC re-establishment loop. Expected in own goroutine. -func (c *webRTCConn) ConnectLoop() { - for { - log.Println("Establishing WebRTC connection...") - // TODO: When go-webrtc is more stable, it's possible that a new - // PeerConnection won't need to be re-prepared each time. - c.PreparePeerConnection() - err := c.EstablishDataChannel() - if err == nil { - c.SendOffer() - c.ReceiveAnswer() - <-c.reset - log.Println(" --- snowflake connection reset ---") - } else { - log.Println("WebRTC: Could not establish DataChannel.") - } - } -} - func (c *webRTCConn) Reset() { go func() { c.reset <- struct{}{} // Attempt to negotiate a new datachannel..

1 0