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

[bridgedb/develop] Make docstring for b.e.server.addServer clearer.
by isis＠torproject.org 08 Jul '14

08 Jul '14

commit e8ffb4252362ff0ef3a2962cb2834ef2bebaee8e Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Jun 9 19:41:02 2014 +0000 Make docstring for b.e.server.addServer clearer. Since there are technically two SMTP servers, be clearer that this function sets up the one which listens for incoming emails. --- lib/bridgedb/email/server.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index aa3e08c..1717958 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/bridgedb/email/server.py @@ -418,7 +418,8 @@ class SMTPIncomingServerFactory(smtp.SMTPFactory): def addServer(config, distributor, schedule): - """Set up a SMTP server for responding to requests for bridges. + """Set up a SMTP server which listens on the configured ``EMAIL_PORT`` for + incoming connections, and responds as necessary to requests for bridges. :type config: :class:`bridgedb.persistent.Conf` :param config: A configuration object.

1 0

[bridgedb/develop] Fix bug with weird '550 Sender not permitted' SMTP responses.
by isis＠torproject.org 08 Jul '14

08 Jul '14

commit 09e333d6c0406e164e62779737ccc475507d73c3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Jun 9 19:36:54 2014 +0000 Fix bug with weird '550 Sender not permitted' SMTP responses. When raising a `twisted.mail.smtp.SMTPBadSender`, we were giving it the origin's domain name as argument, which ended up with weird messages like '550 Cannot receive from specified address <example.com@localhost>: Sender not acceptable' being sent out. Apparently, SMTPBadSender want the whole origin object, not just the domain. * CHANGE raising of SMTPBadSender in b.e.server.SMTPIncomingDelivery.validateFrom() to use the whole origin object, not just the domain, as its argument. --- lib/bridgedb/email/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index 62d3bff..aa3e08c 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/bridgedb/email/server.py @@ -296,7 +296,7 @@ class SMTPIncomingDelivery(smtp.SMTP): self.fromCanonicalSMTP = canonical except UnsupportedDomain as error: logging.info(error) - raise smtp.SMTPBadSender(origin.domain) + raise smtp.SMTPBadSender(origin) except Exception as error: logging.exception(error)

1 0

[bridgedb/develop] Add docstring note that b.p.a.normalizeEmail can raise UnsupportedDomain.
by isis＠torproject.org 08 Jul '14

08 Jul '14

commit ee770c235193d70516e13d6fe9f7674058e8756f Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Jun 9 19:42:05 2014 +0000 Add docstring note that b.p.a.normalizeEmail can raise UnsupportedDomain. --- lib/bridgedb/parse/addr.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/bridgedb/parse/addr.py b/lib/bridgedb/parse/addr.py index a354387..f4cd805 100644 --- a/lib/bridgedb/parse/addr.py +++ b/lib/bridgedb/parse/addr.py @@ -440,6 +440,8 @@ def normalizeEmail(emailaddr, domainmap, domainrules, ignorePlus=True): ``blackhole+kerr(a)torproject.org`` is an alias for ``blackhole(a)torproject.org``, and remove everything after the first ``'+'`` character. + :raises UnsupportedDomain: if the email address originated from a domain + that we do not explicitly support. :raises BadEmail: if the email address could not be parsed or validated. :rtype: str :returns: The validated, normalised email address, if it was from a

1 0

[bridgedb/develop] Check for whitelisted email addresses before any more complicated parsing.
by isis＠torproject.org 08 Jul '14

08 Jul '14

