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

[tor/master] Merge branch 'maint-0.2.3'
by arma＠torproject.org 13 Nov '12

13 Nov '12

commit a90affa84b3597667fd5dc8d9ff761a462653750 Merge: f473d83 88bb48e Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Nov 12 23:49:37 2012 -0500 Merge branch 'maint-0.2.3' changes/bug7464 | 4 ++++ src/or/main.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.3] use a more logical operator
by arma＠torproject.org 13 Nov '12

13 Nov '12

commit 88bb48e785609afeab6b63677f789036e25b34cf Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Nov 12 23:47:21 2012 -0500 use a more logical operator Fix a harmless bug when opting against publishing a relay descriptor because DisableNetwork is set. Fixes bug 7464; bugfix on 0.2.3.9-alpha. --- changes/bug7464 | 4 ++++ src/or/main.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/changes/bug7464 b/changes/bug7464 new file mode 100644 index 0000000..9259cc7 --- /dev/null +++ b/changes/bug7464 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix a harmless bug when opting against publishing a relay descriptor + because DisableNetwork is set. Fixes bug 7464; bugfix on + 0.2.3.9-alpha. diff --git a/src/or/main.c b/src/or/main.c index 20a1e08..34bf3e5 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1199,7 +1199,7 @@ run_scheduled_events(time_t now) if (router_rebuild_descriptor(1)<0) { log_info(LD_CONFIG, "Couldn't rebuild router descriptor"); } - if (advertised_server_mode() & !options->DisableNetwork) + if (advertised_server_mode() && !options->DisableNetwork) router_upload_dir_desc_to_dirservers(0); }

1 0

[flashproxy/master] Removed the setblocking call in listen_socket, all
by dcf＠torproject.org 13 Nov '12

13 Nov '12

commit 9cc3c1af55c59c73e8809fbaed8242cd65898d24 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Thu Nov 1 11:07:33 2012 -0400 Removed the setblocking call in listen_socket, all sockets are now blocking. This fixes an issue on Windows where non-bocking sockets would throw an exception if they couldn't complete a sendall call immediately. See trac ticket #7272 for more info. This doesn't affect the execution of the program substantially, since it uses a select call to process the incoming data. --- flashproxy-client | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index 1e32d8f..8bc3c3f 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -451,7 +451,7 @@ class WebSocketBinaryEncoder(object): def listen_socket(addr): - """Return a nonblocking socket listening on the given address.""" + """Return a socket listening on the given address.""" addrinfo = socket.getaddrinfo(addr[0], addr[1], 0, socket.SOCK_STREAM, socket.IPPROTO_TCP)[0] s = socket.socket(addrinfo[0], addrinfo[1], addrinfo[2]) s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) @@ -470,7 +470,6 @@ def listen_socket(addr): pass s.bind(addr) s.listen(10) - s.setblocking(0) return s # How long to wait for a WebSocket request on the remote socket. It is limited

1 0

[flashproxy/master] Merge branch 'master' of https://git.torproject.org/flashproxy
by dcf＠torproject.org 13 Nov '12

13 Nov '12

commit af631063ecf97e82a290810b527dfeef412829f3 Merge: 9cc3c1a a6e046c Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Wed Nov 7 21:00:18 2012 -0500 Merge branch 'master' of https://git.torproject.org/flashproxy ChangeLog | 10 ++++++++++ flashproxy-reg-email | 10 +++++----- 2 files changed, 15 insertions(+), 5 deletions(-)

1 0

[flashproxy/master] Merge branch 'master' of https://git.torproject.org/flashproxy
by dcf＠torproject.org 13 Nov '12

13 Nov '12

commit 7e8ba657a30ab15383f03ec79c9f6c8ce56af1d8 Merge: af63106 823596e Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Sun Nov 11 19:09:20 2012 -0500 Merge branch 'master' of https://git.torproject.org/flashproxy ChangeLog | 9 ++- Makefile | 2 +- README | 31 ++++----- doc/websocket-transport.txt | 4 +- experiments/exercise/exercise.sh | 2 +- flashproxy-client | 133 +++++++++++++++++++++++++++++++++----- flashproxy-reg-email | 17 +++++- torrc | 3 +- 8 files changed, 160 insertions(+), 41 deletions(-)

1 0

[flashproxy/master] Fixed grammatical error in flashproxy-client man page.
by dcf＠torproject.org 13 Nov '12

13 Nov '12

