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

[websocket/master] Fix typos in server example.
by dcf＠torproject.org 27 Oct '13

27 Oct '13

commit cf2bb29d664de3aa45dd679607056a94cb43ed91 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Oct 26 16:54:37 2013 -0700 Fix typos in server example. --- src/pt/pt.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pt/pt.go b/src/pt/pt.go index 0994131..9ff9437 100644 --- a/src/pt/pt.go +++ b/src/pt/pt.go @@ -15,9 +15,9 @@ // // import "git.torproject.org/pluggable-transports/websocket.git/src/pt" // var ptInfo pt.ServerInfo -// info = pt.ServerSetup([]string{"foo", "bar"}) -// for _, bindAddr := range info.BindAddrs { -// ln, err := startListener(bindAddr.Addr) +// ptInfo = pt.ServerSetup([]string{"foo", "bar"}) +// for _, bindAddr := range ptInfo.BindAddrs { +// ln, err := startListener(bindAddr.Addr, bindAddr.MethodName) // if err != nil { // pt.SmethodError(bindAddr.MethodName, err.Error()) // continue @@ -25,7 +25,7 @@ // pt.Smethod(bindAddr.MethodName, ln.Addr()) // } // pt.SmethodsDone() -// func handler(conn net.Conn, methodName) { +// func handler(conn net.Conn, methodName string) { // or, err := pt.ConnectOr(&ptInfo, conn, methodName) // if err != nil { // return

1 0

[websocket/master] Add dummy server example.
by dcf＠torproject.org 27 Oct '13

27 Oct '13

commit 2933979a66bd70809a12a1137cfa9e109fc27914 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Oct 26 17:01:54 2013 -0700 Add dummy server example. --- src/pt/.gitignore | 1 + src/pt/examples/dummy-server/dummy-server.go | 121 ++++++++++++++++++++++++++ 2 files changed, 122 insertions(+) diff --git a/src/pt/.gitignore b/src/pt/.gitignore index bdcad5a..beb9ac5 100644 --- a/src/pt/.gitignore +++ b/src/pt/.gitignore @@ -1 +1,2 @@ /examples/dummy-client +/examples/dummy-server diff --git a/src/pt/examples/dummy-server/dummy-server.go b/src/pt/examples/dummy-server/dummy-server.go new file mode 100644 index 0000000..26314d0 --- /dev/null +++ b/src/pt/examples/dummy-server/dummy-server.go @@ -0,0 +1,121 @@ +// Usage (in torrc): +// BridgeRelay 1 +// ORPort 9001 +// ExtORPort 6669 +// ServerTransportPlugin dummy exec dummy-server + +package main + +import ( + "io" + "net" + "os" + "os/signal" + "sync" + "syscall" +) + +import "git.torproject.org/pluggable-transports/websocket.git/src/pt" + +var ptInfo pt.ServerInfo + +// When a connection handler starts, +1 is written to this channel; when it +// ends, -1 is written. +var handlerChan = make(chan int) + +func copyLoop(a, b net.Conn) { + var wg sync.WaitGroup + wg.Add(2) + + go func() { + io.Copy(b, a) + wg.Done() + }() + go func() { + io.Copy(a, b) + wg.Done() + }() + + wg.Wait() +} + +func handleConnection(conn net.Conn) { + handlerChan <- 1 + defer func() { + handlerChan <- -1 + }() + + or, err := pt.ConnectOr(&ptInfo, conn, "dummy") + if err != nil { + return + } + copyLoop(conn, or) +} + +func acceptLoop(ln net.Listener) error { + for { + conn, err := ln.Accept() + if err != nil { + return err + } + go handleConnection(conn) + } + return nil +} + +func startListener(addr *net.TCPAddr) (net.Listener, error) { + ln, err := net.ListenTCP("tcp", addr) + if err != nil { + return nil, err + } + go acceptLoop(ln) + return ln, nil +} + +func main() { + ptInfo = pt.ServerSetup([]string{"dummy"}) + + listeners := make([]net.Listener, 0) + for _, bindAddr := range ptInfo.BindAddrs { + ln, err := startListener(bindAddr.Addr) + if err != nil { + pt.SmethodError(bindAddr.MethodName, err.Error()) + continue + } + pt.Smethod(bindAddr.MethodName, ln.Addr()) + listeners = append(listeners, ln) + } + pt.SmethodsDone() + + var numHandlers int = 0 + var sig os.Signal + sigChan := make(chan os.Signal, 1) + signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM) + + // wait for first signal + sig = nil + for sig == nil { + select { + case n := <-handlerChan: + numHandlers += n + case sig = <-sigChan: + } + } + for _, ln := range listeners { + ln.Close() + } + + if sig == syscall.SIGTERM { + return + } + + // wait for second signal or no more handlers + sig = nil + for sig == nil && numHandlers != 0 { + select { + case n := <-handlerChan: + numHandlers += n + case sig = <-sigChan: + } + } +}

