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

[snowflake/master] add --meek flag to client to toggle the domain fronted rendezvous
by arlo＠torproject.org 19 Jan '16

19 Jan '16

commit b4a07c4192841ded1906e3e74a5e4fec6b5c3f65 Author: Serene Han <keroserene+git(a)gmail.com> Date: Tue Jan 19 17:21:07 2016 -0800 add --meek flag to client to toggle the domain fronted rendezvous --- README.md | 7 +++++++ client/meek-webrtc.go | 34 +++++++++++++++------------------- client/snowflake.go | 46 +++++++++++++++++++++++----------------------- 3 files changed, 45 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index 7b6ca9f..f0b7678 100644 --- a/README.md +++ b/README.md @@ -88,4 +88,11 @@ snowflake to just use a default relay. ### 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 927d4bf..172c1b5 100644 --- a/client/meek-webrtc.go +++ b/client/meek-webrtc.go @@ -1,5 +1,5 @@ -// Exchange WebRTC SessionDescriptions over meek. -// Much of this source is extracted from meek-client.go. +// Exchange WebRTC SessionDescriptions over a domain-fronted HTTP +// signalling channel. package main import ( @@ -16,29 +16,26 @@ import ( // roundtrip, including variables that may come from SOCKS args or from the // command line. type RequestInfo struct { - // What to put in the X-Session-ID header. - // SessionID string - // The URL to request. + // What to put in the X-Session-ID header - SessionID string + // The desired potentially filtered URL to request. URL *url.URL // The Host header to put in the HTTP request (optional and may be // different from the host name in URL). Host string } -func NewRequestInfo(meekUrl string, front string) *RequestInfo { +func NewRequestInfo(targetUrl string, front string) *RequestInfo { info := new(RequestInfo) - requestUrl, err := url.Parse(meekUrl) + requestUrl, err := url.Parse(targetUrl) if nil != err { return nil } info.URL = requestUrl info.Host = front - // info.URL.Host = front - // info.Host = info.URL.Host return info } -// Meek Signalling Channel +// Meek Signalling Channel. type MeekChannel struct { info *RequestInfo // Used to make all requests. @@ -58,24 +55,23 @@ func NewMeekChannel(info *RequestInfo) *MeekChannel { } // Do an HTTP roundtrip using the payload data in buf. -func (m *MeekChannel) roundTripHTTP(buf []byte) (*http.Response, error) { +func (mc *MeekChannel) roundTripHTTP(buf []byte) (*http.Response, error) { // Compose an innocent looking request. - req, err := http.NewRequest("POST", m.info.Host+"/reg/123", bytes.NewReader(buf)) + req, err := http.NewRequest("POST", mc.info.Host+"/reg/123", bytes.NewReader(buf)) if nil != err { return nil, err } - // Set actually desired target host. - req.Host = m.info.URL.String() + // Set actually desired host in the request. + req.Host = mc.info.URL.String() // req.Header.Set("X-Session-Id", m.info.SessionID) - return m.transport.RoundTrip(req) + return mc.transport.RoundTrip(req) } // Send an SDP offer to the meek facilitator, and wait for an SDP answer from // the assigned proxy in the response. -func (m *MeekChannel) Negotiate(offer *webrtc.SessionDescription) ( +func (mc *MeekChannel) Negotiate(offer *webrtc.SessionDescription) ( *webrtc.SessionDescription, error) { - buf := []byte(offer.Serialize()) - resp, err := m.roundTripHTTP(buf) + resp, err := mc.roundTripHTTP([]byte(offer.Serialize())) if nil != err { return nil, err } @@ -85,11 +81,11 @@ func (m *MeekChannel) Negotiate(offer *webrtc.SessionDescription) ( if nil != err { return nil, err } - log.Println("MeekChannel 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) { diff --git a/client/snowflake.go b/client/snowflake.go index 7da1e15..cf08c9e 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -25,14 +25,15 @@ import ( // Hard-coded meek signalling channel for now. // TODO: expose as param const ( - MEEK_URL = "snowflake-reg.appspot.com" - FRONT_DOMAIN = "https://www.google.com" - // FRONT_DOMAIN = "https://www.google.com" + // 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 // When a connection handler starts, +1 is written to this channel; when it // ends, -1 is written. @@ -160,7 +161,6 @@ func dialWebRTC(config *webrtc.Configuration, meek *MeekChannel) ( close(openChan) } 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 { @@ -180,20 +180,22 @@ 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 { - // // TODO: Once this is correct, uncomment and remove copy-paste - // // signalling. - // log.Println("Recieved answer from Meek channel: \n", - // answer.Serialize()) - // // signalChan <- answer - // } + if meekEnabled { + log.Println("Sending offer via meek channel...\nTarget URL: ", BROKER_URL, + "\nFront URL: ", FRONT_URL) + answer, err := meek.Negotiate(pc.LocalDescription()) + if nil != err { + log.Printf("MeekChannel signaling error: %s", err) + } + 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 { @@ -253,15 +255,12 @@ func handler(conn *pt.SocksConn) error { }() defer conn.Close() - // go func() { - // }() // Prepare meek signalling channel. - info := NewRequestInfo(MEEK_URL, FRONT_DOMAIN) + info := NewRequestInfo(BROKER_URL, FRONT_URL) meek := NewMeekChannel(info) config := webrtc.NewConfiguration( webrtc.OptionIceServer("stun:stun.l.google.com:19302")) - // remote, err := dialWebRTC(config, nil) remote, err := dialWebRTC(config, meek) if err != nil { conn.Reject() @@ -322,7 +321,8 @@ func readSignalingMessages(f *os.File) { func main() { var err error - flag.StringVar(&offerURL, "url", "", "do signaling through URL") + flag.StringVar(&offerURL, "url", "", "do signalling through URL") + flag.BoolVar(&meekEnabled, "meek", false, "use domain fronted signaling") flag.Parse() logFile, err = os.OpenFile("snowflake.log", os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600)

