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

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 11 Nov '12

11 Nov '12

commit e69c4ec3d535965293345d33ab8120a17bd98ba0 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 11 00:45:20 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index a099e94..11fcdfe 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-11 00:15+0000\n" +"PO-Revision-Date: 2012-11-11 00:45+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -1476,7 +1476,7 @@ msgstr "Atrás" msgctxt "HelpBrowser" msgid "Move to previous page (Backspace)" -msgstr "Ir a la página anterior (tecla Retroceso)" +msgstr "Ir a la página anterior (Retroceso)" msgctxt "HelpBrowser" msgid "Backspace" @@ -1492,15 +1492,15 @@ msgstr "Ir a la página siguiente (Mayúsculas+Retroceso)" msgctxt "HelpBrowser" msgid "Shift+Backspace" -msgstr "Shift+Retroceso" +msgstr "Mayúsculas+Retroceso" msgctxt "HelpBrowser" msgid "Home" -msgstr "Inicio" +msgstr "Principal" msgctxt "HelpBrowser" msgid "Move to the Home page (Ctrl+H)" -msgstr "Ir a la Página de Inicio (Ctrl+H)" +msgstr "Ir a la Página de Principal (Ctrl+H)" msgctxt "HelpBrowser" msgid "Ctrl+H" @@ -1532,7 +1532,7 @@ msgstr "Esc" msgctxt "HelpBrowser" msgid "Find:" -msgstr "Buscar:" +msgstr "Buscar: " msgctxt "HelpBrowser" msgid "Find Previous" @@ -1540,15 +1540,15 @@ msgstr "Buscar Anterior" msgctxt "HelpBrowser" msgid "Find Next" -msgstr "Encontrar Siguiente" +msgstr "Buscar Siguiente" msgctxt "HelpBrowser" msgid "Case sensitive" -msgstr "Coincidir mayúsculas y minúsculas" +msgstr "Coincidencia de mayúsculas y minúsculas" msgctxt "HelpBrowser" msgid "Whole words only" -msgstr "Palabras completas solamente" +msgstr "Sólo palabras completas" msgctxt "HelpBrowser" msgid "Help Topics" @@ -1564,7 +1564,7 @@ msgstr "Búsqueda" msgctxt "HelpBrowser" msgid "Searching for:" -msgstr "Buscando:" +msgstr "Buscando: " msgctxt "HelpBrowser" msgid "Found Documents" @@ -1572,7 +1572,7 @@ msgstr "Documentos encontrados" msgctxt "HelpBrowser" msgid "Error Loading Help Contents:" -msgstr "No se pudo cargar el contenido de la Ayuda:" +msgstr "Error al cargar la tabla de contenido de la Ayuda: " msgctxt "HelpTextBrowser" msgid "Opening External Link" @@ -1583,11 +1583,11 @@ msgid "" "Vidalia can open the link you selected in your default Web browser. If your " "browser is not currently configured to use Tor then the request will not be " "anonymous." -msgstr "Vidalia puede abrir el enlace seleccionado en su Navegador predeterminado. Si su Navegador no está configurado actualmente para usar el Tor, la solicitud no será anónima." +msgstr "Vidalia puede abrir el enlace que ha seleccionado en su navegador predeterminado. Si su navegador no está configurado actualmente para usar Tor, la solicitud no será anónima." msgctxt "HelpTextBrowser" msgid "Do you want Vidalia to open the link in your Web browser?" -msgstr "¿Desea que Vidalia abra el enlace en su Navegador predeterminado?" +msgstr "¿Desea que Vidalia abra el enlace en su navegador predeterminado?" msgctxt "HelpTextBrowser" msgid "Unable to Open Link" @@ -1597,11 +1597,11 @@ msgctxt "HelpTextBrowser" msgid "" "Vidalia was unable to open the selected link in your Web browser. You can " "still copy the URL and paste it into your browser." -msgstr "Vidalia no pudo abrir el enlace seleccionado en su navegador de Internet. Puede intentarlo copiando el URL y pegándolo en su navegador." +msgstr "Vidalia no pudo abrir el enlace seleccionado en su navegador predeterminado. Puede intentarlo copiando el URL y pegándolo en su navegador." msgctxt "HelpTextBrowser" msgid "Error opening help file:" -msgstr "No se pudo abrir el archivo de ayuda:" +msgstr "Error abriendo el archivo de ayuda: " msgctxt "LicenseDialog" msgid "License Information" @@ -1617,7 +1617,7 @@ msgstr "Créditos" msgctxt "LogEvent" msgid "Debug" -msgstr "Depurar" +msgstr "Depurar (debug)" msgctxt "LogEvent" msgid "Info" @@ -1641,11 +1641,11 @@ msgstr "Desconocido" msgctxt "LogTreeItem" msgid "Debug" -msgstr "Depurar" +msgstr "Depurar (debug)" msgctxt "LogTreeItem" msgid "Info" -msgstr "Informacion" +msgstr "Información" msgctxt "LogTreeItem" msgid "Notice"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 11 Nov '12

