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

[meek/extension] Make requests through the browser extension.
by dcf＠torproject.org 18 Mar '14

18 Mar '14

commit 7f449eaa782be553a0be98ef5e6956c8d6d1ffc3 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 18 10:31:07 2014 -0700 Make requests through the browser extension. --- meek-client/meek-client.go | 91 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 1 deletion(-) diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index 94314cf..cfb475f 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -4,10 +4,13 @@ import ( "bytes" "crypto/rand" "encoding/base64" + "encoding/binary" + "encoding/json" "errors" "flag" "fmt" "io" + "io/ioutil" "log" "net" "net/http" @@ -26,6 +29,7 @@ const maxPayloadLength = 0x10000 const initPollInterval = 100 * time.Millisecond const maxPollInterval = 5 * time.Second const pollIntervalMultiplier = 1.5 +const maxHelperResponseLength = 10000000 var ptInfo pt.ClientInfo @@ -75,8 +79,93 @@ func roundTrip(buf []byte, info *RequestInfo) (*http.Response, error) { return tr.RoundTrip(req) } +type JSONRequest struct { + Method string `json:"method,omitempty"` + URL string `json:"url,omitempty"` + Header map[string]string `json:"header,omitempty"` + Body []byte `json:"body,omitempty"` +} + +type JSONResponse struct { + Error string `json:"error,omitempty"` + Status int `json:"status"` + Body []byte `json:"body"` +} + +// Ask a locally running browser extension to make the request for us. +func roundTripWithHelper(buf []byte, info *RequestInfo) (*http.Response, error) { + s, err := net.Dial("tcp", "127.0.0.1:7000") + if err != nil { + return nil, err + } + defer s.Close() + + // Encode our JSON. + req := JSONRequest{ + Method: "POST", + URL: info.URL.String(), + Header: make(map[string]string), + Body: buf, + } + req.Header["X-Session-Id"] = info.SessionID + if info.Host != "" { + req.Header["Host"] = info.Host + } + encReq, err := json.Marshal(&req) + if err != nil { + return nil, err + } + // log.Printf("encoded %s", encReq) + + // Send the request. + err = binary.Write(s, binary.BigEndian, uint32(len(encReq))) + if err != nil { + return nil, err + } + _, err = s.Write(encReq) + if err != nil { + return nil, err + } + + // Read the response. + var length uint32 + err = binary.Read(s, binary.BigEndian, &length) + if err != nil { + return nil, err + } + if length > maxHelperResponseLength { + return nil, errors.New(fmt.Sprintf("helper's returned data is too big (%d > %d)", + length, maxHelperResponseLength)) + } + encResp := make([]byte, length) + _, err = io.ReadFull(s, encResp) + if err != nil { + return nil, err + } + // log.Printf("received %s", encResp) + + // Decode their JSON. + var jsonResp JSONResponse + err = json.Unmarshal(encResp, &jsonResp) + if err != nil { + return nil, err + } + if jsonResp.Error != "" { + return nil, errors.New(fmt.Sprintf("helper returned error: %s", jsonResp.Error)) + } + + // Mock up an HTTP response. + resp := http.Response{ + Status: http.StatusText(jsonResp.Status), + StatusCode: jsonResp.Status, + Body: ioutil.NopCloser(bytes.NewReader(jsonResp.Body)), + ContentLength: int64(len(jsonResp.Body)), + } + return &resp, nil +} + func sendRecv(buf []byte, conn net.Conn, info *RequestInfo) (int64, error) { - resp, err := roundTrip(buf, info) + resp, err := roundTripWithHelper(buf, info) if err != nil { return 0, err }

1 0

[meek/extension] Add a commented --helper example to torrc.
by dcf＠torproject.org 18 Mar '14

18 Mar '14

commit fbe35e1787c635b4785e8438170be37d3a090f57 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 18 10:43:50 2014 -0700 Add a commented --helper example to torrc. --- meek-client/torrc | 1 + 1 file changed, 1 insertion(+) diff --git a/meek-client/torrc b/meek-client/torrc index e839a4c..62f2c72 100644 --- a/meek-client/torrc +++ b/meek-client/torrc @@ -2,5 +2,6 @@ UseBridges 1 # Bridge meek 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com # ClientTransportPlugin meek exec ./meek-client --log meek-client.log Bridge meek 0.0.2.0:1 +# ClientTransportPlugin meek exec ./meek-client --url=https://meek-reflect.appspot.com/ --front=www.google.com --log meek-client.log --helper 127.0.0.1:7000 ClientTransportPlugin meek exec ./meek-client --url=https://meek-reflect.appspot.com/ --front=www.google.com --log meek-client.log DataDirectory datadir

1 0

[meek/extension] Explain a bit what is going on.
by dcf＠torproject.org 18 Mar '14

18 Mar '14

commit 87b4c76a960a1626204cf8cd16fe8217fddd9a57 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 18 11:00:50 2014 -0700 Explain a bit what is going on. --- firefox/components/main.js | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/firefox/components/main.js b/firefox/components/main.js index 8bda493..85ec543 100644 --- a/firefox/components/main.js +++ b/firefox/components/main.js @@ -1,3 +1,33 @@ +// This is an extension that allows external programs to make HTTP requests +// using the browser's networking libraries. +// +// The extension opens a TCP socket listening on localhost (port 7000). When it +// receives a connection, it reads a 4-byte big-endian length field, then tries +// to read that many bytes of data. The data is UTF-8–encoded JSON, having the +// format +// { +// "method": "POST", +// "url": "https://www.google.com/", +// "header": { +// "Host": "meek-reflect.appspot.com", +// "X-Session-Id": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"} +// } +// } +// The extension makes the request as commanded. It returns the response to the +// client as a JSON blob, preceded by a 4-byte length as before. If successful, +// the response looks like +// { +// "status": 200, +// "body": "...base64..." +// } +// If there is a network error, the "error" key will be defined. A 404 response +// or similar from the target web server is not considered such an error. +// { +// "error": "NS_ERROR_UNKNOWN_HOST" +// } +// The extension closes the connectionn after each transaction, and the client +// must reconnect to do another request. + // https://developer.mozilla.org/en-US/docs/How_to_Build_an_XPCOM_Component_in… // https://developer.mozilla.org/en-US/docs/Mozilla/JavaScript_code_modules/XP… Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");

1 0

[meek/extension] Put timeouts on helper interaction.
by dcf＠torproject.org 18 Mar '14

18 Mar '14

commit 2d766407d82ee4ff9329041dc803301a5adace1c Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 18 11:04:47 2014 -0700 Put timeouts on helper interaction. --- meek-client/meek-client.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index 1f64d9e..930b123 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -30,6 +30,8 @@ const initPollInterval = 100 * time.Millisecond const maxPollInterval = 5 * time.Second const pollIntervalMultiplier = 1.5 const maxHelperResponseLength = 10000000 +const helperReadTimeout = 60 * time.Second +const helperWriteTimeout = 2 * time.Second var ptInfo pt.ClientInfo @@ -119,6 +121,7 @@ func roundTripWithHelper(buf []byte, info *RequestInfo) (*http.Response, error) // log.Printf("encoded %s", encReq) // Send the request. + s.SetWriteDeadline(time.Now().Add(helperWriteTimeout)) err = binary.Write(s, binary.BigEndian, uint32(len(encReq))) if err != nil { return nil, err @@ -130,6 +133,7 @@ func roundTripWithHelper(buf []byte, info *RequestInfo) (*http.Response, error) // Read the response. var length uint32 + s.SetReadDeadline(time.Now().Add(helperReadTimeout)) err = binary.Read(s, binary.BigEndian, &length) if err != nil { return nil, err

1 0

[meek/master] Add missing paren in --help output.
by dcf＠torproject.org 18 Mar '14

18 Mar '14

commit a9d6ce933f6512b12d563f711f5d67d4ee69e571 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 18 10:36:48 2014 -0700 Add missing paren in --help output. --- meek-client/meek-client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index 94314cf..b361c79 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -219,7 +219,7 @@ func main() { var err error flag.StringVar(&options.Front, "front", "", "front domain name if no front= SOCKS arg") - flag.StringVar(&httpProxy, "http-proxy", "", "HTTP proxy URL (default from HTTP_PROXY environment variable") + flag.StringVar(&httpProxy, "http-proxy", "", "HTTP proxy URL (default from HTTP_PROXY environment variable)") flag.StringVar(&logFilename, "log", "", "name of log file") flag.StringVar(&options.URL, "url", "", "URL to request if no url= SOCKS arg") flag.Parse()

1 0

[stem/master] Lowering logging about undelivered messages to the info level
by atagar＠torproject.org 18 Mar '14

18 Mar '14

commit 207dba02d6adcf794b19e00b330548348c950878 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Mar 18 09:48:50 2014 -0700 Lowering logging about undelivered messages to the info level Our BaseController's test_msg_repeatedly integ test hammers the holy bejezus out of our controller socket in the hope of triggering exotic concurrency issues that might lead to issues like deadlock. This has been an impressively great test at ferreting out exotic issues and this is no different. Our Jenkins tests frequently log... 03/12/2014 15:37:57 [NOTICE] BUG: the msg() function failed to deliver a response: Authentication required. After a couple hours of looking into this I gotta admit that I'm frustrated by the delicacy of our message handling. It works great in practice, but in theory issues such as socket errors or edge cases can cause undelivered messages. In this case rapidly connecting and closing the socket while simultaneously communicating on it causes the socket's recv() to occasionally raise exceptions. These exceptions are reported to callers, leaving enqueued messages that end up being undelivered (logging this notice). After much head scratching and digging into our socket class I've come to the realization that this is about as good as it's gonna get. If we use our recv queue to communicate *both* messages and exceptions then it is to be expected that exceptions can sometimes result in undelivered messages. Lowering the severity of the log message appropriately. --- stem/control.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/stem/control.py b/stem/control.py index 4d7f5b3..0d91587 100644 --- a/stem/control.py +++ b/stem/control.py @@ -346,9 +346,20 @@ class BaseController(object): # # - This is a leftover response for a msg() call. We can't tell who an # exception was earmarked for, so we only know that this was the case - # if it's a ControlMessage. This should not be possible and indicates - # a stem bug. This deserves a NOTICE level log message since it - # indicates that one of our callers didn't get their reply. + # if it's a ControlMessage. + # + # This is the most concerning situation since it indicates that one of + # our callers didn't get their reply. However, this is still a + # perfectly viable use case. For instance... + # + # 1. We send a request. + # 2. The reader thread encounters an exception, for instance a socket + # error. We enqueue the exception. + # 3. The reader thread receives the reply. + # 4. We raise the socket error, and have an undelivered message. + # + # Thankfully this only seems to arise in edge cases around rapidly + # closing/reconnecting the socket. while not self._reply_queue.empty(): try: @@ -361,7 +372,7 @@ class BaseController(object): elif isinstance(response, stem.ControllerError): log.info("Socket experienced a problem (%s)" % response) elif isinstance(response, stem.response.ControlMessage): - log.notice("BUG: the msg() function failed to deliver a response: %s" % response) + log.info("Failed to deliver a response: %s" % response) except Queue.Empty: # the empty() method is documented to not be fully reliable so this # isn't entirely surprising

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 18 Mar '14

18 Mar '14

commit f4f2e90cc062fdb0720426af9f7f9c32cc194f0c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 18 14:45:54 2014 +0000 Update translations for torbutton-torbuttondtd --- pl/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pl/torbutton.dtd b/pl/torbutton.dtd index bb88dbe..bc8cccf 100644 --- a/pl/torbutton.dtd +++ b/pl/torbutton.dtd @@ -16,7 +16,7 @@ <!ENTITY torbutton.about.code "Wkłady kodu:"> <!ENTITY torbutton.about.maintainer "Opiekun:"> <!ENTITY torbutton.about.security_review "Przegląd bezpieczeństwa:"> -<!ENTITY torbutton.about.donate "Jeśil lubisz korzystać z Tora, możesz rozważyć"> +<!ENTITY torbutton.about.donate "Jeśli lubisz korzystać z Tora, możesz rozważyć"> <!ENTITY torbutton.about.make_donation "złożenie dotacji."> <!ENTITY torbutton.pref_connection.notice "Aby zmienić te ustawienia wyłącz Torbutton."> <!ENTITY torbutton.pref_connection.more_info "Więcej informacji">

1 0

[translation/torbutton-branddtd_completed] Update translations for torbutton-branddtd_completed
by translation＠torproject.org 18 Mar '14

18 Mar '14

commit ca025f3b1663530978af79150564fa1f1cb6e1e4 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 18 14:45:47 2014 +0000 Update translations for torbutton-branddtd_completed --- pl/brand.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pl/brand.dtd b/pl/brand.dtd index 4cc23fd..5f8db34 100644 --- a/pl/brand.dtd +++ b/pl/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "PrzeglądarkaTor'a"> -<!ENTITY brandFullName "Przeglądarka Tor'a"> +<!ENTITY brandShortName "Przeglądarka Tor"> +<!ENTITY brandFullName "Przeglądarka Tor"> <!ENTITY vendorShortName "Project Tor"> <!ENTITY trademarkInfo.part1 "Firefox i jego loga są znakami towarowymi Mozilla Foundation.">

1 0

[translation/torbutton-branddtd] Update translations for torbutton-branddtd
by translation＠torproject.org 18 Mar '14

18 Mar '14

commit 676d385a6da2e987258c94a88828dcbf2066305b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 18 14:45:45 2014 +0000 Update translations for torbutton-branddtd --- pl/brand.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pl/brand.dtd b/pl/brand.dtd index 4cc23fd..5f8db34 100644 --- a/pl/brand.dtd +++ b/pl/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "PrzeglądarkaTor'a"> -<!ENTITY brandFullName "Przeglądarka Tor'a"> +<!ENTITY brandShortName "Przeglądarka Tor"> +<!ENTITY brandFullName "Przeglądarka Tor"> <!ENTITY vendorShortName "Project Tor"> <!ENTITY trademarkInfo.part1 "Firefox i jego loga są znakami towarowymi Mozilla Foundation.">

1 0

[translation/torbutton-brandproperties_completed] Update translations for torbutton-brandproperties_completed
by translation＠torproject.org 18 Mar '14

18 Mar '14

commit 9348bbe5261f9f0421acd1ddb350443a62d19aac Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 18 14:45:43 2014 +0000 Update translations for torbutton-brandproperties_completed --- pl/brand.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pl/brand.properties b/pl/brand.properties index 6283369..d40c141 100644 --- a/pl/brand.properties +++ b/pl/brand.properties @@ -2,8 +2,8 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=PrzeglądarkaTor'a -brandFullName=Przeglądarka Tor'a +brandShortName=Przeglądarka Tor +brandFullName=Przeglądarka Tor vendorShortName=Project Tor homePageSingleStartMain=Firefox Start, szybka strona domowa z wbudowana wyszukiwarką

1 0