- tor-commits - lists.torproject.org

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 21 Jan '16

21 Jan '16

commit 2a60a0d4310b615bb3f1b8fc0d007c7d709dcbbb Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 21 23:15:36 2016 +0000 Update translations for tor-launcher-network-settings --- zh_CN/network-settings.dtd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/zh_CN/network-settings.dtd b/zh_CN/network-settings.dtd index 813cd80..2b51d68 100644 --- a/zh_CN/network-settings.dtd +++ b/zh_CN/network-settings.dtd @@ -13,9 +13,9 @@ <!ENTITY torSettings.firstQuestion "以下哪个描述与你的情况最为匹配？"> <!ENTITY torSettings.configurePrompt1 "网络连接受到审查或需要代理。"> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "我需要配置网桥或本地代理设置才能连接到 Tor 网络。"> <!ENTITY torSettings.configure "配置"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "我想直接连接 Tor 网络。"> <!ENTITY torSettings.connectPrompt3 "通常这种方式是有效的。"> <!ENTITY torSettings.connect "连接"> @@ -28,17 +28,17 @@ <!ENTITY torSettings.bridgePageTitle "Tor 网桥配置"> <!ENTITY torSettings.bridgeQuestion "互联网服务提供商 (ISP) 是否对 Tor 网络连接进行了封锁或审查？"> <!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation2 "如果您选择“是”，那么需要对 Tor 网桥进行配置。网桥指用于连接 Tor 网络的非公开网络中继，更难被封锁。"> <!ENTITY torSettings.bridgeSettingsPrompt "可以使用集成的网桥，也可以获取网桥，以自定义方式手动输入。">  <!ENTITY torsettings.startingTor "等待 Tor 启动..."> <!ENTITY torsettings.restartTor "重新启动 Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "重新配置"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "您已配置 Tor 网桥，或者您已输入本地代理设置。若要直接连接到 Tor 网络，这些设置必须被移除。"> +<!ENTITY torsettings.discardSettings.proceed "移除设置并连接"> <!ENTITY torsettings.optional "可选">

1 0

[snowflake/master] Fix broker test
by arlo＠torproject.org 21 Jan '16

21 Jan '16

