July 2012 - tor-commits - lists.torproject.org

[flashproxy/master] Use the 0.0.0.0:1 for the dummy Bridge address.
by dcf＠torproject.org 05 Jul '12

05 Jul '12

commit bf51cf0b761214e39f635d14451582d27a8915ab Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jul 5 07:36:52 2012 -0700 Use the 0.0.0.0:1 for the dummy Bridge address. It was more confusing when we used the same address as the client transport plugin's listening address; it wasn't clear which one was actually used and which was ignored. --- README | 2 +- doc/design.txt | 2 +- experiments/exercise/exercise.sh | 2 +- torrc | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README b/README index d14c9cc..f26d0c5 100644 --- a/README +++ b/README @@ -77,7 +77,7 @@ public instance of it. This way is not as realistic because all your Tor traffic will first go to a fixed address and can be easily blocked. However this is an easy way to try out the system without having to do port forwarding. - $ tor ClientTransportPlugin "websocket socks4 tor-facilitator.bamsoftware.com:9999" UseBridges 1 Bridge "websocket 127.0.0.1:9001" LearnCircuitBuildTimeout 0 + $ tor ClientTransportPlugin "websocket socks4 tor-facilitator.bamsoftware.com:9999" UseBridges 1 Bridge "websocket 0.0.0.0:1" LearnCircuitBuildTimeout 0 == Troubleshooting diff --git a/doc/design.txt b/doc/design.txt index 7520cb5..5f58cc9 100644 --- a/doc/design.txt +++ b/doc/design.txt @@ -86,7 +86,7 @@ Design of flash proxies sufficient: ClientTransportPlugin websocket socks4 127.0.0.1:9001 UseBridges 1 - Bridge websocket 127.0.0.1:9001 + Bridge websocket 0.0.0.0:1 LearnCircuitBuildTimeout 0 The address given for the "Bridge" option is actually irrelevant. The client transport plugin will ignore it and connect (through the flash diff --git a/experiments/exercise/exercise.sh b/experiments/exercise/exercise.sh index 554e5fb..c60a97e 100755 --- a/experiments/exercise/exercise.sh +++ b/experiments/exercise/exercise.sh @@ -26,7 +26,7 @@ PIDS_TO_KILL+=($!) sleep 20 -"$TOR" ClientTransportPlugin "websocket socks4 127.0.0.1:$LOCAL_PORT" UseBridges 1 Bridge "websocket 127.0.0.1:$LOCAL_PORT" LearnCircuitBuildTimeout 0 & +"$TOR" ClientTransportPlugin "websocket socks4 127.0.0.1:$LOCAL_PORT" UseBridges 1 Bridge "websocket 0.0.0.0:1" LearnCircuitBuildTimeout 0 & PIDS_TO_KILL+=($!) sleep 60 diff --git a/torrc b/torrc index d502265..ec0b552 100644 --- a/torrc +++ b/torrc @@ -5,5 +5,6 @@ ClientTransportPlugin websocket socks4 127.0.0.1:9001 UseBridges 1 -Bridge websocket 127.0.0.1:9001 +# The address and port are ignored by the client transport plugin. +Bridge websocket 0.0.0.0:1 LearnCircuitBuildTimeout 0

1 0

[flashproxy/master] Listen only on localhost in flashproxy-exercise.
by dcf＠torproject.org 05 Jul '12

05 Jul '12

commit f06895533bf78916b956936224d85be18deddbd6 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jul 5 07:39:43 2012 -0700 Listen only on localhost in flashproxy-exercise. --- experiments/exercise/exercise.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/experiments/exercise/exercise.sh b/experiments/exercise/exercise.sh index c60a97e..6a91806 100755 --- a/experiments/exercise/exercise.sh +++ b/experiments/exercise/exercise.sh @@ -21,7 +21,7 @@ trap stop EXIT date cd "$FLASHPROXY_DIR" -./flashproxy-client.py --register ":$LOCAL_PORT" ":$REMOTE_PORT" & +./flashproxy-client.py --register "127.0.0.1:$LOCAL_PORT" ":$REMOTE_PORT" & PIDS_TO_KILL+=($!) sleep 20

1 0

[flashproxy/master] When I "make dist" I want it always to delete the dist directory.
by dcf＠torproject.org 05 Jul '12

05 Jul '12

commit 3c748dd25809d7952ab8662ead76d60c6cda63f5 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jul 5 07:19:30 2012 -0700 When I "make dist" I want it always to delete the dist directory. "make sign" should remake the dist only if necessary. --- Makefile | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f3232aa..5981bd2 100644 --- a/Makefile +++ b/Makefile @@ -22,13 +22,14 @@ test: DISTNAME = flashproxy-client-$(VERSION) DISTDIR = dist/$(DISTNAME) -dist/$(DISTNAME).zip: +dist: rm -rf dist mkdir -p $(DISTDIR) cp -f $(CLIENT_DIST_FILES) $(DISTDIR) cd dist && zip -q -r -9 $(DISTNAME).zip $(DISTNAME) -dist: dist/$(DISTNAME).zip +dist/$(DISTNAME).zip: + $(MAKE) dist sign: dist/$(DISTNAME).zip cd dist && gpg --sign --detach-sign --armor $(DISTNAME).zip

1 0

[flashproxy/master] The dist zip should depend on the files within it.
by dcf＠torproject.org 05 Jul '12

05 Jul '12

commit 3dc41f8fe394b65d1f37feb09ff364ec801c6644 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jul 5 07:20:41 2012 -0700 The dist zip should depend on the files within it. --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 5981bd2..dc8e92a 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ dist: cp -f $(CLIENT_DIST_FILES) $(DISTDIR) cd dist && zip -q -r -9 $(DISTNAME).zip $(DISTNAME) -dist/$(DISTNAME).zip: +dist/$(DISTNAME).zip: $(CLIENT_DIST_FILES) $(MAKE) dist sign: dist/$(DISTNAME).zip

1 0

[flashproxy/master] Be consistent about whether we're in a subdirectory in README instructions.
by dcf＠torproject.org 05 Jul '12

05 Jul '12

commit 9de8929ae53b7245b3a031d447e3ce72c58dd852 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jul 5 03:23:50 2012 -0700 Be consistent about whether we're in a subdirectory in README instructions. --- README | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/README b/README index cb66dde..2aea755 100644 --- a/README +++ b/README @@ -21,7 +21,7 @@ below to try out the system even behind NAT. 8888): $ python connector.py --register 127.0.0.1:9001 :8888 2. Run Tor using the included torrc file. - $ tor -f flashproxy/torrc + $ tor -f torrc Watch the output of connector.py and tor. From connector.py you are expecting output lines like this:

1 0

[flashproxy/master] rm *.pyc in "make clean".
by dcf＠torproject.org 05 Jul '12

05 Jul '12

commit 115df750b297601650f16ba5db7d156e8890122c Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jul 5 03:16:30 2012 -0700 rm *.pyc in "make clean". These get produced as a side effect of running tests. --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 724325e..9a2f10c 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ install: cp -f connector.py facilitator.py flashproxy-reg-http.py $(BINDIR) clean: - : + rm -f *.pyc test: ./connector-test.py

1 0

[flashproxy/master] Add --register to the torrc sample commands.
by dcf＠torproject.org 05 Jul '12

05 Jul '12

commit a1c4c4818e331ed96570f32b9789e0558e9d84ad Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jul 5 03:14:38 2012 -0700 Add --register to the torrc sample commands. --- torrc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/torrc b/torrc index 36b4f93..66dd3b6 100644 --- a/torrc +++ b/torrc @@ -1,6 +1,6 @@ ## Configuration file for Tor over flash proxies. ## Usage: -## python connector.py +## python connector.py --register ## tor -f torrc ClientTransportPlugin websocket socks4 127.0.0.1:9001

1 0

[flashproxy/master] Add "make dist" for a zip package.
by dcf＠torproject.org 05 Jul '12

05 Jul '12

commit 6227b49d097f300686844d6a2761333bedef11b5 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jul 5 05:30:17 2012 -0700 Add "make dist" for a zip package. --- Makefile | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 3b30d61..0becb59 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,10 @@ PREFIX = /usr/local BINDIR = $(PREFIX)/bin +VERSION = 0.0 + +CLIENT_DIST_FILES = flashproxy-client.py flashproxy-reg-http.py README + all: : @@ -10,9 +14,20 @@ install: clean: rm -f *.pyc + rm -rf dist test: ./flashproxy-client-test.py ./flashproxy-test.js -.PHONY: all clean test +DISTNAME = flashproxy-client-$(VERSION) +DISTDIR = dist/$(DISTNAME) +dist/$(DISTNAME).zip: + rm -rf dist + mkdir -p $(DISTDIR) + cp -f $(CLIENT_DIST_FILES) $(DISTDIR) + cd dist && zip -q -r -9 $(DISTNAME).zip $(DISTNAME) + +dist: dist/$(DISTNAME).zip + +.PHONY: all clean test dist

1 0

[flashproxy/master] Use current configuration in design.txt.
by dcf＠torproject.org 05 Jul '12

05 Jul '12

commit 252fdae9bdd93e38602e7b6614d0b589d3c59662 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jul 5 03:54:27 2012 -0700 Use current configuration in design.txt. --- doc/design.txt | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/design.txt b/doc/design.txt index 71cf554..7520cb5 100644 --- a/doc/design.txt +++ b/doc/design.txt @@ -84,9 +84,10 @@ Design of flash proxies The Tor client must be configured to make its connections through a local proxy (the client transport plugin). This configuration is sufficient: + ClientTransportPlugin websocket socks4 127.0.0.1:9001 UseBridges 1 - Bridge 127.0.0.1:9001 - Socks4Proxy 127.0.0.1:9001 + Bridge websocket 127.0.0.1:9001 + LearnCircuitBuildTimeout 0 The address given for the "Bridge" option is actually irrelevant. The client transport plugin will ignore it and connect (through the flash proxy) to a Tor relay. The Tor client does not have control of its

1 0

[flashproxy/master] Add "make sign".
by dcf＠torproject.org 05 Jul '12

05 Jul '12

commit f648e63d03eafb7cdd8c1140fe92d05f6fd98308 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jul 5 05:48:07 2012 -0700 Add "make sign". --- Makefile | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 0becb59..f3232aa 100644 --- a/Makefile +++ b/Makefile @@ -30,4 +30,7 @@ dist/$(DISTNAME).zip: dist: dist/$(DISTNAME).zip -.PHONY: all clean test dist +sign: dist/$(DISTNAME).zip + cd dist && gpg --sign --detach-sign --armor $(DISTNAME).zip + +.PHONY: all clean test dist sign

1 0