11 Nov '12

commit e50ff142c7a627c6b959dc49e733508b7427b1d0 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 11 00:45:18 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index a099e94..11fcdfe 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-11 00:15+0000\n" +"PO-Revision-Date: 2012-11-11 00:45+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -1476,7 +1476,7 @@ msgstr "Atrás" msgctxt "HelpBrowser" msgid "Move to previous page (Backspace)" -msgstr "Ir a la página anterior (tecla Retroceso)" +msgstr "Ir a la página anterior (Retroceso)" msgctxt "HelpBrowser" msgid "Backspace" @@ -1492,15 +1492,15 @@ msgstr "Ir a la página siguiente (Mayúsculas+Retroceso)" msgctxt "HelpBrowser" msgid "Shift+Backspace" -msgstr "Shift+Retroceso" +msgstr "Mayúsculas+Retroceso" msgctxt "HelpBrowser" msgid "Home" -msgstr "Inicio" +msgstr "Principal" msgctxt "HelpBrowser" msgid "Move to the Home page (Ctrl+H)" -msgstr "Ir a la Página de Inicio (Ctrl+H)" +msgstr "Ir a la Página de Principal (Ctrl+H)" msgctxt "HelpBrowser" msgid "Ctrl+H" @@ -1532,7 +1532,7 @@ msgstr "Esc" msgctxt "HelpBrowser" msgid "Find:" -msgstr "Buscar:" +msgstr "Buscar: " msgctxt "HelpBrowser" msgid "Find Previous" @@ -1540,15 +1540,15 @@ msgstr "Buscar Anterior" msgctxt "HelpBrowser" msgid "Find Next" -msgstr "Encontrar Siguiente" +msgstr "Buscar Siguiente" msgctxt "HelpBrowser" msgid "Case sensitive" -msgstr "Coincidir mayúsculas y minúsculas" +msgstr "Coincidencia de mayúsculas y minúsculas" msgctxt "HelpBrowser" msgid "Whole words only" -msgstr "Palabras completas solamente" +msgstr "Sólo palabras completas" msgctxt "HelpBrowser" msgid "Help Topics" @@ -1564,7 +1564,7 @@ msgstr "Búsqueda" msgctxt "HelpBrowser" msgid "Searching for:" -msgstr "Buscando:" +msgstr "Buscando: " msgctxt "HelpBrowser" msgid "Found Documents" @@ -1572,7 +1572,7 @@ msgstr "Documentos encontrados" msgctxt "HelpBrowser" msgid "Error Loading Help Contents:" -msgstr "No se pudo cargar el contenido de la Ayuda:" +msgstr "Error al cargar la tabla de contenido de la Ayuda: " msgctxt "HelpTextBrowser" msgid "Opening External Link" @@ -1583,11 +1583,11 @@ msgid "" "Vidalia can open the link you selected in your default Web browser. If your " "browser is not currently configured to use Tor then the request will not be " "anonymous." -msgstr "Vidalia puede abrir el enlace seleccionado en su Navegador predeterminado. Si su Navegador no está configurado actualmente para usar el Tor, la solicitud no será anónima." +msgstr "Vidalia puede abrir el enlace que ha seleccionado en su navegador predeterminado. Si su navegador no está configurado actualmente para usar Tor, la solicitud no será anónima." msgctxt "HelpTextBrowser" msgid "Do you want Vidalia to open the link in your Web browser?" -msgstr "¿Desea que Vidalia abra el enlace en su Navegador predeterminado?" +msgstr "¿Desea que Vidalia abra el enlace en su navegador predeterminado?" msgctxt "HelpTextBrowser" msgid "Unable to Open Link" @@ -1597,11 +1597,11 @@ msgctxt "HelpTextBrowser" msgid "" "Vidalia was unable to open the selected link in your Web browser. You can " "still copy the URL and paste it into your browser." -msgstr "Vidalia no pudo abrir el enlace seleccionado en su navegador de Internet. Puede intentarlo copiando el URL y pegándolo en su navegador." +msgstr "Vidalia no pudo abrir el enlace seleccionado en su navegador predeterminado. Puede intentarlo copiando el URL y pegándolo en su navegador." msgctxt "HelpTextBrowser" msgid "Error opening help file:" -msgstr "No se pudo abrir el archivo de ayuda:" +msgstr "Error abriendo el archivo de ayuda: " msgctxt "LicenseDialog" msgid "License Information" @@ -1617,7 +1617,7 @@ msgstr "Créditos" msgctxt "LogEvent" msgid "Debug" -msgstr "Depurar" +msgstr "Depurar (debug)" msgctxt "LogEvent" msgid "Info" @@ -1641,11 +1641,11 @@ msgstr "Desconocido" msgctxt "LogTreeItem" msgid "Debug" -msgstr "Depurar" +msgstr "Depurar (debug)" msgctxt "LogTreeItem" msgid "Info" -msgstr "Informacion" +msgstr "Información" msgctxt "LogTreeItem" msgid "Notice"