commit 0a30d6f69d35964d6af7d004e35a7d957aec28f7 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Sun Nov 11 21:17:43 2012 -0500 Fixed grammatical error in flashproxy-client man page. The first word of a sentence in the man page was not capitalized. --- doc/flashproxy-client.1.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/flashproxy-client.1.txt b/doc/flashproxy-client.1.txt index d98a2f8..abd4415 100644 --- a/doc/flashproxy-client.1.txt +++ b/doc/flashproxy-client.1.txt @@ -69,7 +69,7 @@ OPTIONS Register the given address (in case it differs from REMOTE). Implies --register. **--register-methods**=__METHOD__[,__METHOD__]:: - register using the given comma-separated list of methods. Implies --register. + Register using the given comma-separated list of methods. Implies --register. Possible methods are: email, http. Default is "email,http". **--unsafe-logging**::

1 0

[flashproxy/master] Added AsciiDoc source file for flashproxy-client manpage.
by dcf＠torproject.org 13 Nov '12

13 Nov '12

commit 0fbfb6352bfbc3bd7751ea9567fcd7ed01483f27 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Sun Nov 11 21:04:04 2012 -0500 Added AsciiDoc source file for flashproxy-client manpage. Added an AsciiDoc file for the flashproxy-client manpage. You can use the a2x command to generate a file usable by man. Example: a2x --no-xmllint -d manpage -f manpage <file> The manpage is written in the same style as the ones for tor and asciidoc. --- doc/flashproxy-client.1.txt | 90 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 90 insertions(+), 0 deletions(-) diff --git a/doc/flashproxy-client.1.txt b/doc/flashproxy-client.1.txt new file mode 100644 index 0000000..d98a2f8 --- /dev/null +++ b/doc/flashproxy-client.1.txt @@ -0,0 +1,90 @@ +// This file is asciidoc source code. +// To generate manpages, use the a2x command i.e. +// a2x --no-xmllint -d manpage -f manpage flashproxy-client.1.txt +// see http://www.methods.co.nz/asciidoc/userguide.html#X1 +:man source: Flashproxy Client +:man manual: Flashproxy Manual +FLASHPROXY-CLIENT(1) +==================== + +NAME +---- +flashproxy-client - The Flashproxy pluggable transport client program + +SYNOPSIS +-------- +**flashproxy-client** **--register** [__OPTIONS__] [__LOCAL__][:__PORT__] [__REMOTE__][:__PORT__] + +DESCRIPTION +----------- +Wait for connections on a local and a remote port. When any pair of connections +exists, data is ferried between them until one side is closed. By default +__LOCAL__ is localhost addresses on port 9001 and __REMOTE__ is all addresses +on port 9000. + +The local connection acts as a SOCKS4a proxy, but the host and port in the SOCKS +request are ignored and the local connection is always linked to a remote +connection. + +By default, runs as a managed proxy: informs a parent Tor project of support for +the "websocket" pluggable transport. In managed mode, the __LOCAL__ port is chosen +arbitrarily instead of defaulting to 9001; however this can be +overridden by including a __LOCAL__ port in the command. This is the way the +program should be invoked in a torrc ClientTransportPlugin "exec" line. +Use the --external option to run as an external proxy that does not +interact with Tor. + +If any of the **--register**, **--register-addr**, or **--register-methods** options are +used, then your IP address will be sent to the facilitator so that proxies can +connect to you. You need to register in some way in order to get any service. +The **--facilitator** option allows controlling which facilitator is used; if +omitted, it uses a public default. + +OPTIONS +------- + +**--daemon**:: + Daemonize (Unix only). + +**--external**:: + Be an external proxy (don't interact with Tor using environment variables + and stdout). + +**-f**, **--facilitator**=__URL__:: + Advertise willingness to receive connections to URL. + +**-h**, **--help**:: + Display a help message and exit. + +**-l**, **--log** __FILENAME__:: + Write log to __FILENAME__ (default is stdout). + +**--pidfile** __FILENAME__:: + Write PID to __FILENAME__ after daemonizing. + +**-r**, **--register**:: + Register with the facilitator. + +**--register-addr**=__ADDR__:: + Register the given address (in case it differs from REMOTE). Implies --register. + +**--register-methods**=__METHOD__[,__METHOD__]:: + register using the given comma-separated list of methods. Implies --register. + Possible methods are: email, http. Default is "email,http". + +**--unsafe-logging**:: + Don't scrub IP addresses from logs. + +SEE ALSO +-------- +**http://crypto.stanford.edu/flashproxy/** + +**https://www.torproject.org/docs/pluggable-transports.html.en** + +BUGS +---- +Please report using **https://trac.torproject.org/projects/tor**. + +AUTHORS +------- +David Fifield [dcf at torproject.org]