1 0

[websocket/master] Add imports to examples.
by dcf＠torproject.org 27 Oct '13

27 Oct '13

commit 202774b271dc1a29d21005e348ce097ec9817594 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Oct 26 16:34:52 2013 -0700 Add imports to examples. --- src/pt/pt.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pt/pt.go b/src/pt/pt.go index 59543a4..0994131 100644 --- a/src/pt/pt.go +++ b/src/pt/pt.go @@ -2,6 +2,7 @@ // // Sample client usage: // +// import "git.torproject.org/pluggable-transports/websocket.git/src/pt" // pt.ClientSetup([]string{"foo"}) // ln, err := startSocksListener() // if err != nil { @@ -12,6 +13,7 @@ // // Sample server usage: // +// import "git.torproject.org/pluggable-transports/websocket.git/src/pt" // var ptInfo pt.ServerInfo // info = pt.ServerSetup([]string{"foo", "bar"}) // for _, bindAddr := range info.BindAddrs {

1 0

[websocket/master] Add dummy client example.
by dcf＠torproject.org 27 Oct '13

27 Oct '13

commit 808ac4a57123a3dbe8fe1dfebd2b2ec599219dd5 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Oct 26 16:31:09 2013 -0700 Add dummy client example. --- src/pt/.gitignore | 1 + src/pt/examples/dummy-client/dummy-client.go | 127 ++++++++++++++++++++++++++ 2 files changed, 128 insertions(+) diff --git a/src/pt/.gitignore b/src/pt/.gitignore new file mode 100644 index 0000000..bdcad5a --- /dev/null +++ b/src/pt/.gitignore @@ -0,0 +1 @@ +/examples/dummy-client diff --git a/src/pt/examples/dummy-client/dummy-client.go b/src/pt/examples/dummy-client/dummy-client.go new file mode 100644 index 0000000..7b69104 --- /dev/null +++ b/src/pt/examples/dummy-client/dummy-client.go @@ -0,0 +1,127 @@ +// Usage (in torrc): +// UseBridges 1 +// Bridge dummy X.X.X.X:YYYY +// ClientTransportPlugin dummy exec dummy-client +// Because this transport doesn't do anything to the traffic, you can use any +// ordinary relay's ORPort in the Bridge line. + +package main + +import ( + "io" + "net" + "os" + "os/signal" + "sync" + "syscall" +) + +import "git.torproject.org/pluggable-transports/websocket.git/src/pt" +import "git.torproject.org/pluggable-transports/websocket.git/src/pt/socks" + +// When a connection handler starts, +1 is written to this channel; when it +// ends, -1 is written. +var handlerChan = make(chan int) + +func copyLoop(a, b net.Conn) { + var wg sync.WaitGroup + wg.Add(2) + + go func() { + io.Copy(b, a) + wg.Done() + }() + go func() { + io.Copy(a, b) + wg.Done() + }() + + wg.Wait() +} + +func handleConnection(local net.Conn) error { + defer local.Close() + + handlerChan <- 1 + defer func() { + handlerChan <- -1 + }() + + var remote net.Conn + err := socks.AwaitSocks4aConnect(local.(*net.TCPConn), func(dest string) (*net.TCPAddr, error) { + var err error + // set remote in outer function environment + remote, err = net.Dial("tcp", dest) + if err != nil { + return nil, err + } + return remote.RemoteAddr().(*net.TCPAddr), nil + }) + if err != nil { + return err + } + defer remote.Close() + copyLoop(local, remote) + + return nil +} + +func acceptLoop(ln net.Listener) error { + for { + conn, err := ln.Accept() + if err != nil { + return err + } + go handleConnection(conn) + } + return nil +} + +func startListener(addr string) (net.Listener, error) { + ln, err := net.Listen("tcp", addr) + if err != nil { + return nil, err + } + go acceptLoop(ln) + return ln, nil +} + +func main() { + pt.ClientSetup([]string{"dummy"}) + ln, err := startListener("127.0.0.1:0") + if err != nil { + pt.CmethodError("dummy", err.Error()) + } + pt.Cmethod("dummy", "socks4", ln.Addr()) + pt.CmethodsDone() + + var numHandlers int = 0 + var sig os.Signal + sigChan := make(chan os.Signal, 1) + signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM) + + // wait for first signal + sig = nil + for sig == nil { + select { + case n := <-handlerChan: + numHandlers += n + case sig = <-sigChan: + } + } + ln.Close() + + if sig == syscall.SIGTERM { + return + } + + // wait for second signal or no more handlers + sig = nil + for sig == nil && numHandlers != 0 { + select { + case n := <-handlerChan: + numHandlers += n + case sig = <-sigChan: + } + } +}