1 0

[snowflake/master] consolidate RequestInfo into MeekChannel with a simplified Negotiate method
by arlo＠torproject.org 19 Jan '16

19 Jan '16

commit 5e9b23de9e1878eee073ef63664f12e3949708ba Author: Serene Han <keroserene+git(a)gmail.com> Date: Tue Jan 19 18:06:40 2016 -0800 consolidate RequestInfo into MeekChannel with a simplified Negotiate method --- client/meek-webrtc.go | 80 +++++++++++++++++++++---------------------------- client/snowflake.go | 9 ++---- 2 files changed, 37 insertions(+), 52 deletions(-) diff --git a/client/meek-webrtc.go b/client/meek-webrtc.go index 172c1b5..df59e98 100644 --- a/client/meek-webrtc.go +++ b/client/meek-webrtc.go @@ -1,5 +1,5 @@ // Exchange WebRTC SessionDescriptions over a domain-fronted HTTP -// signalling channel. +// signaling channel. package main import ( @@ -12,71 +12,60 @@ import ( "github.com/keroserene/go-webrtc" ) -// RequestInfo encapsulates all the configuration used for a request–response -// roundtrip, including variables that may come from SOCKS args or from the -// command line. -type RequestInfo struct { - // What to put in the X-Session-ID header - SessionID string - // The desired potentially filtered URL to request. - URL *url.URL +// Meek Signalling Channel. +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 + Host string + Method string + trueURL *url.URL + externalUrl string + transport http.Transport // Used to make all requests. } -func NewRequestInfo(targetUrl string, front string) *RequestInfo { - info := new(RequestInfo) - requestUrl, err := url.Parse(targetUrl) +// 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. +func NewMeekChannel(broker string, front string) *MeekChannel { + targetUrl, err := url.Parse(broker) if nil != err { return nil } - info.URL = requestUrl - info.Host = front - return info -} + mc := new(MeekChannel) + mc.Host = front + mc.Method = "POST" -// Meek Signalling Channel. -type MeekChannel struct { - info *RequestInfo - // Used to make all requests. - transport http.Transport -} + mc.trueURL = targetUrl + mc.externalUrl = front + "/reg/test" // TODO: Have a better suffix. -func NewMeekChannel(info *RequestInfo) *MeekChannel { - m := new(MeekChannel) // We make a copy of DefaultTransport because we want the default Dial // and TLSHandshakeTimeout settings. But we want to disable the default - // ProxyFromEnvironment setting. Proxy is overridden below if - // options.ProxyURL is set. - m.transport = *http.DefaultTransport.(*http.Transport) - m.transport.Proxy = nil - m.info = info - return m + // ProxyFromEnvironment setting. + mc.transport = *http.DefaultTransport.(*http.Transport) + mc.transport.Proxy = nil + return mc } -// Do an HTTP roundtrip using the payload data in buf. -func (mc *MeekChannel) roundTripHTTP(buf []byte) (*http.Response, error) { - // Compose an innocent looking request. - req, err := http.NewRequest("POST", mc.info.Host+"/reg/123", bytes.NewReader(buf)) +// Roundtrip HTTP POST using WebRTC SessionDescriptions. +// +// Sends an SDP offer to the meek broker, which assigns a proxy and responds +// with an SDP answer from a designated remote WebRTC peer. +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) if nil != err { return nil, err } - // Set actually desired host in the request. - req.Host = mc.info.URL.String() - // req.Header.Set("X-Session-Id", m.info.SessionID) - return mc.transport.RoundTrip(req) -} - -// Send an SDP offer to the meek facilitator, and wait for an SDP answer from -// the assigned proxy in the response. -func (mc *MeekChannel) Negotiate(offer *webrtc.SessionDescription) ( - *webrtc.SessionDescription, error) { - resp, err := mc.roundTripHTTP([]byte(offer.Serialize())) + request.Host = mc.trueURL.String() + resp, err := mc.transport.RoundTrip(request) if nil != err { return nil, err } defer resp.Body.Close() log.Println("MeekChannel Response: ", resp) + body, err := ioutil.ReadAll(resp.Body) if nil != err { return nil, err @@ -85,7 +74,6 @@ func (mc *MeekChannel) Negotiate(offer *webrtc.SessionDescription) ( 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) { diff --git a/client/snowflake.go b/client/snowflake.go index cf08c9e..61fd46c 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -26,8 +26,8 @@ import ( // 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" + FRONT_URL = "https://www.google.com" + BROKER_URL = "snowflake-reg.appspot.com" ) var ptInfo pt.ClientInfo @@ -255,12 +255,9 @@ func handler(conn *pt.SocksConn) error { }() defer conn.Close() - // Prepare meek signalling channel. - info := NewRequestInfo(BROKER_URL, FRONT_URL) - meek := NewMeekChannel(info) - config := webrtc.NewConfiguration( webrtc.OptionIceServer("stun:stun.l.google.com:19302")) + meek := NewMeekChannel(BROKER_URL, FRONT_URL) remote, err := dialWebRTC(config, meek) if err != nil { conn.Reject()