1 0

[flashproxy/master] Increase version to 0.8.
by dcf＠torproject.org 11 Nov '12

11 Nov '12

commit 167d3b41cdcdefb55db3bb974ba10ac9e75c864e Author: David Fifield <david(a)bamsoftware.com> Date: Sat Nov 10 16:12:03 2012 -0800 Increase version to 0.8. --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 001b3ee..e86c8f5 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ PREFIX = /usr/local BINDIR = $(PREFIX)/bin -VERSION = 0.7 +VERSION = 0.8 CLIENT_DIST_FILES = flashproxy-client flashproxy-reg-email flashproxy-reg-http README LICENSE torrc

1 0

[flashproxy/master] Include bug number for managed proxy.
by dcf＠torproject.org 11 Nov '12

11 Nov '12

commit c0c6f277b10aa135b8e5a9afb2a8474023416a76 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Nov 10 16:15:54 2012 -0800 Include bug number for managed proxy. --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9e2ba83..823b56b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,7 +4,7 @@ Changes in version 0.8 separately from Tor. Use a "ClientTransportPlugin websocket exec" line as in the included torrc. To use flashproxy-client as an external proxy (the way it worked before), use the --external - option. + option. Fixes bug 7016. o The proxy badge does more intelligent parsing of the boolean "debug" parameter. "0", "false", and other values are now interpreted as

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 11 Nov '12

11 Nov '12

commit 71ccfb6cae7863d499a79aebb40827c47e281ed9 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 11 00:15:23 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 7f3fcdb..a099e94 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-10 21:33+0000\n" +"PO-Revision-Date: 2012-11-11 00:15+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -1448,7 +1448,7 @@ msgstr "Envi:" msgctxt "HelpBrowser" msgid "Supplied XML file is not a valid Contents document." -msgstr "Archivo XML suministrado no es un documento de Contenidos valido." +msgstr "El archivo XML suministrado no es un documento Contents (estructura de tabla de contenidos) válido." msgctxt "HelpBrowser" msgid "Search reached end of document" @@ -1476,7 +1476,7 @@ msgstr "Atrás" msgctxt "HelpBrowser" msgid "Move to previous page (Backspace)" -msgstr "Ir a la página anterior (Retroceso)" +msgstr "Ir a la página anterior (tecla Retroceso)" msgctxt "HelpBrowser" msgid "Backspace"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 11 Nov '12

11 Nov '12

commit d1d489281ab2c1482ac64730c2233bf587122fe7 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 11 00:15:20 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 7f3fcdb..a099e94 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-10 21:33+0000\n" +"PO-Revision-Date: 2012-11-11 00:15+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -1448,7 +1448,7 @@ msgstr "Envi:" msgctxt "HelpBrowser" msgid "Supplied XML file is not a valid Contents document." -msgstr "Archivo XML suministrado no es un documento de Contenidos valido." +msgstr "El archivo XML suministrado no es un documento Contents (estructura de tabla de contenidos) válido." msgctxt "HelpBrowser" msgid "Search reached end of document" @@ -1476,7 +1476,7 @@ msgstr "Atrás" msgctxt "HelpBrowser" msgid "Move to previous page (Backspace)" -msgstr "Ir a la página anterior (Retroceso)" +msgstr "Ir a la página anterior (tecla Retroceso)" msgctxt "HelpBrowser" msgid "Backspace"

