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

[collector/master] Validate base64 input more carefully before parsing.
by karsten＠torproject.org 30 Sep '16

30 Sep '16

commit a66e7d350d54bc1f769f42444f914955781bcc37 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Sep 28 17:06:51 2016 +0200 Validate base64 input more carefully before parsing. --- .../bridgedescs/SanitizedBridgesWriter.java | 10 ++++++++++ .../bridgedescs/SanitizedBridgesWriterTest.java | 23 ++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java b/src/main/java/… [View More]org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java index abec743..d93cd90 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java +++ b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java @@ -479,6 +479,11 @@ public class SanitizedBridgesWriter extends CollecTorMain { + "status. Skipping descriptor."); return; } + if (!Base64.isBase64(parts[2])) { + logger.warn("Illegal base64 character in r line '" + parts[2] + + "'. Skipping descriptor."); + return; + } fingerprintBytes = Base64.decodeBase64(parts[2] + "=="); descPublicationTime = parts[4] + " " + parts[5]; String address = parts[6]; @@ -776,6 +781,11 @@ public class SanitizedBridgesWriter extends CollecTorMain { scrubbed.append("extra-info-digest " + DigestUtils.shaHex( Hex.decodeHex(parts[1].toCharArray())).toUpperCase()); if (parts.length > 2) { + if (!Base64.isBase64(parts[2])) { + logger.warn("Illegal base64 character in extra-info-digest line '" + + line + "'. Skipping descriptor."); + return; + } scrubbed.append(" " + Base64.encodeBase64String( DigestUtils.sha256(Base64.decodeBase64(parts[2]))) .replaceAll("=", "")); diff --git a/src/test/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriterTest.java b/src/test/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriterTest.java index 9f3857f..e248b10 100644 --- a/src/test/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriterTest.java +++ b/src/test/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriterTest.java @@ -301,6 +301,18 @@ public class SanitizedBridgesWriterTest { } @Test + public void testServerDescriptorExtraInfoDigestInvalidBase64() + throws Exception { + this.defaultServerDescriptorBuilder.replaceLineStartingWith( + "extra-info-digest ", Arrays.asList("extra-info-digest " + + "6D03E80568DEFA102968D144CB35FFA6E3355B8A " + + "#*?$%§@nxukmmcT1+UnDg4qh0yKbjVUYKhGL8VksoJA")); + this.runTest(); + assertTrue("Invalid base64 in server descriptor accepted.", + this.parsedServerDescriptors.isEmpty()); + } + + @Test public void testServerDescriptorExtraInfoDigestSha1Only() throws Exception { this.defaultServerDescriptorBuilder.replaceLineStartingWith( @@ -497,6 +509,17 @@ public class SanitizedBridgesWriterTest { } @Test + public void testNetworkStatusRlineInvalidBase64() throws Exception { + this.defaultNetworkStatusBuilder.replaceLineStartingWith("r ", + Arrays.asList("r MeekGoogle R#SnE*e4+lFag:xr_XxSL+J;ZVs " + + "g+M7'w+lG$mv6NW9&RmvzLO(R0Y 2016-06-30 21:43:52 " + + "198.50.200.131 8008 0")); + this.runTest(); + assertTrue("Should not have accepted invalid base64.", + this.parsedNetworkStatuses.isEmpty()); + } + + @Test public void testNetworkStatusAlinePortMissing() throws Exception { this.configuration.setProperty(Key.ReplaceIpAddressesWithHashes.name(), "true"); [View Less]

1 0

[collector/master] Extend checkstyle to test sources.
by karsten＠torproject.org 30 Sep '16

30 Sep '16

commit fff9443dfa7f55caff67f6a327e723b04ca0eaf1 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Sep 30 15:07:53 2016 +0200 Extend checkstyle to test sources. Also fix MainTest.waitSec() by not oversleeping in case of an interruption. --- build.xml | 2 ++ .../java/org/torproject/collector/MainTest.java | 26 +++++++++++++--------- .../collector/conf/ConfigurationTest.java | 20 +++++++++-------- .../… [View More]java/org/torproject/collector/cron/Broken.java | 4 ++-- .../collector/cron/CollecTorMainTest.java | 1 + .../org/torproject/collector/cron/Counter.java | 4 ++-- .../java/org/torproject/collector/cron/Dummy.java | 4 ++-- .../torproject/collector/cron/SchedulerTest.java | 19 ++++++++-------- 8 files changed, 46 insertions(+), 34 deletions(-) diff --git a/build.xml b/build.xml index ffbeb31..83f2907 100644 --- a/build.xml +++ b/build.xml @@ -229,6 +229,8 @@ </taskdef> <target name="checks" depends="compile"> <checkstyle config="${testresources}/metrics_checks.xml"> + <fileset dir="${testsources}" + includes="**/*.java" /> <fileset dir="${sources}" includes="**/*.java" /> <classpath> diff --git a/src/test/java/org/torproject/collector/MainTest.java b/src/test/java/org/torproject/collector/MainTest.java index f65d2fa..ebc2021 100644 --- a/src/test/java/org/torproject/collector/MainTest.java +++ b/src/test/java/org/torproject/collector/MainTest.java @@ -1,5 +1,6 @@ /* Copyright 2016 The Tor Project * See LICENSE for licensing information */ + package org.torproject.collector; import static org.junit.Assert.assertEquals; @@ -103,29 +104,34 @@ public class MainTest { waitSec(2); } + /** Wait for the given number of seconds. */ public static void waitSec(int sec) { - long now = System.currentTimeMillis(); - while (System.currentTimeMillis() - now < 1_000L * sec) { + long start = System.currentTimeMillis(); + long toWait = 1_000L * sec; + do { try { - Thread.sleep(sec * 1_000L); - } catch (Exception e) {/* ignored */} - } + Thread.sleep(toWait); + } catch (InterruptedException e) { + /* Ignore the interruption, but possibly resume sleeping if we didn't + * sleep long enough. */ + } + } while ((toWait = start + 1_000L * sec - System.currentTimeMillis()) > 0); } - private void changeFilePathsAndSetActivation(File f, String a) + private void changeFilePathsAndSetActivation(File file, String activation) throws Exception { - List<String> lines = Files.readAllLines(f.toPath()); - BufferedWriter bw = Files.newBufferedWriter(f.toPath()); + List<String> lines = Files.readAllLines(file.toPath()); + BufferedWriter bw = Files.newBufferedWriter(file.toPath()); File in = tmpf.newFolder(); File out = tmpf.newFolder(); String inStr = "in/"; String outStr = "out/"; - for(String line : lines) { + for (String line : lines) { if (line.contains(inStr)) { line = line.replace(inStr, in.toString() + inStr); } else if (line.contains(outStr)) { line = line.replace(outStr, out.toString() + outStr); - } else if (line.contains(a)) { + } else if (line.contains(activation)) { line = line.replace("false", "true"); } bw.write(line); diff --git a/src/test/java/org/torproject/collector/conf/ConfigurationTest.java b/src/test/java/org/torproject/collector/conf/ConfigurationTest.java index fda9601..fdba6b5 100644 --- a/src/test/java/org/torproject/collector/conf/ConfigurationTest.java +++ b/src/test/java/org/torproject/collector/conf/ConfigurationTest.java @@ -1,5 +1,6 @@ /* Copyright 2016 The Tor Project * See LICENSE for licensing information */ + package org.torproject.collector.conf; import static org.junit.Assert.assertArrayEquals; @@ -56,7 +57,7 @@ public class ConfigurationTest { @Test() public void testArrayValues() throws Exception { String[] array = new String[randomSource.nextInt(30) + 1]; - for (int i = 0; i < array.length; i++){ + for (int i = 0; i < array.length; i++) { array[i] = Integer.toBinaryString(randomSource.nextInt(100)); } String[] arrays = new String[] { @@ -65,7 +66,7 @@ public class ConfigurationTest { .replaceAll(" ", "") }; Configuration conf = new Configuration(); - for(String input : arrays) { + for (String input : arrays) { conf.clear(); conf.setProperty(Key.CachedRelayDescriptorsDirectories.name(), input); assertArrayEquals("expected " + Arrays.toString(array) + "\nreceived: " @@ -92,19 +93,20 @@ public class ConfigurationTest { conf.setProperty(Key.BridgeDescriptorMappingsLimit.name(), "inf"); assertEquals(Integer.MAX_VALUE, conf.getInt(Key.BridgeDescriptorMappingsLimit)); - int r = randomSource.nextInt(Integer.MAX_VALUE); + int randomInt = randomSource.nextInt(Integer.MAX_VALUE); conf.clear(); conf.load(new ByteArrayInputStream( - propLine(Key.BridgeDescriptorMappingsLimit, "" + r).getBytes())); - assertEquals(r, + propLine(Key.BridgeDescriptorMappingsLimit, + "" + randomInt).getBytes())); + assertEquals(randomInt, conf.getInt(Key.BridgeDescriptorMappingsLimit)); - } + } @Test() public void testFileValues() throws Exception { String[] files = new String[] { "/the/path/file.txt", "another/path"}; Configuration conf = new Configuration(); - for(String file : files) { + for (String file : files) { conf.clear(); conf.setProperty(Key.DirectoryArchivesOutputDirectory.name(), file); assertEquals(new File(file), @@ -122,7 +124,7 @@ public class ConfigurationTest { Arrays.deepToString(sourceStrings).replace("[[", "").replace("]]", "") .replace("], [", Configuration.ARRAYSEP)); assertArrayEquals(sourceStrings, - conf.getStringArrayArray(Key.TorperfSources)); + conf.getStringArrayArray(Key.TorperfSources)); } @Test(expected = ConfigurationException.class) @@ -211,7 +213,7 @@ public class ConfigurationTest { MainTest.waitSec(1); confFile.delete(); conf.setProperty(Key.ImportDirectoryArchives.name(), "false"); - Dummy dummy = new Dummy(conf); + final Dummy dummy = new Dummy(conf); tmpf.newFolder("empty"); MainTest.waitSec(6); assertFalse("Update was called.", called.get()); diff --git a/src/test/java/org/torproject/collector/cron/Broken.java b/src/test/java/org/torproject/collector/cron/Broken.java index 0a3bc93..f625acb 100644 --- a/src/test/java/org/torproject/collector/cron/Broken.java +++ b/src/test/java/org/torproject/collector/cron/Broken.java @@ -12,8 +12,8 @@ public class Broken extends CollecTorMain { static AtomicInteger count = new AtomicInteger(0); - public Broken(Configuration c) { - super(c); + public Broken(Configuration conf) { + super(conf); } @Override diff --git a/src/test/java/org/torproject/collector/cron/CollecTorMainTest.java b/src/test/java/org/torproject/collector/cron/CollecTorMainTest.java index fecd497..befaad3 100644 --- a/src/test/java/org/torproject/collector/cron/CollecTorMainTest.java +++ b/src/test/java/org/torproject/collector/cron/CollecTorMainTest.java @@ -1,5 +1,6 @@ /* Copyright 2016 The Tor Project * See LICENSE for licensing information */ + package org.torproject.collector.cron; import static org.junit.Assert.assertTrue; diff --git a/src/test/java/org/torproject/collector/cron/Counter.java b/src/test/java/org/torproject/collector/cron/Counter.java index 3b404b2..81aa34d 100644 --- a/src/test/java/org/torproject/collector/cron/Counter.java +++ b/src/test/java/org/torproject/collector/cron/Counter.java @@ -9,8 +9,8 @@ public class Counter extends CollecTorMain { static AtomicInteger count = new AtomicInteger(0); - public Counter(Configuration c) { - super(c); + public Counter(Configuration conf) { + super(conf); } @Override diff --git a/src/test/java/org/torproject/collector/cron/Dummy.java b/src/test/java/org/torproject/collector/cron/Dummy.java index 449cc55..a44caae 100644 --- a/src/test/java/org/torproject/collector/cron/Dummy.java +++ b/src/test/java/org/torproject/collector/cron/Dummy.java @@ -5,8 +5,8 @@ import org.torproject.collector.conf.ConfigurationException; public class Dummy extends CollecTorMain { - public Dummy(Configuration c) { - super(c); + public Dummy(Configuration conf) { + super(conf); } @Override diff --git a/src/test/java/org/torproject/collector/cron/SchedulerTest.java b/src/test/java/org/torproject/collector/cron/SchedulerTest.java index eba05ce..f152ccf 100644 --- a/src/test/java/org/torproject/collector/cron/SchedulerTest.java +++ b/src/test/java/org/torproject/collector/cron/SchedulerTest.java @@ -1,5 +1,6 @@ /* Copyright 2016 The Tor Project * See LICENSE for licensing information */ + package org.torproject.collector.cron; import static org.junit.Assert.assertEquals; @@ -21,15 +22,15 @@ import java.util.concurrent.ScheduledThreadPoolExecutor; public class SchedulerTest { private static final String runConfigProperties = - "TorperfActivated=true\nTorperfPeriodMinutes=1\nTorperfOffsetMinutes=0\n" - + "RelaydescsActivated=true\nRelaydescsPeriodMinutes=1" - + "\nRelaydescsOffsetMinutes=0\n" - + "ExitlistsActivated=true\nExitlistsPeriodMinutes=1\n" - + "ExitlistsOffsetMinutes=0\n" - + "UpdateindexActivated=true\nUpdateindexPeriodMinutes=1\n" - + "UpdateindexOffsetMinutes=0\n" - + "BridgedescsActivated=true\nBridgedescsPeriodMinutes=1\n" - + "BridgedescsOffsetMinutes=0\n"; + "TorperfActivated=true\nTorperfPeriodMinutes=1\nTorperfOffsetMinutes=0\n" + + "RelaydescsActivated=true\nRelaydescsPeriodMinutes=1" + + "\nRelaydescsOffsetMinutes=0\n" + + "ExitlistsActivated=true\nExitlistsPeriodMinutes=1\n" + + "ExitlistsOffsetMinutes=0\n" + + "UpdateindexActivated=true\nUpdateindexPeriodMinutes=1\n" + + "UpdateindexOffsetMinutes=0\n" + + "BridgedescsActivated=true\nBridgedescsPeriodMinutes=1\n" + + "BridgedescsOffsetMinutes=0\n"; @Test() public void testSimpleSchedule() throws Exception { [View Less]

1 0

[collector/master] Add change log entries for bridgedescs changes.
by karsten＠torproject.org 30 Sep '16

30 Sep '16

commit 32459655cd380b9aafa71f47d4e190933f724559 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Sep 30 15:48:16 2016 +0200 Add change log entries for bridgedescs changes. --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0121558..a75a1fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,10 +12,14 @@ bridge-extra-infos-YYYY-MM.tar.xz. - Keep "proto" lines in bridge server descriptors as introduced in … [View More]

1 0

[collector/master] Adapted cobertura-check to the new coverage rates.
by karsten＠torproject.org 30 Sep '16

30 Sep '16

commit 7ea23e7e52f31aa68f1afe0b2699b72d4e676170 Author: iwakeh <iwakeh(a)torproject.org> Date: Fri Sep 30 12:13:24 2016 +0200 Adapted cobertura-check to the new coverage rates. --- build.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index 11d1f92..ffbeb31 100644 --- a/build.xml +++ b/build.xml @@ -280,11 +280,13 @@ <include name="**/*.java" /> </fileset> </cobertura-report> - <… [View More]

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 30 Sep '16

30 Sep '16

commit 5497e2f4181f1f4c4e2fee1099a2bc7289900e0c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 30 12:45:08 2016 +0000 Update translations for bridgedb_completed --- ru/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ru/LC_MESSAGES/bridgedb.po b/ru/LC_MESSAGES/bridgedb.po index b87d88f..c598e65 100644 --- a/ru/LC_MESSAGES/bridgedb.po +++ b/ru/LC_MESSAGES/bridgedb.po @@ -15,6 +15,7 @@ # Sergey Briskin &… [View More]

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 30 Sep '16

30 Sep '16

commit 62527d1cfd5c7ccd8807c66b00c1f835cebb70b5 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 30 12:45:03 2016 +0000 Update translations for bridgedb --- ru/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ru/LC_MESSAGES/bridgedb.po b/ru/LC_MESSAGES/bridgedb.po index b87d88f..c598e65 100644 --- a/ru/LC_MESSAGES/bridgedb.po +++ b/ru/LC_MESSAGES/bridgedb.po @@ -15,6 +15,7 @@ # Sergey Briskin <sergey.… [View More]

1 0

[tor-commits] [translation/tor-messenger-accountsproperties_completed] Update translations for tor-messenger-accountsproperties_completed
by translation＠torproject.org 30 Sep '16

30 Sep '16

commit cc97702e9741948205fb2d57ec6fea9df65063ee Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 30 10:47:09 2016 +0000 Update translations for tor-messenger-accountsproperties_completed --- vi/accounts.properties | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/vi/accounts.properties b/vi/accounts.properties new file mode 100644 index 0000000..6fd244d --- /dev/null +++ b/vi/accounts.properties @@ -0,0 +1,9 @@ +# This Source Code Form is … [View More]

1 0

[translation/tor-messenger-accountsproperties] Update translations for tor-messenger-accountsproperties
by translation＠torproject.org 30 Sep '16

30 Sep '16

commit 64099fbad28186b653c42ea003ee5f5909dd57a9 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 30 10:47:05 2016 +0000 Update translations for tor-messenger-accountsproperties --- vi/accounts.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vi/accounts.properties b/vi/accounts.properties index 051ba0d..6fd244d 100644 --- a/vi/accounts.properties +++ b/vi/accounts.properties @@ -4,6 +4,6 @@ # LOCALIZATION NOTE (… [View More]

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 30 Sep '16

30 Sep '16

commit 4322aff4e0fc991c58c7342a5f39bae3585b3443 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 30 10:46:29 2016 +0000 Update translations for torbutton-torbuttonproperties --- vi/torbutton.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vi/torbutton.properties b/vi/torbutton.properties index 9c7a0b5..d7f382f 100644 --- a/vi/torbutton.properties +++ b/vi/torbutton.properties @@ -28,10 +28,10 @@ torbutton.popup.… [View More]

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 30 Sep '16

30 Sep '16

commit 7636fc0650d038060769164251bfe0a87e81ed69 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 30 10:16:36 2016 +0000 Update translations for torbutton-torbuttondtd --- vi/torbutton.dtd | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/vi/torbutton.dtd b/vi/torbutton.dtd index 1591ab7..8031a96 100644 --- a/vi/torbutton.dtd +++ b/vi/torbutton.dtd @@ -54,14 +54,14 @@ <!ENTITY torbutton.prefs.sec_all_jit_desc "… [View More]Trên những trang nơi JavaScript được cho phép, việc tối ưu hóa hiệu suất bị vô hiệu."> <!ENTITY torbutton.prefs.sec_font_rend_desc "Một vài chức năng tô vẽ phông chữ bị vô hiệu."> <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Cơ chế tô vẽ phông chữ Graphite bị vô hiệu."> -<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled."> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> -<!ENTITY torbutton.prefs.sec_high "High"> -<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> -<!ENTITY torbutton.prefs.sec_custom "Custom Values"> -<!ENTITY torbutton.circuit_display.title "Tor circuit for this site"> +<!ENTITY torbutton.prefs.sec_svg_desc "Một vài loại hình ảnh bị vô hiệu."> +<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Hình ảnh SVG bị vô hiệu."> +<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript mặc định bị vô hiệu trên tất cả các trang non-HTTPS."> +<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript có thể được cho phép trên nền tảng mỗi trang thông qua nút NoScript trên thanh công cụ."> +<!ENTITY torbutton.prefs.sec_high "Cao"> +<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript mặc định bị vô hiệu trên tất cả các trang."> +<!ENTITY torbutton.prefs.sec_webfonts_desc "Một vài phông chữ và biểu tượng có thể hiển thị không đúng."> +<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Những tập tin phông chữ do trang web cung cấp bị chặn."> +<!ENTITY torbutton.prefs.sec_custom "Những giá trị tùy chỉnh"> +<!ENTITY torbutton.circuit_display.title "Đầu nối Tor dành cho trang này."> [View Less]

1 0