1 0

[snowflake/master] rename rendezvous to broker
by arlo＠torproject.org 19 Jan '16

19 Jan '16

commit 62e6704d1f3cbafd843369da6a53d97a2b8eb615 Author: Serene Han <keroserene+git(a)gmail.com> Date: Tue Jan 19 18:07:59 2016 -0800 rename rendezvous to broker --- broker/app.yaml | 10 +++++++ broker/config.go | 16 +++++++++++ broker/snowflake-broker.go | 65 +++++++++++++++++++++++++++++++++++++++++++ rendezvous/app.yaml | 10 ------- rendezvous/config.go | 16 ----------- rendezvous/snowflake-reg.go | 65 ------------------------------------------- 6 files changed, 91 insertions(+), 91 deletions(-) diff --git a/broker/README.md b/broker/README.md new file mode 100644 index 0000000..e69de29 diff --git a/broker/app.yaml b/broker/app.yaml new file mode 100644 index 0000000..14fcf0a --- /dev/null +++ b/broker/app.yaml @@ -0,0 +1,10 @@ +# override this with appcfg.py -A $YOUR_APP_ID +application: snowflake-reg +version: 1 +runtime: go +api_version: go1 + +handlers: +- url: /.* + script: _go_app + secure: always diff --git a/broker/config.go b/broker/config.go new file mode 100644 index 0000000..55d1e69 --- /dev/null +++ b/broker/config.go @@ -0,0 +1,16 @@ +/* +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 facilitator you want to register with +// for example, fp-facilitator.org or example.com:12345/facilitator +// https:// and /reg/ will be prepended and appended respectively. +const SNOWFLAKE_FACILITATOR = "" diff --git a/broker/snowflake-broker.go b/broker/snowflake-broker.go new file mode 100644 index 0000000..784f2da --- /dev/null +++ b/broker/snowflake-broker.go @@ -0,0 +1,65 @@ +package snowflake_broker + +import ( + // "io" + "io/ioutil" + "log" + "net" + "net/http" + "path" + + // "appengine" + // "appengine/urlfetch" +) + +// This is an intermediate step - a basic hardcoded appengine rendezvous +// to a single browser snowflake. + +var snowflakeProxy = "" + +func robotsTxtHandler(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Content-Type", "text/plain; charset=utf-8") + w.Write([]byte("User-agent: *\nDisallow:\n")) +} + +func ipHandler(w http.ResponseWriter, r *http.Request) { + remoteAddr := r.RemoteAddr + if net.ParseIP(remoteAddr).To4() == nil { + remoteAddr = "[" + remoteAddr + "]" + } + w.Header().Set("Content-Type", "text/plain; charset=utf-8") + w.Write([]byte(remoteAddr)) +} + +/* +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) + return + } + body, err := ioutil.ReadAll(r.Body) + if nil != err { + return + log.Println("Invalid data.") + } + + // TODO: Get browser snowflake to talkto this appengine instance + // so it can reply with an answer, and not just the offer again :) + // TODO: Real facilitator which matches clients and snowflake proxies. + w.Write(body) +} + +func init() { + http.HandleFunc("/robots.txt", robotsTxtHandler) + http.HandleFunc("/ip", ipHandler) + http.HandleFunc("/reg/", regHandler) + // if SNOWFLAKE_FACILITATOR == "" { + // panic("SNOWFLAKE_FACILITATOR empty; did you forget to edit config.go?") + // } +} diff --git a/rendezvous/README.md b/rendezvous/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/rendezvous/app.yaml b/rendezvous/app.yaml deleted file mode 100644 index 14fcf0a..0000000 --- a/rendezvous/app.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# override this with appcfg.py -A $YOUR_APP_ID -application: snowflake-reg -version: 1 -runtime: go -api_version: go1 - -handlers: -- url: /.* - script: _go_app - secure: always diff --git a/rendezvous/config.go b/rendezvous/config.go deleted file mode 100644 index eabbe65..0000000 --- a/rendezvous/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_reg - -// host:port/basepath of the facilitator you want to register with -// for example, fp-facilitator.org or example.com:12345/facilitator -// https:// and /reg/ will be prepended and appended respectively. -const SNOWFLAKE_FACILITATOR = "" diff --git a/rendezvous/snowflake-reg.go b/rendezvous/snowflake-reg.go deleted file mode 100644 index 094612d..0000000 --- a/rendezvous/snowflake-reg.go +++ /dev/null @@ -1,65 +0,0 @@ -package snowflake_reg - -import ( - // "io" - "io/ioutil" - "log" - "net" - "net/http" - "path" - - // "appengine" - // "appengine/urlfetch" -) - -// This is an intermediate step - a basic hardcoded appengine rendezvous -// to a single browser snowflake. - -var snowflakeProxy = "" - -func robotsTxtHandler(w http.ResponseWriter, r *http.Request) { - w.Header().Set("Content-Type", "text/plain; charset=utf-8") - w.Write([]byte("User-agent: *\nDisallow:\n")) -} - -func ipHandler(w http.ResponseWriter, r *http.Request) { - remoteAddr := r.RemoteAddr - if net.ParseIP(remoteAddr).To4() == nil { - remoteAddr = "[" + remoteAddr + "]" - } - w.Header().Set("Content-Type", "text/plain; charset=utf-8") - w.Write([]byte(remoteAddr)) -} - -/* -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) - return - } - body, err := ioutil.ReadAll(r.Body) - if nil != err { - return - log.Println("Invalid data.") - } - - // TODO: Get browser snowflake to talkto this appengine instance - // so it can reply with an answer, and not just the offer again :) - // TODO: Real facilitator which matches clients and snowflake proxies. - w.Write(body) -} - -func init() { - http.HandleFunc("/robots.txt", robotsTxtHandler) - http.HandleFunc("/ip", ipHandler) - http.HandleFunc("/reg/", regHandler) - // if SNOWFLAKE_FACILITATOR == "" { - // panic("SNOWFLAKE_FACILITATOR empty; did you forget to edit config.go?") - // } -}

