August 2016 - tor-commits - lists.torproject.org

[metrics-lib/master] Adapted build.xml to use Gson and tweaked some tasks and paths.
by karsten＠torproject.org 30 Aug '16

30 Aug '16

commit 7a0e1097af1a898282ece6426336b41d2b49c891 Author: iwakeh <iwakeh(a)torproject.org> Date: Fri Aug 19 13:40:28 2016 +0200 Adapted build.xml to use Gson and tweaked some tasks and paths. --- build.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/build.xml b/build.xml index bfede7c..728906c 100644 --- a/build.xml +++ b/build.xml @@ -3,7 +3,8 @@ <property name="allsources" value="src"/> <property name="sources" value="src/main/java"/> <property name="resources" value="src/main/resources"/> - <property name="generated" value="generated/"/> + <property name="generated" value="generated"/> + <property name="dist" value="${generated}/dist"/> <property name="classes" value="${generated}/classes"/> <property name="docs" value="${generated}/javadoc"/> <property name="tests" value="src/test/java"/> @@ -14,18 +15,19 @@ <property name="testclasses" value="${generated}/testclasses/"/> <property name="libs" value="lib"/> <property name="cobertura.ser.file" value="${basedir}/cobertura.ser" /> - <property name="jarfile" value="descriptor-${release.version}.jar" /> + <property name="jarfile" value="${dist}/descriptor-${release.version}.jar" /> <property name="jarsourcesfile" - value="descriptor-${release.version}-sources.jar" /> + value="${dist}/descriptor-${release.version}-sources.jar" /> <property name="jardocsfile" - value="descriptor-${release.version}-javadoc.jar" /> + value="${dist}/descriptor-${release.version}-javadoc.jar" /> <property name="source-and-target-java-version" value="1.7" /> <property name="release.tarball" - value="descriptor-${release.version}.tar.gz" /> + value="${dist}/descriptor-${release.version}.tar.gz" /> <property file="build.properties" /> <patternset id="runtime" > <include name="commons-compress-1.9.jar"/> + <include name="gson-2.2.4.jar"/> <include name="slf4j-api-1.7.7.jar" /> <include name="xz-1.5.jar"/> </patternset> @@ -84,10 +86,7 @@ <delete includeEmptyDirs="true" quiet="true"> <fileset dir="${generated}" defaultexcludes="false" includes="**" /> </delete> - <delete file="${jarfile}"/> - <delete file="${jarsourcesfile}"/> - <delete file="${jardocsfile}"/> - <delete file="${release.tarball}"/> + <delete file="${cobertura.ser.file}" quiet="true" /> </target> <target name="init"> @@ -257,6 +256,7 @@ <taskdef classpathref="cobertura.classpath" resource="tasks.properties" /> <target name="coverage" depends="compile,testcompile"> + <delete file="${cobertura.ser.file}" quiet="true" /> <copy todir="${instrument}" > <fileset dir="${classes}"/> </copy> @@ -280,7 +280,7 @@ <include name="**/*.java" /> </fileset> </cobertura-report> - <cobertura-check branchrate="0" totallinerate="31" totalbranchrate="42" > + <cobertura-check branchrate="0" totallinerate="57" totalbranchrate="50" > <regex pattern="org.torproject.descriptor.benchmark.*" branchrate="0" linerate="0"/> </cobertura-check> </target>

1 0

[metrics-lib/master] Increased coverage for DescriptorSourceFactory from zero to 100%.
by karsten＠torproject.org 30 Aug '16

30 Aug '16