1 0

[flashproxy/master] Added asciidoc file for flashproxy-reg-email man page.
by dcf＠torproject.org 13 Nov '12

13 Nov '12

commit 98141a52228d8edb4e18274ae94bb744f1af0717 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Sun Nov 11 22:05:02 2012 -0500 Added asciidoc file for flashproxy-reg-email man page. Added the asciidoc source for the flashproxy-reg-email man page. The title on this one is a bit big, with the default options a2x will truncate it. To generate a manpage with the full title use: a2x --no-xmllint --xsltproc-opts "--stringparam man.th.title.max.length 23" \ -d manpage -f manpage flashproxy-reg-email.1.txt The style is based on the man pages for tor and asciidoc. --- doc/flashproxy-reg-email.1.txt | 64 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) diff --git a/doc/flashproxy-reg-email.1.txt b/doc/flashproxy-reg-email.1.txt new file mode 100644 index 0000000..f98472e --- /dev/null +++ b/doc/flashproxy-reg-email.1.txt @@ -0,0 +1,64 @@ +// This file is asciidoc source code. +// To generate manpages, use the a2x command. +// This one has a long name, if you don't change the +// default length parameter it will be truncated, use: +// a2x --no-xmllint --xsltproc-opts "--stringparam man.th.title.max.length 23" -d manpage -f manpage flashproxy-reg-email.1.txt +:man source: Flashproxy Register Email +:man manual: Flashproxy Manual + +FLASHPROXY-REG-EMAIL(1) +======================= + +NAME +---- +flashproxy-reg-email - Register with a facilitator using the email method + +SYNOPSIS +-------- +**flashproxy-reg-email** [__OPTIONS__] [__REMOTE__][:__PORT__] + +DESCRIPTION +----------- +Register with a flash proxy facilitator through email. Makes a STARTTLS +connection to an SMTP server and sends mail with a client IP address to a +designated address. By default the remote address registered is +":9000" (the external IP address is guessed). + +Using an SMTP server or email address other than the defaults will not work +unless you have made special arrangements to connect them to a facilitator. + +This program requires the M2Crypto library for Python. + +OPTIONS +------- +**-4**:: + Name lookups use only IPv4. + +**-6**:: + Name lookups use only IPv6. + +**-d**, **--debug**:: + Enable debugging output (Python smtplib messages). + +**-e**, **--email**=__ADDRESS__:: + Send mail to __ADDRESS__ (default is "flashproxyreg.a(a)gmail.com"). + +**-h**, **--help**:: + Display help message and exit. + +**-s**, **--smtp**=__HOST__[:__PORT__]:: + Use the given SMTP server (default is "gmail-smtp-in.l.google.com:25"). + +SEE ALSO +-------- +**http://crypto.stanford.edu/flashproxy/** + +**https://www.torproject.org/docs/pluggable-transports.html.en** + +BUGS +---- +Please report using **https://trac.torproject.org/projects/tor**. + +AUTHORS +------- +David Fifield [dcf at torproject.org]

1 0

[flashproxy/master] Add asciidoc file for flashproxy-reg-http man page.
by dcf＠torproject.org 13 Nov '12

13 Nov '12

