- tor-commits - lists.torproject.org

[tor-browser-bundle/hardened-builds] Update port for ndnop3 obfs4 bridge and add new ndnop5 obfs4 brige.
by gk＠torproject.org 19 Jan '16

19 Jan '16

commit 4a27862b00cc8dce3ed9288dedb938b0fe0e8c05 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 18 13:53:58 2016 -0800 Update port for ndnop3 obfs4 bridge and add new ndnop5 obfs4 brige. ndnop3 is listening on a new port. It will continue listening on its old port too. ndnop5 is a new bridge with a different fingerprint. --- Bundle-Data/PTConfigs/bridge_prefs.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index f4a8448..685c651 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -21,9 +21,10 @@ pref("extensions.torlauncher.default_bridge.fte-ipv6.2", "fte [2001:49f0:d00a:1: pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 109.105.109.165:24215 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com");

1 0

[tor-browser-bundle/master] Update port for ndnop3 obfs4 bridge and add new ndnop5 obfs4 brige.
by gk＠torproject.org 19 Jan '16

19 Jan '16

commit 7699096ba7eacbd5e13bcf9abe2601a42da0b45d Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 18 13:53:58 2016 -0800 Update port for ndnop3 obfs4 bridge and add new ndnop5 obfs4 brige. ndnop3 is listening on a new port. It will continue listening on its old port too. ndnop5 is a new bridge with a different fingerprint. --- Bundle-Data/PTConfigs/bridge_prefs.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index f4a8448..685c651 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -21,9 +21,10 @@ pref("extensions.torlauncher.default_bridge.fte-ipv6.2", "fte [2001:49f0:d00a:1: pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 109.105.109.165:24215 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com");

1 0

[snowflake/master] Remove the default -http option from server/torrc.
by dcf＠torproject.org 19 Jan '16

19 Jan '16

commit 5279e32e3e72771978fecf151498c4b1bd05dc7b Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 18 23:03:42 2016 -0800 Remove the default -http option from server/torrc. We'll ask people to insert it manually if they want to test that way. --- server/torrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/torrc b/server/torrc index db54242..44b5964 100644 --- a/server/torrc +++ b/server/torrc @@ -5,4 +5,4 @@ SocksPort 0 ExitPolicy reject *:* DataDirectory datadir -ServerTransportPlugin snowflake exec ./server -http 127.0.0.1:8080 +ServerTransportPlugin snowflake exec ./server

1 0

[snowflake/master] Simpler instructions now for connecting directly to WebRTC server.
by dcf＠torproject.org 19 Jan '16

19 Jan '16