1 0

[tor/master] Use correct u64 int ops instead of regular int ops, in order to avoid warnings on 32bit clang
by nickm＠torproject.org 19 Jan '16

19 Jan '16

commit 3e738211d4301829a7b00fbfd2e57e4f6d671011 Author: Ola Bini <ola(a)olabini.se> Date: Tue Jan 19 11:11:01 2016 -0500 Use correct u64 int ops instead of regular int ops, in order to avoid warnings on 32bit clang --- src/test/test_options.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/test_options.c b/src/test/test_options.c index 18e3e91..ed05811 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -2308,7 +2308,7 @@ test_options_validate__bandwidth(void *ignored) "RelayBandwidthRate 1000\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, 0); - tt_int_op(tdata->opt->RelayBandwidthBurst, OP_EQ, 1000); + tt_u64_op(tdata->opt->RelayBandwidthBurst, OP_EQ, 1000); tor_free(msg); free_options_test_data(tdata); @@ -2316,7 +2316,7 @@ test_options_validate__bandwidth(void *ignored) "RelayBandwidthBurst 1001\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, 0); - tt_int_op(tdata->opt->RelayBandwidthRate, OP_EQ, 1001); + tt_u64_op(tdata->opt->RelayBandwidthRate, OP_EQ, 1001); tor_free(msg); free_options_test_data(tdata); @@ -2347,7 +2347,7 @@ test_options_validate__bandwidth(void *ignored) ); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, 0); - tt_int_op(tdata->opt->BandwidthRate, OP_EQ, 1001); + tt_u64_op(tdata->opt->BandwidthRate, OP_EQ, 1001); tor_free(msg); free_options_test_data(tdata); @@ -2359,7 +2359,7 @@ test_options_validate__bandwidth(void *ignored) ); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, 0); - tt_int_op(tdata->opt->BandwidthBurst, OP_EQ, 1001); + tt_u64_op(tdata->opt->BandwidthBurst, OP_EQ, 1001); tor_free(msg); free_options_test_data(tdata);