commit df2e03397031e7f605ad080fb744b8290afd942c Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Jun 9 19:43:57 2014 +0000 Check for whitelisted email addresses before any more complicated parsing. * CHANGE getMailTo() and runChecks() in b.e.autoresponder.SMTPAutoresponder to check for whitelisted addresses first, before any of the other checks. --- lib/bridgedb/email/autoresponder.py | 87 +++++++++++++++++++---------------- 1 file changed, 48 insertions(+), 39 deletions(-) diff --git a/lib/bridgedb/email/autoresponder.py b/lib/bridgedb/email/autoresponder.py index 2556da9..240818a 100644 --- a/lib/bridgedb/email/autoresponder.py +++ b/lib/bridgedb/email/autoresponder.py @@ -37,6 +37,7 @@ from bridgedb.email import dkim from bridgedb.email import request from bridgedb.email import templates from bridgedb.parse import addr +from bridgedb.parse.addr import canonicalizeEmailDomain from bridgedb import translations @@ -432,29 +433,28 @@ class SMTPAutoresponder(smtp.SMTPClient): else: addrHeader = senderHeader if not addrHeader: logging.warn("No Sender header on incoming mail.") - else: - client = None - try: + return clients + + client = None + try: + if addrHeader in self.incoming.context.whitelist.keys(): + logging.debug("Email address was whitelisted: %s." + % addrHeader) + client = smtp.Address(addrHeader) + else: normalized = addr.normalizeEmail( addrHeader, self.incoming.context.domainMap, self.incoming.context.domainRules) client = smtp.Address(normalized) - except (addr.UnsupportedDomain, addr.BadEmail) as error: - logging.warn(error) - # Check if it was one of the whitelisted addresses, because - # then it would make sense that it couldn't be canonicalized: - try: client = smtp.Address(addrHeader) - except smtp.AddressError as error: pass - else: - if str(client) in self.incoming.context.whitelist.keys(): - logging.debug("Email address was whitelisted: %s." - % str(client)) - except smtp.AddressError as error: - logging.warn(error) - - if client: - clients.append(client) + except (addr.UnsupportedDomain) as error: + logging.warn(error) + except (addr.BadEmail, smtp.AddressError) as error: + logging.warn(error) + + if client: + clients.append(client) + return clients def getMailFrom(self): @@ -578,13 +578,15 @@ class SMTPAutoresponder(smtp.SMTPClient): def runChecks(self, client): """Run checks on the incoming message, and only reply if they pass. - 1. Check that the domain names, taken from the SMTP ``MAIL FROM:`` - command and the email ``'From:'`` header, can be - :func:`canonicalized <addr.canonicalizeEmailDomain>`. + 1. Check if the client's address is whitelisted. + + 2. If it's not whitelisted, check that the domain names, taken from + the SMTP ``MAIL FROM:`` command and the email ``'From:'`` header, can + be :func:`canonicalized <addr.canonicalizeEmailDomain>`. - 2. Check that those canonical domains match, + 3. Check that those canonical domains match. - 3. If the incoming message is from a domain which supports DKIM + 4. If the incoming message is from a domain which supports DKIM signing, then run :func:`bridgedb.email.dkim.checkDKIM` as well. .. note:: Calling this method sets the ``canonicalFromEmail`` and @@ -605,37 +607,44 @@ class SMTPAutoresponder(smtp.SMTPClient): "for email from %s") % str(client)) return False - logging.debug("Canonicalizing client email domain...") # Allow whitelisted addresses through the canonicalization check: if str(client) in self.incoming.context.whitelist.keys(): - canonicalFromEmail = client.domain - # The client's address was already checked to see if it came from a - # supported domain and is a valid email address in :meth:`getMailTo`, - # so we should just be able to re-extract the canonical domain safely - # here: - canonicalFromEmail = addr.canonicalizeEmailDomain( - client.domain, self.incoming.canon) - logging.debug("Canonical email domain: %s" % canonicalFromEmail) + self.incoming.canonicalFromEmail = client.domain + logging.info("'From:' header contained whitelisted address: %s" + % str(client)) + else: + logging.debug("Canonicalizing client email domain...") + try: + # The client's address was already checked to see if it came + # from a supported domain and is a valid email address in + # :meth:`getMailTo`, so we should just be able to re-extract + # the canonical domain safely here: + self.incoming.canonicalFromEmail = canonicalizeEmailDomain( + client.domain, self.incoming.canon) + logging.debug("Canonical email domain: %s" + % self.incoming.canonicalFromEmail) + except addr.UnsupportedDomain as error: + logging.info("Domain couldn't be canonicalized: %s" + % safelog.logSafely(client.domain)) + return False # The canonical domains from the SMTP ``MAIL FROM:`` and the email # ``From:`` header should match: - if self.incoming.canonicalFromSMTP != canonicalFromEmail: + if self.incoming.canonicalFromSMTP != self.incoming.canonicalFromEmail: logging.error("SMTP/Email canonical domain mismatch!") logging.debug("Canonical domain mismatch: %s != %s" % (self.incoming.canonicalFromSMTP, - canonicalFromEmail)) + self.incoming.canonicalFromEmail)) return False - domainRules = self.incoming.context.domainRules.get( - canonicalFromEmail, list()) + self.incoming.domainRules = self.incoming.context.domainRules.get( + self.incoming.canonicalFromEmail, list()) # If the domain's ``domainRules`` say to check DKIM verification # results, and those results look bad, reject this email: - if not dkim.checkDKIM(self.incoming.message, domainRules): + if not dkim.checkDKIM(self.incoming.message, self.incoming.domainRules): return False - self.incoming.canonicalDomainRules = domainRules - self.incoming.canonicalFromEmail = canonicalFromEmail return True def send(self, response, retries=0, timeout=30, reaktor=reactor):

