October 2017 - tor-commits - lists.torproject.org

[snowflake/master] Keep track of clientAddr in statsChannel.
by dcf＠torproject.org 18 Oct '17

18 Oct '17

commit 58556dc07bfba1c25687f2286d0f34319eabb125 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Oct 17 22:19:43 2017 -0700 Keep track of clientAddr in statsChannel. --- server/server.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/server/server.go b/server/server.go index fff5887..5379c7f 100644 --- a/server/server.go +++ b/server/server.go @@ -155,7 +155,13 @@ func webSocketHandler(ws *websocket.WebSocket) { // Pass the address of client as the remote address of incoming connection clientIPParam := ws.Request().URL.Query().Get("client_ip") - or, err := pt.DialOr(&ptInfo, clientAddr(clientIPParam), ptMethodName) + addr := clientAddr(clientIPParam) + if addr == "" { + statsChannel <- false + } else { + statsChannel <- true + } + or, err := pt.DialOr(&ptInfo, addr, ptMethodName) if err != nil { log.Printf("failed to connect to ORPort: %s", err)

1 0

[snowflake/master] Actually call clientAddr.
by dcf＠torproject.org 18 Oct '17

18 Oct '17

commit 46977461207a5670619def77aac9d364e94c2d53 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Oct 17 22:19:23 2017 -0700 Actually call clientAddr. --- server/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/server.go b/server/server.go index 1b33661..fff5887 100644 --- a/server/server.go +++ b/server/server.go @@ -155,7 +155,7 @@ func webSocketHandler(ws *websocket.WebSocket) { // Pass the address of client as the remote address of incoming connection clientIPParam := ws.Request().URL.Query().Get("client_ip") - or, err := pt.DialOr(&ptInfo, clientIPParam, ptMethodName) + or, err := pt.DialOr(&ptInfo, clientAddr(clientIPParam), ptMethodName) if err != nil { log.Printf("failed to connect to ORPort: %s", err)

1 0

[snowflake/master] Factor out a function to extract the client IP address.
by dcf＠torproject.org 18 Oct '17

18 Oct '17

commit 83f87120788c2c25f9c8ac1363711d5146c097d9 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Oct 17 21:39:04 2017 -0700 Factor out a function to extract the client IP address. --- server/server.go | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/server/server.go b/server/server.go index 562ccf8..29e8137 100644 --- a/server/server.go +++ b/server/server.go @@ -128,6 +128,16 @@ func proxy(local *net.TCPConn, conn *webSocketConn) { wg.Wait() } +// Return an address string suitable to pass into pt.DialOr. +func clientAddr(clientIPParam string) string { + // Check if client addr is a valid IP + clientIP := net.ParseIP(clientIPParam) + if clientIP == nil { + return "" + } + return clientIPParam +} + func webSocketHandler(ws *websocket.WebSocket) { // Undo timeouts on HTTP request handling. ws.Conn.SetDeadline(time.Time{}) @@ -139,17 +149,9 @@ func webSocketHandler(ws *websocket.WebSocket) { handlerChan <- -1 }() - // Check if client addr is a valid IP - addr := ws.Request().URL.Query().Get("client_ip") - clientIP := net.ParseIP(addr) - - if clientIP == nil { - // Set client addr to empty - addr = "" - } - // Pass the address of client as the remote address of incoming connection - or, err := pt.DialOr(&ptInfo, addr, ptMethodName) + clientIPParam := ws.Request().URL.Query().Get("client_ip") + or, err := pt.DialOr(&ptInfo, clientIPParam, ptMethodName) if err != nil { log.Printf("failed to connect to ORPort: %s", err)

1 0

[snowflake/master] Log once a day how many connections had client_ip.
by dcf＠torproject.org 18 Oct '17

18 Oct '17

commit d9e8f8f6479a8b4abe31eb5bfb9023de1bbca8af Author: David Fifield <david(a)bamsoftware.com> Date: Tue Oct 17 21:45:36 2017 -0700 Log once a day how many connections had client_ip. This is a sanity check against any catastrophic failure of our parsing code. --- server/server.go | 2 ++ server/stats.go | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/server/server.go b/server/server.go index 3c97e06..1b33661 100644 --- a/server/server.go +++ b/server/server.go @@ -269,6 +269,8 @@ func main() { log.Fatalf("error in setup: %s", err) } + go statsThread() + var certManager *autocert.Manager if !disableTLS { log.Printf("ACME hostnames: %q", acmeHostnames) diff --git a/server/stats.go b/server/stats.go new file mode 100644 index 0000000..1aeefb5 --- /dev/null +++ b/server/stats.go @@ -0,0 +1,42 @@ +package main + +// This code handled periodic statistics logging. +// +// The only thing it keeps track of is how many connections had the client_ip +// parameter. Write true to statsChannel to record a connection with client_ip; +// write false for without. + +import ( + "log" + "time" +) + +const ( + statsInterval = 24 * time.Hour +) + +var ( + statsChannel = make(chan bool) +) + +func statsThread() { + var numClientIP, numConnections uint64 + prevTime := time.Now() + for { + select { + case v := <-statsChannel: + if v { + numClientIP += 1 + } + numConnections += 1 + case <-time.After(statsInterval): + now := time.Now() + log.Printf("in the past %.g s, %d/%d connections had client_ip", + (now.Sub(prevTime)).Seconds(), + numClientIP, numConnections) + numClientIP = 0 + numConnections = 0 + prevTime = now + } + } +}

1 0

[snowflake/master] Rough tests for the clientAddr function.
by dcf＠torproject.org 18 Oct '17

18 Oct '17

commit 1ef6211c6c00101e6f0355f83168681b5fd65bfc Author: David Fifield <david(a)bamsoftware.com> Date: Tue Oct 17 22:09:58 2017 -0700 Rough tests for the clientAddr function. --- server/server_test.go | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/server/server_test.go b/server/server_test.go new file mode 100644 index 0000000..84ac7ba --- /dev/null +++ b/server/server_test.go @@ -0,0 +1,49 @@ +package main + +import ( + "net" + "strconv" + "testing" +) + +func TestClientAddr(t *testing.T) { + // good tests + for _, test := range []struct { + input string + expected net.IP + }{ + {"1.2.3.4", net.ParseIP("1.2.3.4")}, + {"1:2::3:4", net.ParseIP("1:2::3:4")}, + } { + useraddr := clientAddr(test.input) + host, port, err := net.SplitHostPort(useraddr) + if err != nil { + t.Errorf("clientAddr(%q) → SplitHostPort error %v", test.input, err) + continue + } + if !test.expected.Equal(net.ParseIP(host)) { + t.Errorf("clientAddr(%q) → host %q, not %v", test.input, host, test.expected) + } + portNo, err := strconv.Atoi(port) + if err != nil { + t.Errorf("clientAddr(%q) → port %q", test.input, port) + continue + } + if portNo == 0 { + t.Errorf("clientAddr(%q) → port %d", test.input, portNo) + } + } + + // bad tests + for _, input := range []string{ + "", + "abc", + "1.2.3.4.5", + "[12::34]", + } { + useraddr := clientAddr(input) + if useraddr != "" { + t.Errorf("clientAddr(%q) → %q, not %q", input, useraddr, "") + } + } +}

1 0

[snowflake/master] Add a dummy port number to USERADDR.
by dcf＠torproject.org 18 Oct '17

18 Oct '17

commit c84e1a2e034bb3e2e454389cf9e8fd71d2d8d040 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Oct 17 21:41:24 2017 -0700 Add a dummy port number to USERADDR. Current versions of tor accept USERADDR with or without a port number, but future versions may become more strict and require the port number. https://bugs.torproject.org/23080 --- server/server.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/server.go b/server/server.go index 29e8137..3c97e06 100644 --- a/server/server.go +++ b/server/server.go @@ -130,12 +130,16 @@ func proxy(local *net.TCPConn, conn *webSocketConn) { // Return an address string suitable to pass into pt.DialOr. func clientAddr(clientIPParam string) string { + if clientIPParam == "" { + return "" + } // Check if client addr is a valid IP clientIP := net.ParseIP(clientIPParam) if clientIP == nil { return "" } - return clientIPParam + // Add a dummy port number. USERADDR requires a port number. + return (&net.TCPAddr{IP: clientIP, Port: 1, Zone: ""}).String() } func webSocketHandler(ws *websocket.WebSocket) {

1 0

[webwml/master] looks like omidyar.net has expired. long live omidyar.com.
by arma＠torproject.org 18 Oct '17

18 Oct '17

commit 53c0f817d7cefad1e80f9fd65381fa7580ef0253 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Oct 17 23:51:32 2017 -0400 looks like omidyar.net has expired. long live omidyar.com. --- about/en/sponsors.wml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/about/en/sponsors.wml b/about/en/sponsors.wml index 37c6fdbe..556e6fcb 100644 --- a/about/en/sponsors.wml +++ b/about/en/sponsors.wml @@ -69,8 +69,8 @@ <li><a href="http://chacs.nrl.navy.mil/">DARPA and ONR via Naval Research Laboratory</a> (2001-2006)</li> <li><a href="http://www.cyber-ta.org/">Cyber-TA project</a> (2006-2008)</li> <li>Bell Security Solutions Inc (2006)</li> - <li><a href="http://www.omidyar.net/">Omidyar Network Enzyme Grant</a> (2006)</li> - <li><a href="http://seclab.cs.rice.edu/lab/2005/08/01/seclab-awarded-grant-to-study-secu…">NSF via Rice University</a> (2006-2007)</li> + <li><a href="https://www.omidyar.com/">Omidyar Network Enzyme Grant</a> (2006)</li> + <li><a href="https://nsf.gov/">NSF via Rice University</a> (2006-2007)</li> </ul> <p>This sponsors page is based upon un-audited and un-reviewed

1 0

[collector/master] Bump version to 1.4.0-dev.
by karsten＠torproject.org 17 Oct '17

17 Oct '17

commit ebb13b12d0ae492ef7f30638c4aaea29cea3af45 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Oct 17 21:22:04 2017 +0200 Bump version to 1.4.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 7cbff44..c4f4bd0 100644 --- a/build.xml +++ b/build.xml @@ -8,7 +8,7 @@ <property name="javadoc-title" value="CollecTor API Documentation"/> <property name="implementation-title" value="CollecTor" /> - <property name="release.version" value="1.4.0" /> + <property name="release.version" value="1.4.0-dev" /> <property name="project-main-class" value="org.torproject.collector.Main" /> <property name="name" value="collector"/> <property name="metricslibversion" value="2.1.1" />

1 0

[metrics-lib/master] Bump version to 2.1.1-dev.
by karsten＠torproject.org 17 Oct '17

17 Oct '17

commit 03bc88c23bee7e5bdea45987252ed5b6d28dbcf1 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Oct 17 21:21:18 2017 +0200 Bump version to 2.1.1-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index badaf37..72c1de1 100644 --- a/build.xml +++ b/build.xml @@ -6,7 +6,7 @@ <project default="usage" name="metrics-lib" basedir="."> - <property name="release.version" value="2.1.1" /> + <property name="release.version" value="2.1.1-dev" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/** **/internal/** **/log/**" /> <property name="implementation-title" value="Tor Metrics Library" />

1 0

[onionoo/master] Bump version to 4.2-1.6.0-dev.
by karsten＠torproject.org 17 Oct '17

17 Oct '17

commit da9fe314bfa089536dbbd4901b737e36bd5b9cc6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Oct 17 21:19:46 2017 +0200 Bump version to 4.2-1.6.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index ee3c0da..5f072bb 100644 --- a/build.xml +++ b/build.xml @@ -10,7 +10,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="4.2"/> <property name="release.version" - value="${onionoo.protocol.version}-1.6.0"/> + value="${onionoo.protocol.version}-1.6.0-dev"/> <property name="metricslibversion" value="2.1.1"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0