1 0

[tor/master] Make sure that tests for domain sockets only run on OSes with domain sockets
by nickm＠torproject.org 19 Jan '16

19 Jan '16

commit 32946e2c9652d28c988466cfc7c3e6ca6007b114 Author: Ola Bini <ola(a)olabini.se> Date: Tue Jan 19 11:14:41 2016 -0500 Make sure that tests for domain sockets only run on OSes with domain sockets --- src/test/test_options.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/test_options.c b/src/test/test_options.c index ed05811..91aae68 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -3221,6 +3221,7 @@ test_options_validate__control(void *ignored) "controller as soon as possible.\n"); tor_free(msg); +#ifdef HAVE_SYS_UN_H free_options_test_data(tdata); tdata = get_options_test_data(TEST_OPTIONS_DEFAULT_VALUES "ControlSocket unix:/tmp WorldWritable\n" @@ -3282,6 +3283,7 @@ test_options_validate__control(void *ignored) "can reconfigure your Tor. That's bad! You should upgrade your " "Tor controller as soon as possible.\n"); tor_free(msg); +#endif free_options_test_data(tdata); tdata = get_options_test_data(TEST_OPTIONS_DEFAULT_VALUES

1 0

[tor/master] Merge remote-tracking branch 'twstrike/options_test'
by nickm＠torproject.org 19 Jan '16