1 0

[flashproxy/master] undo overzealous factoring - enforce v4/v6 behaviour only applies for registration helpers
by infinity0＠torproject.org 08 Jul '14

08 Jul '14

commit a2c0980e51ac6fe73b1a6fccea240df493201c4c Author: Ximin Luo <infinity0(a)torproject.org> Date: Tue Jul 8 10:32:32 2014 +0100 undo overzealous factoring - enforce v4/v6 behaviour only applies for registration helpers --- flashproxy-reg-appspot | 1 + flashproxy-reg-email | 1 + flashproxy-reg-http | 1 + flashproxy/util.py | 11 +++++++---- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/flashproxy-reg-appspot b/flashproxy-reg-appspot index 42aef97..373ffb2 100755 --- a/flashproxy-reg-appspot +++ b/flashproxy-reg-appspot @@ -91,6 +91,7 @@ flashproxy.keys.add_module_opts(parser) flashproxy.reg.add_registration_args(parser) options = parser.parse_args(sys.argv[1:]) +flashproxy.util.enforce_address_family(options.address_family) remote_addr = options.remote_addr ensure_M2Crypto() diff --git a/flashproxy-reg-email b/flashproxy-reg-email index ddfc9fa..d5a7b26 100755 --- a/flashproxy-reg-email +++ b/flashproxy-reg-email @@ -50,6 +50,7 @@ parser.add_argument("-d", "--debug", action="store_true") options = parser.parse_args(sys.argv[1:]) +flashproxy.util.enforce_address_family(options.address_family) ensure_M2Crypto() diff --git a/flashproxy-reg-http b/flashproxy-reg-http index 3414802..afb3b5c 100755 --- a/flashproxy-reg-http +++ b/flashproxy-reg-http @@ -27,6 +27,7 @@ parser.add_argument("-f", "--facilitator", metavar="URL", default=DEFAULT_FACILITATOR_URL) options = parser.parse_args(sys.argv[1:]) +flashproxy.util.enforce_address_family(options.address_family) body = build_reg(options.remote_addr, options.transport) try: diff --git a/flashproxy/util.py b/flashproxy/util.py index 5df15be..3d9804b 100644 --- a/flashproxy/util.py +++ b/flashproxy/util.py @@ -22,13 +22,16 @@ def add_module_opts(parser): def parse_args(namespace): options.safe_logging = not namespace.unsafe_logging options.address_family = namespace.address_family or socket.AF_UNSPEC - if options.address_family != socket.AF_UNSPEC: - def getaddrinfo_replacement(host, port, family, *args, **kwargs): - return _old_socket_getaddrinfo(host, port, options.address_family, *args, **kwargs) - socket.getaddrinfo = getaddrinfo_replacement return namespace parser.parse_args = lambda *a, **kw: parse_args(old_parse(*a, **kw)) +def enforce_address_family(address_family): + """Force all future name lookups to use the given address family.""" + if address_family != socket.AF_UNSPEC: + def getaddrinfo_replacement(host, port, family, *args, **kwargs): + return _old_socket_getaddrinfo(host, port, options.address_family, *args, **kwargs) + socket.getaddrinfo = getaddrinfo_replacement + def safe_str(s): """Return "[scrubbed]" if options.safe_logging is true, and s otherwise.""" if options.safe_logging:

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 08 Jul '14

08 Jul '14

