May 2014 - tor-commits - lists.torproject.org

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 06 May '14

06 May '14

commit 5b058348375ed19b87fcb78234bd496fdc614fa5 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 6 14:15:11 2014 +0000 Update translations for torcheck --- es/torcheck.po | 6 +++--- fr/torcheck.po | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/es/torcheck.po b/es/torcheck.po index 06e3484..3dab419 100644 --- a/es/torcheck.po +++ b/es/torcheck.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-06 08:21+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-05-06 14:00+0000\n" +"Last-Translator: strel\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -99,4 +99,4 @@ msgid "JavaScript is disabled." msgstr "JavaScript está deshabilitado." msgid "However, it does not appear to be the Tor Browser Bundle." -msgstr "" +msgstr "Sin embargo, no parece que sea el Paquete de Navegador Tor." diff --git a/fr/torcheck.po b/fr/torcheck.po index a970cd2..19c0c42 100644 --- a/fr/torcheck.po +++ b/fr/torcheck.po @@ -4,6 +4,7 @@ # Translators: # bassmax, 2013-2014 # arpalord <arpalord(a)gmail.com>, 2012 +# fanjoe <fanjoe(a)netcourrier.com>, 2014 # Maijin <maijin21(a)gmail.com>, 2013 # Onizuka, 2013 # rike <u(a)451f.org>, 2014 @@ -12,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-06 08:21+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-05-06 14:10+0000\n" +"Last-Translator: fanjoe <fanjoe(a)netcourrier.com>\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -99,4 +100,4 @@ msgid "JavaScript is disabled." msgstr "JavaScript est désactivé." msgid "However, it does not appear to be the Tor Browser Bundle." -msgstr "" +msgstr "Toutefois, il semble qu'il ne s'agit pas de Tor Browser Bundle."

1 0

[tor-browser-bundle/master] Add a tor-master version of #8402 for nightly testing.
by mikeperry＠torproject.org 06 May '14

06 May '14