commit e9c0731f395fa12be7b2f9d370fb4374bcfeef06 Author: iwakeh <iwakeh(a)torproject.org> Date: Fri Aug 19 13:42:44 2016 +0200 Increased coverage for DescriptorSourceFactory from zero to 100%. --- .../descriptor/DescriptorSourceFactoryTest.java | 130 +++++++++++++++++++++ 1 file changed, 130 insertions(+) diff --git a/src/test/java/org/torproject/descriptor/DescriptorSourceFactoryTest.java b/src/test/java/org/torproject/descriptor/DescriptorSourceFactoryTest.java new file mode 100644 index 0000000..5f2e42e --- /dev/null +++ b/src/test/java/org/torproject/descriptor/DescriptorSourceFactoryTest.java @@ -0,0 +1,130 @@ +/* Copyright 2016 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.descriptor; + +import static org.torproject.descriptor.DescriptorSourceFactory.*; + +import org.torproject.descriptor.DescriptorCollector; +import org.torproject.descriptor.DescriptorDownloader; +import org.torproject.descriptor.DescriptorParser; +import org.torproject.descriptor.DescriptorReader; +import org.torproject.descriptor.ImplementationNotAccessibleException; +import org.torproject.descriptor.impl.DescriptorCollectorImpl; +import org.torproject.descriptor.impl.DescriptorDownloaderImpl; +import org.torproject.descriptor.impl.DescriptorParserImpl; +import org.torproject.descriptor.impl.DescriptorReaderImpl; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import org.junit.Test; + +import java.lang.reflect.Method; +import java.lang.reflect.InvocationTargetException; + +public class DescriptorSourceFactoryTest { + + private final static String[] properties = new String[]{ + COLLECTOR_PROPERTY, DOWNLOADER_PROPERTY, PARSER_PROPERTY, READER_PROPERTY}; + private final static String[] defaults = new String[]{ + COLLECTOR_DEFAULT, DOWNLOADER_DEFAULT, PARSER_DEFAULT, READER_DEFAULT}; + + @Test() + public void testDefaults() { + setProperties(defaults); + DescriptorCollector dc = DescriptorSourceFactory.createDescriptorCollector(); + assertTrue(dc instanceof DescriptorCollectorImpl); + DescriptorDownloader dd = DescriptorSourceFactory.createDescriptorDownloader(); + assertTrue(dd instanceof DescriptorDownloaderImpl); + DescriptorParser dp = DescriptorSourceFactory.createDescriptorParser(); + assertTrue(dp instanceof DescriptorParserImpl); + DescriptorReader dr = DescriptorSourceFactory.createDescriptorReader(); + assertTrue(dr instanceof DescriptorReaderImpl); + } + + private void setProperties(String[] vals) { + for (int k = 0; k < properties.length; k++) { + System.setProperty(properties[k], vals[k]); + } + } + + @Test(expected = ImplementationNotAccessibleException.class) + public void testException() { + System.setProperty(COLLECTOR_PROPERTY , + "no.implementation.available.X"); + DescriptorSourceFactory.createDescriptorCollector(); + } + + @Test() + public void testUnknownPropertyException() { + setProperties(defaults); + try { + Method retrieve = DescriptorSourceFactory.class + .getDeclaredMethod("retrieve", String.class); + retrieve.setAccessible(true); + retrieve.invoke(null, "unknown.property"); + } catch (InvocationTargetException ite) { + if(ite.getCause() instanceof ImplementationNotAccessibleException) { + return; + } else { + fail("Cause was " + ite.getCause() + + ", but expected InvocationTargetException."); + } + } catch (Throwable t) { + fail("Caught " + t + ", but expected InvocationTargetException."); + } + } + + @Test() + public void testProperties() { + setProperties(new String[]{ + "org.torproject.descriptor.DummyCollectorImplementation", + "org.torproject.descriptor.DummyDownloaderImplementation", + "org.torproject.descriptor.DummyParserImplementation", + "org.torproject.descriptor.DummyReaderImplementation", + }); + DescriptorCollector dc = DescriptorSourceFactory.createDescriptorCollector(); + assertTrue(dc instanceof DummyCollectorImplementation); + assertEquals(1, DummyCollectorImplementation.count); + DescriptorDownloader dd = DescriptorSourceFactory.createDescriptorDownloader(); + assertTrue(dd instanceof DummyDownloaderImplementation); + assertEquals(1, DummyDownloaderImplementation.count); + DescriptorParser dp = DescriptorSourceFactory.createDescriptorParser(); + assertTrue(dp instanceof DummyParserImplementation); + assertEquals(1, DummyParserImplementation.count); + DescriptorReader dr = DescriptorSourceFactory.createDescriptorReader(); + assertTrue(dr instanceof DummyReaderImplementation); + assertEquals(1, DummyReaderImplementation.count); + } + +} + +class DummyCollectorImplementation extends DescriptorCollectorImpl { + static int count; + public DummyCollectorImplementation() { + count++; + } +} + +class DummyDownloaderImplementation extends DescriptorDownloaderImpl { + static int count; + public DummyDownloaderImplementation() { + count++; + } +} + +class DummyParserImplementation extends DescriptorParserImpl { + static int count; + public DummyParserImplementation() { + count++; + } +} + +class DummyReaderImplementation extends DescriptorReaderImpl { + static int count; + public DummyReaderImplementation() { + count++; + } +}

1 0

[metrics-lib/master] Added more inline comments and extended tests.
by karsten＠torproject.org 30 Aug '16

30 Aug '16

commit d65b26e0db29fe71701027ee1567374a55abb378 Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Aug 30 12:15:51 2016 +0200 Added more inline comments and extended tests. --- .../index/DescriptorIndexCollectorTest.java | 46 ++++++++++++++++++---- 1 file changed, 39 insertions(+), 7 deletions(-) diff --git a/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java b/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java index 8f14ec7..c5a6a5c 100644 --- a/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java +++ b/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java @@ -44,6 +44,11 @@ public class DescriptorIndexCollectorTest { File indexFile = newIndexFile("testindex.json", remoteDirectory.toURL().toString()); + + // verify precondition for test. + checkContains(true, + DescriptorIndexCollector.statLocalDirectory(localFolder).toString(), + "a/b/x1", "a/b/y1", "a/b/c/w1", "a/b/c/z1", "a/b/c/u1"); checkContains(false, DescriptorIndexCollector.statLocalDirectory(localFolder).toString(), "a/b/y2","a/b/x2"); @@ -51,22 +56,26 @@ public class DescriptorIndexCollectorTest { DescriptorCollector dc = new DescriptorIndexCollector(); dc.collectDescriptors(indexFile.toURL().toString(), new String[]{"a/b", "a"}, 1451606400_000L, localFolder, false); + + // verify that files in 'a/b' were fetched checkContains(true, DescriptorIndexCollector.statLocalDirectory(localFolder).toString(), "a/b/x1", "a/b/y1", "a/b/y2","a/b/x2", "a/b/c/w1", "a/b/c/z1"); + + // verify that files in 'a/b/c' were not fetched. checkContains(false, DescriptorIndexCollector.statLocalDirectory(localFolder).toString(), - "a/b/c/w2","a/b/c/z2"); + "a/b/c/u2"); } private void makeStructure(File folder, String suffix) throws IOException { File dir = makeDirs(folder.toString(), "a", "b"); makeFiles(dir, "x" + suffix, "y" + suffix); File subdir = makeDirs(dir.toString(), "c"); - makeFiles(subdir, "w" + suffix, "z" + suffix); + makeFiles(subdir, "u" + suffix, "w" + suffix, "z" + suffix); SortedMap<String, Long> local = DescriptorIndexCollector .statLocalDirectory(folder); - assertEquals("found " + local, 4, local.size()); + assertEquals("found " + local, 5, local.size()); } private File makeDirs(String first, String ... dirs) throws IOException { @@ -97,11 +106,20 @@ public class DescriptorIndexCollectorTest { private File newIndexFile(String name, String remoteDirectory) throws Exception { SortedSet<FileNode> fm = new TreeSet<>(); - fm.add(new FileNode("w2", 0L, "2100-01-01 01:01")); + + // 'u2' should be fetched when the path is included. + fm.add(new FileNode("u2", 0L, "2100-01-01 01:02")); + + // 'w2' should not be fetched, b/c of wrong filesize + fm.add(new FileNode("w2", 100L, "2100-01-01 01:01")); + + // 'z2' should not be fetched, b/c of being too old. fm.add(new FileNode("z2", 0L, "1900-01-01 01:02")); SortedSet<DirectoryNode> dm = new TreeSet<>(); dm.add(new DirectoryNode("c", fm, null)); fm = new TreeSet<>(); + + // 'x2' and 'y2' should be fetched when their path is included. fm.add(new FileNode("x2", 0L, "2100-01-01 01:01")); fm.add(new FileNode("y2", 0L, "2100-01-01 01:02")); DirectoryNode dnb = new DirectoryNode("b", fm, dm); @@ -127,19 +145,33 @@ public class DescriptorIndexCollectorTest { File indexFile = newIndexFile("testindexDelete.json", remoteDirectory.toURL().toString()); + + // verify precondition for test. + checkContains(true, + DescriptorIndexCollector.statLocalDirectory(localFolder).toString(), + "a/b/x1", "a/b/y1", "a/b/c/w1", "a/b/c/z1", "a/b/c/u1"); checkContains(false, DescriptorIndexCollector.statLocalDirectory(localFolder).toString(), "a/b/y2","a/b/x2"); new DescriptorIndexCollector() .collectDescriptors(indexFile.toURL().toString(), - new String[]{"a/b"}, 1451606400_000L, localFolder, true); + new String[]{"a/b", "a/b/c"}, 1451606400_000L, localFolder, true); + + // verify file addition. checkContains(true, DescriptorIndexCollector.statLocalDirectory(localFolder).toString(), - "a/b/y2","a/b/x2"); + "a/b/y2", "a/b/x2", "a/b/c/u2"); + + // verify that invalid files weren't fetched. + checkContains(false, + DescriptorIndexCollector.statLocalDirectory(localFolder).toString(), + "a/b/c/w2", "a/b/c/z2"); + + // verify file deletion. checkContains(false, DescriptorIndexCollector.statLocalDirectory(localFolder).toString(), - "a/b/x1", "a/b/y1", "a/b/c/w1", "a/b/c/z1", "a/b/c/w2", "a/b/c/z2"); + "a/b/x1", "a/b/y1", "a/b/c/w1", "a/b/c/z1", "a/b/c/u1"); } @Test()

1 0

[tor-messenger-build/master] Update version number to 0.2.0b1
by sukhbir＠torproject.org 30 Aug '16

30 Aug '16

commit 61231d818fba5296469c5f92eab641518e9a2d13 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Aug 30 09:23:36 2016 -0400 Update version number to 0.2.0b1 --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index f45309f..caf7a43 100644 --- a/rbm.conf +++ b/rbm.conf @@ -6,7 +6,7 @@ output_dir: "out/[% project %]" pkg_type: build var: - tormessenger_version: '0.2.0-beta' + tormessenger_version: '0.2.0b1' build_id: '[% sha256(c("var/build_id_txt")).substr(0, 6) %]' build_id_txt: | [% c("version") %]

1 0

[torspec/master] Replaced a vague may with RFC-ish MAY
by nickm＠torproject.org 30 Aug '16

30 Aug '16

commit 4adc21feb4eea16f17aa4ad964554a1a9244ebc7 Author: Ivan Markin <twim(a)riseup.net> Date: Thu Jun 23 15:22:55 2016 +0000 Replaced a vague may with RFC-ish MAY --- dir-spec.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dir-spec.txt b/dir-spec.txt index fb7ee9a..6ba05bc 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -516,7 +516,7 @@ A curve25519 public key used for the ntor circuit extended handshake. It's the standard encoding of the OR's curve25519 - public key, encoded in base 64. The trailing = sign may be + public key, encoded in base 64. The trailing '=' sign MAY be omitted from the base64 encoding. The key MUST be accepted for at least 1 week after any new key is published in a subsequent descriptor.

1 0

[torspec/master] Fix a typo in rend-spec.txt
by nickm＠torproject.org 30 Aug '16

30 Aug '16

commit 29c7d98eaf8e720a13e546abc8cdf121a6d852f7 Author: Ivan Markin <twim(a)riseup.net> Date: Sun Aug 28 13:39:09 2016 +0000 Fix a typo in rend-spec.txt --- rend-spec.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rend-spec.txt b/rend-spec.txt index d4dfefe..cf32f2b 100644 --- a/rend-spec.txt +++ b/rend-spec.txt @@ -747,7 +747,7 @@ match the value in the RENDEZVOUS2 cell, the client must close the circuit. - Subsequently, the rendezvous point passes relay cells, unchanged, from + Subsequently, the rendezvous point passes RELAY cells, unchanged, from each of the two circuits to the other. When Alice's OP sends RELAY cells along the circuit, it authenticates with Df, and encrypts them with the Kf, then with all of the keys for the ORs in Alice's side of the circuit;

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 30 Aug '16

30 Aug '16

commit 384b128f2901bead191a2f1f727024badbb94ae2 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 30 10:16:18 2016 +0000 Update translations for tails-misc_completed --- hr_HR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hr_HR.po b/hr_HR.po index 938bcb1..7c5a967 100644 --- a/hr_HR.po +++ b/hr_HR.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-07-31 10:43+0200\n" -"PO-Revision-Date: 2016-08-30 09:45+0000\n" +"PO-Revision-Date: 2016-08-30 09:52+0000\n" "Last-Translator: Igor <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/otf/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 30 Aug '16

30 Aug '16

commit a0648a11583e2d5cf81284fb3867caa147481224 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 30 10:16:14 2016 +0000 Update translations for tails-misc --- hr_HR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hr_HR.po b/hr_HR.po index 938bcb1..7c5a967 100644 --- a/hr_HR.po +++ b/hr_HR.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-07-31 10:43+0200\n" -"PO-Revision-Date: 2016-08-30 09:45+0000\n" +"PO-Revision-Date: 2016-08-30 09:52+0000\n" "Last-Translator: Igor <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/otf/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 30 Aug '16

30 Aug '16

commit 0eb23e77079ffb9e998227380aac09117b75029c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 30 10:15:37 2016 +0000 Update translations for tails-persistence-setup_completed --- hr_HR/hr_HR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po index 319917e..a9d8840 100644 --- a/hr_HR/hr_HR.po +++ b/hr_HR/hr_HR.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: 2016-05-25 02:27+0200\n" -"PO-Revision-Date: 2016-08-30 09:45+0000\n" +"PO-Revision-Date: 2016-08-30 09:52+0000\n" "Last-Translator: Igor <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/otf/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" @@ -211,7 +211,7 @@ msgstr "Izaberite lozinku kako bi zaštitili trajni pogon" msgid "" "A %s persistent volume will be created on the %s %s device. Data on " "this volume will be stored in an encrypted form protected by a passphrase." -msgstr "%s trajni pogon će biti stvoren na uređaju %s %s. Podatci na ovom pogonu će biti pohranjeni u enkriptiranom obliku i zaštićeni lozinkom." +msgstr "Trajni pogon %s će biti stvoren na uređaju %s %s. Podatci na ovom pogonu će biti pohranjeni u enkriptiranom obliku i zaštićeni lozinkom." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 msgid "Create"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 30 Aug '16

30 Aug '16

commit 0bfbe0ec9c69e40387e15ab78495785045650422 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 30 10:15:33 2016 +0000 Update translations for tails-persistence-setup --- hr_HR/hr_HR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po index 319917e..a9d8840 100644 --- a/hr_HR/hr_HR.po +++ b/hr_HR/hr_HR.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: 2016-05-25 02:27+0200\n" -"PO-Revision-Date: 2016-08-30 09:45+0000\n" +"PO-Revision-Date: 2016-08-30 09:52+0000\n" "Last-Translator: Igor <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/otf/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" @@ -211,7 +211,7 @@ msgstr "Izaberite lozinku kako bi zaštitili trajni pogon" msgid "" "A %s persistent volume will be created on the %s %s device. Data on " "this volume will be stored in an encrypted form protected by a passphrase." -msgstr "%s trajni pogon će biti stvoren na uređaju %s %s. Podatci na ovom pogonu će biti pohranjeni u enkriptiranom obliku i zaštićeni lozinkom." +msgstr "Trajni pogon %s će biti stvoren na uređaju %s %s. Podatci na ovom pogonu će biti pohranjeni u enkriptiranom obliku i zaštićeni lozinkom." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 msgid "Create"

1 0