commit bd1790a5daba512a98085b403d5f3969cb975327 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 8 05:45:29 2014 +0000 Update translations for tails-persistence-setup_completed --- cs/cs.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cs/cs.po b/cs/cs.po index da64ee1..e5664f8 100644 --- a/cs/cs.po +++ b/cs/cs.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-07-01 22:15+0200\n" -"PO-Revision-Date: 2014-07-08 05:12+0000\n" +"PO-Revision-Date: 2014-07-08 05:20+0000\n" "Last-Translator: Jiří Vírava <appukonrad(a)gmail.com>\n" "Language-Team: Czech (http://www.transifex.com/projects/p/torproject/language/cs/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 08 Jul '14

08 Jul '14

commit aa087b95e8f3480dd8679103c955ab843dc5a6f0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 8 05:45:26 2014 +0000 Update translations for tails-persistence-setup --- cs/cs.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cs/cs.po b/cs/cs.po index da64ee1..e5664f8 100644 --- a/cs/cs.po +++ b/cs/cs.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-07-01 22:15+0200\n" -"PO-Revision-Date: 2014-07-08 05:12+0000\n" +"PO-Revision-Date: 2014-07-08 05:20+0000\n" "Last-Translator: Jiří Vírava <appukonrad(a)gmail.com>\n" "Language-Team: Czech (http://www.transifex.com/projects/p/torproject/language/cs/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 08 Jul '14

08 Jul '14

commit 2ac82ca36cc71d0ac74f2c7dce3089f1e0261132 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 8 05:15:28 2014 +0000 Update translations for tails-persistence-setup_completed --- cs/cs.po | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/cs/cs.po b/cs/cs.po index 358650b..da64ee1 100644 --- a/cs/cs.po +++ b/cs/cs.po @@ -3,16 +3,17 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# FHRFHRFHRFHR <fhr(a)fhrnet.eu>, 2013 +# Filip Hruska <fhr(a)fhrnet.eu>, 2013 # Pivoj, 2014 -# Radog <bensch.radek(a)gmail.com>, 2013 +# Jiří Vírava <appukonrad(a)gmail.com>, 2014 +# Radek Bensch <inactive+Radog(a)transifex.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-01-18 21:00+0100\n" -"PO-Revision-Date: 2014-03-17 07:00+0000\n" -"Last-Translator: Pivoj\n" +"POT-Creation-Date: 2014-07-01 22:15+0200\n" +"PO-Revision-Date: 2014-07-08 05:12+0000\n" +"Last-Translator: Jiří Vírava <appukonrad(a)gmail.com>\n" "Language-Team: Czech (http://www.transifex.com/projects/p/torproject/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -121,67 +122,67 @@ msgstr "Symbolický odkaz do $ HOME nalezne každý soubor nebo adresář v `dot msgid "Setup Tails persistent volume" msgstr "Nastavení trvalého oddílu pro Tails" -#: ../lib/Tails/Persistence/Setup.pm:337 +#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:452 +msgid "Error" +msgstr "Chyba" + +#: ../lib/Tails/Persistence/Setup.pm:339 #, perl-format msgid "Device %s already has a persistent volume." msgstr "Zařízení %s už má trvalý oddíl." -#: ../lib/Tails/Persistence/Setup.pm:345 +#: ../lib/Tails/Persistence/Setup.pm:347 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "Zařízení %s nemá dostatek nealokovaného místa." -#: ../lib/Tails/Persistence/Setup.pm:353 ../lib/Tails/Persistence/Setup.pm:367 +#: ../lib/Tails/Persistence/Setup.pm:355 ../lib/Tails/Persistence/Setup.pm:369 #, perl-format msgid "Device %s has no persistent volume." msgstr "Zařízení %s nemá trvalý oddíl." -#: ../lib/Tails/Persistence/Setup.pm:359 +#: ../lib/Tails/Persistence/Setup.pm:361 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "Nelze smazat trvalý oddíl, zatímco je používán. Musíte restartovat Tails bez používání trvalého oddílu." -#: ../lib/Tails/Persistence/Setup.pm:378 +#: ../lib/Tails/Persistence/Setup.pm:380 msgid "Persistence volume is not unlocked." msgstr "Trvalý oddíl není odemčen." -#: ../lib/Tails/Persistence/Setup.pm:383 +#: ../lib/Tails/Persistence/Setup.pm:385 msgid "Persistence volume is not mounted." msgstr "Trvalý oddíl není připojen." -#: ../lib/Tails/Persistence/Setup.pm:388 +#: ../lib/Tails/Persistence/Setup.pm:390 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "Trvalý oddíl není čitelný. Problém s povolením nebo s vlastnictvím?" -#: ../lib/Tails/Persistence/Setup.pm:393 +#: ../lib/Tails/Persistence/Setup.pm:395 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "Trvalý oddíl nejde přepsat. Nebyl připojen pouze pro čtení?" -#: ../lib/Tails/Persistence/Setup.pm:402 +#: ../lib/Tails/Persistence/Setup.pm:404 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tails běží ze zařízení %s, které není USB / SDIO." -#: ../lib/Tails/Persistence/Setup.pm:408 +#: ../lib/Tails/Persistence/Setup.pm:410 #, perl-format msgid "Device %s is optical." msgstr "Zařízení %s je optické." -#: ../lib/Tails/Persistence/Setup.pm:415 +#: ../lib/Tails/Persistence/Setup.pm:417 #, perl-format -msgid "Device %s was not created using Tails USB installer." -msgstr "Zařízení %s nebylo vytvořeno pomocí Tails USB instalátorem." - -#: ../lib/Tails/Persistence/Setup.pm:450 -msgid "Error" -msgstr "Chyba" +msgid "Device %s was not created using Tails Installer." +msgstr "Zařízení %s nebylo pomocí Tails instaleru vytvořeno." -#: ../lib/Tails/Persistence/Setup.pm:670 +#: ../lib/Tails/Persistence/Setup.pm:677 msgid "Persistence wizard - Finished" msgstr "Průvodce tvorby trvalého oddílu dokončil svou činnost." -#: ../lib/Tails/Persistence/Setup.pm:673 +#: ../lib/Tails/Persistence/Setup.pm:680 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 08 Jul '14

08 Jul '14

commit cef899e4b6a7c70998b0ac8b446f77984572e18b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 8 05:15:24 2014 +0000 Update translations for tails-persistence-setup --- cs/cs.po | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/cs/cs.po b/cs/cs.po index 9749a28..da64ee1 100644 --- a/cs/cs.po +++ b/cs/cs.po @@ -3,16 +3,17 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# FHRFHRFHRFHR <fhr(a)fhrnet.eu>, 2013 +# Filip Hruska <fhr(a)fhrnet.eu>, 2013 # Pivoj, 2014 -# Radog <inactive+Radog(a)transifex.com>, 2013 +# Jiří Vírava <appukonrad(a)gmail.com>, 2014 +# Radek Bensch <inactive+Radog(a)transifex.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-04-16 21:26+0200\n" -"PO-Revision-Date: 2014-04-17 09:09+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-07-01 22:15+0200\n" +"PO-Revision-Date: 2014-07-08 05:12+0000\n" +"Last-Translator: Jiří Vírava <appukonrad(a)gmail.com>\n" "Language-Team: Czech (http://www.transifex.com/projects/p/torproject/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -121,67 +122,67 @@ msgstr "Symbolický odkaz do $ HOME nalezne každý soubor nebo adresář v `dot msgid "Setup Tails persistent volume" msgstr "Nastavení trvalého oddílu pro Tails" -#: ../lib/Tails/Persistence/Setup.pm:337 +#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:452 +msgid "Error" +msgstr "Chyba" + +#: ../lib/Tails/Persistence/Setup.pm:339 #, perl-format msgid "Device %s already has a persistent volume." msgstr "Zařízení %s už má trvalý oddíl." -#: ../lib/Tails/Persistence/Setup.pm:345 +#: ../lib/Tails/Persistence/Setup.pm:347 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "Zařízení %s nemá dostatek nealokovaného místa." -#: ../lib/Tails/Persistence/Setup.pm:353 ../lib/Tails/Persistence/Setup.pm:367 +#: ../lib/Tails/Persistence/Setup.pm:355 ../lib/Tails/Persistence/Setup.pm:369 #, perl-format msgid "Device %s has no persistent volume." msgstr "Zařízení %s nemá trvalý oddíl." -#: ../lib/Tails/Persistence/Setup.pm:359 +#: ../lib/Tails/Persistence/Setup.pm:361 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "Nelze smazat trvalý oddíl, zatímco je používán. Musíte restartovat Tails bez používání trvalého oddílu." -#: ../lib/Tails/Persistence/Setup.pm:378 +#: ../lib/Tails/Persistence/Setup.pm:380 msgid "Persistence volume is not unlocked." msgstr "Trvalý oddíl není odemčen." -#: ../lib/Tails/Persistence/Setup.pm:383 +#: ../lib/Tails/Persistence/Setup.pm:385 msgid "Persistence volume is not mounted." msgstr "Trvalý oddíl není připojen." -#: ../lib/Tails/Persistence/Setup.pm:388 +#: ../lib/Tails/Persistence/Setup.pm:390 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "Trvalý oddíl není čitelný. Problém s povolením nebo s vlastnictvím?" -#: ../lib/Tails/Persistence/Setup.pm:393 +#: ../lib/Tails/Persistence/Setup.pm:395 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "Trvalý oddíl nejde přepsat. Nebyl připojen pouze pro čtení?" -#: ../lib/Tails/Persistence/Setup.pm:402 +#: ../lib/Tails/Persistence/Setup.pm:404 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tails běží ze zařízení %s, které není USB / SDIO." -#: ../lib/Tails/Persistence/Setup.pm:408 +#: ../lib/Tails/Persistence/Setup.pm:410 #, perl-format msgid "Device %s is optical." msgstr "Zařízení %s je optické." -#: ../lib/Tails/Persistence/Setup.pm:415 +#: ../lib/Tails/Persistence/Setup.pm:417 #, perl-format msgid "Device %s was not created using Tails Installer." -msgstr "" - -#: ../lib/Tails/Persistence/Setup.pm:450 -msgid "Error" -msgstr "Chyba" +msgstr "Zařízení %s nebylo pomocí Tails instaleru vytvořeno." -#: ../lib/Tails/Persistence/Setup.pm:670 +#: ../lib/Tails/Persistence/Setup.pm:677 msgid "Persistence wizard - Finished" msgstr "Průvodce tvorby trvalého oddílu dokončil svou činnost." -#: ../lib/Tails/Persistence/Setup.pm:673 +#: ../lib/Tails/Persistence/Setup.pm:680 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n"

1 0

[onionoo/master] Write problems with lock file to stderr, not stdout.
by karsten＠torproject.org 08 Jul '14

08 Jul '14

commit afebec01c101abb76af40d0d66a9fcbf88b026a5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jul 7 17:58:51 2014 +0200 Write problems with lock file to stderr, not stdout. --- bin/update.sh | 2 +- build.xml | 3 ++- src/org/torproject/onionoo/Logger.java | 18 ++++++++++++++++-- src/org/torproject/onionoo/Main.java | 4 ++-- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/bin/update.sh b/bin/update.sh index 71d54a8..9294f41 100755 --- a/bin/update.sh +++ b/bin/update.sh @@ -1,3 +1,3 @@ #!/bin/bash -ant run >> log +ant run >> log && cat errors diff --git a/build.xml b/build.xml index 500204d..dccf374 100644 --- a/build.xml +++ b/build.xml @@ -93,7 +93,8 @@ <target name="run" depends="compile"> <java fork="true" maxmemory="4g" - classname="org.torproject.onionoo.Main"> + classname="org.torproject.onionoo.Main" + error="errors"> <classpath refid="classpath"/> </java> </target> diff --git a/src/org/torproject/onionoo/Logger.java b/src/org/torproject/onionoo/Logger.java index d84adf2..6906a6a 100644 --- a/src/org/torproject/onionoo/Logger.java +++ b/src/org/torproject/onionoo/Logger.java @@ -56,11 +56,25 @@ public class Logger { } public static void printStatusTime(String message) { + printStatusOrErrorTime(message, false); + } + + public static void printErrorTime(String message) { + printStatusOrErrorTime(message, true); + } + + private static void printStatusOrErrorTime(String message, + boolean printToSystemErr) { long now = currentTimeMillis(); long millis = printedLastStatusMessage < 0 ? 0 : now - printedLastStatusMessage; - System.out.println(" " + message + " (" + Logger.formatMillis(millis) - + ")."); + String line = " " + message + " (" + Logger.formatMillis(millis) + + ")."; + if (printToSystemErr) { + System.err.println(line); + } else { + System.out.println(line); + } printedLastStatusMessage = now; } } diff --git a/src/org/torproject/onionoo/Main.java b/src/org/torproject/onionoo/Main.java index 347701c..0ae12e4 100644 --- a/src/org/torproject/onionoo/Main.java +++ b/src/org/torproject/onionoo/Main.java @@ -18,7 +18,7 @@ public class Main { if (lf.acquireLock()) { Logger.printStatusTime("Acquired lock"); } else { - Logger.printStatusTime("Could not acquire lock. Is Onionoo " + Logger.printErrorTime("Could not acquire lock. Is Onionoo " + "already running? Terminating"); return; } @@ -107,7 +107,7 @@ public class Main { if (lf.releaseLock()) { Logger.printStatusTime("Released lock"); } else { - Logger.printStatusTime("Could not release lock. The next " + Logger.printErrorTime("Could not release lock. The next " + "execution may not start as expected"); }

1 0