commit 14c8ff18ccdaccdf8ddf8287dea48b9da03b72dd Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri May 2 10:14:43 2014 -0700 Add a tor-master version of #8402 for nightly testing. --- gitian/descriptors/linux/gitian-tor.yml | 3 + gitian/descriptors/mac/gitian-tor.yml | 3 + gitian/descriptors/windows/gitian-tor.yml | 3 + gitian/patches/bug8402-master.patch | 767 +++++++++++++++++++++++++++++ 4 files changed, 776 insertions(+) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 8b1644e..44c2b1f 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -30,6 +30,7 @@ files: - "bug11069.patch" - "bug9665.patch" - "bug8402.patch" +- "bug8402-master.patch" - "dzip.sh" - "openssl-linux32-utils.zip" - "openssl-linux64-utils.zip" @@ -81,6 +82,8 @@ script: | git am ~/build/bug9665.patch git am ~/build/bug11200.patch git am ~/build/bug8402.patch + else + git am ~/build/bug8402-master.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index ca938fc..68905e7 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -33,6 +33,7 @@ files: - "bug11069.patch" - "bug9665.patch" - "bug8402.patch" +- "bug8402-master.patch" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" @@ -112,6 +113,8 @@ script: | git am ~/build/bug9665.patch git am ~/build/bug11200.patch git am ~/build/bug8402.patch + else + git am ~/build/bug8402-master.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 61fc9b5..bb6998b 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -32,6 +32,7 @@ files: - "bug11069.patch" - "bug9665.patch" - "bug8402.patch" +- "bug8402-master.patch" - "binutils.tar.bz2" - "dzip.sh" - "openssl.tar.gz" @@ -108,6 +109,8 @@ script: | git am ~/build/bug9665.patch git am ~/build/bug11200.patch git am ~/build/bug8402.patch + else + git am ~/build/bug8402-master.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/patches/bug8402-master.patch b/gitian/patches/bug8402-master.patch new file mode 100644 index 0000000..33d6e20 --- /dev/null +++ b/gitian/patches/bug8402-master.patch @@ -0,0 +1,767 @@ +From 7476a5c00aabdb2b2b4cd29f3029a7fa3afc657d Mon Sep 17 00:00:00 2001 +From: Yawning Angel <yawning(a)schwanenlied.me> +Date: Tue, 25 Mar 2014 07:21:22 +0000 +Subject: [PATCH 1/5] Allow ClientTransportPlugins to use proxies + +This change allows using Socks4Proxy, Socks5Proxy and HTTPSProxy with +ClientTransportPlugins via the TOR_PT_PROXY extension to the +pluggable transport specification. + +This fixes bug #8402. +--- + src/or/config.c | 24 +++++++---- + src/or/connection.c | 62 +++++++++++++++++++++-------- + src/or/transports.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++-- + src/or/transports.h | 6 +++ + src/test/test_pt.c | 81 +++++++++++++++++++++++++++++++++++++ + 5 files changed, 258 insertions(+), 27 deletions(-) + +diff --git a/src/or/config.c b/src/or/config.c +index da6aec0..91e8410 100644 +--- a/src/or/config.c ++++ b/src/or/config.c +@@ -535,7 +535,9 @@ static int options_transition_affects_descriptor( + const or_options_t *old_options, const or_options_t *new_options); + static int check_nickname_list(char **lst, const char *name, char **msg); + +-static int parse_client_transport_line(const char *line, int validate_only); ++static int parse_client_transport_line(const or_options_t *options, ++ const char *line, ++ int validate_only); + + static int parse_server_transport_line(const char *line, int validate_only); + static char *get_bindaddr_from_transport_listen_line(const char *line, +@@ -1399,7 +1401,7 @@ options_act(const or_options_t *old_options) + pt_prepare_proxy_list_for_config_read(); + if (options->ClientTransportPlugin) { + for (cl = options->ClientTransportPlugin; cl; cl = cl->next) { +- if (parse_client_transport_line(cl->value, 0)<0) { ++ if (parse_client_transport_line(options, cl->value, 0)<0) { + log_warn(LD_BUG, + "Previously validated ClientTransportPlugin line " + "could not be added!"); +@@ -3120,11 +3122,11 @@ options_validate(or_options_t *old_options, or_options_t *options, + } + } + +- /* Check if more than one proxy type has been enabled. */ ++ /* Check if more than one exclusive proxy type has been enabled. */ + if (!!options->Socks4Proxy + !!options->Socks5Proxy + +- !!options->HTTPSProxy + !!options->ClientTransportPlugin > 1) ++ !!options->HTTPSProxy > 1) + REJECT("You have configured more than one proxy type. " +- "(Socks4Proxy|Socks5Proxy|HTTPSProxy|ClientTransportPlugin)"); ++ "(Socks4Proxy|Socks5Proxy|HTTPSProxy)"); + + /* Check if the proxies will give surprising behavior. */ + if (options->HTTPProxy && !(options->Socks4Proxy || +@@ -3237,7 +3239,7 @@ options_validate(or_options_t *old_options, or_options_t *options, + } + + for (cl = options->ClientTransportPlugin; cl; cl = cl->next) { +- if (parse_client_transport_line(cl->value, 1)<0) ++ if (parse_client_transport_line(options, cl->value, 1)<0) + REJECT("Transport line did not parse. See logs for details."); + } + +@@ -4609,7 +4611,8 @@ parse_bridge_line(const char *line) + * our internal transport list. + * - If it's a managed proxy line, launch the managed proxy. */ + static int +-parse_client_transport_line(const char *line, int validate_only) ++parse_client_transport_line(const or_options_t *options, const char *line, ++ int validate_only) + { + smartlist_t *items = NULL; + int r; +@@ -4700,6 +4703,13 @@ parse_client_transport_line(const char *line, int validate_only) + pt_kickstart_client_proxy(transport_list, proxy_argv); + } + } else { /* external */ ++ /* ClientTransportPlugins connecting through a proxy is managed only. */ ++ if (options->Socks4Proxy || options->Socks5Proxy || options->HTTPSProxy) { ++ log_warn(LD_CONFIG, "You have configured an external proxy with another " ++ "proxy type. (Socks4Proxy|Socks5Proxy|HTTPSProxy)"); ++ goto err; ++ } ++ + if (smartlist_len(transport_list) != 1) { + log_warn(LD_CONFIG, "You can't have an external proxy with " + "more than one transports."); +diff --git a/src/or/connection.c b/src/or/connection.c +index 8c697d6..93d164c 100644 +--- a/src/or/connection.c ++++ b/src/or/connection.c +@@ -86,6 +86,8 @@ static int connection_read_https_proxy_response(connection_t *conn); + static void connection_send_socks5_connect(connection_t *conn); + static const char *proxy_type_to_string(int proxy_type); + static int get_proxy_type(void); ++static int get_bridge_pt_addrport(tor_addr_t *addr, uint16_t *port, ++ int *proxy_type, const connection_t *conn); + + /** The last addresses that our network interface seemed to have been + * binding to. We use this as one way to detect when our IP changes. +@@ -1671,14 +1673,14 @@ get_proxy_type(void) + { + const or_options_t *options = get_options(); + +- if (options->HTTPSProxy) ++ if (options->ClientTransportPlugin) ++ return PROXY_PLUGGABLE; ++ else if (options->HTTPSProxy) + return PROXY_CONNECT; + else if (options->Socks4Proxy) + return PROXY_SOCKS4; + else if (options->Socks5Proxy) + return PROXY_SOCKS5; +- else if (options->ClientTransportPlugin) +- return PROXY_PLUGGABLE; + else + return PROXY_NONE; + } +@@ -4733,6 +4735,35 @@ assert_connection_ok(connection_t *conn, time_t now) + } + + /** Fills addr and port with the details of the global ++ * pluggable transport or bridge we are using. ++ * conn contains the connection we are using the PT/bridge for. ++ * ++ * Return 0 on success, -1 on failure. ++ */ ++static int ++get_bridge_pt_addrport(tor_addr_t *addr, uint16_t *port, int *proxy_type, ++ const connection_t *conn) ++{ ++ const or_options_t *options = get_options(); ++ ++ if (options->ClientTransportPlugin || options->Bridges) { ++ const transport_t *transport = NULL; ++ int r; ++ r = get_transport_by_bridge_addrport(&conn->addr, conn->port, &transport); ++ if (r<0) ++ return -1; ++ if (transport) { /* transport found */ ++ tor_addr_copy(addr, &transport->addr); ++ *port = transport->port; ++ *proxy_type = transport->socks_version; ++ return 0; ++ } ++ } ++ ++ return -1; ++} ++ ++/** Fills addr and port with the details of the global + * proxy server we are using. + * conn contains the connection we are using the proxy for. + * +@@ -4744,6 +4775,16 @@ get_proxy_addrport(tor_addr_t *addr, uint16_t *port, int *proxy_type, + { + const or_options_t *options = get_options(); + ++ /* Client Transport Plugins can use another proxy, but that should be hidden ++ * from the rest of tor (as the plugin is responsible for dealing with the ++ * proxy), check it first, then check the rest of the proxy types to allow ++ * the config to have unused ClientTransportPlugin entries. ++ */ ++ if (options->ClientTransportPlugin) { ++ if (get_bridge_pt_addrport(addr, port, proxy_type, conn) == 0) ++ return 0; ++ } ++ + if (options->HTTPSProxy) { + tor_addr_copy(addr, &options->HTTPSProxyAddr); + *port = options->HTTPSProxyPort; +@@ -4759,19 +4800,8 @@ get_proxy_addrport(tor_addr_t *addr, uint16_t *port, int *proxy_type, + *port = options->Socks5ProxyPort; + *proxy_type = PROXY_SOCKS5; + return 0; +- } else if (options->ClientTransportPlugin || +- options->Bridges) { +- const transport_t *transport = NULL; +- int r; +- r = get_transport_by_bridge_addrport(&conn->addr, conn->port, &transport); +- if (r<0) +- return -1; +- if (transport) { /* transport found */ +- tor_addr_copy(addr, &transport->addr); +- *port = transport->port; +- *proxy_type = transport->socks_version; +- return 0; +- } ++ } else if (options->Bridges) { ++ return get_bridge_pt_addrport(addr, port, proxy_type, conn); + } + + *proxy_type = PROXY_NONE; +diff --git a/src/or/transports.c b/src/or/transports.c +index 8b4a118..8e82a41 100644 +--- a/src/or/transports.c ++++ b/src/or/transports.c +@@ -122,6 +122,8 @@ static INLINE void free_execve_args(char **arg); + #define PROTO_SMETHOD_ERROR "SMETHOD-ERROR" + #define PROTO_CMETHODS_DONE "CMETHODS DONE" + #define PROTO_SMETHODS_DONE "SMETHODS DONE" ++#define PROTO_PROXY_DONE "PROXY DONE" ++#define PROTO_PROXY_ERROR "PROXY-ERROR" + + /** The first and only supported - at the moment - configuration + protocol version. */ +@@ -437,6 +439,17 @@ add_transport_to_proxy(const char *transport, managed_proxy_t *mp) + static int + proxy_needs_restart(const managed_proxy_t *mp) + { ++ int ret = 1; ++ char* proxy_uri; ++ ++ /* If the PT proxy config has changed, then all existing pluggable transports ++ * should be restarted. ++ */ ++ ++ proxy_uri = get_pt_proxy_uri(); ++ if (strcmp_opt(proxy_uri, mp->proxy_uri) != 0) ++ goto needs_restart; ++ + /* mp->transport_to_launch is populated with the names of the + transports that must be launched *after* the SIGHUP. + mp->transports is populated with the transports that were +@@ -457,10 +470,10 @@ proxy_needs_restart(const managed_proxy_t *mp) + + } SMARTLIST_FOREACH_END(t); + +- return 0; +- +- needs_restart: +- return 1; ++ ret = 0; ++needs_restart: ++ tor_free(proxy_uri); ++ return ret; + } + + /** Managed proxy mp must be restarted. Do all the necessary +@@ -491,6 +504,11 @@ proxy_prepare_for_restart(managed_proxy_t *mp) + SMARTLIST_FOREACH(mp->transports, transport_t *, t, transport_free(t)); + smartlist_clear(mp->transports); + ++ /* Reset the proxy's HTTPS/SOCKS proxy */ ++ tor_free(mp->proxy_uri); ++ mp->proxy_uri = get_pt_proxy_uri(); ++ mp->proxy_supported = 0; ++ + /* flag it as an infant proxy so that it gets launched on next tick */ + mp->conf_state = PT_PROTO_INFANT; + unconfigured_proxies_n++; +@@ -725,12 +743,52 @@ managed_proxy_destroy(managed_proxy_t *mp, + /* free the argv */ + free_execve_args(mp->argv); + ++ /* free the outgoing proxy URI */ ++ tor_free(mp->proxy_uri); ++ + tor_process_handle_destroy(mp->process_handle, also_terminate_process); + mp->process_handle = NULL; + + tor_free(mp); + } + ++/** Convert the tor proxy options to a URI suitable for TOR_PT_PROXY. */ ++STATIC char * ++get_pt_proxy_uri(void) ++{ ++ const or_options_t *options = get_options(); ++ char *uri = NULL; ++ ++ if (options->Socks4Proxy || options->Socks5Proxy || options->HTTPSProxy) { ++ char addr[TOR_ADDR_BUF_LEN+1]; ++ ++ if (options->Socks4Proxy) { ++ tor_addr_to_str(addr, &options->Socks4ProxyAddr, sizeof(addr), 1); ++ tor_asprintf(&uri, "socks4a://%s:%d", addr, options->Socks4ProxyPort); ++ } else if (options->Socks5Proxy) { ++ tor_addr_to_str(addr, &options->Socks5ProxyAddr, sizeof(addr), 1); ++ if (!options->Socks5ProxyUsername && !options->Socks5ProxyPassword) { ++ tor_asprintf(&uri, "socks5://%s:%d", addr, options->Socks5ProxyPort); ++ } else { ++ tor_asprintf(&uri, "socks5://%s:%s@%s:%d", ++ options->Socks5ProxyUsername, ++ options->Socks5ProxyPassword, ++ addr, options->Socks5ProxyPort); ++ } ++ } else if (options->HTTPSProxy) { ++ tor_addr_to_str(addr, &options->HTTPSProxyAddr, sizeof(addr), 1); ++ if (!options->HTTPSProxyAuthenticator) { ++ tor_asprintf(&uri, "http://%s:%d", addr, options->HTTPSProxyPort); ++ } else { ++ tor_asprintf(&uri, "http://%s@%s:%d", options->HTTPSProxyAuthenticator, ++ addr, options->HTTPSProxyPort); ++ } ++ } ++ } ++ ++ return uri; ++} ++ + /** Handle a configured or broken managed proxy mp. */ + static void + handle_finished_proxy(managed_proxy_t *mp) +@@ -743,6 +801,12 @@ handle_finished_proxy(managed_proxy_t *mp) + managed_proxy_destroy(mp, 0); /* destroy it but don't terminate */ + break; + case PT_PROTO_CONFIGURED: /* if configured correctly: */ ++ if (mp->proxy_uri && !mp->proxy_supported) { ++ log_warn(LD_CONFIG, "Managed proxy '%s' did not configure the " ++ "specified outgoing proxy.", mp->argv[0]); ++ managed_proxy_destroy(mp, 1); /* annihilate it. */ ++ break; ++ } + register_proxy(mp); /* register its transports */ + mp->conf_state = PT_PROTO_COMPLETED; /* and mark it as completed. */ + break; +@@ -860,6 +924,22 @@ handle_proxy_line(const char *line, managed_proxy_t *mp) + goto err; + + return; ++ } else if (!strcmpstart(line, PROTO_PROXY_DONE)) { ++ if (mp->conf_state != PT_PROTO_ACCEPTING_METHODS) ++ goto err; ++ ++ if (mp->proxy_uri) { ++ mp->proxy_supported = 1; ++ return; ++ } ++ ++ /* No proxy was configured, this should log */ ++ } else if (!strcmpstart(line, PROTO_PROXY_ERROR)) { ++ if (mp->conf_state != PT_PROTO_ACCEPTING_METHODS) ++ goto err; ++ ++ parse_proxy_error(line); ++ goto err; + } else if (!strcmpstart(line, SPAWN_ERROR_MESSAGE)) { + /* managed proxy launch failed: parse error message to learn why. */ + int retval, child_state, saved_errno; +@@ -1126,6 +1206,21 @@ parse_cmethod_line(const char *line, managed_proxy_t *mp) + return r; + } + ++/** Parses an PROXY-ERROR line and warns the user accordingly. */ ++STATIC void ++parse_proxy_error(const char *line) ++{ ++ /* (Length of the protocol string) plus (a space) and (the first char of ++ the error message) */ ++ if (strlen(line) < (strlen(PROTO_PROXY_ERROR) + 2)) ++ log_notice(LD_CONFIG, "Managed proxy sent us an %s without an error " ++ "message.", PROTO_PROXY_ERROR); ++ ++ log_warn(LD_CONFIG, "Managed proxy failed to configure the " ++ "pluggable transport's outgoing proxy. (%s)", ++ line+strlen(PROTO_PROXY_ERROR)+1); ++} ++ + /** Return a newly allocated string that tor should place in + * TOR_PT_SERVER_TRANSPORT_OPTIONS while configuring the server + * manged proxy in mp. Return NULL if no such options are found. */ +@@ -1286,6 +1381,14 @@ create_managed_proxy_environment(const managed_proxy_t *mp) + } else { + smartlist_add_asprintf(envs, "TOR_PT_EXTENDED_SERVER_PORT="); + } ++ } else { ++ /* If ClientTransportPlugin has a HTTPS/SOCKS proxy configured, set the ++ * TOR_PT_PROXY line. ++ */ ++ ++ if (mp->proxy_uri) { ++ smartlist_add_asprintf(envs, "TOR_PT_PROXY=%s", mp->proxy_uri); ++ } + } + + SMARTLIST_FOREACH_BEGIN(envs, const char *, env_var) { +@@ -1318,6 +1421,7 @@ managed_proxy_create(const smartlist_t *transport_list, + mp->is_server = is_server; + mp->argv = proxy_argv; + mp->transports = smartlist_new(); ++ mp->proxy_uri = get_pt_proxy_uri(); + + mp->transports_to_launch = smartlist_new(); + SMARTLIST_FOREACH(transport_list, const char *, transport, +diff --git a/src/or/transports.h b/src/or/transports.h +index 7b524f2..5b8144b 100644 +--- a/src/or/transports.h ++++ b/src/or/transports.h +@@ -81,6 +81,9 @@ typedef struct { + char **argv; /* the cli arguments of this proxy */ + int conf_protocol; /* the configuration protocol version used */ + ++ char *proxy_uri; /* the outgoing proxy in TOR_PT_PROXY URI format */ ++ int proxy_supported : 1; /* the proxy claims to honor TOR_PT_PROXY */ ++ + int is_server; /* is it a server proxy? */ + + /* A pointer to the process handle of this managed proxy. */ +@@ -112,6 +115,7 @@ STATIC int parse_smethod_line(const char *line, managed_proxy_t *mp); + + STATIC int parse_version(const char *line, managed_proxy_t *mp); + STATIC void parse_env_error(const char *line); ++STATIC void parse_proxy_error(const char *line); + STATIC void handle_proxy_line(const char *line, managed_proxy_t *mp); + STATIC char *get_transport_options_for_server_proxy(const managed_proxy_t *mp); + +@@ -123,6 +127,8 @@ STATIC managed_proxy_t *managed_proxy_create(const smartlist_t *transport_list, + + STATIC int configure_proxy(managed_proxy_t *mp); + ++STATIC char* get_pt_proxy_uri(void); ++ + #endif + + #endif +diff --git a/src/test/test_pt.c b/src/test/test_pt.c +index 3277921..ada8dbe 100644 +--- a/src/test/test_pt.c ++++ b/src/test/test_pt.c +@@ -435,6 +435,85 @@ test_pt_configure_proxy(void *arg) + } + } + ++/* Test the get_pt_proxy_uri() function. */ ++static void ++test_get_pt_proxy_uri(void *arg) ++{ ++ or_options_t *options = get_options_mutable(); ++ char *uri = NULL; ++ int ret; ++ (void) arg; ++ ++ /* Test with no proxy. */ ++ uri = get_pt_proxy_uri(); ++ tt_assert(uri == NULL); ++ ++ /* Test with a SOCKS4 proxy. */ ++ options->Socks4Proxy = "192.0.2.1:1080"; ++ ret = tor_addr_port_lookup(options->Socks4Proxy, ++ &options->Socks4ProxyAddr, ++ &options->Socks4ProxyPort); ++ tt_assert(ret == 0); ++ uri = get_pt_proxy_uri(); ++ tt_str_op(uri, ==, "socks4a://192.0.2.1:1080"); ++ tor_free(uri); ++ ++ options->Socks4Proxy = NULL; ++ ++ /* Test with a SOCKS5 proxy, no username/password. */ ++ options->Socks5Proxy = "192.0.2.1:1080"; ++ ret = tor_addr_port_lookup(options->Socks5Proxy, ++ &options->Socks5ProxyAddr, ++ &options->Socks5ProxyPort); ++ tt_assert(ret == 0); ++ uri = get_pt_proxy_uri(); ++ tt_str_op(uri, ==, "socks5://192.0.2.1:1080"); ++ tor_free(uri); ++ ++ /* Test with a SOCKS5 proxy, with username/password. */ ++ options->Socks5ProxyUsername = "hwest"; ++ options->Socks5ProxyPassword = "r34n1m470r"; ++ uri = get_pt_proxy_uri(); ++ tt_str_op(uri, ==, "socks5://hwest:r34n1m470r@192.0.2.1:1080"); ++ tor_free(uri); ++ ++ options->Socks5Proxy = NULL; ++ ++ /* Test with a HTTPS proxy, no authenticator. */ ++ options->HTTPSProxy = "192.0.2.1:80"; ++ ret = tor_addr_port_lookup(options->HTTPSProxy, ++ &options->HTTPSProxyAddr, ++ &options->HTTPSProxyPort); ++ tt_assert(ret == 0); ++ uri = get_pt_proxy_uri(); ++ tt_str_op(uri, ==, "http://192.0.2.1:80"); ++ tor_free(uri); ++ ++ /* Test with a HTTPS proxy, with authenticator. */ ++ options->HTTPSProxyAuthenticator = "hwest:r34n1m470r"; ++ uri = get_pt_proxy_uri(); ++ tt_str_op(uri, ==, "http://hwest:r34n1m470r@192.0.2.1:80"); ++ tor_free(uri); ++ ++ options->HTTPSProxy = NULL; ++ ++ /* Token nod to the fact that IPv6 exists. */ ++ options->Socks4Proxy = "[2001:db8::1]:1080"; ++ ret = tor_addr_port_lookup(options->Socks4Proxy, ++ &options->Socks4ProxyAddr, ++ &options->Socks4ProxyPort); ++ tt_assert(ret == 0); ++ uri = get_pt_proxy_uri(); ++ tt_str_op(uri, ==, "socks4a://[2001:db8::1]:1080"); ++ tor_free(uri); ++ ++ ++ done: ++ if (uri) ++ tor_free(uri); ++} ++ ++ + #define PT_LEGACY(name) \ + { #name, legacy_test_helper, 0, &legacy_setup, test_pt_ ## name } + +@@ -447,6 +526,8 @@ struct testcase_t pt_tests[] = { + NULL, NULL }, + { "configure_proxy",test_pt_configure_proxy, TT_FORK, + NULL, NULL }, ++ { "get_pt_proxy_uri", test_get_pt_proxy_uri, TT_FORK, ++ NULL, NULL }, + END_OF_TESTCASES + }; + +-- +1.8.1.2 + +From bc59556e87a0b0ebaf2adfc57147522f05b3f974 Mon Sep 17 00:00:00 2001 +From: Yawning Angel <yawning(a)schwanenlied.me> +Date: Mon, 14 Apr 2014 21:51:34 +0000 +Subject: [PATCH 2/5] Fixed the test build with --enable-gcc-warnings + +--- + src/test/test_pt.c | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/src/test/test_pt.c b/src/test/test_pt.c +index ada8dbe..ac604eb 100644 +--- a/src/test/test_pt.c ++++ b/src/test/test_pt.c +@@ -449,7 +449,7 @@ test_get_pt_proxy_uri(void *arg) + tt_assert(uri == NULL); + + /* Test with a SOCKS4 proxy. */ +- options->Socks4Proxy = "192.0.2.1:1080"; ++ options->Socks4Proxy = tor_strdup("192.0.2.1:1080"); + ret = tor_addr_port_lookup(options->Socks4Proxy, + &options->Socks4ProxyAddr, + &options->Socks4ProxyPort); +@@ -457,11 +457,10 @@ test_get_pt_proxy_uri(void *arg) + uri = get_pt_proxy_uri(); + tt_str_op(uri, ==, "socks4a://192.0.2.1:1080"); + tor_free(uri); +- +- options->Socks4Proxy = NULL; ++ tor_free(options->Socks4Proxy); + + /* Test with a SOCKS5 proxy, no username/password. */ +- options->Socks5Proxy = "192.0.2.1:1080"; ++ options->Socks5Proxy = tor_strdup("192.0.2.1:1080"); + ret = tor_addr_port_lookup(options->Socks5Proxy, + &options->Socks5ProxyAddr, + &options->Socks5ProxyPort); +@@ -471,16 +470,17 @@ test_get_pt_proxy_uri(void *arg) + tor_free(uri); + + /* Test with a SOCKS5 proxy, with username/password. */ +- options->Socks5ProxyUsername = "hwest"; +- options->Socks5ProxyPassword = "r34n1m470r"; ++ options->Socks5ProxyUsername = tor_strdup("hwest"); ++ options->Socks5ProxyPassword = tor_strdup("r34n1m470r"); + uri = get_pt_proxy_uri(); + tt_str_op(uri, ==, "socks5://hwest:r34n1m470r@192.0.2.1:1080"); + tor_free(uri); +- +- options->Socks5Proxy = NULL; ++ tor_free(options->Socks5Proxy); ++ tor_free(options->Socks5ProxyUsername); ++ tor_free(options->Socks5ProxyPassword); + + /* Test with a HTTPS proxy, no authenticator. */ +- options->HTTPSProxy = "192.0.2.1:80"; ++ options->HTTPSProxy = tor_strdup("192.0.2.1:80"); + ret = tor_addr_port_lookup(options->HTTPSProxy, + &options->HTTPSProxyAddr, + &options->HTTPSProxyPort); +@@ -490,15 +490,15 @@ test_get_pt_proxy_uri(void *arg) + tor_free(uri); + + /* Test with a HTTPS proxy, with authenticator. */ +- options->HTTPSProxyAuthenticator = "hwest:r34n1m470r"; ++ options->HTTPSProxyAuthenticator = tor_strdup("hwest:r34n1m470r"); + uri = get_pt_proxy_uri(); + tt_str_op(uri, ==, "http://hwest:r34n1m470r@192.0.2.1:80"); + tor_free(uri); +- +- options->HTTPSProxy = NULL; ++ tor_free(options->HTTPSProxy); ++ tor_free(options->HTTPSProxyAuthenticator); + + /* Token nod to the fact that IPv6 exists. */ +- options->Socks4Proxy = "[2001:db8::1]:1080"; ++ options->Socks4Proxy = tor_strdup("[2001:db8::1]:1080"); + ret = tor_addr_port_lookup(options->Socks4Proxy, + &options->Socks4ProxyAddr, + &options->Socks4ProxyPort); +@@ -506,7 +506,7 @@ test_get_pt_proxy_uri(void *arg) + uri = get_pt_proxy_uri(); + tt_str_op(uri, ==, "socks4a://[2001:db8::1]:1080"); + tor_free(uri); +- ++ tor_free(options->Socks4Proxy); + + done: + if (uri) +-- +1.8.1.2 + +From 3c991178926f39ffacef1d86e403f5d360d30404 Mon Sep 17 00:00:00 2001 +From: Yawning Angel <yawning(a)schwanenlied.me> +Date: Thu, 1 May 2014 03:30:09 +0000 +Subject: [PATCH 3/5] Remove get_bridge_pt_addrport(). + +The code was not disambiguating ClientTransportPlugin configured and +not used, and ClientTransportPlugin configured, but in a failed state. + +The right thing to do is to undo moving the get_transport_by_addrport() +call back into get_proxy_addrport(), and remove and explicit check for +using a Bridge since by the time the check is made, if a Bridge is +being used, it is PT/proxy-less. +--- + src/or/connection.c | 46 ++++++++++++---------------------------------- + 1 file changed, 12 insertions(+), 34 deletions(-) + +diff --git a/src/or/connection.c b/src/or/connection.c +index 93d164c..9a766d6 100644 +--- a/src/or/connection.c ++++ b/src/or/connection.c +@@ -86,8 +86,6 @@ static int connection_read_https_proxy_response(connection_t *conn); + static void connection_send_socks5_connect(connection_t *conn); + static const char *proxy_type_to_string(int proxy_type); + static int get_proxy_type(void); +-static int get_bridge_pt_addrport(tor_addr_t *addr, uint16_t *port, +- int *proxy_type, const connection_t *conn); + + /** The last addresses that our network interface seemed to have been + * binding to. We use this as one way to detect when our IP changes. +@@ -4735,35 +4733,6 @@ assert_connection_ok(connection_t *conn, time_t now) + } + + /** Fills addr and port with the details of the global +- * pluggable transport or bridge we are using. +- * conn contains the connection we are using the PT/bridge for. +- * +- * Return 0 on success, -1 on failure. +- */ +-static int +-get_bridge_pt_addrport(tor_addr_t *addr, uint16_t *port, int *proxy_type, +- const connection_t *conn) +-{ +- const or_options_t *options = get_options(); +- +- if (options->ClientTransportPlugin || options->Bridges) { +- const transport_t *transport = NULL; +- int r; +- r = get_transport_by_bridge_addrport(&conn->addr, conn->port, &transport); +- if (r<0) +- return -1; +- if (transport) { /* transport found */ +- tor_addr_copy(addr, &transport->addr); +- *port = transport->port; +- *proxy_type = transport->socks_version; +- return 0; +- } +- } +- +- return -1; +-} +- +-/** Fills addr and port with the details of the global + * proxy server we are using. + * conn contains the connection we are using the proxy for. + * +@@ -4781,8 +4750,19 @@ get_proxy_addrport(tor_addr_t *addr, uint16_t *port, int *proxy_type, + * the config to have unused ClientTransportPlugin entries. + */ + if (options->ClientTransportPlugin) { +- if (get_bridge_pt_addrport(addr, port, proxy_type, conn) == 0) ++ const transport_t *transport = NULL; ++ int r; ++ r = get_transport_by_bridge_addrport(&conn->addr, conn->port, &transport); ++ if (r<0) ++ return -1; ++ if (transport) { /* transport found */ ++ tor_addr_copy(addr, &transport->addr); ++ *port = transport->port; ++ *proxy_type = transport->socks_version; + return 0; ++ } ++ ++ /* Unused ClientTransportPlugin. */ + } + + if (options->HTTPSProxy) { +@@ -4800,8 +4780,6 @@ get_proxy_addrport(tor_addr_t *addr, uint16_t *port, int *proxy_type, + *port = options->Socks5ProxyPort; + *proxy_type = PROXY_SOCKS5; + return 0; +- } else if (options->Bridges) { +- return get_bridge_pt_addrport(addr, port, proxy_type, conn); + } + + *proxy_type = PROXY_NONE; +-- +1.8.1.2 + +From c4c41bb8e31ab39f2c7fe3c8f11ee727a65c3e09 Mon Sep 17 00:00:00 2001 +From: Yawning Angel <yawning(a)schwanenlied.me> +Date: Thu, 1 May 2014 03:43:53 +0000 +Subject: [PATCH 4/5] Log the correct proxy type on failure. + +get_proxy_addrport fills in proxy_type with the correct value, so there +is no point in logging something that's a "best guess" based off the +config. +--- + src/or/connection.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/or/connection.c b/src/or/connection.c +index 9a766d6..b2e6a69 100644 +--- a/src/or/connection.c ++++ b/src/or/connection.c +@@ -4801,7 +4801,7 @@ log_failed_proxy_connection(connection_t *conn) + log_warn(LD_NET, + "The connection to the %s proxy server at %s just failed. " + "Make sure that the proxy server is up and running.", +- proxy_type_to_string(get_proxy_type()), ++ proxy_type_to_string(proxy_type), + fmt_addrport(&proxy_addr, proxy_port)); + } + +-- +1.8.1.2 + +From e3b5b7f4b9e5ef4637f0719d54be9f534e41019c Mon Sep 17 00:00:00 2001 +From: Yawning Angel <yawning(a)schwanenlied.me> +Date: Thu, 1 May 2014 18:58:53 +0000 +Subject: [PATCH 5/5] Improve the log message when a transport doesn't support + proxies. + +Per feedback, explicltly note that the transport will be killed when it +does not acknowledge the configured outgoing proxy. +--- + src/or/transports.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/or/transports.c b/src/or/transports.c +index 8e82a41..3991bd3 100644 +--- a/src/or/transports.c ++++ b/src/or/transports.c +@@ -803,7 +803,8 @@ handle_finished_proxy(managed_proxy_t *mp) + case PT_PROTO_CONFIGURED: /* if configured correctly: */ + if (mp->proxy_uri && !mp->proxy_supported) { + log_warn(LD_CONFIG, "Managed proxy '%s' did not configure the " +- "specified outgoing proxy.", mp->argv[0]); ++ "specified outgoing proxy and will be terminated.", ++ mp->argv[0]); + managed_proxy_destroy(mp, 1); /* annihilate it. */ + break; + } +-- +1.8.1.2 +