commit ff5d23b08c7d6301f06c478052cb7f8fea3f2f5b Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 18 23:07:22 2016 -0800 Simpler instructions now for connecting directly to WebRTC server. --- README.md | 48 ++++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index b1b35b4..7b6ca9f 100644 --- a/README.md +++ b/README.md @@ -14,48 +14,52 @@ There are currently two ways to try this: - Directly to the go-webrtc server plugin. - Through a browser snowflake proxy. -Using the server plugin requires copy and pasting between 6 terminals. +Using the server plugin uses an HTTP server that simulates the interaction +that a client would have with a facilitator. Using the browser proxy (which will soon be the only way) requires copy and pasting between 3 terminals and a browser tab. Once a signalling facilitator is implemented ([issue #1](https://github.com/keroserene/snowflake/issues/1)) this will become much simpler to use. -Setting up the client is the same in both cases. -Open up three terminals for the **client:** +##### -- Via WebRTC Server -- +Edit server/torrc and add "-http 127.0.0.1:8080" to the end of the +ServerTransportPlugin line: ``` -cd client/ -go build +ServerTransportPlugin snowflake exec ./server -http 127.0.0.1:8080 ``` -A: `tor -f torrc SOCKSPort auto` - -B: `cat > signal` - -C: `tail -F snowflake.log` - -##### -- Via WebRTC Server -- +``` +cd server/ +go build +tor -f torrc +``` -To connect directly to a server plugin, -open up another three terminals for the **server:** +Edit client/torrc and add "-url http://127.0.0.1:8080" to the end of the +ClientTransportPlugin line: +``` +ClientTransportPlugin snowflake exec ./client -url http://127.0.0.1:8080/ +``` ``` -cd server/ +cd client/ go build +tor -f torrc ``` -D: `tor -f torrc` +At this point the tor client should bootstrap to 100%. -E: `cat > signal` +##### -- Via Browser Proxy -- -F: `tail -F snowflake.log` +Open up three terminals for the **client:** -- Look for the offer in terminal C; copy and paste it into terminal E. -- Copy and paste the answer in terminal F to terminal B. -- At this point the tor client should bootstrap to 100%. +A: `tor -f torrc SOCKSPort auto` + +B: `cat > signal` + +C: `tail -F snowflake.log` -##### -- Via Browser Proxy -- To connect through the WebRTC browser proxy, first make sure coffeescript is installed. Then, build with:

1 0

[snowflake/master] Do simple HTTP POST signaling in the client.
by dcf＠torproject.org 19 Jan '16

19 Jan '16

commit e0b36d2f33ba39ec70a3014c0d49c0fc29751f92 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 18 22:53:22 2016 -0800 Do simple HTTP POST signaling in the client. This is just enough to be compatible with the HTTP signaling in the server, and doesn't do domain fronting or anything like that. It's just an interim replacement for the copy-paste FIFO signaling while we continue to develop the other pieces that'll be dropped in the middle. --- client/meek-webrtc.go | 16 ++++++++++++++++ client/snowflake.go | 31 ++++++++++++++++++++++--------- 2 files changed, 38 insertions(+), 9 deletions(-) diff --git a/client/meek-webrtc.go b/client/meek-webrtc.go index 6a50bd1..d783781 100644 --- a/client/meek-webrtc.go +++ b/client/meek-webrtc.go @@ -82,3 +82,19 @@ func (m *MeekChannel) Negotiate(offer *webrtc.SessionDescription) ( answer := webrtc.DeserializeSessionDescription(string(body)) return answer, nil } + +// Simple interim non-fronting HTTP POST negotiation, to be removed when more +// general fronting is present. +func sendOfferHTTP(url string, offer *webrtc.SessionDescription) (*webrtc.SessionDescription, error) { + resp, err := http.Post(url, "", bytes.NewBuffer([]byte(offer.Serialize()))) + if err != nil { + return nil, err + } + defer resp.Body.Close() + body, err := ioutil.ReadAll(resp.Body) + if err != nil { + return nil, err + } + answer := webrtc.DeserializeSessionDescription(string(body)) + return answer, nil +} diff --git a/client/snowflake.go b/client/snowflake.go index 6bf6fe5..b42b17d 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -5,6 +5,7 @@ package main import ( "bufio" + "flag" "fmt" "io" "log" @@ -30,6 +31,7 @@ const ( var ptInfo pt.ClientInfo var logFile *os.File +var offerURL string // When a connection handler starts, +1 is written to this channel; when it // ends, -1 is written. @@ -177,15 +179,23 @@ func dialWebRTC(config *webrtc.Configuration, meek *MeekChannel) ( fmt.Fprintln(logFile, "\n"+offer.Serialize()+"\n") log.Printf("----------------") go func() { - log.Printf("Sending offer via meek...") - answer, err := meek.Negotiate(pc.LocalDescription()) - if nil != err { - log.Printf("Signalling error: %s", err) - } - if nil == answer { - log.Printf("No answer received from meek channel.") - } else { - signalChan <- answer + // log.Printf("Sending offer via meek...") + // answer, err := meek.Negotiate(pc.LocalDescription()) + // if nil != err { + // log.Printf("Signalling error: %s", err) + // } + // if nil == answer { + // log.Printf("No answer received from meek channel.") + // } else { + // signalChan <- answer + // } + if offerURL != "" { + answer, err := sendOfferHTTP(offerURL, offer) + if err != nil { + log.Println(err) + } else { + signalChan <- answer + } } }() } @@ -307,6 +317,9 @@ func readSignalingMessages(f *os.File) { func main() { var err error + flag.StringVar(&offerURL, "url", "", "do signaling through URL") + flag.Parse() + logFile, err = os.OpenFile("snowflake.log", os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600) if err != nil { log.Fatal(err)

1 0

[snowflake/master] Remove unused notImplemented error.
by dcf＠torproject.org 19 Jan '16

19 Jan '16

commit c9eeff6fc2517e2f3f4fca064194f0458531d355 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 18 22:39:18 2016 -0800 Remove unused notImplemented error. --- client/snowflake.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/client/snowflake.go b/client/snowflake.go index da609b3..6bf6fe5 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -31,8 +31,6 @@ const ( var ptInfo pt.ClientInfo var logFile *os.File -var notImplemented = fmt.Errorf("not implemented") - // When a connection handler starts, +1 is written to this channel; when it // ends, -1 is written. var handlerChan = make(chan int)

1 0

[snowflake/master] Refactor signal receiving in server.
by dcf＠torproject.org 19 Jan '16

19 Jan '16

commit ac8669b38f8b2a363b5f46036ea8e5de5a69c121 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 18 21:13:08 2016 -0800 Refactor signal receiving in server. There's one FIFO reader goroutine instead of one per bindaddr. makePeerConnectionFromOffer gives you a PeerConnection with an answer and also sets up callbacks to pass a webRTCConn to datachannelHandler when ready. --- server/snowflake.go | 196 ++++++++++++++++++++++++++------------------------- 1 file changed, 99 insertions(+), 97 deletions(-) diff --git a/server/snowflake.go b/server/snowflake.go index d046998..88a07d8 100644 --- a/server/snowflake.go +++ b/server/snowflake.go @@ -81,6 +81,8 @@ func (c *webRTCConn) SetWriteDeadline(t time.Time) error { } func datachannelHandler(conn *webRTCConn) { + defer conn.Close() + handlerChan <- 1 defer func() { handlerChan <- -1 @@ -91,121 +93,123 @@ func datachannelHandler(conn *webRTCConn) { log.Printf("Failed to connect to ORPort: " + err.Error()) return } - //defer or.Close() - - pr, pw := io.Pipe() - conn.pr = pr - - dc := conn.dc - dc.OnOpen = func() { - log.Println("OnOpen channel") - } - dc.OnClose = func() { - log.Println("OnClose channel") - pw.Close() - } - dc.OnMessage = func(msg []byte) { - // log.Printf("OnMessage channel %d %+q", len(msg), msg) - log.Printf("OnMessage <--- %d bytes", len(msg)) - n, err := pw.Write(msg) - if err != nil { - pw.CloseWithError(err) - } - if n != len(msg) { - panic("short write") - } - } + defer or.Close() - go copyLoop(conn, or) + copyLoop(conn, or) } -func makePeerConnection(config *webrtc.Configuration) (*webrtc.PeerConnection, error) { - pc, err := webrtc.NewPeerConnection(config) +// Create a PeerConnection from an SDP offer. Blocks until the gathering of ICE +// candidates is complete and and answer is available in LocalDescription. +// Installs an OnDataChannel callback that creates a webRTCConn and passes it to +// datachannelHandler. +func makePeerConnectionFromOffer(sdp *webrtc.SessionDescription, config *webrtc.Configuration) (*webrtc.PeerConnection, error) { + errChan := make(chan error) + answerChan := make(chan *webrtc.SessionDescription) + pc, err := webrtc.NewPeerConnection(config) if err != nil { - log.Printf("NewPeerConnection: %s", err) - return nil, err + return nil, fmt.Errorf("accept: NewPeerConnection: %s", err) } pc.OnNegotiationNeeded = func() { panic("OnNegotiationNeeded") } - pc.OnDataChannel = func(dc *data.Channel) { - log.Println("OnDataChannel") - datachannelHandler(&webRTCConn{pc: pc, dc: dc}) - } pc.OnIceComplete = func() { - log.Printf("----------------") - fmt.Fprintln(logFile, pc.LocalDescription().Serialize()) - log.Printf("----------------") + answerChan <- pc.LocalDescription() } - return pc, nil -} + pc.OnDataChannel = func(dc *data.Channel) { + log.Println("OnDataChannel") -func readSignalingMessages(signalChan chan *webrtc.SessionDescription, f *os.File) { - s := bufio.NewScanner(f) - for s.Scan() { - msg := s.Text() - sdp := webrtc.DeserializeSessionDescription(msg) - if sdp == nil { - log.Printf("ignoring invalid signal message %+q", msg) - continue + pr, pw := io.Pipe() + + dc.OnOpen = func() { + log.Println("OnOpen channel") } - signalChan <- sdp - continue - } - if err := s.Err(); err != nil { - log.Printf("signal FIFO: %s", err) + dc.OnClose = func() { + log.Println("OnClose channel") + pw.Close() + } + dc.OnMessage = func(msg []byte) { + log.Printf("OnMessage <--- %d bytes", len(msg)) + n, err := pw.Write(msg) + if err != nil { + pw.CloseWithError(err) + } + if n != len(msg) { + panic("short write") + } + } + + conn := &webRTCConn{pc: pc, dc: dc, pr: pr} + go datachannelHandler(conn) } -} -func generateAnswer(pc *webrtc.PeerConnection) { - fmt.Println("Generating answer...") - answer, err := pc.CreateAnswer() // blocking + err = pc.SetRemoteDescription(sdp) if err != nil { - fmt.Println(err) - return + pc.Close() + return nil, fmt.Errorf("accept: SetRemoteDescription: %s", err) } - pc.SetLocalDescription(answer) + log.Println("sdp offer successfully received.") + + go func() { + log.Println("Generating answer...") + answer, err := pc.CreateAnswer() // blocking + if err != nil { + errChan <- err + return + } + err = pc.SetLocalDescription(answer) + if err != nil { + errChan <- err + return + } + }() + + // Wait until answer is ready. + select { + case err = <-errChan: + pc.Close() + return nil, err + case <-answerChan: + } + + return pc, nil } -func listenWebRTC(config *webrtc.Configuration, signal string) (*os.File, error) { - err := syscall.Mkfifo(signal, 0600) +// Create a signaling named pipe and feed offers from it into +// makePeerConnectionFromOffer. +func receiveSignalsFIFO(filename string, config *webrtc.Configuration) error { + err := syscall.Mkfifo(filename, 0600) if err != nil { if err.(syscall.Errno) != syscall.EEXIST { - return nil, err + return err } } - signalFile, err := os.OpenFile(signal, os.O_RDONLY, 0600) + signalFile, err := os.OpenFile(filename, os.O_RDONLY, 0600) if err != nil { - return nil, err + return err } - //defer signalFile.Close() + defer signalFile.Close() - var signalChan = make(chan *webrtc.SessionDescription) - - go func() { - for { - select { - case sdp := <-signalChan: - pc, err := makePeerConnection(config) - if err != nil { - log.Printf("makePeerConnection: %s", err) - break - } - err = pc.SetRemoteDescription(sdp) - if err != nil { - fmt.Println("ERROR", err) - break - } - fmt.Println("sdp offer successfully received.") - go generateAnswer(pc) - } + s := bufio.NewScanner(signalFile) + for s.Scan() { + msg := s.Text() + sdp := webrtc.DeserializeSessionDescription(msg) + if sdp == nil { + log.Printf("ignoring invalid signal message %+q", msg) + continue } - }() - go readSignalingMessages(signalChan, signalFile) - log.Printf("waiting for offer") - return signalFile, nil + pc, err := makePeerConnectionFromOffer(sdp, config) + if err != nil { + log.Printf("makePeerConnectionFromOffer: %s", err) + continue + } + // Write offer to log for manual signaling. + log.Printf("----------------") + fmt.Fprintln(logFile, pc.LocalDescription().Serialize()) + log.Printf("----------------") + } + return s.Err() } func main() { @@ -228,18 +232,19 @@ func main() { webRTCConfig := webrtc.NewConfiguration(webrtc.OptionIceServer("stun:stun.l.google.com:19302")) - listeners := make([]*os.File, 0) + // Start FIFO-based signaling receiver. + go func() { + err := receiveSignalsFIFO("signal", webRTCConfig) + if err != nil { + log.Printf("receiveSignalsFIFO: %s", err) + } + }() + for _, bindaddr := range ptInfo.Bindaddrs { switch bindaddr.MethodName { case ptMethodName: - ln, err := listenWebRTC(webRTCConfig, "signal") // meh - if err != nil { - pt.SmethodError(bindaddr.MethodName, err.Error()) - break - } bindaddr.Addr.Port = 12345 // lies!!! pt.Smethod(bindaddr.MethodName, bindaddr.Addr) - listeners = append(listeners, ln) default: pt.SmethodError(bindaddr.MethodName, "no such method") } @@ -260,9 +265,6 @@ func main() { case sig = <-sigChan: } } - for _, ln := range listeners { - ln.Close() - } if sig == syscall.SIGTERM { return

1 0

[snowflake/master] Add an HTTP signaling receiver in the server.
by dcf＠torproject.org 19 Jan '16

19 Jan '16

commit ff7cc926f76913cdf1e061b78282499b0553bd25 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 18 21:24:18 2016 -0800 Add an HTTP signaling receiver in the server. This is a stand-in for some kind of faciliator that is separate from the server transport plugin. --- server/http.go | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++ server/snowflake.go | 15 ++++++++++++ server/torrc | 2 +- 3 files changed, 83 insertions(+), 1 deletion(-) diff --git a/server/http.go b/server/http.go new file mode 100644 index 0000000..99e03d0 --- /dev/null +++ b/server/http.go @@ -0,0 +1,67 @@ +// An HTTP-based signaling channel for the WebRTC server. It imitates the +// facilitator as seen by clients, but it doesn't connect them to an +// intermediate WebRTC proxy, rather connects them directly to this WebRTC +// server. This code should be deleted when we have proxies in place. + +package main + +import ( + "fmt" + "io/ioutil" + "log" + "net/http" + + "github.com/keroserene/go-webrtc" +) + +type httpHandler struct { + config *webrtc.Configuration +} + +func (h *httpHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) { + switch req.Method { + case "GET": + w.Header().Set("Content-Type", "text/plain; charset=utf-8") + w.WriteHeader(http.StatusOK) + w.Write([]byte(`HTTP signaling channel + +Send a POST request containing an SDP offer. The response will +contain an SDP answer. +`)) + return + case "POST": + break + default: + http.Error(w, "Bad request.", http.StatusBadRequest) + return + } + + // POST handling begins here. + body, err := ioutil.ReadAll(http.MaxBytesReader(w, req.Body, 100000)) + if err != nil { + http.Error(w, "Bad request.", http.StatusBadRequest) + return + } + offer := webrtc.DeserializeSessionDescription(string(body)) + if offer == nil { + http.Error(w, "Bad request.", http.StatusBadRequest) + return + } + + pc, err := makePeerConnectionFromOffer(offer, h.config) + if err != nil { + http.Error(w, fmt.Sprintf("Cannot create offer: %s", err), http.StatusInternalServerError) + return + } + + log.Println("answering HTTP POST") + + w.WriteHeader(http.StatusOK) + w.Write([]byte(pc.LocalDescription().Serialize())) +} + +func receiveSignalsHTTP(addr string, config *webrtc.Configuration) error { + http.Handle("/", &httpHandler{config}) + log.Printf("listening HTTP on %s", addr) + return http.ListenAndServe(addr, nil) +} diff --git a/server/snowflake.go b/server/snowflake.go index 88a07d8..88eecca 100644 --- a/server/snowflake.go +++ b/server/snowflake.go @@ -2,6 +2,7 @@ package main import ( "bufio" + "flag" "fmt" "io" "log" @@ -214,6 +215,10 @@ func receiveSignalsFIFO(filename string, config *webrtc.Configuration) error { func main() { var err error + var httpAddr string + + flag.StringVar(&httpAddr, "http", "", "listen for HTTP signaling") + flag.Parse() logFile, err = os.OpenFile("snowflake.log", os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600) if err != nil { @@ -240,6 +245,16 @@ func main() { } }() + // Start HTTP-based signaling receiver. + if httpAddr != "" { + go func() { + err := receiveSignalsHTTP(httpAddr, webRTCConfig) + if err != nil { + log.Printf("receiveSignalsHTTP: %s", err) + } + }() + } + for _, bindaddr := range ptInfo.Bindaddrs { switch bindaddr.MethodName { case ptMethodName: diff --git a/server/torrc b/server/torrc index 44b5964..db54242 100644 --- a/server/torrc +++ b/server/torrc @@ -5,4 +5,4 @@ SocksPort 0 ExitPolicy reject *:* DataDirectory datadir -ServerTransportPlugin snowflake exec ./server +ServerTransportPlugin snowflake exec ./server -http 127.0.0.1:8080

1 0

[tor-messenger-build/master] Remove TorButton about:config options
by arlo＠torproject.org 19 Jan '16

19 Jan '16

commit b443cc69554c8be7f743e210dcb187a3ec7db671 Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon Jan 18 18:25:56 2016 -0800 Remove TorButton about:config options * Trac 18094 --- projects/tor-messenger/start-tor-messenger | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/projects/tor-messenger/start-tor-messenger b/projects/tor-messenger/start-tor-messenger index 6c85733..94624ca 100755 --- a/projects/tor-messenger/start-tor-messenger +++ b/projects/tor-messenger/start-tor-messenger @@ -310,25 +310,14 @@ EOF # TOR_CONTROL_PASSWD='"secret"' # # Yes, the variable MUST be double-quoted, then single-quoted, exactly as -# shown. This is used by TorButton and Tor Launcher to authenticate to Tor's -# ControlPort, and is necessary for using TB with a system-installed Tor. +# shown. This is used by Tor Launcher to authenticate to Tor's ControlPort, +# and is necessary for using TM with a system-installed Tor. # # Additionally, if using a system-installed Tor, the following about:config # options should be set (values in <> mean they are the value taken from your # torrc): # # SETTING NAME VALUE -# extensions.torbutton.banned_ports [...],<SocksPort>,<ControlPort> -# extensions.torbutton.block_disk false -# extensions.torbutton.custom.socks_host 127.0.0.1 -# extensions.torbutton.custom.socks_port <SocksPort> -# extensions.torbutton.inserted_button true -# extensions.torbutton.launch_warning false -# extensions.torbutton.loglevel 2 -# extensions.torbutton.logmethod 0 -# extensions.torbutton.settings_method custom -# extensions.torbutton.socks_port <SocksPort> -# extensions.torbutton.use_privoxy false # extensions.torlauncher.control_port <ControlPort> # extensions.torlauncher.loglevel 2 # extensions.torlauncher.logmethod 0

1 0

[tor/master] Fix a display issue in updateFallbackDirs.py output
by nickm＠torproject.org 19 Jan '16

19 Jan '16

commit efd2c9d05b3ef0f2b6b29a89056560bb80454d6f Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Mon Jan 18 12:35:58 2016 +1100 Fix a display issue in updateFallbackDirs.py output --- scripts/maint/updateFallbackDirs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index 5c9b320..fd7d350 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -1230,8 +1230,8 @@ def list_fallbacks(): max_weight = max_weight_fb.fallback_weight_fraction(total_weight) if max_weight > TARGET_MAX_WEIGHT_FRACTION: error_str = 'Maximum fallback weight: %.3f%% exceeds target %.3f%%. '%( - max_weight, - TARGET_MAX_WEIGHT_FRACTION) + max_weight*100.0, + TARGET_MAX_WEIGHT_FRACTION*100.0) error_str += 'Try decreasing REWEIGHTING_FUDGE_FACTOR.' if STRICT_FALLBACK_WEIGHTS: print '#error ' + error_str

1 0