19 Jan '16

commit ae3d2a93f0cbf05803d358b2e86de1f79f103669 Merge: f557a7f 32946e2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 19 20:14:18 2016 -0500 Merge remote-tracking branch 'twstrike/options_test' src/test/test_options.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)

1 0

[snowflake/master] Use chan struct{} instead
by arlo＠torproject.org 19 Jan '16

19 Jan '16

commit dcb901e4086636b3ed3248096021f23bb4363cda Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Jan 19 13:41:19 2016 -0800 Use chan struct{} instead * Similar to a77ae6b771e5550b3a5370f7b1f2c0e434f4e9eb. --- server/snowflake.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/server/snowflake.go b/server/snowflake.go index 88eecca..1da419f 100644 --- a/server/snowflake.go +++ b/server/snowflake.go @@ -100,12 +100,12 @@ func datachannelHandler(conn *webRTCConn) { } // Create a PeerConnection from an SDP offer. Blocks until the gathering of ICE -// candidates is complete and and answer is available in LocalDescription. +// candidates is complete and the 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) + answerChan := make(chan struct{}) pc, err := webrtc.NewPeerConnection(config) if err != nil { @@ -115,7 +115,7 @@ func makePeerConnectionFromOffer(sdp *webrtc.SessionDescription, config *webrtc. panic("OnNegotiationNeeded") } pc.OnIceComplete = func() { - answerChan <- pc.LocalDescription() + answerChan <- struct{}{} } pc.OnDataChannel = func(dc *data.Channel) { log.Println("OnDataChannel") @@ -170,7 +170,11 @@ func makePeerConnectionFromOffer(sdp *webrtc.SessionDescription, config *webrtc. case err = <-errChan: pc.Close() return nil, err - case <-answerChan: + case _, ok := <-answerChan: + if !ok { + pc.Close() + return nil, fmt.Errorf("Failed gathering ICE candidates.") + } } return pc, nil

1 0

[snowflake/master] begin appengine rendezvous component - domain fronting works,
by arlo＠torproject.org 19 Jan '16

19 Jan '16