1 0

[tor-launcher/master] Bug #11772: Proxy Type menu not set correctly
by brade＠torproject.org 06 May '14

06 May '14

commit da9c9ad4b61ed0ce002b5e771f50991640bc9f43 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue May 6 09:53:06 2014 -0400 Bug #11772: Proxy Type menu not set correctly Fixed problem where the Proxy Type menu was not restored to the configured value after restarting the browser. --- src/chrome/content/network-settings.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 98028e2..c6b6cf2 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -1186,27 +1186,27 @@ function setElemValue(aID, aValue) var elem = document.getElementById(aID); if (elem) { + var val = aValue; switch (elem.tagName) { case "checkbox": - elem.checked = aValue; + elem.checked = val; toggleElemUI(elem); break; case "textbox": - var s = aValue; if (Array.isArray(aValue)) { - s = ""; + val = ""; for (var i = 0; i < aValue.length; ++i) { - if (s.length > 0) - s += '\n'; - s += aValue[i]; + if (val.length > 0) + val += '\n'; + val += aValue[i]; } } // fallthru case "menulist": - elem.value = (s) ? s : ""; + elem.value = (val) ? val : ""; break; } }

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 06 May '14

06 May '14

commit c3c8ba796a3689ab30a18c88fbec933a1de0b985 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 6 13:45:11 2014 +0000 Update translations for torcheck_completed --- de/torcheck.po | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/de/torcheck.po b/de/torcheck.po index f0fb985..8868fcc 100644 --- a/de/torcheck.po +++ b/de/torcheck.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-02 19:01+0000\n" -"Last-Translator: si.mueller1 <si.mueller1(a)web.de>\n" +"PO-Revision-Date: 2014-05-06 13:40+0000\n" +"Last-Translator: to_ba\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -97,3 +97,6 @@ msgstr "JavaScript ist aktiviert." msgid "JavaScript is disabled." msgstr "JavaScript ist deaktiviert." + +msgid "However, it does not appear to be the Tor Browser Bundle." +msgstr "Allerdings erscheint es nicht das Tor-Browser-Paket zu sein."

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 06 May '14

