- tor-commits - lists.torproject.org

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 28 Sep '12

28 Sep '12

commit 15bd238c37251dc87c77a89e100c53de0aabfb8a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 28 21:45:28 2012 +0000 Update translations for vidalia_help_completed --- sv/index.po | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/sv/index.po b/sv/index.po new file mode 100644 index 0000000..19c5113 --- /dev/null +++ b/sv/index.po @@ -0,0 +1,48 @@ +# +# Translators: +# <kanin(a)ersboda.nu>, 2012. +# <unknown365(a)hotmail.com>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2010-06-26 16:59+0200\n" +"PO-Revision-Date: 2012-09-28 21:37+0000\n" +"Last-Translator: unknown365 <unknown365(a)hotmail.com>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sv\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. type: Content of: <html><body><h1> +#: en/index.html:16 +msgid "Vidalia Help" +msgstr "Vidalia Hjälp" + +#. type: Content of: <html><body> +#: en/index.html:20 +msgid "" +"Select a help topic from the tree on the left or click on the Search button " +"above the list of topics to search through all available help topics." +msgstr "Välj ett ämne du behöver hjälp med från listan till vänster eller klicka på Sök-knappen ovanför listan över ämnen." + +#. type: Content of: <html><body> +#: en/index.html:25 +msgid "" +"You can use the Find button on the toolbar above to search within a " +"particular help topic." +msgstr "Du kan använda Hitta knappen i verktygsfältet ovan för att söka inom ett visst ämne." + +#. type: Content of: <html><body> +#: en/index.html:30 +msgid "The Home button above will bring you back to this home page." +msgstr "Hem knappen ovan tar dig tillbaka till denna hemsida." + +#. type: Content of: <html><body> +#: en/index.html:34 +msgid "" +"See the <a href=\"links.html\">Helpful Links</a> topic for some places you " +"can visit to find additional help and information about Vidalia and Tor." +msgstr "Se <a href=\"links.html\">Nyttiga länkar</a> ämne för vissa platser du kan besöka för att hitta ytterligare hjälp och information om Vidalia och Tor."

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 28 Sep '12

28 Sep '12

commit 8b6f5c54b2c1e69cf714bda2c7d9eb2543073395 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 28 21:45:23 2012 +0000 Update translations for vidalia_help --- sv/bridges.po | 27 +++++++++++++-------------- sv/index.po | 13 +++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/sv/bridges.po b/sv/bridges.po index a9948c0..37cea61 100644 --- a/sv/bridges.po +++ b/sv/bridges.po @@ -1,33 +1,34 @@ # # Translators: +# <unknown365(a)hotmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2010-11-30 05:02+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2012-09-28 21:43+0000\n" +"Last-Translator: unknown365 <unknown365(a)hotmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sv\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. type: Content of: <html><body><h1> #: en/bridges.html:16 msgid "Bridge Relays" -msgstr "" +msgstr "Bro Reläer" #. type: Content of: <html><body> #: en/bridges.html:19 msgid "<a name=\"about\"/>" -msgstr "" +msgstr "<a name=\"om\"/>" #. type: Content of: <html><body><h3> #: en/bridges.html:20 msgid "What are bridge relays?" -msgstr "" +msgstr "Vad är bro reläer?" #. type: Content of: <html><body> #: en/bridges.html:22 @@ -45,27 +46,27 @@ msgstr "" #. type: Content of: <html><body> #: en/bridges.html:31 msgid "<a name=\"finding\"/>" -msgstr "" +msgstr "<a name=\"hitta\"/>" #. type: Content of: <html><body><h3> #: en/bridges.html:32 msgid "How do I find a bridge relay?" -msgstr "" +msgstr "Hur hittar jag en bro relä?" #. type: Content of: <html><body> #: en/bridges.html:34 msgid "There are two main ways to learn about a bridge address:" -msgstr "" +msgstr "Det finns två huvudsakliga sätt att lära sig om en bro adress:" #. type: Content of: <html><body><ol><li> #: en/bridges.html:36 msgid "Get some friends to run private bridges for you" -msgstr "" +msgstr "Få lite vänner att köra privata bryggor för dig" #. type: Content of: <html><body><ol><li> #: en/bridges.html:37 msgid "Use some of the public bridges" -msgstr "" +msgstr "Använda några av de offentliga broar" #. type: Content of: <html><body> #: en/bridges.html:42 @@ -97,6 +98,4 @@ msgstr "" msgid "" "Configuring more than one bridge address will make your Tor connection more " "stable, in case some of the bridges become unreachable." -msgstr "" - - +msgstr "Konfigurera fler än ett bro-adress kommer att göra din Tor-anslutning mer stabil, om några av broarna blir onåbar." diff --git a/sv/index.po b/sv/index.po index 8c399ce..19c5113 100644 --- a/sv/index.po +++ b/sv/index.po @@ -1,19 +1,20 @@ # # Translators: # <kanin(a)ersboda.nu>, 2012. +# <unknown365(a)hotmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:59+0200\n" -"PO-Revision-Date: 2012-08-02 10:43+0000\n" -"Last-Translator: youcanbeshiva <kanin(a)ersboda.nu>\n" +"PO-Revision-Date: 2012-09-28 21:37+0000\n" +"Last-Translator: unknown365 <unknown365(a)hotmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sv\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. type: Content of: <html><body><h1> #: en/index.html:16 @@ -32,16 +33,16 @@ msgstr "Välj ett ämne du behöver hjälp med från listan till vänster eller msgid "" "You can use the Find button on the toolbar above to search within a " "particular help topic." -msgstr "" +msgstr "Du kan använda Hitta knappen i verktygsfältet ovan för att söka inom ett visst ämne." #. type: Content of: <html><body> #: en/index.html:30 msgid "The Home button above will bring you back to this home page." -msgstr "" +msgstr "Hem knappen ovan tar dig tillbaka till denna hemsida." #. type: Content of: <html><body> #: en/index.html:34 msgid "" "See the <a href=\"links.html\">Helpful Links</a> topic for some places you " "can visit to find additional help and information about Vidalia and Tor." -msgstr "" +msgstr "Se <a href=\"links.html\">Nyttiga länkar</a> ämne för vissa platser du kan besöka för att hitta ytterligare hjälp och information om Vidalia och Tor."

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 28 Sep '12