1 0

[websocket/master] escape doesn't remove '\\'.
by dcf＠torproject.org 27 Oct '13

27 Oct '13

commit e0fedd184f513e31fd4faec966ee00e5fceeabae Author: David Fifield <david(a)bamsoftware.com> Date: Sat Oct 26 15:20:05 2013 -0700 escape doesn't remove '\\'. It uses '\\' to escape other dangerous characters. --- src/pt/pt.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pt/pt.go b/src/pt/pt.go index 6b40098..59543a4 100644 --- a/src/pt/pt.go +++ b/src/pt/pt.go @@ -64,7 +64,7 @@ func getenvRequired(key string) string { } // Escape a string so it contains no byte values over 127 and doesn't contain -// any of the characters '\x00', '\n', or '\\'. +// any of the characters '\x00' or '\n'. func escape(s string) string { var buf bytes.Buffer for _, b := range []byte(s) {

1 0

[websocket/master] Begin test program with tests for escape.
by dcf＠torproject.org 27 Oct '13

27 Oct '13

commit e2dcd4e884cd95ba471454cb77922d7322773b2b Author: David Fifield <david(a)bamsoftware.com> Date: Sat Oct 26 15:20:44 2013 -0700 Begin test program with tests for escape. The exact escaping of of escape is unspecified; it says only that it will encode so as to remove certain byte values. The idea is that you shouldn't be able to inject a line by sending '\n', or truncate one with '\0'. So the tests don't look for specific output values, only that they don't contain any forbidden bytes. --- src/pt/pt_test.go | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/src/pt/pt_test.go b/src/pt/pt_test.go new file mode 100644 index 0000000..baece70 --- /dev/null +++ b/src/pt/pt_test.go @@ -0,0 +1,40 @@ +package pt + +import "testing" + +func stringIsSafe(s string) bool { + for _, c := range []byte(s) { + if c == '\x00' || c == '\n' || c > 127 { + return false + } + } + return true +} + +func TestEscape(t *testing.T) { + tests := [...]string { + "", + "abc", + "a\nb", + "a\\b", + "ab\\", + "ab\\\n", + "ab\n\\", + } + + check := func (input string) { + output := escape(input) + if !stringIsSafe(output) { + t.Errorf("escape(%q) → %q", input, output) + } + } + for _, input := range tests { + check(input) + } + for b := 0; b < 256; b++ { + // check one-byte string with each byte value 0–255 + check(string([]byte{byte(b)})) + // check UTF-8 encoding of each character 0–255 + check(string(b)) + } +}

1 0

[check/master] Remove stray option.
by arlo＠torproject.org 27 Oct '13

27 Oct '13

commit d9af8c2cce847f999178eb61cfe8c0dbcf495305 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat Oct 26 14:51:40 2013 -0700 Remove stray option. --- public/index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/public/index.html b/public/index.html index 832ec99..1c1047a 100644 --- a/public/index.html +++ b/public/index.html @@ -8,7 +8,6 @@ <label for="lang" class="small">{{ GetText .Lang "This page is also available in the following languages:" }}</label> <select id="cl" name="lang"> {{ $out := . }} - <option value="en_US"> {{ range $k, $i := .Locales }} <option value="{{ $k }}" {{ if Equal $k $out.Lang }}selected="selected"{{ end }}>{{ $i | UnEscaped }}</option> {{ end }}

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 27 Oct '13

27 Oct '13

commit 6bb60cbfbf091d8b28c0c03b6e8530f569d996f6 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 26 21:45:59 2013 +0000 Update translations for torbirdy --- hi/torbirdy.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hi/torbirdy.dtd b/hi/torbirdy.dtd index 1aa76ac..95d1c55 100644 --- a/hi/torbirdy.dtd +++ b/hi/torbirdy.dtd @@ -19,7 +19,7 @@ <!ENTITY torbirdy.prefs.proxy.label ""> <!ENTITY torbirdy.prefs.privacy.label ""> <!ENTITY torbirdy.prefs.enigmail.label ""> -<!ENTITY torbirdy.prefs.security.label ""> +<!ENTITY torbirdy.prefs.security.label "सुरक्षा "> <!ENTITY torbirdy.prefs.recommended.text "टॉरबर्डी (टॉर) के लिए अनुशंसित प्रोक्सी पतिस्थितियों का प्रयोग करें"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "एक अज्ञातकृत सेवा चुनें"> @@ -55,7 +55,7 @@ <!ENTITY torbirdy.prefs.enigmail.keyserver.label ""> <!ENTITY torbirdy.prefs.enigmail.keyserver.key ""> -<!ENTITY torbirdy.panel.usetor.label ""> +<!ENTITY torbirdy.panel.usetor.label "Tor Onion Router का प्रयोग कीजिये."> <!ENTITY torbirdy.panel.usejondo.label ""> <!ENTITY torbirdy.panel.usewhonix.label ""> <!ENTITY torbirdy.panel.preferences.label "">