06 May '14

commit bc11dc2069173a5febe238dc86b1431ddd774bfb Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 6 13:45:09 2014 +0000 Update translations for torcheck --- de/torcheck.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/de/torcheck.po b/de/torcheck.po index 866683b..8868fcc 100644 --- a/de/torcheck.po +++ b/de/torcheck.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-06 08:21+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-05-06 13:40+0000\n" +"Last-Translator: to_ba\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -99,4 +99,4 @@ msgid "JavaScript is disabled." msgstr "JavaScript ist deaktiviert." msgid "However, it does not appear to be the Tor Browser Bundle." -msgstr "" +msgstr "Allerdings erscheint es nicht das Tor-Browser-Paket zu sein."

1 0

[obfsproxy/master] Print ScrambleSuit disclaimer on startup.
by asn＠torproject.org 06 May '14

06 May '14

commit 0005192c52863f45c36709722cb3c7f237f9c375 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue May 6 14:15:15 2014 +0100 Print ScrambleSuit disclaimer on startup. instead of printing it for every new connection --- ChangeLog | 4 ++++ obfsproxy/transports/scramblesuit/scramblesuit.py | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 05cc725..469988e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Changes in version 0.2.10 - UNRELEASED: + - Only print ScrambleSuit disclaimer on startup (instead of + printing it for every connection). Fixes #11768. + Changes in version 0.2.9 - 2014-05-01: - Support connecting over a HTTPS CONNECT proxy. Patch by Yawning Angel. Fixes #11409. diff --git a/obfsproxy/transports/scramblesuit/scramblesuit.py b/obfsproxy/transports/scramblesuit/scramblesuit.py index 9262b34..6279925 100644 --- a/obfsproxy/transports/scramblesuit/scramblesuit.py +++ b/obfsproxy/transports/scramblesuit/scramblesuit.py @@ -45,10 +45,6 @@ class ScrambleSuitTransport( base.BaseTransport ): Initialise a ScrambleSuitTransport object. """ - log.error("\n\n################################################\n" - "Do NOT rely on ScrambleSuit for strong security!\n" - "################################################\n") - log.debug("Initialising %s." % const.TRANSPORT_NAME) super(ScrambleSuitTransport, self).__init__() @@ -106,6 +102,10 @@ class ScrambleSuitTransport( base.BaseTransport ): Called once when obfsproxy starts. """ + log.error("\n\n################################################\n" + "Do NOT rely on ScrambleSuit for strong security!\n" + "################################################\n") + util.setStateLocation(transportConfig.getStateLocation()) cls.weAreClient = transportConfig.weAreClient