commit e4e068640f26bc070199bc9d7ba661bb14d2e25a Author: Serene Han <keroserene+git(a)gmail.com> Date: Mon Jan 18 10:53:22 2016 -0800 begin appengine rendezvous component - domain fronting works, although it just reflects the offer. next step is to retrieve browser proxy answer (#1) --- client/meek-webrtc.go | 19 +++++++++---- client/snowflake.go | 13 ++++++--- rendezvous/app.yaml | 10 +++++++ rendezvous/config.go | 16 +++++++++++ rendezvous/snowflake-reg.go | 65 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 113 insertions(+), 10 deletions(-) diff --git a/client/meek-webrtc.go b/client/meek-webrtc.go index d783781..927d4bf 100644 --- a/client/meek-webrtc.go +++ b/client/meek-webrtc.go @@ -5,6 +5,7 @@ package main import ( "bytes" "io/ioutil" + "log" "net/http" "net/url" @@ -31,8 +32,9 @@ func NewRequestInfo(meekUrl string, front string) *RequestInfo { return nil } info.URL = requestUrl - info.Host = info.URL.Host - info.URL.Host = front + info.Host = front + // info.URL.Host = front + // info.Host = info.URL.Host return info } @@ -57,13 +59,13 @@ func NewMeekChannel(info *RequestInfo) *MeekChannel { // Do an HTTP roundtrip using the payload data in buf. func (m *MeekChannel) roundTripHTTP(buf []byte) (*http.Response, error) { - req, err := http.NewRequest("POST", m.info.URL.String(), bytes.NewReader(buf)) + // Compose an innocent looking request. + req, err := http.NewRequest("POST", m.info.Host+"/reg/123", bytes.NewReader(buf)) if nil != err { return nil, err } - if "" != m.info.Host { - req.Host = m.info.Host - } + // Set actually desired target host. + req.Host = m.info.URL.String() // req.Header.Set("X-Session-Id", m.info.SessionID) return m.transport.RoundTrip(req) } @@ -78,7 +80,12 @@ func (m *MeekChannel) Negotiate(offer *webrtc.SessionDescription) ( return nil, err } defer resp.Body.Close() + log.Println("MeekChannel Response: ", resp) body, err := ioutil.ReadAll(resp.Body) + if nil != err { + return nil, err + } + log.Println("MeekChannel Body: ", string(body)) answer := webrtc.DeserializeSessionDescription(string(body)) return answer, nil } diff --git a/client/snowflake.go b/client/snowflake.go index b42b17d..7da1e15 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -25,8 +25,9 @@ import ( // Hard-coded meek signalling channel for now. // TODO: expose as param const ( - MEEK_URL = "not implemented yet" - FRONT_DOMAIN = "www.google.com" + MEEK_URL = "snowflake-reg.appspot.com" + FRONT_DOMAIN = "https://www.google.com" + // FRONT_DOMAIN = "https://www.google.com" ) var ptInfo pt.ClientInfo @@ -187,7 +188,11 @@ func dialWebRTC(config *webrtc.Configuration, meek *MeekChannel) ( // if nil == answer { // log.Printf("No answer received from meek channel.") // } else { - // signalChan <- answer + // // TODO: Once this is correct, uncomment and remove copy-paste + // // signalling. + // log.Println("Recieved answer from Meek channel: \n", + // answer.Serialize()) + // // signalChan <- answer // } if offerURL != "" { answer, err := sendOfferHTTP(offerURL, offer) @@ -207,7 +212,7 @@ func dialWebRTC(config *webrtc.Configuration, meek *MeekChannel) ( pc.Close() return nil, fmt.Errorf("no answer received") } - log.Printf("got answer %s", answer.Serialize()) + log.Printf("Received Answer: %s", answer.Serialize()) err = pc.SetRemoteDescription(answer) if err != nil { pc.Close() diff --git a/rendezvous/README.md b/rendezvous/README.md new file mode 100644 index 0000000..e69de29 diff --git a/rendezvous/app.yaml b/rendezvous/app.yaml new file mode 100644 index 0000000..14fcf0a --- /dev/null +++ b/rendezvous/app.yaml @@ -0,0 +1,10 @@ +# override this with appcfg.py -A $YOUR_APP_ID +application: snowflake-reg +version: 1 +runtime: go +api_version: go1 + +handlers: +- url: /.* + script: _go_app + secure: always diff --git a/rendezvous/config.go b/rendezvous/config.go new file mode 100644 index 0000000..eabbe65 --- /dev/null +++ b/rendezvous/config.go @@ -0,0 +1,16 @@ +/* +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_reg + +// host:port/basepath of the facilitator you want to register with +// for example, fp-facilitator.org or example.com:12345/facilitator +// https:// and /reg/ will be prepended and appended respectively. +const SNOWFLAKE_FACILITATOR = "" diff --git a/rendezvous/snowflake-reg.go b/rendezvous/snowflake-reg.go new file mode 100644 index 0000000..094612d --- /dev/null +++ b/rendezvous/snowflake-reg.go @@ -0,0 +1,65 @@ +package snowflake_reg + +import ( + // "io" + "io/ioutil" + "log" + "net" + "net/http" + "path" + + // "appengine" + // "appengine/urlfetch" +) + +// This is an intermediate step - a basic hardcoded appengine rendezvous +// to a single browser snowflake. + +var snowflakeProxy = "" + +func robotsTxtHandler(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Content-Type", "text/plain; charset=utf-8") + w.Write([]byte("User-agent: *\nDisallow:\n")) +} + +func ipHandler(w http.ResponseWriter, r *http.Request) { + remoteAddr := r.RemoteAddr + if net.ParseIP(remoteAddr).To4() == nil { + remoteAddr = "[" + remoteAddr + "]" + } + w.Header().Set("Content-Type", "text/plain; charset=utf-8") + w.Write([]byte(remoteAddr)) +} + +/* +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) + return + } + body, err := ioutil.ReadAll(r.Body) + if nil != err { + return + log.Println("Invalid data.") + } + + // TODO: Get browser snowflake to talkto this appengine instance + // so it can reply with an answer, and not just the offer again :) + // TODO: Real facilitator which matches clients and snowflake proxies. + w.Write(body) +} + +func init() { + http.HandleFunc("/robots.txt", robotsTxtHandler) + http.HandleFunc("/ip", ipHandler) + http.HandleFunc("/reg/", regHandler) + // if SNOWFLAKE_FACILITATOR == "" { + // panic("SNOWFLAKE_FACILITATOR empty; did you forget to edit config.go?") + // } +}

1 0

[translation/tails-perl5lib_completed] Update translations for tails-perl5lib_completed
by translation＠torproject.org 19 Jan '16

19 Jan '16

commit 01950f634c52041b10c1cd22b7df20d17ca84161 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 19 20:46:14 2016 +0000 Update translations for tails-perl5lib_completed --- fr.po | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/fr.po b/fr.po index 6fc7603..ebce126 100644 --- a/fr.po +++ b/fr.po @@ -3,22 +3,33 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Bronner Matthieu <mat.bronner(a)hotmail.fr>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2013-11-28 11:56+0100\n" -"PO-Revision-Date: 2013-12-30 04:50+0000\n" -"Last-Translator: Phoul <colin(a)torproject.org>\n" -"Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" +"POT-Creation-Date: 2016-01-11 15:40+0100\n" +"PO-Revision-Date: 2016-01-19 20:40+0000\n" +"Last-Translator: Bronner Matthieu <mat.bronner(a)hotmail.fr>\n" +"Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../lib/Tails/RunningSystem.pm:139 +#: ../lib/Tails/RunningSystem.pm:159 +msgid "Error" +msgstr "Erreur" + +#: ../lib/Tails/RunningSystem.pm:161 msgid "" "The device Tails is running from cannot be found. Maybe you used the `toram'" " option?" -msgstr "Le périphérique depuis lequel Tails fonctionne n’a pas été trouvé. Peut-être avez-vous utilisé l’option “toram” ?" +msgstr "Le périphérique depuis lequel Tails est exécuté n’a pas été trouvé. Peut-être avez-vous utilisé l’option “toram” ?" + +#: ../lib/Tails/RunningSystem.pm:192 +msgid "" +"The drive Tails is running from cannot be found. Maybe you used the `toram' " +"option?" +msgstr "Le périphérique depuis lequel Tails est exécuté n’a pas été trouvé. Peut-être avez-vous utilisé l’option “toram” ?"

1 0

[translation/tails-perl5lib] Update translations for tails-perl5lib
by translation＠torproject.org 19 Jan '16

19 Jan '16

commit 675f0be7b7545df132f836a1de8ac87fcd44fc7a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 19 20:46:09 2016 +0000 Update translations for tails-perl5lib --- fr.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fr.po b/fr.po index 9dd25d4..ebce126 100644 --- a/fr.po +++ b/fr.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Bronner Matthieu <mat.bronner(a)hotmail.fr>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-01-11 15:40+0100\n" -"PO-Revision-Date: 2016-01-12 08:13+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-01-19 20:40+0000\n" +"Last-Translator: Bronner Matthieu <mat.bronner(a)hotmail.fr>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,16 +20,16 @@ msgstr "" #: ../lib/Tails/RunningSystem.pm:159 msgid "Error" -msgstr "" +msgstr "Erreur" #: ../lib/Tails/RunningSystem.pm:161 msgid "" "The device Tails is running from cannot be found. Maybe you used the `toram'" " option?" -msgstr "Le périphérique depuis lequel Tails fonctionne n’a pas été trouvé. Peut-être avez-vous utilisé l’option “toram” ?" +msgstr "Le périphérique depuis lequel Tails est exécuté n’a pas été trouvé. Peut-être avez-vous utilisé l’option “toram” ?" #: ../lib/Tails/RunningSystem.pm:192 msgid "" "The drive Tails is running from cannot be found. Maybe you used the `toram' " "option?" -msgstr "" +msgstr "Le périphérique depuis lequel Tails est exécuté n’a pas été trouvé. Peut-être avez-vous utilisé l’option “toram” ?"

1 0