1 0

[check/master] Add setup instructions to the readme.
by arlo＠torproject.org 27 Oct '13

27 Oct '13

commit d9d7cbee7f1fed27f1fc3f75cb7e6ee827d6ad8a Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat Oct 26 14:39:32 2013 -0700 Add setup instructions to the readme. Assumes a base dir of /opt/check --- Makefile | 8 ++++---- Readme.md | 19 +++++++++++++++++++ scripts/cpexits.sh | 7 ++----- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index a9c6cbc..cb2a3e0 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ SHELL := /bin/bash -start: data/exit-policies data/langs i18n +start: exits i18n @./check rsync_server = metrics.torproject.org @@ -30,7 +30,7 @@ data/exit-addresses: data/exit-lists/ @rsync -avz $(rsync_server)::$(exit_lists_dir) --delete ./data/exit-lists/ @echo Exit lists written -data/exit-policies: data/consensus data/exit-addresses data/cached-descriptors +exits: data/consensus data/exit-addresses data/cached-descriptors @echo Generating exit-policies file @python scripts/exitips.py @echo Done @@ -68,7 +68,7 @@ bench: build profile: build go test -cpuprofile ../../cpu.prof -memprofile ../../mem.prof -benchtime 40s -bench "$(filter)" -i18n: locale/ +i18n: locale/ data/langs locale/: rm -rf locale @@ -88,4 +88,4 @@ install: build cp scripts/check.init /etc/init.d/check update-rc.d check defaults -.PHONY: start build i18n test bench cover profile descriptors install \ No newline at end of file +.PHONY: start build i18n exits test bench cover profile descriptors install \ No newline at end of file diff --git a/Readme.md b/Readme.md index 90632a4..2a58ac2 100644 --- a/Readme.md +++ b/Readme.md @@ -44,6 +44,25 @@ The data that `make start` pulls in will quickly become stale. What you want to Then setup a cron job to run a script like `scripts/cpexits.sh` every hour. Setting up TorDNSEL to get the exit addresses is beyond the scope of this readme. +## Setup + +Assuming debian, install the dependencies, + + apt-get install git golang gettext python-dateutil python-stem + go get github.com/samuel/go-gettext/gettext + +The cron job and init script assume a base directory of `/opt/check`. + + git clone https://git.torproject.org/check.git /opt/check + cd /opt/check + make i18n + make exits + make install + +Then you start it up, + + /etc/init.d/check start + ## Capacity planning > 54.7 requests/sec - 47.0 kB/second - 879 B/request diff --git a/scripts/cpexits.sh b/scripts/cpexits.sh index 109ccfc..fb9da8e 100755 --- a/scripts/cpexits.sh +++ b/scripts/cpexits.sh @@ -1,9 +1,6 @@ #!/usr/bin/env bash -HOME=/home/arlo -GIT=$HOME/git -TAR=$HOME/tar -CHECK=$GIT/check +CHECK=/opt/check TORDATA=/srv/tor DNSEL=/srv/tordnsel.torproject.org/state NOW=$(date +"%Y-%m-%d-%H-%M-%S") @@ -13,5 +10,5 @@ cp $TORDATA/cached-consensus $CHECK/data/consensuses/$NOW-consensus cat $TORDATA/cached-descriptors $TORDATA/cached-descriptors.new > $CHECK/data/cached-descriptors cd $CHECK -PYTHONPATH=$GIT/stem:$TAR/six:$TAR/dateutil scripts/exitips.py -n 1 +scripts/exitips.py -n 1 kill -s SIGUSR2 `cat check.pid`

1 0

[check/master] Specify shell in makefile.
by arlo＠torproject.org 26 Oct '13

26 Oct '13

commit bbd59d691b9b7657e6ec9bafff719fd5f6e452dd Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat Oct 26 13:56:43 2013 -0700 Specify shell in makefile. pushd / popd require it. --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 64835b4..a9c6cbc 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,5 @@ +SHELL := /bin/bash + start: data/exit-policies data/langs i18n @./check

1 0