1 0

[bridgedb/develop] Sphinxify docstring for EmailBasedDistributor.getBridgesForEmail().
by isis＠torproject.org 06 May '14

06 May '14

commit 34d61788f471091bb7d466bedd800d98d818517c Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon May 5 19:25:47 2014 +0000 Sphinxify docstring for EmailBasedDistributor.getBridgesForEmail(). --- lib/bridgedb/Dist.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 984dd59..1596fd1 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -380,10 +380,15 @@ class EmailBasedDistributor(Distributor): def getBridgesForEmail(self, emailaddress, epoch, N=1, parameters=None, countryCode=None, bridgeFilterRules=None): """Return a list of bridges to give to a user. - emailaddress -- the user's email address, as given in a from line. - epoch -- the time period when we got this request. This can - be any string, so long as it changes with every period. - N -- the number of bridges to try to give back. + + :param str emailaddress: The user's email address, as given in a + :header:`From:` line. + :param epoch: The time period when we got this request. This can be + any string, so long as it changes with every period. + :param int N: The number of bridges to try to give back. + :param parameters: DOCDOC + :param countryCode: DOCDOC + :param bridgeFilterRules: DOCDOC """ if not bridgeFilterRules: bridgeFilterRules=[]

1 0

[bridgedb/develop] Kill bridgedb.I18n and add new bridgedb.strings module.
by isis＠torproject.org 06 May '14