1 0

[flashproxy/master] Use --external in exercise.sh.
by dcf＠torproject.org 11 Nov '12

11 Nov '12

commit 8b1ad7a0cc2703d823960835ae99f6548ff0d5d5 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Nov 10 16:06:05 2012 -0800 Use --external in exercise.sh. --- 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 24c1342..0bc49c0 100755 --- a/experiments/exercise/exercise.sh +++ b/experiments/exercise/exercise.sh @@ -21,7 +21,7 @@ trap stop EXIT date cd "$FLASHPROXY_DIR" -./flashproxy-client --register ":$LOCAL_PORT" ":$REMOTE_PORT" & +./flashproxy-client --external --register ":$LOCAL_PORT" ":$REMOTE_PORT" & PIDS_TO_KILL+=($!) sleep 20

1 0

[flashproxy/master] Make flashproxy-client a a managed proxy.
by dcf＠torproject.org 11 Nov '12

11 Nov '12

commit 2c052b414fe2e820773aeb408dc4ba5e97a04c5c Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 24 09:42:21 2012 -0700 Make flashproxy-client a a managed proxy. Managed mode is the default. Use --external to override it and be an external proxy like before. --- README | 31 +++++++------- doc/websocket-transport.txt | 4 +- flashproxy-client | 94 +++++++++++++++++++++++++++++++++++-------- torrc | 3 +- 4 files changed, 95 insertions(+), 37 deletions(-) diff --git a/README b/README index 75252d0..efcec98 100644 --- a/README +++ b/README @@ -13,24 +13,20 @@ You must be able to receive TCP connections; unfortunately means that you cannot be behind NAT. See the section "Using a public client transport plugin" below to try out the system even behind NAT. -1. Run the client transport plugin. - $ flashproxy-client --register - By default the transport plugin listens on Internet-facing TCP port - 9000. If you have to use a different port (to get through a firewall, - for example), give it on the command lines like this (here using port - 8888): - $ flashproxy-client --register :9001 :8888 -2. Run Tor using the included torrc file. +Run Tor using the included torrc file: $ tor -f torrc +By default the transport plugin listens on Internet-facing TCP port +9000. If you have to use a different port (to get through a firewall, +for example), edit the ClientTransportPlugin line of the torrc to give a +different port number: + ClientTransportPlugin websocket exec ./flashproxy-client --register :0 :8888 +If the flashproxy-client program is in a different directoy (after being +installed, for example), use the full path in the ClientTransportPlugin +line: + ClientTransportPlugin websocket exec /usr/local/bin/flashproxy-client --register -Watch the output of flashproxy-client and tor. From -flashproxy-client you are expecting output lines like this: - Remote connection from [scrubbed]. - Local connection from [scrubbed]. - Linking [scrubbed] and [scrubbed]. -From tor you are looking for: - [notice] Tor has successfully opened a circuit. Looks like client functionality is working. - [notice] Bootstrapped 100%: Done. +You should receive a flash proxy connection within about 60 seconds. See +"Troubleshooting" below if it doesn't work. == Overview @@ -81,6 +77,9 @@ port forwarding. Make sure someone is viewing http://crypto.stanford.edu/flashproxy/, or another web page with a flash proxy badge on it. +You can add the --log option to the ClientTransportPlugin command line +in order to save debugging log messages. + If tor hangs at 10% with these messages: [notice] Bootstrapped 10%: Finishing handshake with directory server. [notice] no known bridge descriptors running yet; stalling diff --git a/doc/websocket-transport.txt b/doc/websocket-transport.txt index 78e3297..94d4060 100644 --- a/doc/websocket-transport.txt +++ b/doc/websocket-transport.txt @@ -54,10 +54,10 @@ Method name respectively: UseBridges 1 -ClientTransportPlugin websocket exec /usr/libexec/tor-websocket-proxy --client --managed +ClientTransportPlugin websocket exec /usr/libexec/tor-websocket-proxy --client Bridge websocket 198.51.100.1 -ServerTransportPlugin websocket exec /usr/libexec/tor-websocket-proxy --server --managed +ServerTransportPlugin websocket exec /usr/libexec/tor-websocket-proxy --server The base64 subprotocol diff --git a/flashproxy-client b/flashproxy-client index 6c92c91..fb4b4f7 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -31,7 +31,10 @@ try: except ImportError: numpy = None -DEFAULT_LOCAL_PORT = 9001 +# Default local port in managed mode (choose one arbitrarily). +DEFAULT_LOCAL_PORT_MANAGED = 0 +# Default local port in external mode. +DEFAULT_LOCAL_PORT_EXTERNAL = 9001 DEFAULT_REMOTE_PORT = 9000 DEFAULT_REGISTER_METHODS = ["email", "http"] @@ -43,6 +46,8 @@ class options(object): register_addr = None facilitator_url = None + managed = True + log_filename = None log_file = sys.stdout daemonize = False @@ -67,6 +72,14 @@ 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 %(local_port)d; 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. @@ -74,6 +87,8 @@ The --facilitator option allows controlling which facilitator is used; if omitted, it uses a public default. --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 show this help. -l, --log FILENAME write log to FILENAME (default stdout). @@ -89,7 +104,7 @@ omitted, it uses a public default. --unsafe-logging don't scrub IP addresses from logs.\ """ % { "progname": sys.argv[0], - "local_port": DEFAULT_LOCAL_PORT, + "local_port": DEFAULT_LOCAL_PORT_EXTERNAL, "remote_port": DEFAULT_REMOTE_PORT, "reg_methods": ",".join(DEFAULT_REGISTER_METHODS), } @@ -961,6 +976,34 @@ def pt_smethoderror(msg): pt_line("SMETHOD-ERROR", msg) sys.exit(1) +def pt_get_client_transports(known): + result = [] + if os.environ.get("TOR_PT_CLIENT_TRANSPORTS") == "*": + return known + for method in os.environ.get("TOR_PT_CLIENT_TRANSPORTS", "").split(","): + if method in known: + result.append(method) + return result + +def pt_setup_managed(): + for ver in os.environ.get("TOR_PT_MANAGED_TRANSPORT_VER", "").split(","): + if ver == "1": + pt_line("VERSION", ver) + break + else: + pt_versionerror("no-version") + + client_transports = pt_get_client_transports(["websocket"]) + if not client_transports: + pt_line("CMETHODS", "DONE") + sys.exit(1) + +def pt_cmethod(method_name, addr): + pt_line("CMETHOD", method_name, "socks4", format_sockaddr(addr)) + +def pt_cmethods_done(): + pt_line("CMETHODS", "DONE") + def main(): global remote_listen, local_listen global locals, remotes @@ -970,10 +1013,12 @@ def main(): register_addr_spec = None register_methods = [] - opts, args = getopt.gnu_getopt(sys.argv[1:], "f:hl:r", ["daemon", "facilitator=", "help", "log=", "pidfile=", "register", "register-addr=", "register-methods=", "unsafe-logging"]) + opts, args = getopt.gnu_getopt(sys.argv[1:], "f:hl:r", ["daemon", "external", "facilitator=", "help", "log=", "pidfile=", "register", "register-addr=", "register-methods=", "unsafe-logging"]) for o, a in opts: if o == "--daemon": options.daemonize = True + elif o == "--external": + options.managed = False elif o == "-f" or o == "--facilitator": options.facilitator_url = a elif o == "-h" or o == "--help": @@ -1002,17 +1047,26 @@ def main(): # Send error tracebacks to the log. sys.stderr = options.log_file else: - options.log_file = sys.stdout + options.log_file = sys.stderr + + if options.managed: + pt_setup_managed() + + if options.managed: + default_local_port = DEFAULT_LOCAL_PORT_MANAGED + else: + default_local_port = DEFAULT_LOCAL_PORT_EXTERNAL + default_remote_port = DEFAULT_REMOTE_PORT if len(args) == 0: - local_addr = (None, DEFAULT_LOCAL_PORT) - remote_addr = (None, DEFAULT_REMOTE_PORT) + local_addr = (None, default_local_port) + remote_addr = (None, default_remote_port) elif len(args) == 1: - local_addr = parse_addr_spec(args[0], defport=DEFAULT_LOCAL_PORT) - remote_addr = (None, DEFAULT_REMOTE_PORT) + local_addr = parse_addr_spec(args[0], defport=default_local_port) + remote_addr = (None, default_remote_port) elif len(args) == 2: - local_addr = parse_addr_spec(args[0], defport=DEFAULT_LOCAL_PORT) - remote_addr = parse_addr_spec(args[1], defport=DEFAULT_REMOTE_PORT) + local_addr = parse_addr_spec(args[0], defport=default_local_port) + remote_addr = parse_addr_spec(args[1], defport=default_remote_port) else: usage(sys.stderr) sys.exit(1) @@ -1037,16 +1091,22 @@ def main(): for method in register_methods: options.register_commands.append(build_register_command(method)) - # Local sockets, accepting SOCKS requests from localhost - local_listen = [] - for addr in options.local_addrs: - local_listen.append(listen_socket(addr)) - log(u"Listening local on %s." % format_addr(addr)) # Remote sockets, accepting remote WebSocket connections from proxies. remote_listen = [] for addr in options.remote_addrs: - remote_listen.append(listen_socket(addr)) - log(u"Listening remote on %s." % format_addr(addr)) + listen = listen_socket(addr) + remote_listen.append(listen) + log(u"Listening remote on %s." % format_sockaddr(listen.getsockname())) + # Local sockets, accepting SOCKS requests from localhost + local_listen = [] + for addr in options.local_addrs: + listen = listen_socket(addr) + local_listen.append(listen) + log(u"Listening local on %s." % format_sockaddr(listen.getsockname())) + if options.managed: + pt_cmethod("websocket", listen.getsockname()) + if options.managed: + pt_cmethods_done() # New remote sockets waiting to finish their WebSocket negotiation. websocket_pending = [] diff --git a/torrc b/torrc index 4ee54e1..c5e40d2 100644 --- a/torrc +++ b/torrc @@ -1,9 +1,8 @@ ## Configuration file for Tor over flash proxies. ## Usage: -## flashproxy-client --register ## tor -f torrc -ClientTransportPlugin websocket socks4 127.0.0.1:9001 +ClientTransportPlugin websocket exec ./flashproxy-client --register UseBridges 1 # The address and port are ignored by the client transport plugin. Bridge websocket 0.0.1.0:1

1 0

[flashproxy/master] Store CA certs file in TOR_PT_STATE_LOCATION if defined.
by dcf＠torproject.org 11 Nov '12

11 Nov '12

commit 8113e07a92cb25978a373c864de61fbaabb3ebb3 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 24 15:59:28 2012 -0700 Store CA certs file in TOR_PT_STATE_LOCATION if defined. --- flashproxy-reg-email | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/flashproxy-reg-email b/flashproxy-reg-email index 7c5fd3f..33d9db4 100755 --- a/flashproxy-reg-email +++ b/flashproxy-reg-email @@ -1,5 +1,6 @@ #!/usr/bin/env python +import errno import getopt import os import re @@ -161,6 +162,19 @@ def format_addr(addr): result += u":%d" % port return result +def get_state_dir(): + """Get a directory where we can put temporary files. Returns None if any + suitable temporary directory will do.""" + pt_dir = os.environ.get("TOR_PT_STATE_LOCATION") + if pt_dir is None: + return None + try: + os.makedirs(pt_dir) + except OSError, e: + if e.errno != errno.EEXIST: + raise + return pt_dir + options.remote_addr = (DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT) options.email_addr = DEFAULT_EMAIL_ADDRESS options.smtp_addr = (DEFAULT_SMTP_HOST, DEFAULT_SMTP_PORT) @@ -212,7 +226,8 @@ if options.debug: smtp.set_debuglevel(1) try: - ca_certs_fd, ca_certs_path = tempfile.mkstemp(prefix="flashproxy-reg-email-", suffix=".crt") + ca_certs_fd, ca_certs_path = tempfile.mkstemp(prefix="flashproxy-reg-email-", + dir=get_state_dir(), suffix=".crt") try: os.write(ca_certs_fd, CA_CERTS) os.close(ca_certs_fd)

1 0

[flashproxy/master] ChangeLog for managed flashproxy-client.
by dcf＠torproject.org 11 Nov '12

11 Nov '12

commit a42faa88672123cc174875fefaa1e73170d4b256 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Nov 10 16:03:14 2012 -0800 ChangeLog for managed flashproxy-client. --- ChangeLog | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e7033e..b104f90 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,11 @@ Changes in version 0.8 + o flashproxy-client now operates as a managed proxy by default. This + means that there is no longer a need to start flashproxy-client + separately from Tor. Use a "ClientTransportPlugin websocket exec" + line as in the included torrc. To use flashproxy-client as an + external proxy (the way it worked before), use the --external + option. + o The proxy badge does more intelligent parsing of the boolean "debug" parameter. "0", "false", and other values are now interpreted as false and do not activate debug mode. Formerly any non-empty value

1 0