commit 26803437908b058f452dc61f42381ee0a4f6bc91 Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Jan 21 14:59:02 2016 -0800 Fix broker test --- broker/snowflake-broker.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/broker/snowflake-broker.go b/broker/snowflake-broker.go index c2bde7b..13b0586 100644 --- a/broker/snowflake-broker.go +++ b/broker/snowflake-broker.go @@ -118,7 +118,7 @@ func clientHandler(w http.ResponseWriter, r *http.Request) { // TODO: Needs improvement. snowflake := heap.Pop(snowflakes).(*Snowflake) if nil == snowflake { - w.Header().Set("Status", http.StatusServiceUnavailable) + w.WriteHeader(http.StatusServiceUnavailable) // w.Write([]byte("no snowflake proxies available")) return }

1 0

[snowflake/master] Automatic 100% bootstrap using meek-signaling broker works.
by arlo＠torproject.org 21 Jan '16

21 Jan '16

commit c0b6383f26d2b721ce5896a4c8a52646ea89ba5e Author: Serene Han <keroserene+git(a)gmail.com> Date: Thu Jan 21 13:54:43 2016 -0800 Automatic 100% bootstrap using meek-signaling broker works. Minimum viable webrtc pt now exists. (close #1) --- README.md | 113 ++++++++++++++++++++++++++++--------------------- client/meek-webrtc.go | 54 ++++++++--------------- client/snowflake.go | 40 +++++------------ client/torrc | 5 ++- client/torrc-manual | 6 +++ 5 files changed, 103 insertions(+), 115 deletions(-) diff --git a/README.md b/README.md index 4213ba7..077a900 100644 --- a/README.md +++ b/README.md @@ -4,25 +4,78 @@ A Pluggable Transport using WebRTC ### Status -- Successfully bootstraps over WebRTC, both directly to a server plugin, - as well as through the browser which proxies WebRTC to websocket. -- Needs work on signaling with the broker. +- Successful automatic bootstraps with a WebRTC transport, + using HTTP signaling (with optional domain fronting) speaking to + a multitude of volunteer "snowflakes". +- Needs a lot more work though. ### Usage -There are currently two ways to try this: -- Directly to the go-webrtc server plugin. -- Through a browser snowflake proxy. + + +``` +cd client/ +go build +tor -f torrc +``` + +And it will start the client plugin with the following `torrc` +options: +``` +ClientTransportPlugin snowflake exec ./client \ +--url https://snowflake-reg.appspot.com/ \ +--front www.google.com +``` + +It will speak to the Broker, get matched with a "snowflake" browser proxy, +and negotiate a WebRTC PeerConnection. +After that, it should bootstrap to 100%. + +To see logs, do `tail -F snowflake.log` in a second terminal. + +You can modify the `torrc` to use your own broker, +or remove the options entirely which will default to the old copy paste +method (see `torrc-manual`): + +``` +ClientTransportPlugin snowflake exec ./client --meek +``` + +Also, it is possible to connect directly to the go-webrtc server plugin +(skipping all the browser snowflake / broker stuff - see appendix) + +### Building a Snowflake Proxy + +This will only work if there are any browser snowflakes running at all. +To run your own, first make sure coffeescript is installed. +Then, build with: + +``` +cd proxy/ +cake build +``` +(Type `cake` by itself to see possible commands) + +Then, start a local http server in the `proxy/build/` in any way you like. +For instance: + +``` +cd build/ +python -m http.server +``` + +Open a browser tab to `0.0.0.0:8000/snowflake.html`. + +TODO: Turn the snowflake proxy into a more deployable badge. + +### Appendix + +##### -- Testing directly via WebRTC Server -- Using the server plugin uses an HTTP server that simulates the interaction that a client would have with a broker. Using the browser proxy (which will soon be the only way) requires copy and pasting between 3 terminals and a browser tab. -Once a signaling broker is implemented -([issue #1](https://github.com/keroserene/snowflake/issues/1)) -this will become much simpler to use. - -##### -- Via WebRTC Server -- Edit server/torrc and add "-http 127.0.0.1:8080" to the end of the ServerTransportPlugin line: @@ -42,14 +95,6 @@ ClientTransportPlugin line: ClientTransportPlugin snowflake exec ./client -url http://127.0.0.1:8080/ ``` -``` -cd client/ -go build -tor -f torrc -``` - -At this point the tor client should bootstrap to 100%. - ##### -- Via Browser Proxy -- Open up three terminals for the **client:** @@ -60,39 +105,11 @@ B: `cat > signal` C: `tail -F snowflake.log` - -To connect through the WebRTC browser proxy, first make sure -coffeescript is installed. Then, build with: -``` -cd proxy/ -cake build -``` - -Then start a local http server in the `proxy/build/` in any way you like. -For instance: - -``` -cd build/ -python -m http.server -``` - -Open a browser tab to `0.0.0.0:8000/snowflake.html`. -Input your desired relay address, or nothing/gibberish, which will cause -snowflake to just use a default relay. +Then, in the browser proxy: - Look for the offer in terminal C; copy and paste it into the browser. - Copy and paste the answer generated in the browser back to terminal B. - Once WebRTC successfully connects, the browser terminal should turn green. Shortly after, the tor client should bootstrap to 100%. - -### More - -To try using the Meek signaling channel (which will soon be fully ready), -add the `--meek` flag like so: - -``` -ClientTransportPlugin snowflake exec ./client --meek -``` - More documentation on the way. diff --git a/client/meek-webrtc.go b/client/meek-webrtc.go index 2d68770..369987d 100644 --- a/client/meek-webrtc.go +++ b/client/meek-webrtc.go @@ -16,28 +16,25 @@ import ( type MeekChannel struct { // The Host header to put in the HTTP request (optional and may be // different from the host name in URL). - Host string - Method string - trueURL *url.URL - externalUrl string - transport http.Transport // Used to make all requests. + Host string + url *url.URL + transport http.Transport // Used to make all requests. } -// Construct a new MeekChannel, where -// |broker| is the URL of the facilitating program which assigns proxies -// to clients, and -// |front| is URL of the front domain. +// Construct a new MeekChannel, where: +// |broker| is the full URL of the facilitating program which assigns proxies +// to clients, and |front| is the option fronting domain. func NewMeekChannel(broker string, front string) *MeekChannel { - targetUrl, err := url.Parse(broker) + targetURL, err := url.Parse(broker) if nil != err { return nil } mc := new(MeekChannel) - mc.Host = front - mc.Method = "POST" - - mc.trueURL = targetUrl - mc.externalUrl = front + "/client" + mc.url = targetURL + if "" != front { // Optional front domain. + mc.Host = mc.url.Host + mc.url.Host = front + } // We make a copy of DefaultTransport because we want the default Dial // and TLSHandshakeTimeout settings. But we want to disable the default @@ -54,39 +51,24 @@ func NewMeekChannel(broker string, front string) *MeekChannel { func (mc *MeekChannel) Negotiate(offer *webrtc.SessionDescription) ( *webrtc.SessionDescription, error) { data := bytes.NewReader([]byte(offer.Serialize())) - request, err := http.NewRequest(mc.Method, mc.externalUrl, data) + // Suffix with broker's client registration handler. + request, err := http.NewRequest("POST", mc.url.String()+"client", data) if nil != err { return nil, err } - request.Host = mc.trueURL.String() + if "" != mc.Host { // Set true host if necessary. + request.Host = mc.Host + } resp, err := mc.transport.RoundTrip(request) if nil != err { return nil, err } defer resp.Body.Close() - log.Println("MeekChannel Response: ", resp) - + log.Printf("MeekChannel Response:\n%s\n\n", resp) body, err := ioutil.ReadAll(resp.Body) if nil != err { return nil, err } - log.Println("Body: ", string(body)) - 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 ad496f9..83179a3 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -22,18 +22,10 @@ import ( "git.torproject.org/pluggable-transports/goptlib.git" ) -// Hard-coded meek signalling channel for now. -// TODO: expose as param -const ( - // Go fully requires the protocol to make url spec - FRONT_URL = "https://www.google.com" - BROKER_URL = "snowflake-reg.appspot.com" -) - var ptInfo pt.ClientInfo var logFile *os.File -var offerURL string -var meekEnabled bool +var brokerURL string +var frontDomain string // When a connection handler starts, +1 is written to this channel; when it // ends, -1 is written. @@ -180,9 +172,9 @@ func dialWebRTC(config *webrtc.Configuration, meek *MeekChannel) ( fmt.Fprintln(logFile, "\n"+offer.Serialize()+"\n") log.Printf("----------------") go func() { - if meekEnabled { - log.Println("Sending offer via meek channel...\nTarget URL: ", BROKER_URL, - "\nFront URL: ", FRONT_URL) + if "" != brokerURL { + log.Println("Sending offer via meek channel...\nTarget URL: ", brokerURL, + "\nFront URL: ", frontDomain) answer, err := meek.Negotiate(pc.LocalDescription()) if nil != err { log.Printf("MeekChannel signaling error: %s", err) @@ -190,17 +182,6 @@ func dialWebRTC(config *webrtc.Configuration, meek *MeekChannel) ( if nil == answer { log.Printf("MeekChannel: No answer received.") } else { - log.Println("Recieved answer from Meek channel: \n\n", - answer.Serialize(), "\n") - // TODO: Once this is correct, uncomment and remove copy-paste stuff. - // signalChan <- answer - } - } - if offerURL != "" { - answer, err := sendOfferHTTP(offerURL, offer) - if err != nil { - log.Println(err) - } else { signalChan <- answer } } @@ -214,7 +195,7 @@ func dialWebRTC(config *webrtc.Configuration, meek *MeekChannel) ( pc.Close() return nil, fmt.Errorf("no answer received") } - log.Printf("Received Answer: %s", answer.Serialize()) + log.Printf("Received Answer:\n\n%s\n", answer.Sdp) err = pc.SetRemoteDescription(answer) if err != nil { pc.Close() @@ -257,7 +238,7 @@ func handler(conn *pt.SocksConn) error { config := webrtc.NewConfiguration( webrtc.OptionIceServer("stun:stun.l.google.com:19302")) - meek := NewMeekChannel(BROKER_URL, FRONT_URL) + meek := NewMeekChannel(brokerURL, frontDomain) remote, err := dialWebRTC(config, meek) if err != nil { conn.Reject() @@ -318,8 +299,8 @@ func readSignalingMessages(f *os.File) { func main() { var err error - flag.StringVar(&offerURL, "url", "", "do signalling through URL") - flag.BoolVar(&meekEnabled, "meek", false, "use domain fronted signaling") + 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) @@ -328,10 +309,9 @@ func main() { } defer logFile.Close() log.SetOutput(logFile) - log.Println("starting") - if offerURL == "" && !meekEnabled { + if "" == brokerURL { log.Println("No HTTP signaling detected. Waiting for a \"signal\" pipe...") // This FIFO receives signaling messages. err = syscall.Mkfifo("signal", 0600) diff --git a/client/torrc b/client/torrc index 63c88a4..9af942b 100644 --- a/client/torrc +++ b/client/torrc @@ -1,5 +1,8 @@ UseBridges 1 DataDirectory datadir -ClientTransportPlugin snowflake exec ./client +ClientTransportPlugin snowflake exec ./client \ +-url https://snowflake-reg.appspot.com/ \ +-front www.google.com + Bridge snowflake 0.0.3.0:1 diff --git a/client/torrc-manual b/client/torrc-manual new file mode 100644 index 0000000..014b539 --- /dev/null +++ b/client/torrc-manual @@ -0,0 +1,6 @@ +UseBridges 1 +DataDirectory datadir + +ClientTransportPlugin snowflake exec ./client + +Bridge snowflake 0.0.3.0:1

1 0

[snowflake/master] broker tracking a heap of snowflakes
by arlo＠torproject.org 21 Jan '16

21 Jan '16

commit 0cd6852ad0060fad40aaf31d5ba1f6951127fc35 Author: Serene Han <keroserene+git(a)gmail.com> Date: Thu Jan 21 10:44:14 2016 -0800 broker tracking a heap of snowflakes --- broker/snowflake-broker.go | 130 +++++++++++++++++++++++++++++++++++---- broker/snowflake-broker_test.go | 59 ++++++++++++++++++ client/meek-webrtc.go | 3 +- proxy/broker.coffee | 7 +-- proxy/snowflake.coffee | 2 +- 5 files changed, 182 insertions(+), 19 deletions(-) diff --git a/broker/snowflake-broker.go b/broker/snowflake-broker.go index 4c0e62f..279b2b6 100644 --- a/broker/snowflake-broker.go +++ b/broker/snowflake-broker.go @@ -1,13 +1,13 @@ package snowflake_broker import ( - // "io" + "container/heap" + "fmt" "io/ioutil" "log" "net" "net/http" - "path" - + "time" // "appengine" // "appengine/urlfetch" ) @@ -15,7 +15,64 @@ import ( // This is an intermediate step - a basic hardcoded appengine rendezvous // to a single browser snowflake. -var snowflakeProxy = "" +// This is minimum viable client-proxy registration. +// TODO: better, more secure registration corresponding to what's in +// the python flashproxy facilitator. + +// Slice of available snowflake proxies. +// var snowflakes []chan []byte + +type Snowflake struct { + id string + sigChannel chan []byte + clients int + index int +} + +// Implements heap.Interface, and holds Snowflakes. +type SnowflakeHeap []*Snowflake + +func (sh SnowflakeHeap) Len() int { return len(sh) } + +func (sh SnowflakeHeap) Less(i, j int) bool { + // Snowflakes serving less clients should sort earlier. + return sh[i].clients < sh[j].clients +} + +func (sh SnowflakeHeap) Swap(i, j int) { + sh[i], sh[j] = sh[j], sh[i] + sh[i].index = i + sh[j].index = j +} + +func (sh *SnowflakeHeap) Push(s interface{}) { + n := len(*sh) + snowflake := s.(*Snowflake) + snowflake.index = n + *sh = append(*sh, snowflake) +} + +// Only valid when Len() > 0. +func (sh *SnowflakeHeap) Pop() interface{} { + flakes := *sh + n := len(flakes) + snowflake := flakes[n-1] + snowflake.index = -1 + *sh = flakes[0 : n-1] + return snowflake +} + +var snowflakes *SnowflakeHeap + +// Create and add a Snowflake to the heap. +func AddSnowflake(id string) *Snowflake { + snowflake := new(Snowflake) + snowflake.id = id + snowflake.clients = 0 + snowflake.sigChannel = make(chan []byte) + heap.Push(snowflakes, snowflake) + return snowflake +} func robotsTxtHandler(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "text/plain; charset=utf-8") @@ -36,29 +93,76 @@ Expects a WebRTC SDP offer in the Request to give to an assigned snowflake proxy, which responds with the SDP answer to be sent in the HTTP response back to the client. */ -func regHandler(w http.ResponseWriter, r *http.Request) { - // TODO: Maybe don't pass anything on path, since it will always be bidirectional - dir, _ := path.Split(path.Clean(r.URL.Path)) - if dir != "/reg/" { - http.NotFound(w, r) +func clientHandler(w http.ResponseWriter, r *http.Request) { + offer, err := ioutil.ReadAll(r.Body) + if nil != err { + log.Println("Invalid data.") + return + } + w.Header().Set("Access-Control-Allow-Origin", "*") + // Pop the most available snowflake proxy, and pass the offer to it. + // TODO: Make this much better. + snowflake := heap.Pop(snowflakes).(*Snowflake) + if nil == snowflake { + w.Write([]byte("no snowflake proxies available")) + // w.WriteHeader(http.StatusServiceUnavailable) return } + // snowflakes = snowflakes[1:] + snowflake.sigChannel <- offer + w.Write([]byte("sent offer to proxy!")) + // TODO: Get browser snowflake to talkto this appengine instance + // so it can reply with an answer, and not just the offer again :) + // TODO: Real broker which matches clients and snowflake proxies. + w.Write(offer) +} + +/* +A snowflake browser proxy requests a client from the Broker. +*/ +func proxyHandler(w http.ResponseWriter, r *http.Request) { body, err := ioutil.ReadAll(r.Body) if nil != err { + log.Println("Invalid data.") return + } + w.Header().Set("Access-Control-Allow-Origin", "*") + snowflakeSession := body + log.Println("Received snowflake: ", snowflakeSession) + snowflake := AddSnowflake(string(snowflakeSession)) + select { + case offer := <-snowflake.sigChannel: + log.Println("Passing client offer to snowflake.") + w.Write(offer) + case <-time.After(time.Second * 10): + s := fmt.Sprintf("%d snowflakes left.", snowflakes.Len()) + w.Write([]byte("timed out. " + s)) + heap.Remove(snowflakes, snowflake.index) + // w.WriteHeader(http.StatusRequestTimeout) + } +} + +func reflectHandler(w http.ResponseWriter, r *http.Request) { + body, err := ioutil.ReadAll(r.Body) + if nil != err { log.Println("Invalid data.") + return } w.Header().Set("Access-Control-Allow-Origin", "*") - // TODO: Get browser snowflake to talkto this appengine instance - // so it can reply with an answer, and not just the offer again :) - // TODO: Real broker which matches clients and snowflake proxies. w.Write(body) } func init() { + // snowflakes = make([]chan []byte, 0) + snowflakes = new(SnowflakeHeap) + heap.Init(snowflakes) + http.HandleFunc("/robots.txt", robotsTxtHandler) http.HandleFunc("/ip", ipHandler) - http.HandleFunc("/reg/", regHandler) + + http.HandleFunc("/client", clientHandler) + http.HandleFunc("/proxy", proxyHandler) + http.HandleFunc("/reflect", reflectHandler) // if SNOWFLAKE_BROKER == "" { // panic("SNOWFLAKE_BROKER empty; did you forget to edit config.go?") // } diff --git a/broker/snowflake-broker_test.go b/broker/snowflake-broker_test.go new file mode 100644 index 0000000..03f876b --- /dev/null +++ b/broker/snowflake-broker_test.go @@ -0,0 +1,59 @@ +package snowflake_broker + +import ( + "container/heap" + "testing" +) + +func TestSnowflakeHeap(t *testing.T) { + h := new(SnowflakeHeap) + heap.Init(h) + if 0 != h.Len() { + t.Error("Unexpected length.") + } + s1 := new(Snowflake) + s2 := new(Snowflake) + s3 := new(Snowflake) + s4 := new(Snowflake) + + s1.clients = 4 + s2.clients = 5 + s3.clients = 3 + s4.clients = 1 + + heap.Push(h, s1) + heap.Push(h, s2) + heap.Push(h, s3) + heap.Push(h, s4) + + if 4 != h.Len() { + t.Error("Unexpected length.") + } + + heap.Remove(h, 0) + if 3 != h.Len() { + t.Error("Unexpected length.") + } + + r := heap.Pop(h).(*Snowflake) + if r.clients != 3 { + t.Error("Unexpected clients: ", r.clients) + } + if r.index != -1 { + t.Error("Unexpected index: ", r.index) + } + + r = heap.Pop(h).(*Snowflake) + if r.clients != 4 { + t.Error("Unexpected clients: ", r.clients) + } + + r = heap.Pop(h).(*Snowflake) + if r.clients != 5 { + t.Error("Unexpected clients: ", r.clients) + } + + if 0 != h.Len() { + t.Error("Unexpected length.") + } +} diff --git a/client/meek-webrtc.go b/client/meek-webrtc.go index df59e98..2d68770 100644 --- a/client/meek-webrtc.go +++ b/client/meek-webrtc.go @@ -37,7 +37,7 @@ func NewMeekChannel(broker string, front string) *MeekChannel { mc.Method = "POST" mc.trueURL = targetUrl - mc.externalUrl = front + "/reg/test" // TODO: Have a better suffix. + mc.externalUrl = front + "/client" // We make a copy of DefaultTransport because we want the default Dial // and TLSHandshakeTimeout settings. But we want to disable the default @@ -70,6 +70,7 @@ func (mc *MeekChannel) Negotiate(offer *webrtc.SessionDescription) ( if nil != err { return nil, err } + log.Println("Body: ", string(body)) answer := webrtc.DeserializeSessionDescription(string(body)) return answer, nil } diff --git a/proxy/broker.coffee b/proxy/broker.coffee index fb2add9..9432e5c 100644 --- a/proxy/broker.coffee +++ b/proxy/broker.coffee @@ -21,7 +21,6 @@ class Broker xhr = new XMLHttpRequest() try xhr.open 'POST', @url - xhr catch err ### An exception happens here when, for example, NoScript allows the domain on @@ -35,14 +34,14 @@ class Broker # xhr.responseType = 'text' xhr.onreadystatechange = -> if xhr.DONE == xhr.readyState + log 'Broker: ' + xhr.status if 200 == xhr.status - log 'Broker: success' log 'Response: ' + xhr.responseText - # @fac_complete xhr.responseText + log xhr else log 'Broker error ' + xhr.status + ' - ' + xhr.statusText - xhr.send 'snowflake-testing' + log "Broker: sent a registration message, waiting for reply..." sendAnswer: (answer) -> log 'Sending answer to broker.' diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index ac59419..1b837d5 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -8,7 +8,7 @@ Assume that the webrtc client plugin is always the offerer, in which case this must always act as the answerer. ### DEFAULT_WEBSOCKET = '192.81.135.242:9901' -DEFAULT_BROKER = 'https://snowflake-reg.appspot.com/reg/test' +DEFAULT_BROKER = 'https://snowflake-reg.appspot.com/proxy' DEFAULT_PORTS = http: 80 https: 443

1 0

[snowflake/master] answer successfully roundtripped back from snowflake proxy through broker to client (#1)
by arlo＠torproject.org 21 Jan '16

21 Jan '16

commit c9013b2f80aeda0aa6e86d984f1d7e9b89aabd46 Author: Serene Han <keroserene+git(a)gmail.com> Date: Thu Jan 21 13:02:46 2016 -0800 answer successfully roundtripped back from snowflake proxy through broker to client (#1) --- broker/config.go | 16 ------ broker/snowflake-broker.go | 123 +++++++++++++++++++++++++++++++------------- proxy/broker.coffee | 42 ++++++++++++--- proxy/proxypair.coffee | 5 +- proxy/snowflake.coffee | 11 +--- 5 files changed, 127 insertions(+), 70 deletions(-) diff --git a/broker/config.go b/broker/config.go deleted file mode 100644 index 7e250aa..0000000 --- a/broker/config.go +++ /dev/null @@ -1,16 +0,0 @@ -/* -This is the server-side code that runs on Google App Engine for the -"appspot" registration method. - -See doc/appspot-howto.txt for more details about setting up an -application, and advice on running one. - -To upload a new version: -$ torify ~/go_appengine/appcfg.py --no_cookies -A $YOUR_APP_ID update . -*/ -package snowflake_broker - -// host:port/basepath of the broker you want to register with -// for example, fp-broker.org or example.com:12345/broker -// https:// and /reg/ will be prepended and appended respectively. -const SNOWFLAKE_BROKER = "" diff --git a/broker/snowflake-broker.go b/broker/snowflake-broker.go index 1d26eb1..c2bde7b 100644 --- a/broker/snowflake-broker.go +++ b/broker/snowflake-broker.go @@ -1,3 +1,12 @@ +/* +Broker acts as the HTTP signaling channel. +It matches clients and snowflake proxies by passing corresponding +SessionDescriptions in order to negotiate a WebRTC connection. + +TODO(serene): This code is currently the absolute minimum required to +cause a successful negotiation. +It's otherwise very unsafe and problematic, and needs quite some work... +*/ package snowflake_broker import ( @@ -8,8 +17,6 @@ import ( "net" "net/http" "time" - // "appengine" - // "appengine/urlfetch" ) // This is an intermediate step - a basic hardcoded appengine rendezvous @@ -23,10 +30,11 @@ import ( // var snowflakes []chan []byte type Snowflake struct { - id string - sigChannel chan []byte - clients int - index int + id string + offerChannel chan []byte + answerChannel chan []byte + clients int + index int } // Implements heap.Interface, and holds Snowflakes. @@ -63,14 +71,17 @@ func (sh *SnowflakeHeap) Pop() interface{} { } var snowflakes *SnowflakeHeap +var snowflakeMap map[string]*Snowflake // Create and add a Snowflake to the heap. func AddSnowflake(id string) *Snowflake { snowflake := new(Snowflake) snowflake.id = id snowflake.clients = 0 - snowflake.sigChannel = make(chan []byte) + snowflake.offerChannel = make(chan []byte) + snowflake.answerChannel = make(chan []byte) heap.Push(snowflakes, snowflake) + snowflakeMap[id] = snowflake return snowflake } @@ -97,65 +108,108 @@ func clientHandler(w http.ResponseWriter, r *http.Request) { offer, err := ioutil.ReadAll(r.Body) if nil != err { log.Println("Invalid data.") + w.WriteHeader(http.StatusBadRequest) return } w.Header().Set("Access-Control-Allow-Origin", "*") - // Pop the most available snowflake proxy, and pass the offer to it. - // TODO: Make this much better. + w.Header().Set("Access-Control-Allow-Headers", "X-Session-ID") + + // Find the most available snowflake proxy, and pass the offer to it. + // TODO: Needs improvement. snowflake := heap.Pop(snowflakes).(*Snowflake) if nil == snowflake { - // w.Header().Set("Status", http.StatusServiceUnavailable) - w.Write([]byte("no snowflake proxies available")) + w.Header().Set("Status", http.StatusServiceUnavailable) + // w.Write([]byte("no snowflake proxies available")) return } - // snowflakes = snowflakes[1:] - snowflake.sigChannel <- offer - w.Write([]byte("sent offer to proxy!")) - // TODO: Get browser snowflake to talkto this appengine instance - // so it can reply with an answer, and not just the offer again :) - // TODO: Real broker which matches clients and snowflake proxies. - w.Write(offer) + snowflake.offerChannel <- offer + + // Wait for the answer to be returned on the channel. + select { + case answer := <-snowflake.answerChannel: + log.Println("Retrieving answer") + w.Write(answer) + // Only remove from the snowflake map once the answer is set. + delete(snowflakeMap, snowflake.id) + + case <-time.After(time.Second * 10): + w.WriteHeader(http.StatusGatewayTimeout) + w.Write([]byte("timed out waiting for answer!")) + } } /* -A snowflake browser proxy requests a client from the Broker. +For snowflake proxies to request a client from the Broker. */ func proxyHandler(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Access-Control-Allow-Origin", "*") + w.Header().Set("Access-Control-Allow-Headers", "Origin, X-Session-ID") + // For CORS preflight. + if "OPTIONS" == r.Method { + return + } + + id := r.Header.Get("X-Session-ID") body, err := ioutil.ReadAll(r.Body) if nil != err { log.Println("Invalid data.") + w.WriteHeader(http.StatusBadRequest) return } - w.Header().Set("Access-Control-Allow-Origin", "*") - snowflakeSession := body - log.Println("Received snowflake: ", snowflakeSession) - snowflake := AddSnowflake(string(snowflakeSession)) + if string(body) != id { // Mismatched IDs! + w.WriteHeader(http.StatusBadRequest) + } + // Maybe confirm that X-Session-ID is the same. + log.Println("Received snowflake: ", id) + snowflake := AddSnowflake(id) + + // Wait for a client to avail an offer to the snowflake, or timeout + // and ask the snowflake to poll later. select { - case offer := <-snowflake.sigChannel: + case offer := <-snowflake.offerChannel: log.Println("Passing client offer to snowflake.") w.Write(offer) + case <-time.After(time.Second * 10): - // s := fmt.Sprintf("%d snowflakes left.", snowflakes.Len()) - // w.Write([]byte("timed out. " + s)) - // w.Header().Set("Status", http.StatusRequestTimeout) - w.WriteHeader(http.StatusGatewayTimeout) heap.Remove(snowflakes, snowflake.index) + w.WriteHeader(http.StatusGatewayTimeout) } } -func reflectHandler(w http.ResponseWriter, r *http.Request) { +/* +Expects snowflake proxes which have previously successfully received +an offer from proxyHandler to respond with an answer in an HTTP POST, +which the broker will pass back to the original client. +*/ +func answerHandler(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Access-Control-Allow-Origin", "*") + w.Header().Set("Access-Control-Allow-Headers", "X-Session-ID") + // For CORS preflight. + if "OPTIONS" == r.Method { + return + } + + id := r.Header.Get("X-Session-ID") + snowflake, ok := snowflakeMap[id] + if !ok || nil == snowflake { + // The snowflake took too long to respond with an answer, + // and the designated client is no longer around / recognized by the Broker. + w.WriteHeader(http.StatusGone) + return + } body, err := ioutil.ReadAll(r.Body) if nil != err { log.Println("Invalid data.") + w.WriteHeader(http.StatusBadRequest) return } - w.Header().Set("Access-Control-Allow-Origin", "*") - w.Write(body) + log.Println("Received answer: ", body) + snowflake.answerChannel <- body } func init() { - // snowflakes = make([]chan []byte, 0) snowflakes = new(SnowflakeHeap) + snowflakeMap = make(map[string]*Snowflake) heap.Init(snowflakes) http.HandleFunc("/robots.txt", robotsTxtHandler) @@ -163,8 +217,5 @@ func init() { http.HandleFunc("/client", clientHandler) http.HandleFunc("/proxy", proxyHandler) - http.HandleFunc("/reflect", reflectHandler) - // if SNOWFLAKE_BROKER == "" { - // panic("SNOWFLAKE_BROKER empty; did you forget to edit config.go?") - // } + http.HandleFunc("/answer", answerHandler) } diff --git a/proxy/broker.coffee b/proxy/broker.coffee index 688d45d..91a81d2 100644 --- a/proxy/broker.coffee +++ b/proxy/broker.coffee @@ -6,19 +6,25 @@ to get assigned to clients. ### STATUS_OK = 200 +STATUS_GONE = 410 STATUS_GATEWAY_TIMEOUT = 504 +genSnowflakeID = -> + Math.random().toString(36).substring(2) + # Represents a broker running remotely. class Broker clients: 0 + id: null # When interacting with the Broker, snowflake must generate a unique session # ID so the Broker can keep track of which signalling channel it's speaking # to. constructor: (@url) -> - log 'Using Broker at ' + @url - clients = 0 + @clients = 0 + @id = genSnowflakeID() + log 'Contacting Broker at ' + @url + '\nSnowflake ID: ' + @id # Snowflake registers with the broker using an HTTP POST request, and expects # a response from the broker containing some client offer. @@ -27,7 +33,8 @@ class Broker new Promise (fulfill, reject) => xhr = new XMLHttpRequest() try - xhr.open 'POST', @url + xhr.open 'POST', @url + 'proxy' + xhr.setRequestHeader('X-Session-ID', @id) catch err ### An exception happens here when, for example, NoScript allows the domain @@ -47,10 +54,29 @@ class Broker else log 'Broker ERROR: Unexpected ' + xhr.status + ' - ' + xhr.statusText - - xhr.send 'snowflake-testing' - log "Broker: polling for client offer..." + xhr.send @id + log @id + " - polling for client offer..." sendAnswer: (answer) -> - log 'Sending answer to broker.' - log answer + log @id + ' - Sending answer back to broker...\n' + log answer.sdp + xhr = new XMLHttpRequest() + try + xhr.open 'POST', @url + 'answer' + xhr.setRequestHeader('X-Session-ID', @id) + catch err + log 'Broker: exception while connecting: ' + err.message + return + xhr.onreadystatechange = -> + return if xhr.DONE != xhr.readyState + log xhr + switch xhr.status + when STATUS_OK + log 'Broker: Successfully replied with answer.' + log xhr.responseText + when STATUS_GONE + log 'Broker: No longer valid to reply with answer.' + else + log 'Broker ERROR: Unexpected ' + xhr.status + + ' - ' + xhr.statusText + xhr.send JSON.stringify(answer) diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index a27ac92..f78e9f6 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -32,7 +32,10 @@ class ProxyPair # TODO: Use a promise.all to tell Snowflake about all offers at once, # once multiple proxypairs are supported. log 'Finished gathering ICE candidates.' - Signalling.send @pc.localDescription + if COPY_PASTE_ENABLED + Signalling.send @pc.localDescription + else + snowflake.broker.sendAnswer @pc.localDescription # OnDataChannel triggered remotely from the client when connection succeeds. @pc.ondatachannel = (dc) => console.log dc diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 646b9b4..cc34f81 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -8,7 +8,7 @@ Assume that the webrtc client plugin is always the offerer, in which case this must always act as the answerer. ### DEFAULT_WEBSOCKET = '192.81.135.242:9901' -DEFAULT_BROKER = 'https://snowflake-reg.appspot.com/proxy' +DEFAULT_BROKER = 'https://snowflake-reg.appspot.com/' COPY_PASTE_ENABLED = false DEFAULT_PORTS = http: 80 @@ -104,8 +104,8 @@ class Snowflake poll = => recv = broker.getClientOffer() recv.then((desc) => - log 'Received:\n\n' + desc + '\n' offer = JSON.parse desc + log 'Received:\n\n' + offer.sdp + '\n' @receiveOffer offer , (err) -> log err @@ -113,13 +113,6 @@ class Snowflake ) poll() - # if @proxyPairs.length >= MAX_NUM_CLIENTS * CONNECTIONS_PER_CLIENT - # setTimeout(@proxyMain, @broker_poll_interval * 1000) - # return - # params = [['r', '1']] - # params.push ['transport', 'websocket'] - # params.push ['transport', 'webrtc'] - # Receive an SDP offer from client plugin. receiveOffer: (desc) => sdp = new RTCSessionDescription desc

1 0

[snowflake/master] broker successfully passing client offers to snowflake proxy (#1)
by arlo＠torproject.org 21 Jan '16

21 Jan '16

commit 7081e6328c34db31fec437aabaac829a9280e0f9 Author: Serene Han <keroserene+git(a)gmail.com> Date: Thu Jan 21 11:40:42 2016 -0800 broker successfully passing client offers to snowflake proxy (#1) --- broker/snowflake-broker.go | 11 ++++---- proxy/broker.coffee | 64 +++++++++++++++++++++++++------------------- proxy/snowflake.coffee | 48 +++++++++++++++++++++++---------- 3 files changed, 76 insertions(+), 47 deletions(-) diff --git a/broker/snowflake-broker.go b/broker/snowflake-broker.go index 279b2b6..1d26eb1 100644 --- a/broker/snowflake-broker.go +++ b/broker/snowflake-broker.go @@ -2,7 +2,7 @@ package snowflake_broker import ( "container/heap" - "fmt" + // "fmt" "io/ioutil" "log" "net" @@ -104,8 +104,8 @@ func clientHandler(w http.ResponseWriter, r *http.Request) { // TODO: Make this much better. snowflake := heap.Pop(snowflakes).(*Snowflake) if nil == snowflake { + // w.Header().Set("Status", http.StatusServiceUnavailable) w.Write([]byte("no snowflake proxies available")) - // w.WriteHeader(http.StatusServiceUnavailable) return } // snowflakes = snowflakes[1:] @@ -135,10 +135,11 @@ func proxyHandler(w http.ResponseWriter, r *http.Request) { log.Println("Passing client offer to snowflake.") w.Write(offer) case <-time.After(time.Second * 10): - s := fmt.Sprintf("%d snowflakes left.", snowflakes.Len()) - w.Write([]byte("timed out. " + s)) + // s := fmt.Sprintf("%d snowflakes left.", snowflakes.Len()) + // w.Write([]byte("timed out. " + s)) + // w.Header().Set("Status", http.StatusRequestTimeout) + w.WriteHeader(http.StatusGatewayTimeout) heap.Remove(snowflakes, snowflake.index) - // w.WriteHeader(http.StatusRequestTimeout) } } diff --git a/proxy/broker.coffee b/proxy/broker.coffee index 9432e5c..688d45d 100644 --- a/proxy/broker.coffee +++ b/proxy/broker.coffee @@ -5,43 +5,51 @@ Browser snowflakes must register with the broker in order to get assigned to clients. ### +STATUS_OK = 200 +STATUS_GATEWAY_TIMEOUT = 504 + # Represents a broker running remotely. class Broker + + clients: 0 + # When interacting with the Broker, snowflake must generate a unique session # ID so the Broker can keep track of which signalling channel it's speaking # to. constructor: (@url) -> log 'Using Broker at ' + @url + clients = 0 # Snowflake registers with the broker using an HTTP POST request, and expects - # a response from the broker containing some client offer - register: -> - # base_url = this.fac_url.replace(/\?.*/, ""); - # url = base_url + "?" + build_query_string(params); - xhr = new XMLHttpRequest() - try - xhr.open 'POST', @url - catch err - ### - An exception happens here when, for example, NoScript allows the domain on - which the proxy badge runs, but not the domain to which it's trying to - make the HTTP request. The exception message is like "Component returned - failure code: 0x805e0006 [nsIXMLHttpRequest.open]" on Firefox. - ### - log 'Broker: exception while connecting: ' + err.message - return - - # xhr.responseType = 'text' - xhr.onreadystatechange = -> - if xhr.DONE == xhr.readyState - log 'Broker: ' + xhr.status - if 200 == xhr.status - log 'Response: ' + xhr.responseText - log xhr - else - log 'Broker error ' + xhr.status + ' - ' + xhr.statusText - xhr.send 'snowflake-testing' - log "Broker: sent a registration message, waiting for reply..." + # a response from the broker containing some client offer. + # TODO: Actually support multiple clients. + getClientOffer: -> + new Promise (fulfill, reject) => + xhr = new XMLHttpRequest() + try + xhr.open 'POST', @url + catch err + ### + An exception happens here when, for example, NoScript allows the domain + on which the proxy badge runs, but not the domain to which it's trying + to make the HTTP request. The exception message is like "Component + returned failure code: 0x805e0006 [nsIXMLHttpRequest.open]" on Firefox. + ### + log 'Broker: exception while connecting: ' + err.message + return + xhr.onreadystatechange = -> + return if xhr.DONE != xhr.readyState + switch xhr.status + when STATUS_OK + fulfill xhr.responseText # Should contain offer. + when STATUS_GATEWAY_TIMEOUT + reject 'Timed out waiting for a client to serve. Retrying...' + else + log 'Broker ERROR: Unexpected ' + xhr.status + + ' - ' + xhr.statusText + + xhr.send 'snowflake-testing' + log "Broker: polling for client offer..." sendAnswer: (answer) -> log 'Sending answer to broker.' diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 1b837d5..646b9b4 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -9,6 +9,7 @@ this must always act as the answerer. ### DEFAULT_WEBSOCKET = '192.81.135.242:9901' DEFAULT_BROKER = 'https://snowflake-reg.appspot.com/proxy' +COPY_PASTE_ENABLED = false DEFAULT_PORTS = http: 80 https: 443 @@ -58,7 +59,7 @@ class Snowflake $badge: null state: MODE.INIT - constructor: -> + constructor: (@broker) -> if HEADLESS # No badge else if DEBUG @@ -98,6 +99,27 @@ class Snowflake @makeProxyPair @relayAddr @proxyPair = @proxyPairs[0] + # Poll broker for clients. + findClients: -> + poll = => + recv = broker.getClientOffer() + recv.then((desc) => + log 'Received:\n\n' + desc + '\n' + offer = JSON.parse desc + @receiveOffer offer + , (err) -> + log err + setTimeout(poll, 1000) + ) + poll() + + # if @proxyPairs.length >= MAX_NUM_CLIENTS * CONNECTIONS_PER_CLIENT + # setTimeout(@proxyMain, @broker_poll_interval * 1000) + # return + # params = [['r', '1']] + # params.push ['transport', 'websocket'] + # params.push ['transport', 'webrtc'] + # Receive an SDP offer from client plugin. receiveOffer: (desc) => sdp = new RTCSessionDescription desc @@ -117,14 +139,6 @@ class Snowflake promise = @proxyPair.pc.createAnswer next promise.then next if promise - # Poll broker when this snowflake can support more clients. - proxyMain: -> - if @proxyPairs.length >= MAX_NUM_CLIENTS * CONNECTIONS_PER_CLIENT - setTimeout(@proxyMain, @broker_poll_interval * 1000) - return - params = [['r', '1']] - params.push ['transport', 'websocket'] - params.push ['transport', 'webrtc'] makeProxyPair: (relay) -> pair = new ProxyPair null, relay, @rateLimit @@ -156,6 +170,7 @@ class Snowflake @badge.die() if @badge snowflake = null +broker = null # ## -- DOM & Inputs -- # @@ -170,7 +185,9 @@ Interface = # Local input from keyboard into message window. acceptInput: -> msg = $input.value - switch snowflake.state + if !COPY_PASTE_ENABLED + log 'No input expected - Copy Paste Signalling disabled.' + else switch snowflake.state when MODE.INIT # Set target relay. if !(snowflake.setRelayAddr msg) @@ -224,10 +241,13 @@ init = -> $input.onkeydown = (e) -> $send.onclick() if 13 == e.keyCode # enter log '== snowflake browser proxy ==' - snowflake = new Snowflake() - window.snowflake = snowflake broker = new Broker DEFAULT_BROKER - broker.register() - log 'Input desired relay address:' + snowflake = new Snowflake(broker) + window.snowflake = snowflake + if COPY_PASTE_ENABLED + log 'Input desired relay address:' + else + snowflake.setRelayAddr DEFAULT_WEBSOCKET + snowflake.findClients() window.onload = init if window

1 0

[snowflake/master] Also skip creating named pipe if --meek is enabled, and output a more useful waiting message if pipe is expected
by arlo＠torproject.org 21 Jan '16

21 Jan '16

commit f2d8a749f448bfbfd69a454c0ce7b14b56143513 Author: Serene Han <keroserene+git(a)gmail.com> Date: Wed Jan 20 15:51:22 2016 -0800 Also skip creating named pipe if --meek is enabled, and output a more useful waiting message if pipe is expected --- client/snowflake.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/snowflake.go b/client/snowflake.go index 076080d..ad496f9 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -331,7 +331,8 @@ func main() { log.Println("starting") - if offerURL == "" { + if offerURL == "" && !meekEnabled { + log.Println("No HTTP signaling detected. Waiting for a \"signal\" pipe...") // This FIFO receives signaling messages. err = syscall.Mkfifo("signal", 0600) if err != nil {

1 0

[snowflake/master] Initial broker registration of browser proxies
by arlo＠torproject.org 21 Jan '16

21 Jan '16

commit 28e557fb4368878134c345f0951d8ee824525617 Author: Serene Han <keroserene+git(a)gmail.com> Date: Wed Jan 20 16:16:20 2016 -0800 Initial broker registration of browser proxies - broker.coffee contains the xhr stuff - COR enabled on the go broker - POST body reflection works --- broker/snowflake-broker.go | 2 +- proxy/Cakefile | 1 + proxy/broker.coffee | 49 ++++++++++++++++++++++++++++++++++++++++++++ proxy/snowflake.coffee | 13 ++++++------ 4 files changed, 57 insertions(+), 8 deletions(-) diff --git a/broker/snowflake-broker.go b/broker/snowflake-broker.go index 6bcff63..4c0e62f 100644 --- a/broker/snowflake-broker.go +++ b/broker/snowflake-broker.go @@ -48,7 +48,7 @@ func regHandler(w http.ResponseWriter, r *http.Request) { return log.Println("Invalid data.") } - + w.Header().Set("Access-Control-Allow-Origin", "*") // TODO: Get browser snowflake to talkto this appengine instance // so it can reply with an answer, and not just the offer again :) // TODO: Real broker which matches clients and snowflake proxies. diff --git a/proxy/Cakefile b/proxy/Cakefile index d657e17..499de94 100644 --- a/proxy/Cakefile +++ b/proxy/Cakefile @@ -7,6 +7,7 @@ FILES = [ 'util.coffee' 'proxypair.coffee' 'websocket.coffee' + 'broker.coffee' 'snowflake.coffee' ] FILES_TEST = [ diff --git a/proxy/broker.coffee b/proxy/broker.coffee new file mode 100644 index 0000000..fb2add9 --- /dev/null +++ b/proxy/broker.coffee @@ -0,0 +1,49 @@ +### +Communication with the snowflake broker. + +Browser snowflakes must register with the broker in order +to get assigned to clients. +### + +# Represents a broker running remotely. +class Broker + # When interacting with the Broker, snowflake must generate a unique session + # ID so the Broker can keep track of which signalling channel it's speaking + # to. + constructor: (@url) -> + log 'Using Broker at ' + @url + + # Snowflake registers with the broker using an HTTP POST request, and expects + # a response from the broker containing some client offer + register: -> + # base_url = this.fac_url.replace(/\?.*/, ""); + # url = base_url + "?" + build_query_string(params); + xhr = new XMLHttpRequest() + try + xhr.open 'POST', @url + xhr + catch err + ### + An exception happens here when, for example, NoScript allows the domain on + which the proxy badge runs, but not the domain to which it's trying to + make the HTTP request. The exception message is like "Component returned + failure code: 0x805e0006 [nsIXMLHttpRequest.open]" on Firefox. + ### + log 'Broker: exception while connecting: ' + err.message + return + + # xhr.responseType = 'text' + xhr.onreadystatechange = -> + if xhr.DONE == xhr.readyState + if 200 == xhr.status + log 'Broker: success' + log 'Response: ' + xhr.responseText + # @fac_complete xhr.responseText + else + log 'Broker error ' + xhr.status + ' - ' + xhr.statusText + + xhr.send 'snowflake-testing' + + sendAnswer: (answer) -> + log 'Sending answer to broker.' + log answer diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index a7f64a8..ac59419 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -8,6 +8,7 @@ Assume that the webrtc client plugin is always the offerer, in which case this must always act as the answerer. ### DEFAULT_WEBSOCKET = '192.81.135.242:9901' +DEFAULT_BROKER = 'https://snowflake-reg.appspot.com/reg/test' DEFAULT_PORTS = http: 80 https: 443 @@ -207,15 +208,10 @@ Signalling = log = (msg) -> # Log to the message window. console.log msg - # Scroll to latest - if $msglog + if $msglog # Scroll to latest $msglog.value += msg + '\n' $msglog.scrollTop = $msglog.scrollHeight -welcome = -> - log '== snowflake browser proxy ==' - log 'Input desired relay address:' - init = -> $msglog = document.getElementById('msglog') $msglog.value = '' @@ -227,8 +223,11 @@ init = -> $input.focus() $input.onkeydown = (e) -> $send.onclick() if 13 == e.keyCode # enter + log '== snowflake browser proxy ==' snowflake = new Snowflake() window.snowflake = snowflake - welcome() + broker = new Broker DEFAULT_BROKER + broker.register() + log 'Input desired relay address:' window.onload = init if window

1 0

[tor-browser-bundle/master] Release preparations
by gk＠torproject.org 21 Jan '16

21 Jan '16

commit 56c9e21c35d93e29d2750184fa44d23f46aef71c Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 21 20:22:19 2016 +0000 Release preparations --- Bundle-Data/Docs/ChangeLog.txt | 49 +++++++++++++++++++++++++++++++++++++ gitian/versions | 32 ++++++++++-------------- tools/update-responses/config.yml | 12 ++++----- 3 files changed, 68 insertions(+), 25 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index dbb01bd..6042c2f 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,52 @@ +Tor Browser 5.5 -- January 26 2016 + * All Platforms + * Update Firefox to 38.6.0esr + * Update libevent to 2.0.22-stable + * Update NoScript to 2.9.0.2 + * Update Torbutton to 1.9.4.3 + * Bug 16990: Show circuit display for connections using multi-party channels + * Bug 18019: Avoid empty prompt shown after non-en-US update + * Bug 18004: Remove Tor fundraising donation banner + * Bug 16940: After update, load local change notes + * Bug 17108: Polish about:tor appearance + * Bug 17568: Clean up tor-control-port.js + * Bug 16620: Move window.name handling into a Firefox patch + * Bug 17351: Code cleanup + * Translation updates + * Update Tor Launcher to 0.2.7.8 + * Bug 18113: Randomly permutate available default bridges of chosen type + * Bug 13313: Bundle a fixed set of fonts to defend against fingerprinting + * Bug 10140: Add new Tor Browser locale (Japanese) + * Bug 17428: Remove Flashproxy + * Bug 13512: Load a static tab with change notes after an update + * Bug 9659: Avoid loop due to optimistic data SOCKS code (fix of #3875) + * Bug 15564: Isolate SharedWorkers by first-party domain + * Bug 16940: After update, load local change notes + * Bug 17759: Apply whitelist to local fonts in @font-face (fix of #13313) + * Bug 17009: Shift and Alt keys leak physical keyboard layout (fix of #15646) + * Bug 17369: Disable RC4 fallback + * Bug 17442: Remove custom updater certificate pinning + * Bug 16620: Move window.name handling into a Firefox patch + * Bug 17220: Support math symbols in font whitelist + * Bug 10599+17305: Include updater and build patches needed for hardened builds + * Bug 18115+18102+18071+18091: Update/add new obfs4 bridge + * Bug 18072: Change recommended pluggable transport type to obfs4 + * Bug 18008: Create a new MAR Signing key and bake it into Tor Browser + * Bug 16322: Use onion address for DuckDuckGo search engine + * Bug 17917: Changelog after update is empty if JS is disabled + * Windows + * Bug 17250: Add localized font names to font whitelist + * Bug 16707: Allow more system fonts to get used on Windows + * Bug 13819: Ship expert bundles with console enabled + * Bug 17250: Fix broken Japanese fonts + * Bug 17870: Add intermediate certificate for authenticode signing + * OS X + * Bug 17122: Rename Japanese OS X bundle + * Bug 16707: Allow more system fonts to get used on OS X + * Bug 17661: Whitelist font .Helvetica Neue DeskInterface + * Linux + * Bug 16672: Don't use font whitelisting for Linux users + Tor Browser 5.5a6-hardened -- January 7 2016 * All Platforms * Update NoScript to 2.9 diff --git a/gitian/versions b/gitian/versions index 8e35391..7ff094e 100755 --- a/gitian/versions +++ b/gitian/versions @@ -3,27 +3,25 @@ BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUNDLE_LOCALES_LINUX="ja" BUNDLE_LOCALES_WIN32="ja" BUNDLE_LOCALES_MAC="ja-JP-mac" - BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=38.2.0esr +FIREFOX_VERSION=38.6.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build2 -TOR_TAG=tor-0.2.6.10 -TORLAUNCHER_TAG=0.2.7.7 -TORBUTTON_TAG=1.9.3.2 -HTTPSE_TAG=5.1.0 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build1 +TOR_TAG=tor-0.2.7.6 +TORLAUNCHER_TAG=0.2.7.8 +TORBUTTON_TAG=1.9.4.3 +HTTPSE_TAG=5.1.2 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 -LIBEVENT_TAG=release-2.0.21-stable +LIBEVENT_TAG=release-2.0.22-stable MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 -FLASHPROXY_TAG=1.6 LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 @@ -38,12 +36,12 @@ GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844 OBFS4_TAG=obfs4proxy-0.0.5 NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 -GITIAN_TAG=tor-browser-builder-3.x-8 +GITIAN_TAG=tor-browser-builder-3.x-8-gpgsux -OPENSSL_VER=1.0.1p +OPENSSL_VER=1.0.1q GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=5.1.0 PYTHON_VER=2.7.5 @@ -52,7 +50,6 @@ ARGPARSE_VER=1.2.1 PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 -M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 @@ -63,7 +60,7 @@ NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.34-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.2-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -78,7 +75,6 @@ ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz PYYAML_PACKAGE=PyYAML-${PYYAML_VER}.tar.gz ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 -M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz @@ -88,20 +84,19 @@ NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=bd5ee6803165c0fb60bbecbacacf244f1f90d2aa0d71353af610c29121e9b2f1 +OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=d17e3eeb8cc6ddc6c6cabd002184eced5c8cf061c9d337bac2085e7d2daceacd +NOSCRIPT_HASH=f3c9dec710e02d809fa85ac76750e5f074656105c1bde03d400cb597b2eb1fba MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 -M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 @@ -127,7 +122,6 @@ PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} -M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_PACKAGE} PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index d61793c..362c146 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -10,14 +10,14 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 5.5a6 - release: 5.0 + release: 5.5 versions: - 5.0: - platformVersion: 38.2.0 - detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/5.0 + 5.5: + platformVersion: 38.6.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-55-released + download_url: https://www.torproject.org/dist/torbrowser/5.5 incremental_from: - - 4.5.3 + - 5.0.7 migrate_archs: osx32: osx64 osx32:

1 0

[tor-launcher/maint-0.2.7] Version bump
by gk＠torproject.org 21 Jan '16

21 Jan '16

commit 5cf4922eedbca64f956f0cc589701757f0b88680 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 21 14:41:57 2016 +0000 Version bump --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index a7524b7..06ebe1a 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.7.7</em:version> + <em:version>0.2.7.8</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL> <em:updateKey>-</em:updateKey>

1 0