28 Sep '12

commit c2a7b4b499aec1b56253daa063180026c48e9455 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 28 21:45:14 2012 +0000 Update translations for vidalia_alpha --- he/vidalia_he.po | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/he/vidalia_he.po b/he/vidalia_he.po index fb1190d..bbc12b0 100644 --- a/he/vidalia_he.po +++ b/he/vidalia_he.po @@ -7,19 +7,20 @@ # runasand <runa.sandvik(a)gmail.com>, 2011. # Something Another <roeyjobsyud(a)gmail.com>, 2012. # <static.172(a)gmail.com>, 2012. +# <unknown365(a)hotmail.com>, 2012. msgid "" 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-07-22 14:26+0000\n" -"Last-Translator: GenghisKhan <genghiskhan(a)gmx.ca>\n" +"PO-Revision-Date: 2012-09-28 21:24+0000\n" +"Last-Translator: unknown365 <unknown365(a)hotmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: he\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Vidalia ts2po 0.2\n" msgctxt "AboutDialog" @@ -216,7 +217,7 @@ msgstr "בהלה" msgctxt "AdvancedPage" msgid "" "WARNING: The panic button will erease the application if pressed" -msgstr "" +msgstr "אזהרה: כפתור הפאניקה ימחק את היישום אם לחצה" msgctxt "AdvancedPage" msgid "Enable panic button" @@ -2754,7 +2755,7 @@ msgstr "דחה" msgctxt "QDialogButtonBox" msgid "OK" -msgstr "" +msgstr "אישור" msgctxt "QObject" msgid "There were some settings that Vidalia wasn't able to apply together" @@ -3226,7 +3227,7 @@ msgstr "חודש" msgctxt "ServerPage" msgid "Enable accounting" -msgstr "" +msgstr "אפשר חשבונאות" msgctxt "ServerPage" msgid "h:mm" @@ -3262,7 +3263,7 @@ msgstr "ט״ב" msgctxt "ServerPage" msgid "Push no more than" -msgstr "" +msgstr "לדחוף לא יותר" msgctxt "ServerPage" msgid "time" @@ -3585,7 +3586,7 @@ msgstr "כשל בחיבור: %1" msgctxt "TorControl" msgid "Disconnected" -msgstr "" +msgstr "מנותק" msgctxt "TorProcess" msgid "Process %1 failed to stop. [%2]"

1 0

[tor/master] Add missing declaration so 6876 compiles
by nickm＠torproject.org 28 Sep '12

28 Sep '12

