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

[metrics-lib/master] Improve reading descriptors from tarballs.
by karsten＠torproject.org 17 Apr '12

17 Apr '12

commit 8959d90e280f438fcec16a344ef227317a299c3a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Apr 17 17:30:05 2012 +0200 Improve reading descriptors from tarballs. --- src/org/torproject/descriptor/DescriptorFile.java | 14 ++++++++++++-- .../descriptor/impl/DescriptorFileImpl.java | 16 ++++++++++++++++ .../descriptor/impl/DescriptorReaderImpl.java | 12 +++++++----- 3 files changed, 35 insertions(+), 7 deletions(-) diff --git a/src/org/torproject/descriptor/DescriptorFile.java b/src/org/torproject/descriptor/DescriptorFile.java index 863ce92..153b700 100644 --- a/src/org/torproject/descriptor/DescriptorFile.java +++ b/src/org/torproject/descriptor/DescriptorFile.java @@ -9,12 +9,22 @@ import java.util.List; * descriptors. */ public interface DescriptorFile { - /* Return the directory where this descriptor file was contained. */ + /* Return the directory where this descriptor file was contained, or + * null if the file was contained in a tarball. */ public File getDirectory(); - /* Return the descriptor file itself. */ + /* Return the tarball where this descriptor file was contained, or null + * if the file was not contained in a tarball. */ + public File getTarball(); + + /* Return the descriptor file itself, or null if the descriptor file was + * contained in a tarball. */ public File getFile(); + /* Return the descriptor file name, which is either the absolute path of + * the file on disk, or the tar file entry name. */ + public String getFileName(); + /* Return the time in millis when the descriptor file on disk was last * modified. */ public long getLastModified(); diff --git a/src/org/torproject/descriptor/impl/DescriptorFileImpl.java b/src/org/torproject/descriptor/impl/DescriptorFileImpl.java index 787961b..7ab9a24 100644 --- a/src/org/torproject/descriptor/impl/DescriptorFileImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorFileImpl.java @@ -19,6 +19,14 @@ public class DescriptorFileImpl implements DescriptorFile { return this.directory; } + private File tarball; + protected void setTarball(File tarball) { + this.tarball = tarball; + } + public File getTarball() { + return this.tarball; + } + private File file; protected void setFile(File file) { this.file = file; @@ -27,6 +35,14 @@ public class DescriptorFileImpl implements DescriptorFile { return this.file; } + private String fileName; + protected void setFileName(String fileName) { + this.fileName = fileName; + } + public String getFileName() { + return this.fileName; + } + private long lastModified; protected void setLastModified(long lastModified) { this.lastModified = lastModified; diff --git a/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java b/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java index 7db883b..d5f779d 100644 --- a/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java @@ -221,13 +221,15 @@ public class DescriptorReaderImpl implements DescriptorReader { BufferedInputStream bis = new BufferedInputStream(tais); TarArchiveEntry tae = null; while ((tae = tais.getNextTarEntry()) != null) { + if (tae.isDirectory()) { + continue; + } DescriptorFileImpl descriptorFile = new DescriptorFileImpl(); - /* TODO Is it correct to set these values for files - * contained in a tarball? */ - descriptorFile.setDirectory(tarball); - descriptorFile.setFile(null); - descriptorFile.setLastModified(lastModifiedMillis); + descriptorFile.setTarball(tarball); + descriptorFile.setFileName(tae.getName()); + descriptorFile.setLastModified(tae.getLastModifiedDate(). + getTime()); ByteArrayOutputStream baos = new ByteArrayOutputStream(); int len; byte[] data = new byte[1024];

1 0

[metrics-lib/master] Accept negative uptimes and uptimes > MAXINT.
by karsten＠torproject.org 17 Apr '12

17 Apr '12

commit bd21da9b4370afe385dc2c9a88a07f15dd3a7892 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Apr 17 18:20:54 2012 +0200 Accept negative uptimes and uptimes > MAXINT. --- .../torproject/descriptor/ServerDescriptor.java | 5 +++-- .../descriptor/impl/ServerDescriptorImpl.java | 10 ++++------ .../descriptor/impl/ServerDescriptorImplTest.java | 8 ++++---- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/org/torproject/descriptor/ServerDescriptor.java b/src/org/torproject/descriptor/ServerDescriptor.java index b6bc9de..453d038 100644 --- a/src/org/torproject/descriptor/ServerDescriptor.java +++ b/src/org/torproject/descriptor/ServerDescriptor.java @@ -60,9 +60,10 @@ public interface ServerDescriptor extends Descriptor { * published. */ public boolean isHibernating(); - /* Return the number of seconds that this relay has been running, or -1 + /* Return the number of seconds that this relay has been running (which + * might even be negative in a few descriptors due to a bug), or null * if the descriptor does not contain an uptime line. */ - public int getUptime(); + public Long getUptime(); /* Return the onion key in PEM format, or null if the descriptor * doesn't contain a signing key (which is the case in sanitized bridge diff --git a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java index 68b0e70..d7049eb 100644 --- a/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/ServerDescriptorImpl.java @@ -258,10 +258,8 @@ public class ServerDescriptorImpl extends DescriptorImpl } boolean isValid = false; try { - this.uptime = Integer.parseInt(partsNoOpt[1]); - if (this.uptime >= 0) { - isValid = true; - } + this.uptime = Long.parseLong(partsNoOpt[1]); + isValid = true; } catch (NumberFormatException e) { /* Handle below. */ } @@ -536,8 +534,8 @@ public class ServerDescriptorImpl extends DescriptorImpl return this.hibernating; } - private int uptime = -1; - public int getUptime() { + private Long uptime; + public Long getUptime() { return this.uptime; } diff --git a/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java b/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java index 1407195..1995697 100644 --- a/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java +++ b/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java @@ -293,7 +293,7 @@ public class ServerDescriptorImplTest { assertEquals(1325390599000L, descriptor.getPublishedMillis()); assertEquals("D8733048FC8EC9102466AD8F3098622BF1BF71FD", descriptor.getFingerprint()); - assertEquals(48, (int) descriptor.getUptime()); + assertEquals(48, descriptor.getUptime().longValue()); assertEquals(51200, (int) descriptor.getBandwidthRate()); assertEquals(51200, (int) descriptor.getBandwidthBurst()); assertEquals(53470, (int) descriptor.getBandwidthObserved()); @@ -529,14 +529,14 @@ public class ServerDescriptorImplTest { public void testUptimeMissing() throws DescriptorParseException { ServerDescriptor descriptor = DescriptorBuilder. createWithUptimeLine(null); - assertEquals(-1, (int) descriptor.getUptime()); + assertNull(descriptor.getUptime()); } @Test() public void testUptimeOpt() throws DescriptorParseException { ServerDescriptor descriptor = DescriptorBuilder. createWithUptimeLine("opt uptime 48"); - assertEquals(48, (int) descriptor.getUptime()); + assertEquals(48, descriptor.getUptime().longValue()); } @Test(expected = DescriptorParseException.class) @@ -544,7 +544,7 @@ public class ServerDescriptorImplTest { DescriptorBuilder.createWithUptimeLine("uptime fourty-eight"); } - @Test(expected = DescriptorParseException.class) + @Test() public void testUptimeMinusOne() throws DescriptorParseException { DescriptorBuilder.createWithUptimeLine("uptime -1"); }

1 0

[metrics-lib/master] Accept dates at least until signed 32-bit timestamps run out.
by karsten＠torproject.org 17 Apr '12

17 Apr '12

commit bca3d4cd30dabd50c57db96ef8ee806745081ea0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Apr 17 18:10:44 2012 +0200 Accept dates at least until signed 32-bit timestamps run out. --- .../torproject/descriptor/impl/ParseHelper.java | 2 +- .../descriptor/impl/ServerDescriptorImplTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/org/torproject/descriptor/impl/ParseHelper.java b/src/org/torproject/descriptor/impl/ParseHelper.java index 8db09e2..daea018 100644 --- a/src/org/torproject/descriptor/impl/ParseHelper.java +++ b/src/org/torproject/descriptor/impl/ParseHelper.java @@ -142,7 +142,7 @@ public class ParseHelper { } catch (ParseException e) { /* Leave result at -1L. */ } - if (result < 0L || result > 2000000000000L) { + if (result < 0L || result / 1000L > (long) Integer.MAX_VALUE) { throw new DescriptorParseException("Illegal timestamp format in " + "line '" + line + "'."); } diff --git a/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java b/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java index a96fa33..1407195 100644 --- a/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java +++ b/test/org/torproject/descriptor/impl/ServerDescriptorImplTest.java @@ -470,8 +470,8 @@ public class ServerDescriptorImplTest { } @Test(expected = DescriptorParseException.class) - public void testPublished3012() throws DescriptorParseException { - DescriptorBuilder.createWithPublishedLine("published 3012-01-01 " + public void testPublished2039() throws DescriptorParseException { + DescriptorBuilder.createWithPublishedLine("published 2039-01-01 " + "04:03:19"); }

1 0

[stem/master] Checking if a file's a tarball could fail due to permissions
by atagar＠torproject.org 17 Apr '12

17 Apr '12

commit e69cb95f93d6646e809bf0143ff595dae32a2b5e Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Apr 17 08:42:40 2012 -0700 Checking if a file's a tarball could fail due to permissions I encountered a transient IOError from the tarfile.is_tarfile() call. I'm still not sure why it complained about '/vmlinuz.old' (and the test actually still passed), but it's inappropriate for the reader to raise an IOError there. Falling back to mime type. --- stem/descriptor/reader.py | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py index 01f8809..83b29c6 100644 --- a/stem/descriptor/reader.py +++ b/stem/descriptor/reader.py @@ -371,10 +371,19 @@ class DescriptorReader: target_type = mimetypes.guess_type(target) + # Checking if it's a tar file may fail due to permissions so failing back + # to the mime type... + # IOError: [Errno 13] Permission denied: '/vmlinuz.old' + + try: + is_tar = tarfile.is_tarfile(target) + except IOError: + is_tar = target_type[0] == 'application/x-tar' + if target_type[0] in (None, 'text/plain'): # either '.txt' or an unknown type self._handle_descriptor_file(target) - elif tarfile.is_tarfile(target): + elif is_tar: # handles gzip, bz2, and decompressed tarballs among others self._handle_archive(target) else:

1 0

[stem/master] Left out part of the whitespace rename change
by atagar＠torproject.org 17 Apr '12

17 Apr '12

commit ebf4c0274f7e90da8946f2ba49c3e787fb367264 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Apr 17 08:46:21 2012 -0700 Left out part of the whitespace rename change Oops! Forgot to do a 'git commit -a' to pick up the other changes from renaming to 'check_whitespace.py'. --- run_tests.py | 4 ++-- test/__init__.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/run_tests.py b/run_tests.py index d764d54..1fee4da 100755 --- a/run_tests.py +++ b/run_tests.py @@ -13,7 +13,7 @@ import StringIO import test.output import test.runner -import test.whitespace_check +import test.check_whitespace import test.unit.connection.authentication import test.unit.connection.protocolinfo import test.unit.socket.control_line @@ -338,7 +338,7 @@ if __name__ == '__main__': # TODO: note unused config options afterward? - whitespace_issues = test.whitespace_check.get_issues() + whitespace_issues = test.check_whitespace.get_issues() if whitespace_issues: test.output.print_line("WHITESPACE ISSUES", term.Color.BLUE, term.Attr.BOLD) diff --git a/test/__init__.py b/test/__init__.py index 9f227af..eb03299 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -2,5 +2,5 @@ Unit and integration tests for the stem library. """ -__all__ = ["mocking", "output", "runner", "whitespace_check"] +__all__ = ["check_whitespace", "mocking", "output", "runner"]

1 0

[stem/master] Retaining padding in the server descriptor digest() funciton
by atagar＠torproject.org 17 Apr '12

17 Apr '12

commit 21228b096617abbaabc1d53ca964b8cad591bf88 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Apr 17 08:47:19 2012 -0700 Retaining padding in the server descriptor digest() funciton Network status entries exclude base64 padding to save on space but there's no reason for us to do the same. Adding a comment explaining why they might mismatch. Thanks to Karsten for explaining it! --- stem/descriptor/server_descriptor.py | 12 +++++------- test/integ/descriptor/server_descriptor.py | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 525322c..7823cf0 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -615,6 +615,10 @@ class RelayDescriptorV3(ServerDescriptorV3): Provides the base64 encoded sha1 of our content. This value is part of the server descriptor entry for this relay. + Note that network status entries exclude the padding, so you'll need to add + a '=' to it so they'll match... + https://en.wikipedia.org/wiki/Base64#Padding + Returns: str with the digest value for this server descriptor """ @@ -625,13 +629,7 @@ class RelayDescriptorV3(ServerDescriptorV3): raw_content = raw_content[:raw_content.find(ending) + len(ending)] digest_sha1 = hashlib.sha1(raw_content).digest() - digest = base64.b64encode(digest_sha1) - - # TODO: I'm not sure why but the base64 decodings have an anomalous '=' - # ending which the network status entries don't have. Tad puzzled, but - # for now stripping it so we match. - - self._digest = digest[:-1] + self._digest = base64.b64encode(digest_sha1) return self._digest diff --git a/test/integ/descriptor/server_descriptor.py b/test/integ/descriptor/server_descriptor.py index bd270b4..ee099b4 100644 --- a/test/integ/descriptor/server_descriptor.py +++ b/test/integ/descriptor/server_descriptor.py @@ -103,7 +103,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= self.assertEquals(expected_signing_key, desc.signing_key) self.assertEquals(expected_signature, desc.signature) self.assertEquals([], desc.get_unrecognized_lines()) - self.assertEquals("LHsnvqsEtOJFnYnKbVzRzF+Vpok", desc.digest()) + self.assertEquals("LHsnvqsEtOJFnYnKbVzRzF+Vpok" + "=", desc.digest()) def test_old_descriptor(self): """

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 17 Apr '12

17 Apr '12

commit 458b451e472d31a7fbdea5d017c523505401d2ea Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 17 15:15:03 2012 +0000 Update translations for gettor --- eu/gettor.po | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eu/gettor.po b/eu/gettor.po index 2197a9c..a3f8d0f 100644 --- a/eu/gettor.po +++ b/eu/gettor.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-04-14 14:24+0000\n" +"PO-Revision-Date: 2012-04-17 15:01+0000\n" "Last-Translator: Antxon Baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgstr "" #: lib/gettor/i18n.py:27 msgid "Hello, This is the \"GetTor\" robot." -msgstr "Kaixo, Heu \"GetTor\" errobota da." +msgstr "Kaixo, hau \"GetTor\" errobota da." #: lib/gettor/i18n.py:29 msgid "Thank you for your request." @@ -72,7 +72,7 @@ msgstr "Tor pakete bat bidaliko dizut e-mailez, zein nahi duzun esaten badidazu. msgid "" "Please reply to this mail, and tell me a single package name anywhere \n" "in the body of your email." -msgstr "" +msgstr "Mesedez erantzun mezu honi, eta esaidazu pakete izen bakar bat \nmezuaren gorputzaren edozein tokian." #: lib/gettor/i18n.py:59 msgid "" @@ -86,18 +86,18 @@ msgid "" "language you want in the address you send the mail to:\n" "\n" " gettor+fa(a)torproject.org" -msgstr "" +msgstr "Zure hizkuntzara itzulitako Tor bertsio bat eskuratzeko, zehaztu \nezazu nahi duzun hizkuntza mezuan bidaltzen duzun helbidean:\n\ngettor+fa@torproject.org" #: lib/gettor/i18n.py:67 msgid "" "This example will give you the requested package in a localized\n" "version for Farsi (Persian). Check below for a list of supported language\n" "codes. " -msgstr "" +msgstr "Adibide honek eskatutako paketea emango dizu Farsi (Pertsiar) \nhizkuntzan. Ikusi behean onartutako hizkuntzen kodeen zerrenda." #: lib/gettor/i18n.py:71 msgid " List of supported locales:" -msgstr "Baimendutakohizkuntzen zerrenda:" +msgstr "Baimendutako hizkuntzen zerrenda:" #: lib/gettor/i18n.py:73 msgid "Here is a list of all available languages:" @@ -171,7 +171,7 @@ msgstr "" msgid "" "3.) Verify all files as described in the mail you received with \n" "each package. (gpg --verify)" -msgstr "3.) Egiaztatu mailean jasotako fitxategi guztiak pakete bakoitzarekin. (gpg --verify)" +msgstr "3.) Egiaztatu mezuan jasotako fitxategi guztiak pakete bakoitzarekin. (gpg --verify)" #: lib/gettor/i18n.py:117 msgid "" @@ -189,7 +189,7 @@ msgstr "5.) Erauzketa amaitu ostean, duela gutxi sortutako \".exe\" bat \naurkit #: lib/gettor/i18n.py:125 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" -msgstr "6.) Hori da. Bukatu duzu. Eskerrik asko Tor erabiltzeagatik eta ondo pasa!" +msgstr "6.) Hori da dena. Bukatu duzu. Eskerrik asko Tor erabiltzeagatik eta ondo pasa!" #: lib/gettor/i18n.py:127 msgid ""

1 0

[obfsproxy/master] Avoid segfault on resolve_address_port(NULL)
by asn＠torproject.org 17 Apr '12

17 Apr '12

commit f9d55f065c0348f8f39a96a4844184928ec7019a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 15 12:22:52 2012 -0500 Avoid segfault on resolve_address_port(NULL) --- src/util.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/util.c b/src/util.c index b820981..e7ba9c3 100644 --- a/src/util.c +++ b/src/util.c @@ -169,9 +169,14 @@ resolve_address_port(const char *address, int nodns, int passive, struct evutil_addrinfo *ai = NULL; struct evutil_addrinfo ai_hints; int ai_res, ai_errno; - char *a = xstrdup(address), *cp; + char *a, *cp; const char *portstr; + if (!address) + return NULL; + + a = xstrdup(address); + if ((cp = strchr(a, ':'))) { portstr = cp+1; *cp = '\0';

1 0

[obfsproxy/master] Fix obfs2 argument parsing.
by asn＠torproject.org 17 Apr '12

17 Apr '12

commit ee63d3fa345ed7230d229433416e75d4c43d7436 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Apr 11 22:31:30 2012 +0200 Fix obfs2 argument parsing. Keep a count of how many command line arguments we have left, so that we know when to stop parsing. --- ChangeLog | 5 +++++ src/protocols/obfs2.c | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2a7605c..ae2ee92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Changes in version 0.1.4 - <not yet released> + - Fix crash when parsing obfs2 command line arguments. Fixes bug + #5141. + + Changes in version 0.1.3 - 2012-04-03 - Display git revision when we start logging. Fixes part of bug #5157. diff --git a/src/protocols/obfs2.c b/src/protocols/obfs2.c index 59c3d55..566c2ed 100644 --- a/src/protocols/obfs2.c +++ b/src/protocols/obfs2.c @@ -167,6 +167,7 @@ int parse_and_set_options(int n_options, const char *const *options, obfs2_config_t *cfg) { + int options_left = n_options; int got_dest=0; int got_ss=0; const char* defport; @@ -177,7 +178,7 @@ parse_and_set_options(int n_options, const char *const *options, } /* Now parse the optional arguments */ - while (!strncmp(*options,"--",2)) { + while (options_left && !strncmp(*options,"--",2)) { if (!strncmp(*options,"--dest=",7)) { if (got_dest) return -1; @@ -201,9 +202,17 @@ parse_and_set_options(int n_options, const char *const *options, log_warn("obfs2: Unknown argument '%s'.", *options); return -1; } + options_left--; options++; } + /* we still need to parse the mode and the listen address. */ + if (options_left != 2) { + log_warn("obfs2 needs two options (mode, listen address), after its " + "optional arguments. You provided %d.", options_left); + return -1; + } + if (!strcmp(*options, "client")) { defport = "48988"; /* bf5c */ cfg->mode = LSN_SIMPLE_CLIENT;

1 0

[obfsproxy/master] Merge remote-tracking branch 'nickm/bug5141'
by asn＠torproject.org 17 Apr '12

17 Apr '12

commit 5d9ac64d15ca373f2a295dee38bba5691fd53a46 Merge: 29be607 f9d55f0 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Apr 17 15:46:27 2012 +0200 Merge remote-tracking branch 'nickm/bug5141' src/util.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)

1 0