commit 809d1733f52abbf6e87af948a2339a7f39aae22e Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Sun Nov 11 22:20:47 2012 -0500 Add asciidoc file for flashproxy-reg-http man page. Add asciidoc file for flashproxy-reg-http man page. a2x can be used to generate the man page, however since the title is large, a DocBook parameter needs or the title will be truncated. Use: a2x --no-xmllint --xsltproc-opts "--stringparam man.th.title.max.length 23" \ -d manpage -f manpage flashproxy-reg-http.1.txt The style is similar to the tor and asciidoc man pages. --- doc/flashproxy-reg-http.1.txt | 45 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/doc/flashproxy-reg-http.1.txt b/doc/flashproxy-reg-http.1.txt new file mode 100644 index 0000000..a81e143 --- /dev/null +++ b/doc/flashproxy-reg-http.1.txt @@ -0,0 +1,45 @@ +// This file is asciidoc source code. +// To generate manpages, use the a2x command. +// This one has a long name, if you don't change the +// default length parameter it will be truncated, use: +// a2x --no-xmllint --xsltproc-opts "--stringparam man.th.title.max.length 22" -d manpage -f manpage flashproxy-reg-http.1.txt +:man source: Flashproxy Register HTTP +:man manual: Flashproxy Manual + +FLASHPROXY-REG-HTTP(1) +====================== + +NAME +---- +flashproxy-reg-http - Register with a facilitator using the http method + +SYNOPSIS +-------- +**flashproxy-reg-http** [__OPTIONS__] [__REMOTE__][:__PORT__] + +DESCRIPTION +----------- +Register with a flash proxy facilitator using an HTTP POST. By default the +remote address registered is ":9000". + +OPTIONS +------- +**-f**, **--facilitator**:: + Register with the given facilitator (by default "https://tor-facilitator.bamsoftware.com/"). + +**-h**, **--help**:: + Display help message and exit. + +SEE ALSO +-------- +**http://crypto.stanford.edu/flashproxy/** + +**https://www.torproject.org/docs/pluggable-transports.html.en** + +BUGS +---- +Please report using **https://trac.torproject.org/projects/tor**. + +AUTHORS +------- +David Fifield [dcf at torproject.org]

1 0

[flashproxy/master] Modified makefile to package man pages.
by dcf＠torproject.org 13 Nov '12

13 Nov '12

commit 1cdeeb36061f710931732e4156497073d470b298 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Mon Nov 12 20:10:43 2012 -0500 Modified makefile to package man pages. dist target now depends on generated generated man pages, added target to generate them using a2x. Also added highlighting of an option name in flashproxy-client man page. --- Makefile | 14 ++++++++++++-- doc/flashproxy-client.1.txt | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e86c8f5..1f12d46 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,10 @@ BINDIR = $(PREFIX)/bin VERSION = 0.8 -CLIENT_DIST_FILES = flashproxy-client flashproxy-reg-email flashproxy-reg-http README LICENSE torrc +CLIENT_EXECUTABLES = flashproxy-client flashproxy-reg-email flashproxy-reg-http +CLIENT_ASCIIDOCS = $(CLIENT_EXECUTABLES:%=doc/%.1.txt) +CLIENT_MANPAGES = $(CLIENT_EXECUTABLES:%=doc/%.1) +CLIENT_DIST_FILES = $(CLIENT_EXECUTABLES) README LICENSE torrc all: : @@ -23,10 +26,12 @@ test: DISTNAME = flashproxy-client-$(VERSION) DISTDIR = dist/$(DISTNAME) -dist: +dist: $(CLIENT_MANPAGES) rm -rf dist mkdir -p $(DISTDIR) + mkdir $(DISTDIR)/doc cp -f $(CLIENT_DIST_FILES) $(DISTDIR) + cp -f $(CLIENT_MANPAGES) $(DISTDIR)/doc cd dist && zip -q -r -9 $(DISTNAME).zip $(DISTNAME) dist/$(DISTNAME).zip: $(CLIENT_DIST_FILES) @@ -37,4 +42,9 @@ sign: dist/$(DISTNAME).zip cd dist && gpg --sign --detach-sign --armor $(DISTNAME).zip cd dist && gpg --verify $(DISTNAME).zip.asc $(DISTNAME).zip +%.1: $(CLIENT_ASCIIDOCS) + rm -rf $@ + a2x --no-xmllint --xsltproc-opts "--stringparam man.th.title.max.length 23" \ + -d manpage -f manpage $@.txt; + .PHONY: all install clean test dist sign diff --git a/doc/flashproxy-client.1.txt b/doc/flashproxy-client.1.txt index abd4415..752f6e2 100644 --- a/doc/flashproxy-client.1.txt +++ b/doc/flashproxy-client.1.txt @@ -31,7 +31,7 @@ the "websocket" pluggable transport. In managed mode, the __LOCAL__ port is chos arbitrarily instead of defaulting to 9001; however this can be overridden by including a __LOCAL__ port in the command. This is the way the program should be invoked in a torrc ClientTransportPlugin "exec" line. -Use the --external option to run as an external proxy that does not +Use the **--external** option to run as an external proxy that does not interact with Tor. If any of the **--register**, **--register-addr**, or **--register-methods** options are

1 0