commit f128baf36c8378d40b82a2859f3c939c1d0f77dd Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 28 12:03:37 2012 -0400 Add missing declaration so 6876 compiles --- src/or/config.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 8e51085..c04f2aa 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1164,6 +1164,7 @@ options_act(const or_options_t *old_options) config_line_t *cl; or_options_t *options = get_options_mutable(); int running_tor = options->command == CMD_RUN_TOR; + char *msg=NULL; const int transition_affects_workers = old_options && options_transition_affects_workers(old_options, options);

1 0

[tor/master] Make option OutboundBindAddress accept IPv6 addresses too.
by nickm＠torproject.org 28 Sep '12

28 Sep '12

commit 1cbf45bed1451997e0815bedca8e816d87e081ce Author: Linus Nordberg <linus(a)torproject.org> Date: Thu Sep 20 17:09:25 2012 +0200 Make option OutboundBindAddress accept IPv6 addresses too. Implements ticket 6786. --- doc/tor.1.txt | 6 +++- src/or/config.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++- src/or/connection.c | 45 +++++++++++++++++++++------------- src/or/or.h | 6 ++++- 4 files changed, 103 insertions(+), 21 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 97fdb48..8245ff4 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -472,8 +472,10 @@ GENERAL OPTIONS **OutboundBindAddress** __IP__:: Make all outbound connections originate from the IP address specified. This is only useful when you have multiple network interfaces, and you want all - of Tor's outgoing connections to use a single one. This setting will be - ignored for connections to the loopback addresses (127.0.0.0/8 and ::1). + of Tor's outgoing connections to use a single one. This option may + be used twice, once with an IPv4 address and once with an IPv6 address. + This setting will be ignored for connections to the loopback addresses + (127.0.0.0/8 and ::1). **PidFile** __FILE__:: On startup, write our PID to FILE. On clean shutdown, remove diff --git a/src/or/config.c b/src/or/config.c index affe238..05c7028 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -302,7 +302,7 @@ static config_var_t _option_vars[] = { V(NumEntryGuards, UINT, "3"), V(ORListenAddress, LINELIST, NULL), VPORT(ORPort, LINELIST, NULL), - V(OutboundBindAddress, STRING, NULL), + V(OutboundBindAddress, LINELIST, NULL), V(PathBiasCircThreshold, INT, "-1"), V(PathBiasNoticeRate, DOUBLE, "-1"), @@ -474,6 +474,8 @@ static int options_init_logs(or_options_t *options, int validate_only); static void init_libevent(const or_options_t *options); static int opt_streq(const char *s1, const char *s2); +static int parse_outbound_addresses(or_options_t *options, int validate_only, + char **msg); /** Magic value for or_options_t. */ #define OR_OPTIONS_MAGIC 9090909 @@ -1390,6 +1392,12 @@ options_act(const or_options_t *old_options) tor_free(http_authenticator); } + if (parse_outbound_addresses(options, 0, &msg) < 0) { + log_warn(LD_BUG, "Failed parsing oubound bind addresses: %s", msg); + tor_free(msg); + return -1; + } + /* Check for transitions that need action. */ if (old_options) { int revise_trackexithosts = 0; @@ -2164,6 +2172,9 @@ options_validate(or_options_t *old_options, or_options_t *options, if (parse_ports(options, 1, msg, &n_ports) < 0) return -1; + if (parse_outbound_addresses(options, 1, msg) < 0) + return -1; + if (validate_data_directory(options)<0) REJECT("Invalid DataDirectory"); @@ -5482,3 +5493,57 @@ getinfo_helper_config(control_connection_t *conn, return 0; } +/** Parse outbound bind address option lines. If validate_only + * is not 0 update _OutboundBindAddressIPv4 and + * _OutboundBindAddressIPv6 in options. On failure, set + * msg (if provided) to a newly allocated string containing a + * description of the problem and return -1. */ +static int +parse_outbound_addresses(or_options_t *options, int validate_only, char **msg) +{ + const config_line_t *lines = options->OutboundBindAddress; + int found_v4 = 0, found_v6 = 0; + + if (!validate_only) { + memset(&options->_OutboundBindAddressIPv4, 0, + sizeof(options->_OutboundBindAddressIPv4)); + memset(&options->_OutboundBindAddressIPv6, 0, + sizeof(options->_OutboundBindAddressIPv6)); + } + while (lines) { + tor_addr_t addr, *dst_addr = NULL; + int af = tor_addr_parse(&addr, lines->value); + switch (af) { + case AF_INET: + if (found_v4) { + if (msg) + tor_asprintf(msg, "Multiple IPv4 outbound bind addresses " + "configured: %s", lines->value); + return -1; + } + found_v4 = 1; + dst_addr = &options->_OutboundBindAddressIPv4; + break; + case AF_INET6: + if (found_v6) { + if (msg) + tor_asprintf(msg, "Multiple IPv6 outbound bind addresses " + "configured: %s", lines->value); + return -1; + } + found_v6 = 1; + dst_addr = &options->_OutboundBindAddressIPv6; + break; + default: + if (msg) + tor_asprintf(msg, "Outbound bind address '%s' didn't parse.", + lines->value); + return -1; + } + if (!validate_only) + tor_addr_copy(dst_addr, &addr); + lines = lines->next; + } + return 0; +} + diff --git a/src/or/connection.c b/src/or/connection.c index d8f5d87..d64c676 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1377,23 +1377,34 @@ connection_connect(connection_t *conn, const char *address, make_socket_reuseable(s); - if (options->OutboundBindAddress && !tor_addr_is_loopback(addr)) { - struct sockaddr_in ext_addr; - - memset(&ext_addr, 0, sizeof(ext_addr)); - ext_addr.sin_family = AF_INET; - ext_addr.sin_port = 0; - if (!tor_inet_aton(options->OutboundBindAddress, &ext_addr.sin_addr)) { - log_warn(LD_CONFIG,"Outbound bind address '%s' didn't parse. Ignoring.", - options->OutboundBindAddress); - } else { - if (bind(s, (struct sockaddr*)&ext_addr, - (socklen_t)sizeof(ext_addr)) < 0) { - *socket_error = tor_socket_errno(s); - log_warn(LD_NET,"Error binding network socket: %s", - tor_socket_strerror(*socket_error)); - tor_close_socket(s); - return -1; + if (!tor_addr_is_loopback(addr)) { + const tor_addr_t *ext_addr = NULL; + if (protocol_family == AF_INET && + !tor_addr_is_null(&options->_OutboundBindAddressIPv4)) + ext_addr = &options->_OutboundBindAddressIPv4; + else if (protocol_family == AF_INET6 && + !tor_addr_is_null(&options->_OutboundBindAddressIPv6)) + ext_addr = &options->_OutboundBindAddressIPv6; + if (ext_addr) { + struct sockaddr_storage ext_addr_sa; + socklen_t ext_addr_len = 0; + memset(&ext_addr_sa, 0, sizeof(ext_addr_sa)); + ext_addr_len = tor_addr_to_sockaddr(ext_addr, 0, + (struct sockaddr *) &ext_addr_sa, + sizeof(ext_addr_sa)); + if (ext_addr_len == 0) { + log_warn(LD_NET, + "Error converting OutboundBindAddress %s into sockaddr. " + "Ignoring.", fmt_addr(ext_addr)); + } else { + if (bind(s, (struct sockaddr *) &ext_addr_sa, ext_addr_len) < 0) { + *socket_error = tor_socket_errno(s); + log_warn(LD_NET,"Error binding network socket to %s: %s", + fmt_addr(ext_addr), + tor_socket_strerror(*socket_error)); + tor_close_socket(s); + return -1; + } } } } diff --git a/src/or/or.h b/src/or/or.h index f7914b8..577cf6d 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3028,7 +3028,11 @@ typedef struct { /** Addresses to bind for listening for control connections. */ config_line_t *ControlListenAddress; /** Local address to bind outbound sockets */ - char *OutboundBindAddress; + config_line_t *OutboundBindAddress; + /** IPv4 address derived from OutboundBindAddress. */ + tor_addr_t _OutboundBindAddressIPv4; + /** IPv6 address derived from OutboundBindAddress. */ + tor_addr_t _OutboundBindAddressIPv6; /** Directory server only: which versions of * Tor should we tell users to run? */ config_line_t *RecommendedVersions;

1 0

[tor/master] Merge remote-tracking branch 'linus/enh6876_2'
by nickm＠torproject.org 28 Sep '12

28 Sep '12

commit 5f494a363a725951af884882a472ff4ab2b0a6db Merge: 95d9f7e 1cbf45b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 28 11:57:36 2012 -0400 Merge remote-tracking branch 'linus/enh6876_2' doc/tor.1.txt | 6 +++- src/or/config.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++- src/or/connection.c | 45 +++++++++++++++++++++------------- src/or/or.h | 6 ++++- 4 files changed, 103 insertions(+), 21 deletions(-)

1 0

[flashproxy/master] Increase version to 0.5.
by dcf＠torproject.org 28 Sep '12

28 Sep '12

commit 8923f602f817c2fb09313df087d9b8f0dba18760 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Sep 27 23:14:00 2012 -0700 Increase version to 0.5. --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index a83a77e..0effce4 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ PREFIX = /usr/local BINDIR = $(PREFIX)/bin -VERSION = 0.4 +VERSION = 0.5 CLIENT_DIST_FILES = flashproxy-client flashproxy-reg-email flashproxy-reg-http README LICENSE torrc

1 0

[flashproxy/master] Put flashproxy-reg-email in the "re-register" hint.
by dcf＠torproject.org 28 Sep '12

28 Sep '12

commit 8be08c4cc91dae767df37f9e5f43e0790405b738 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Sep 27 23:18:22 2012 -0700 Put flashproxy-reg-email in the "re-register" hint. --- README | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/README b/README index af19893..75252d0 100644 --- a/README +++ b/README @@ -94,6 +94,7 @@ wait a few minutes. It can take a while to download relay descriptors. If you suspect that the facilitator has lost your client registration, you can re-register: + $ flashproxy-reg-email $ flashproxy-reg-http

1 0

[flashproxy/master] Add usage and everything to flashproxy-reg-email.
by dcf＠torproject.org 28 Sep '12

28 Sep '12

commit 0b23a75f2a131b43a15301bdf73aebf85a09876a Author: David Fifield <david(a)bamsoftware.com> Date: Tue Sep 11 08:16:25 2012 -0700 Add usage and everything to flashproxy-reg-email. --- flashproxy-reg-email | 165 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 148 insertions(+), 17 deletions(-) diff --git a/flashproxy-reg-email b/flashproxy-reg-email index 09cd1ea..246b1dc 100755 --- a/flashproxy-reg-email +++ b/flashproxy-reg-email @@ -1,28 +1,159 @@ #!/usr/bin/env python +import getopt import re import smtplib +import socket import sys -smtp = smtplib.SMTP("gmail-smtp-in.l.google.com.", 25, "[127.0.0.1]") -smtp.set_debuglevel(1) -smtp.starttls() +DEFAULT_REMOTE_ADDRESS = "" +DEFAULT_REMOTE_PORT = 9000 +DEFAULT_EMAIL_ADDRESS = "hoddwee(a)gmail.com" +# dig MX gmail.com +DEFAULT_SMTP_HOST = "gmail-smtp-in.l.google.com" +DEFAULT_SMTP_PORT = 25 -# Grep the EHLO response for our public IP address. -smtp.ehlo() -m = re.search(r'at your service, \[([0-9a-fA-F.:]+)\]', smtp.ehlo_resp) -if not m: - print >> sys.stderr, "Could not determine external IP address." +# Use this to prevent Python smtplib from guessing and leaking our hostname. +EHLO_FQDN = "[127.0.0.1]" +FROM_EMAIL_ADDRESS = "nobody@localhost" + +class options(object): + remote_addr = None + email_addr = None + smtp_addr = None + debug = False + +def usage(f = sys.stdout): + print >> f, """\ +Usage: %(progname)s [REMOTE][:PORT] +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 +"%(remote_addr)s" (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. + + -d, --debug enable debugging output (Python smtplib messages). + -e, --email=ADDRESS send mail to ADDRESS (default "%(email_addr)s"). + -h, --help show this help. + -s, --smtp=HOST[:PORT] use the given SMTP server + (default "%(smtp_addr)s"). \ +""" % { + "progname": sys.argv[0], + "remote_addr": format_addr((DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT)), + "email_addr": DEFAULT_EMAIL_ADDRESS, + "smtp_addr": format_addr((DEFAULT_SMTP_HOST, DEFAULT_SMTP_PORT)), +} + +def parse_addr_spec(spec, defhost = None, defport = None): + host = None + port = None + af = 0 + m = None + # IPv6 syntax. + if not m: + m = re.match(ur'^\[(.+)\]:(\d*)$', spec) + if m: + host, port = m.groups() + af = socket.AF_INET6 + if not m: + m = re.match(ur'^\[(.+)\]$', spec) + if m: + host, = m.groups() + af = socket.AF_INET6 + # IPv4/hostname/port-only syntax. + if not m: + try: + host, port = spec.split(":", 1) + except ValueError: + host = spec + if re.match(ur'^[\d.]+$', host): + af = socket.AF_INET + else: + af = 0 + host = host or defhost + port = port or defport + if port is not None: + port = int(port) + return host, port + +def format_addr(addr): + host, port = addr + if not host: + return u":%d" % port + # Numeric IPv6 address? + try: + addrs = socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM, socket.IPPROTO_TCP, socket.AI_NUMERICHOST) + af = addrs[0][0] + except socket.gaierror, e: + af = 0 + if af == socket.AF_INET6: + result = u"[%s]" % host + else: + result = "%s" % host + if port is not None: + result += u":%d" % port + return result + +options.remote_addr = (DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT) +options.email_addr = DEFAULT_EMAIL_ADDRESS +options.smtp_addr = (DEFAULT_SMTP_HOST, DEFAULT_SMTP_PORT) + +opts, args = getopt.gnu_getopt(sys.argv[1:], "de:hs:", ["debug", "email=", "help", "smtp="]) +for o, a in opts: + if o == "-d" or o == "--debug": + options.debug = True + elif o == "-e" or o == "--email": + options.email_addr = parse_addr_spec(a, DEFAULT_FACILITATOR_HOST, DEFAULT_FACILITATOR_PORT) + elif o == "-h" or o == "--help": + usage() + sys.exit() + elif o == "-s" or o == "--smtp": + options.smtp_addr = parse_addr_spec(a, DEFAULT_SMTP_HOST, DEFAULT_SMTP_PORT) + +if len(args) == 0: + pass +elif len(args) == 1: + options.remote_addr = parse_addr_spec(args[0], DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT) +else: + usage(sys.stderr) sys.exit(1) -client_spec = m.group(1) -smtp.sendmail("hoddwee(a)gmail.com", "hoddwee(a)gmail.com", """\ -From: hoddwee(a)gmail.com -To: hoddwee(a)gmail.com -Subject: Flash proxy client registration +smtp = smtplib.SMTP(options.smtp_addr[0], options.smtp_addr[1], EHLO_FQDN) + +if options.debug: + smtp.set_debuglevel(1) -client=%s -""" % client_spec) -smtp.quit() +try: + smtp.starttls() + smtp.ehlo() + + if not options.remote_addr[0]: + # Grep the EHLO response for our public IP address. + m = re.search(r'at your service, \[([0-9a-fA-F.:]+)\]', smtp.ehlo_resp) + if not m: + raise ValueError("Could not guess external IP address from EHLO response") + spec = m.group(1) + if ":" in spec: + # Guess IPv6. + spec = "[" + spec + "]" + options.remote_addr = parse_addr_spec(spec, *options.remote_addr) + + smtp.sendmail(options.email_addr, options.email_addr, """\ +To: %(to_addr)s\r +From: %(from_addr)s\r +Subject: client reg\r +\r +client=%(client_spec)s +""" % { + "to_addr": options.email_addr, + "from_addr": FROM_EMAIL_ADDRESS, + "client_spec": format_addr(options.remote_addr), + }) + smtp.quit() +except Exception, e: + print >> sys.stderr, "Failed to register: %s" % str(e) + sys.exit(1) -print "Registered %s." % client_spec +print "Registered \"%s\" with %s." % (format_addr(options.remote_addr), options.email_addr)

1 0

[flashproxy/master] Randomize the subject to prevent Gmail threading.
by dcf＠torproject.org 28 Sep '12

28 Sep '12

commit becf8d873967fb2e91ee101b6901b72f3db631e1 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Sep 11 09:07:29 2012 -0700 Randomize the subject to prevent Gmail threading. --- flashproxy-reg-email | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/flashproxy-reg-email b/flashproxy-reg-email index 246b1dc..7dc1d84 100755 --- a/flashproxy-reg-email +++ b/flashproxy-reg-email @@ -1,6 +1,7 @@ #!/usr/bin/env python import getopt +import os import re import smtplib import socket @@ -140,15 +141,18 @@ try: spec = "[" + spec + "]" options.remote_addr = parse_addr_spec(spec, *options.remote_addr) + # Add a random subject to keep Gmail from threading everything. + rand_string = os.urandom(5).encode("hex") smtp.sendmail(options.email_addr, options.email_addr, """\ To: %(to_addr)s\r From: %(from_addr)s\r -Subject: client reg\r +Subject: client reg %(rand_string)s\r \r client=%(client_spec)s """ % { "to_addr": options.email_addr, "from_addr": FROM_EMAIL_ADDRESS, + "rand_string": rand_string, "client_spec": format_addr(options.remote_addr), }) smtp.quit()

1 0