06 May '14

commit 242409d57460d6ab47c4443c1741bc6cd282bfac Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri May 2 16:55:28 2014 +0000 Kill bridgedb.I18n and add new bridgedb.strings module. This new module holds translated strings which are used in several places in the code, in order to save our helpful translators from having to translate the same boring string over and over again. This has been redesigned to permit these strings to be formatted for both the email and HTTPS distributors. --- README | 2 +- doc/sphinx/source/bridgedb.I18n.rst | 8 -- doc/sphinx/source/bridgedb.rst | 2 +- doc/sphinx/source/bridgedb.strings.rst | 8 ++ doc/sphinx/source/conf.py | 2 +- lib/bridgedb/HTTPServer.py | 2 +- lib/bridgedb/I18n.py | 88 --------------- lib/bridgedb/strings.py | 182 ++++++++++++++++++++++++++++++++ 8 files changed, 194 insertions(+), 100 deletions(-) diff --git a/README b/README index 4724594..c5adf54 100644 --- a/README +++ b/README @@ -124,7 +124,7 @@ all the updated files in their correct locations. **Requesting Translations for Altered/Added Source Code**: This should be done whenever any of the strings requiring translation -- _("they are formatted like this") -- are changed, or new ones are added. - See ```lib/bridgedb/I18n.py```. + See ```lib/bridgedb/strings.py```. Translations for Tor Project repos are kept [in a separate repo](https://gitweb.torproject.org/translation.git). You'll diff --git a/doc/sphinx/source/bridgedb.I18n.rst b/doc/sphinx/source/bridgedb.I18n.rst deleted file mode 100644 index cd1274f..0000000 --- a/doc/sphinx/source/bridgedb.I18n.rst +++ /dev/null @@ -1,8 +0,0 @@ -bridgedb.I18n -------------- - -.. automodule:: bridgedb.I18n - :members: - :undoc-members: - :private-members: - :show-inheritance: diff --git a/doc/sphinx/source/bridgedb.rst b/doc/sphinx/source/bridgedb.rst index 3c768cc..aa775f9 100644 --- a/doc/sphinx/source/bridgedb.rst +++ b/doc/sphinx/source/bridgedb.rst @@ -14,7 +14,6 @@ BridgeDB Package and Module Documentation bridgedb.EmailServer bridgedb.Filters bridgedb.HTTPServer - bridgedb.I18n bridgedb.Main bridgedb.parse bridgedb.persistent @@ -22,6 +21,7 @@ BridgeDB Package and Module Documentation bridgedb.safelog bridgedb.Stability bridgedb.Storage + bridgedb.strings bridgedb.Tests bridgedb.txrecaptcha bridgedb.util diff --git a/doc/sphinx/source/bridgedb.strings.rst b/doc/sphinx/source/bridgedb.strings.rst new file mode 100644 index 0000000..114931b --- /dev/null +++ b/doc/sphinx/source/bridgedb.strings.rst @@ -0,0 +1,8 @@ +bridgedb.strings +---------------- + +.. automodule:: bridgedb.strings + :members: + :undoc-members: + :private-members: + :show-inheritance: diff --git a/doc/sphinx/source/conf.py b/doc/sphinx/source/conf.py index 0a71d87..977032f 100644 --- a/doc/sphinx/source/conf.py +++ b/doc/sphinx/source/conf.py @@ -35,13 +35,13 @@ import bridgedb.Dist import bridgedb.EmailServer import bridgedb.Filters import bridgedb.HTTPServer -import bridgedb.I18n import bridgedb.Main import bridgedb.persistent import bridgedb.runner import bridgedb.safelog import bridgedb.Stability import bridgedb.Storage +import bridgedb.strings import bridgedb.test import bridgedb.Tests import bridgedb.txrecaptcha diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index c28dee0..cf8a83a 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -31,10 +31,10 @@ from twisted.web import static from twisted.web.util import redirectTo import bridgedb.Dist -import bridgedb.I18n as I18n from bridgedb import captcha from bridgedb import crypto +from bridgedb import strings from bridgedb import translations from bridgedb import txrecaptcha from bridgedb.Filters import filterBridgesByIP4 diff --git a/lib/bridgedb/I18n.py b/lib/bridgedb/I18n.py deleted file mode 100644 index c6fbf3f..0000000 --- a/lib/bridgedb/I18n.py +++ /dev/null @@ -1,88 +0,0 @@ -# BridgeDB i18n strings & helper routines. The string should go into pootle - -import os -import gettext - -def getLang(lang, localedir=os.path.expanduser("~") + "/share/locale"): - """Return the Translation instance for a given language. If no Translation - instance is found, return the one for 'en' - """ - return gettext.translation("bridgedb", localedir=localedir, - languages=[lang], fallback="en") - -def _(text): - """This is necessary because strings are translated when they're imported. - Otherwise this would make it impossible to switch languages more than - once. - - :returns: The **text**. - """ - return text - -# All text that needs translation goes here -BRIDGEDB_TEXT = [ - # BRIDGEDB_TEXT[0] - _("""Here are your bridge relays: """), - # BRIDGEDB_TEXT[1] - _("""Bridge relays (or "bridges" for short) are Tor relays that aren't listed -in the main directory. Since there is no complete public list of them, -even if your ISP is filtering connections to all the known Tor relays, -they probably won't be able to block all the bridges."""), - # BRIDGEDB_TEXT[2] - _("""To use the above lines, go to Vidalia's Network settings page, and click -"My ISP blocks connections to the Tor network". Then add each bridge -address one at a time."""), - # BRIDGEDB_TEXT[3] - _("""Configuring more than one bridge address will make your Tor connection -more stable, in case some of the bridges become unreachable."""), - # BRIDGEDB_TEXT[4] - _("""Another way to find public bridge addresses is to send mail to -bridges(a)torproject.org with the line "get bridges" by itself in the body -of the mail. However, so we can make it harder for an attacker to learn -lots of bridge addresses, you must send this request from an email address at -one of the following domains:"""), - # BRIDGEDB_TEXT[5] - _("""[This is an automated message; please do not reply.]"""), - # BRIDGEDB_TEXT[6] - _("""Another way to find public bridge addresses is to visit -https://bridges.torproject.org/. The answers you get from that page -will change every few days, so check back periodically if you need more -bridge addresses."""), - # BRIDGEDB_TEXT[7] - _("""(no bridges currently available)"""), - # BRIDGEDB_TEXT[8] - _("""(e-mail requests not currently supported)"""), - # BRIDGEDB_TEXT[9] - _("""To receive your bridge relays, please prove you are human"""), - # BRIDGEDB_TEXT[10] - _("""You have exceeded the rate limit. Please slow down, the minimum time -between emails is: """), - # BRIDGEDB_TEXT[11] - _("""hours"""), - # BRIDGEDB_TEXT[12] - _("""All further emails will be ignored."""), - # BRIDGEDB_TEXT[13] - _("""Type the two words"""), - # BRIDGEDB_TEXT[14] - _("""I am human"""), - # BRIDGEDB_TEXT[15] - _("""Upgrade your browser to Firefox"""), - # BRIDGEDB_TEXT[16] - _("""(Might be blocked)"""), - # BRIDGEDB_TEXT[17] - _("""The following commands are also supported:"""), - # BRIDGEDB_TEXT[18] - _("""ipv6 : request ipv6 bridges."""), - # BRIDGEDB_TEXT[19] - _("""transport NAME : request transport NAME. Example: 'transport obfs2'"""), - # BRIDGEDB_TEXT[20] - _("""Looking for IPv6 bridges?"""), - # BRIDGEDB_TEXT[21] - _("""Looking for obfsproxy bridges?"""), - # BRIDGEDB_TEXT[22] - _("""Specify transport by name:"""), - # BRIDGEDB_TEXT[23] - _("""Submit"""), - # BRIDGEDB_TEXT[24] - _("""days at this address""") -] diff --git a/lib/bridgedb/strings.py b/lib/bridgedb/strings.py new file mode 100644 index 0000000..0157ecb --- /dev/null +++ b/lib/bridgedb/strings.py @@ -0,0 +1,182 @@ +# -*- coding: utf-8 -*- + +from __future__ import unicode_literals + + +def _(text): + """This is necessary because strings are translated when they're imported. + Otherwise this would make it impossible to switch languages more than + once. + + :returns: The **text**. + """ + return text + + +# TRANSLATORS: Please do not translate the word "TYPE". +EMAIL_MISC_TEXT = { + 0: _("""\ +[This is an automated message; please do not reply.]"""), + 1: _("""\ +Here are your bridges:"""), + 2: _("""\ +You have exceeded the rate limit. Please slow down! The minimum time between +emails is %s hours. All further emails during this time period will be ignored."""), + 3: _("""\ +COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"""), + 4: _("Welcome to BridgeDB!"), + # TRANLATORS: Please DO NOT tranlate the words "transport" or "TYPE". + 5: _("Currently supported tranport TYPEs:"), +} + +WELCOME = { + 0: _("""\ +BridgeDB can provide bridges with several %stypes of Pluggable Transports%s, +which can help obfuscate your connections to the Tor Network, making it more +difficult for anyone watching your internet traffic to determine that you are +using Tor.\n\n"""), + + 1: _("""\ +Some bridges with IPv6 addresses are also available, though some Pluggable +Transports aren't IPv6 compatible.\n\n"""), + + 2: _("""\ +Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any +Pluggable Transports %s which maybe doesn't sound as cool, but they can still +help to circumvent internet censorship in many cases.\n\n"""), +} +"""These strings should go on the first "Welcome" email sent by the +:mod:`~bridgedb.EmailServer`, as well as on the ``index.html`` template used +by the :mod:`~bridgedb.HTTPServer`. They are used as an introduction to +explain what Tor bridges are, what bridges do, and why someone might want to +use bridges. +""" + +FAQ = { + 0: _("What are bridges?"), + 1: _("""\ +%s Bridges %s are Tor relays that help you circumvent censorship."""), +} + +OTHER_DISTRIBUTORS = { + 0: _("I need an alternative way of getting bridges!"), + 1: _("""\ +Another way to get bridges is to send an email to %s. Please note that you must +send the email using an address from one of the following email providers: +%s or %s."""), +} + +HELP = { + 0: _("My bridges don't work! I need help!"), + 1: _("""If your Tor doesn't work, you should email %s."""), + 2: _("""\ +Try including as much info about your case as you can, including the list of +bridges and Pluggable Transports you tried to use, your Tor Browser version, +and any messages which Tor gave out, etc."""), +} + +BRIDGES = { + 0: _("Bridges"), + 1: _("Get Bridges!"), +} + +OPTIONS = { + 0: _("Please select options for bridge type:"), + 1: _("Do you need IPv6 addresses?"), + 2: _("Do you need a %s?"), +} + +CAPTCHA = { + 0: _('Your browser is not displaying images properly.'), + 1: _('Enter the characters from the image above...'), +} + +HOWTO_TBB = { + 0: _("""How to start using your bridges"""), + 1: _("""\ +To enter bridges into Tor Browser, follow the instructions on the %s Tor +Browser download page %s to start Tor Browser."""), + 2: _("""\ +When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow +the wizard until it asks:"""), + 3: _("""\ +Does your Internet Service Provider (ISP) block or otherwise censor connections +to the Tor network?"""), + 4: _("""\ +Select 'Yes' and then click 'Next'. To configure your new bridges, copy and +paste the bridge lines (shown above) into the text input box. Finally, click +'Connect', and you should be good to go! If you experience trouble, try +clicking the 'Help' button in the 'Tor Network Settings' wizard for further +assistance."""), +} + +EMAIL_COMMANDS = { + "get help": _("Displays this message."), + "get bridges": _("Request vanilla bridges."), + "get ipv6": _("Request IPv6 bridges."), + # TRANLATORS: Please DO NOT tranlate the word the word "TYPE". + "get transport [TYPE]": _("Request a Pluggable Transport by TYPE."), + #"subscribe": _("Subscribe to receive new bridges once per week") + #"unsubscribe": _("Cancel a subscription to new bridges") +} + +#----------------------------------------------------------------------------- +# All of the following containers are untranslated! +#----------------------------------------------------------------------------- + +#: A list of all currently available pluggable transports. By "currently +#: available" we mean: +#: +#: 1. The PT is in a widely accepted, usable state for most Tor users. +#: 2. The PT is currently publicly deployed *en masse*". +#: +CURRENT_TRANSPORTS = [ + "obfs2", + "obfs3", + "scramblesuit", +] + +EMAIL_SPRINTF = { + # Goes into the "%s types of Pluggable Transports %s" part of ``WELCOME[0]`` + "WELCOME0": ("", "[0]"), + # Goes into the "%s without Pluggable Transport %s" part of ``WELCOME[2]`` + "WELCOME2": ("-", "-"), + # For the "%s Tor Browser download page %s" part of ``HOWTO_TBB[1]`` + "HOWTO_TBB1": ("", "[0]"), + # For the "you should email %s" in ``HELP[0]`` + "HELP0": ("help(a)rt.torproject.org"), +} +"""``EMAIL_SPRINTF`` is a dictionary that maps translated strings which +contain format specifiers (i.e. ``%s``) to what those format specifiers should +be replaced with in a given template system. + +For example, a string which needs a pair of HTML ``("<a href=''">, "</a>")`` +tags (for the templates used by :mod:`bridgedb.HTTPServer`) would need some +alternative replacements for the :mod:`EmailServer`, because the latter uses +templates with a ``text/plain`` mimetype instead of HTML. For the +``EmailServer``, the format strings specifiers are replaced with an empty +string where the opening ``<a>`` tags would go, and a numbered Markdown link +specifier where the closing ``</a>`` tags would go. + +The keys in this dictionary are the Python variable names of the corresponding +strings which are being formatted, i.e. ``WELCOME0`` would be the string +replacements for ``strings.WELCOME.get(0)``. + + +For example, the ``0`` string in :data:`WELCOME` above has the substring:: + + "%s without Pluggable Transport %s" + +and so to replace the two ``%s`` format specifiers, you would use this mapping +like so:: + +>>> from bridgedb import strings +>>> welcome = strings.WELCOME.get(0) +>>> emailWelcome = welcome.format(strings.EMAIL_SPRINTF.get("WELCOME0")) +>>> emailWelcome +""" + +EMAIL_REFERENCE_LINKS = { + "WELCOME0": "[0]: https://www.torproject.org/docs/pluggable-transports.html", + "HOWTO_TBB1": "[0]: https://www.torproject.org/projects/torbrowser.html.en#downloads-beta", +}

1 0

[bridgedb/develop] PEP8 whitespace fix for method signature lines in Dist.
by isis＠torproject.org 06 May '14

06 May '14

commit 06b114765e4691173b2653bd1e3239b11f37038d Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon May 5 19:25:08 2014 +0000 PEP8 whitespace fix for method signature lines in Dist. --- lib/bridgedb/Dist.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 4e0a1aa..984dd59 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -377,8 +377,8 @@ class EmailBasedDistributor(Distributor): """Assign a bridge to this distributor.""" self.splitter.insert(bridge) - def getBridgesForEmail(self, emailaddress, epoch, N=1, - parameters=None, countryCode=None, bridgeFilterRules=None): + def getBridgesForEmail(self, emailaddress, epoch, N=1, parameters=None, + countryCode=None, bridgeFilterRules=None): """Return a list of bridges to give to a user. emailaddress -- the user's email address, as given in a from line. epoch -- the time period when we got this request. This can

1 0

[bridgedb/develop] Update copyright/licence file header for lib/bridgedb/HTTPServer.py.
by isis＠torproject.org 06 May '14

06 May '14

commit d2ff6dd8efabc255dbad60253a4a052cd714ec32 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon May 5 19:26:26 2014 +0000 Update copyright/licence file header for lib/bridgedb/HTTPServer.py. --- lib/bridgedb/HTTPServer.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index cf8a83a..cbff653 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -1,6 +1,11 @@ -# BridgeDB by Nick Mathewson. -# Copyright (c) 2007-2013, The Tor Project, Inc. -# See LICENSE for licensing information +# -*- coding: utf-8 ; test-case-name: bridgedb.test.test_HTTPServer -*- +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: please see included AUTHORS file +# :copyright: (c) 2007-2014, The Tor Project, Inc. +# (c) 2013-2014, Isis Lovecruft +# :license: see LICENSE for licensing information """ This module implements the web (http, https) interfaces to the bridge database.

1 0