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

[onionoo/master] Fix possible NPE and make tests pass again.
by karsten＠torproject.org 31 Aug '17

31 Aug '17

commit b2b1bf1d0b2bce7748386b3ecdafec7391890fe6 Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Aug 30 20:37:37 2017 +0000 Fix possible NPE and make tests pass again. Also, added error logging for indexing process. --- .../org/torproject/onionoo/server/NodeIndexer.java | 30 +++++++++++++--------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/server/NodeIndexer.java b/src/main/java/org/torproject/onionoo/server/… [View More]NodeIndexer.java index db13ed9..5411d0e 100644 --- a/src/main/java/org/torproject/onionoo/server/NodeIndexer.java +++ b/src/main/java/org/torproject/onionoo/server/NodeIndexer.java @@ -91,7 +91,7 @@ public class NodeIndexer implements ServletContextListener, Runnable { * background thread. */ public synchronized void startIndexing() { if (this.nodeIndexerThread == null) { - this.nodeIndexerThread = new Thread(this); + this.nodeIndexerThread = new Thread(this, "Onionoo-Node-Indexer"); this.nodeIndexerThread.setDaemon(true); this.nodeIndexerThread.start(); } @@ -103,14 +103,18 @@ public class NodeIndexer implements ServletContextListener, Runnable { @Override public void run() { - while (this.nodeIndexerThread != null) { - this.indexNodeStatuses(); - try { - Thread.sleep(ONE_MINUTE); - } catch (InterruptedException e) { - /* Nothing that we could handle, just check if there's new data - * to index now. */ + try { + while (this.nodeIndexerThread != null) { + this.indexNodeStatuses(); + try { + Thread.sleep(ONE_MINUTE); + } catch (InterruptedException e) { + /* Nothing that we could handle, just check if there's new data + * to index now. */ + } } + } catch (Throwable th) { // catch all and log + log.error("Indexing failed: {}", th.getMessage(), th); } } @@ -247,11 +251,13 @@ public class NodeIndexer implements ServletContextListener, Runnable { newRelaysByContact.get(contact).add(fingerprint); newRelaysByContact.get(contact).add(hashedFingerprint); String version = entry.getVersion(); - if (!newRelaysByVersion.containsKey(version)) { - newRelaysByVersion.put(version, new HashSet<String>()); + if (null != version) { + if (!newRelaysByVersion.containsKey(version)) { + newRelaysByVersion.put(version, new HashSet<String>()); + } + newRelaysByVersion.get(version).add(fingerprint); + newRelaysByVersion.get(version).add(hashedFingerprint); } - newRelaysByVersion.get(version).add(fingerprint); - newRelaysByVersion.get(version).add(hashedFingerprint); } /* This loop can go away once all Onionoo services had their hourly * updater write effective families to summary documents at least [View Less]

1 0

[onionoo/master] Add test that reproduces NPE.
by karsten＠torproject.org 31 Aug '17

31 Aug '17

commit 2eead2a12ff350d66e5713d105d50e8d8cd287b3 Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Aug 30 20:37:35 2017 +0000 Add test that reproduces NPE. The timeouts are ncessary, when something unforseen makes the NodeIndexer.getLatestNodeIndex wait forever. --- .../onionoo/server/ResourceServletTest.java | 370 ++++++++++----------- 1 file changed, 185 insertions(+), 185 deletions(-) diff --git a/src/test/java/org/torproject/onionoo/server/… [View More]ResourceServletTest.java b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java index 4ebf0d2..303cf21 100644 --- a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java +++ b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java @@ -155,7 +155,7 @@ public class ResourceServletTest { new TreeSet<String>(Arrays.asList(new String[] { "000C5F55BD4814B917CC474BD537F1A3B33CCE2A" })), new TreeSet<>(Arrays.asList(new String[] { - "000C5F55BD4814B917CC474BD537F1A3B33CCE2A" })), "0.2.3.24-rc-dev"); + "000C5F55BD4814B917CC474BD537F1A3B33CCE2A" })), null); this.relays = new TreeMap<>(); this.relays.put("000C5F55BD4814B917CC474BD537F1A3B33CCE2A", relayTorkaZ); @@ -367,7 +367,7 @@ public class ResourceServletTest { private boolean r; } - @Test() + @Test(timeout = 100) public void testValidSummaryRelay() throws IOException { this.runTest("/summary"); assertEquals("2013-04-24 12:00:00", @@ -387,7 +387,7 @@ public class ResourceServletTest { assertFalse(relay.r); } - @Test() + @Test(timeout = 100) public void testValidSummaryBridge() { this.runTest("/summary"); assertEquals("2013-04-24 01:07:04", @@ -405,519 +405,519 @@ public class ResourceServletTest { assertFalse(bridge.r); } - @Test() + @Test(timeout = 100) public void testNonExistantDocumentType() { this.assertErrorStatusCode( "/doesnotexist", 400); } - @Test() + @Test(timeout = 100) public void testSummaryUpperCaseDocument() { this.assertErrorStatusCode( "/SUMMARY", 400); } - @Test() + @Test(timeout = 100) public void testTypeRelay() { this.assertSummaryDocument( "/summary?type=relay", 3, null, 0, null); } - @Test() + @Test(timeout = 100) public void testTypeBridge() { this.assertSummaryDocument( "/summary?type=bridge", 0, null, 3, null); } - @Test() + @Test(timeout = 100) public void testTypeBridgerelay() { this.assertErrorStatusCode( "/summary?type=bridgerelay", 400); } - @Test() + @Test(timeout = 100) public void testTypeRelayBridge() { this.assertSummaryDocument( "/summary?type=relay&type=bridge", 3, null, 0, null); } - @Test() + @Test(timeout = 100) public void testTypeBridgeRelay() { this.assertSummaryDocument( "/summary?type=bridge&type=relay", 0, null, 3, null); } - @Test() + @Test(timeout = 100) public void testTypeRelayRelay() { this.assertSummaryDocument( "/summary?type=relay&type=relay", 3, null, 0, null); } - @Test() + @Test(timeout = 100) public void testTypeUpperCaseRelay() { this.assertErrorStatusCode( "/summary?TYPE=relay", 400); } - @Test() + @Test(timeout = 100) public void testTypeRelayUpperCase() { this.assertSummaryDocument( "/summary?type=RELAY", 3, null, 0, null); } - @Test() + @Test(timeout = 100) public void testRunningTrue() { this.assertSummaryDocument( "/summary?running=true", 1, new String[] { "Ferrari458" }, 1, new String[] { "gummy" }); } - @Test() + @Test(timeout = 100) public void testRunningFalse() { this.assertSummaryDocument( "/summary?running=false", 2, null, 2, null); } - @Test() + @Test(timeout = 100) public void testRunningTruefalse() { this.assertErrorStatusCode( "/summary?running=truefalse", 400); } - @Test() + @Test(timeout = 100) public void testRunningTrueFalse() { this.assertSummaryDocument( "/summary?running=true&running=false", 1, new String[] { "Ferrari458" }, 1, new String[] { "gummy" }); } - @Test() + @Test(timeout = 100) public void testRunningFalseTrue() { this.assertSummaryDocument( "/summary?running=false&running=true", 2, null, 2, null); } - @Test() + @Test(timeout = 100) public void testRunningTrueTrue() { this.assertSummaryDocument( "/summary?running=true&running=true", 1, new String[] { "Ferrari458" }, 1, new String[] { "gummy" }); } - @Test() + @Test(timeout = 100) public void testRunningUpperCaseTrue() { this.assertErrorStatusCode( "/summary?RUNNING=true", 400); } - @Test() + @Test(timeout = 100) public void testRunningTrueUpperCase() { this.assertSummaryDocument( "/summary?running=TRUE", 1, null, 1, null); } - @Test() + @Test(timeout = 100) public void testSearchTorkaZ() { this.assertSummaryDocument( "/summary?search=TorkaZ", 1, new String[] { "TorkaZ" }, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchTorkaX() { this.assertSummaryDocument( "/summary?search=TorkaX", 0, null, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchOrkaZ() { this.assertSummaryDocument( "/summary?search=orkaZ", 1, new String[] { "TorkaZ" }, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchTorka() { this.assertSummaryDocument( "/summary?search=Torka", 1, new String[] { "TorkaZ" }, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchTorkazUpperCase() { this.assertSummaryDocument( "/summary?search=TORKAZ", 1, new String[] { "TorkaZ" }, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchDollarFingerprint() { this.assertSummaryDocument( "/summary?search=$000C5F55BD4814B917CC474BD537F1A3B33CCE2A", 1, new String[] { "TorkaZ" }, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchFingerprint() { this.assertSummaryDocument( "/summary?search=000C5F55BD4814B917CC474BD537F1A3B33CCE2A", 1, new String[] { "TorkaZ" }, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchDollarFingerprint39() { this.assertSummaryDocument( "/summary?search=$000C5F55BD4814B917CC474BD537F1A3B33CCE2", 1, new String[] { "TorkaZ" }, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchDollarFingerprintLowerCase39() { this.assertSummaryDocument( "/summary?search=$000c5f55bd4814b917cc474bd537f1a3b33cce2", 1, new String[] { "TorkaZ" }, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchFingerprintLowerCase39() { this.assertSummaryDocument( "/summary?search=000c5f55bd4814b917cc474bd537f1a3b33cce2", 1, new String[] { "TorkaZ" }, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchDollarHashedFingerprint() { this.assertSummaryDocument( "/summary?search=$5aa14c08d62913e0057a9ad5863b458c0ce94cee", 1, new String[] { "TorkaZ" }, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchDollarHashedFingerprint39() { this.assertSummaryDocument( "/summary?search=$5aa14c08d62913e0057a9ad5863b458c0ce94ce", 1, new String[] { "TorkaZ" }, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchDollarHashedFingerprint41() { this.assertErrorStatusCode( "/summary?search=$5aa14c08d62913e0057a9ad5863b458c0ce94ceee", 400); } - @Test() + @Test(timeout = 100) public void testSearchBase64FingerprintAlphaNum() { this.assertSummaryDocument( "/summary?search=AAxfVb1IFLkXzEdL1Tfxo7M8zio", 1, new String[] { "TorkaZ" }, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchBase64FingerprintSlash() { this.assertSummaryDocument( "/summary?search=ABwTs6Vacbl3ymXshVOdecZTo/w", 1, new String[] { "Ferrari458" }, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchBase64FingerprintPlus() { this.assertSummaryDocument( "/summary?search=ACXBNsHzqe7+KuP5GPA7+iG1Bws", 1, new String[] { "TimMayTribute" }, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchBase64FingerprintBridge() { this.assertSummaryDocument( "/summary?search=AACDGyNt/3PUCa0XtA4qcopTmU8", 0, null, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchBase64FingerprintPartial() { this.assertSummaryDocument( "/summary?search=AAx", 1, new String[] { "TorkaZ" }, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchBase64HashedFingerprintTorkaZ() { this.assertSummaryDocument( "/summary?search=WqFMCNYpE+AFeprVhjtFjAzpTO4", 0, null, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchBase64Fingerprint28() { this.assertErrorStatusCode( "/summary?search=AAAAAAAAAAAA//AAAAAAAAAAAAAA", 400); } - @Test() + @Test(timeout = 100) public void testSearchSpaceSeparatedFingerprintFourty() { this.assertSummaryDocument( "/summary?search=000C 5F55 BD48 14B9 17CC 474B D537 F1A3 B33C " + "CE2A", 1, new String[] { "TorkaZ" }, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchSpaceSeparatedFingerprintLastEight() { this.assertSummaryDocument( "/summary?search=F1A3 B33C", 1, new String[] { "TorkaZ" }, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchSpaceSeparatedFingerprintLastThree() { this.assertSummaryDocument( "/summary?search=33C", 0, null, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchIp() { this.assertSummaryDocument( "/summary?search=62.216.201.221", 1, new String[] { "TorkaZ" }, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchIp24Network() { this.assertSummaryDocument( "/summary?search=62.216.201", 1, new String[] { "TorkaZ" }, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchIpExit() { this.assertSummaryDocument( "/summary?search=62.216.201.222", 1, new String[] { "TorkaZ" }, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchIpv6() { this.assertSummaryDocument( "/summary?search=[2001:4f8:3:2e::51]", 1, new String[] { "Ferrari458" }, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchIpv6Slash64NoTrailingBracket() { this.assertSummaryDocument( "/summary?search=[2001:4f8:3:2e::", 1, new String[] { "Ferrari458" }, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchIpv6Slash64TrailingBracket() { this.assertSummaryDocument( "/summary?search=[2001:4f8:3:2e::]", 0, null, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchIpv6Slash64NoBrackets() { this.assertSummaryDocument( "/summary?search=2001:4f8:3:2e::", 1, new String[] { "Ferrari458" }, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchIpv6Slash8Colon() { this.assertSummaryDocument( "/summary?search=[2001:", 1, new String[] { "Ferrari458" }, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchIpv6Slash8NoColon() { this.assertSummaryDocument( "/summary?search=[2001", 1, new String[] { "Ferrari458" }, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchIpv6Slash8NoColonNoBrackets() { this.assertSummaryDocument( "/summary?search=2001", 1, new String[] { "Ferrari458" }, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchIpv6Uncompressed() { this.assertSummaryDocument( "/summary?search=[2001:04f8:0003:002e:0000:0000:0000:0051]", 0, null, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchIpv6UpperCase() { this.assertSummaryDocument( "/summary?search=[2001:4F8:3:2E::51]", 1, new String[] { "Ferrari458" }, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchIpv6ThreeColons() { this.assertSummaryDocument( "/summary?search=[2001:4f8:3:2e:::51]", 0, null, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchIpv6FiveHex() { this.assertSummaryDocument( "/summary?search=[20014:f80:3:2e::51]", 0, null, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchIpv6NineGroups() { this.assertSummaryDocument( "/summary?search=[1:2:3:4:5:6:7:8:9]", 0, null, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchIpv6TcpPort() { this.assertErrorStatusCode( "/summary?search=[2001:4f8:3:2e::51]:9001", 400); } - @Test() + @Test(timeout = 100) public void testSearchGummy() { this.assertSummaryDocument( "/summary?search=gummy", 0, null, 1, new String[] { "gummy" }); } - @Test() + @Test(timeout = 100) public void testSearchGummi() { this.assertSummaryDocument( "/summary?search=gummi", 0, null, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchUmmy() { this.assertSummaryDocument( "/summary?search=ummy", 0, null, 1, new String[] { "gummy" }); } - @Test() + @Test(timeout = 100) public void testSearchGumm() { this.assertSummaryDocument( "/summary?search=gumm", 0, null, 1, new String[] { "gummy" }); } - @Test() + @Test(timeout = 100) public void testSearchGummyUpperCase() { this.assertSummaryDocument( "/summary?search=GUMMY", 0, null, 1, new String[] { "gummy" }); } - @Test() + @Test(timeout = 100) public void testSearchBridgeDollarHashedFingerprint() { this.assertSummaryDocument( "/summary?search=$1FEDE50ED8DBA1DD9F9165F78C8131E4A44AB756", 0, null, 1, new String[] { "gummy" }); } - @Test() + @Test(timeout = 100) public void testSearchBridgeHashedFingerprint() { this.assertSummaryDocument( "/summary?search=1FEDE50ED8DBA1DD9F9165F78C8131E4A44AB756", 0, null, 1, new String[] { "gummy" }); } - @Test() + @Test(timeout = 100) public void testSearchBridgeDollarHashedFingerprint39() { this.assertSummaryDocument( "/summary?search=$1FEDE50ED8DBA1DD9F9165F78C8131E4A44AB75", 0, null, 1, new String[] { "gummy" }); } - @Test() + @Test(timeout = 100) public void testSearchBridgeDollarHashedFingerprintLowerCase39() { this.assertSummaryDocument( "/summary?search=$1fede50ed8dba1dd9f9165f78c8131e4a44ab75", 0, null, 1, new String[] { "gummy" }); } - @Test() + @Test(timeout = 100) public void testSearchBridgeHashedFingerprintLowerCase39() { this.assertSummaryDocument( "/summary?search=1fede50ed8dba1dd9f9165f78c8131e4a44ab75", 0, null, 1, new String[] { "gummy" }); } - @Test() + @Test(timeout = 100) public void testSearchBridgeDollarHashedHashedFingerprint() { this.assertSummaryDocument( "/summary?search=$CE52F898DB3678BCE33FAC28C92774DE90D618B5", 0, null, 1, new String[] { "gummy" }); } - @Test() + @Test(timeout = 100) public void testSearchBridgeDollarHashedHashedFingerprint39() { this.assertSummaryDocument( "/summary?search=$CE52F898DB3678BCE33FAC28C92774DE90D618B", 0, null, 1, new String[] { "gummy" }); } - @Test() + @Test(timeout = 100) public void testSearchBridgeDollarOriginalFingerprint() { this.assertSummaryDocument( "/summary?search=$0010D49C6DA1E46A316563099F41BFE40B6C7183", 0, null, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchUnderscore() { this.assertErrorStatusCode( "/summary?search=_", 400); } - @Test() + @Test(timeout = 100) public void testSearchTypeRelay() { this.assertSummaryDocument("/summary?search=type:relay", 3, null, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchTypeRelayTorkaZ() { this.assertSummaryDocument("/summary?search=type:relay TorkaZ", 1, new String[] { "TorkaZ" }, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchTorkaZTypeRelay() { this.assertSummaryDocument("/summary?search=TorkaZ type:relay", 1, new String[] { "TorkaZ" }, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchTorkaZEscapedSpaceTypeRelay() { this.assertSummaryDocument("/summary?search=TorkaZ%20type:relay", 1, new String[] { "TorkaZ" }, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchTypeRelayTypeDirectory() { this.assertSummaryDocument( "/summary?search=type:relay type:directory", 3, null, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchTypeDirectoryTypeRelay() { this.assertErrorStatusCode( "/summary?search=type:directory type:relay", 400); } - @Test() + @Test(timeout = 100) public void testSearchFooBar() { this.assertErrorStatusCode("/summary?search=foo:bar", 400); } - @Test() + @Test(timeout = 100) public void testSearchSearchTorkaZ() { this.assertErrorStatusCode("/summary?search=search:TorkaZ", 400); } - @Test() + @Test(timeout = 100) public void testSearchLimitOne() { this.assertErrorStatusCode("/summary?search=limit:1", 400); } - @Test() + @Test(timeout = 100) public void testSearchDeadBeef() { /* This does not return 400 Bad Request, even though "dead" is not a valid * search term qualifier, because this could be the start of an IPv6 address @@ -925,389 +925,389 @@ public class ResourceServletTest { this.assertSummaryDocument("/summary?search=dead:beef", 0, null, 0, null); } - @Test() + @Test(timeout = 100) public void testSearchEmailAddress() { this.assertSummaryDocument( "/summary?search=contact:<tor+steven.murdoch(a)cl.cam.ac.uk>", 1, new String[] { "TimMayTribute" }, 0, null); } - @Test() + @Test(timeout = 100) public void testLookupFingerprint() { this.assertSummaryDocument( "/summary?lookup=000C5F55BD4814B917CC474BD537F1A3B33CCE2A", 1, new String[] { "TorkaZ" }, 0, null); } - @Test() + @Test(timeout = 100) public void testLookupDollarFingerprint() { this.assertErrorStatusCode( "/summary?lookup=$000C5F55BD4814B917CC474BD537F1A3B33CCE2A", 400); } - @Test() + @Test(timeout = 100) public void testLookupDollarFingerprint39() { this.assertErrorStatusCode( "/summary?lookup=$000C5F55BD4814B917CC474BD537F1A3B33CCE2", 400); } - @Test() + @Test(timeout = 100) public void testLookupFingerprintLowerCase39() { this.assertErrorStatusCode( "/summary?lookup=000c5f55bd4814b917cc474bd537f1a3b33cce2", 400); } - @Test() + @Test(timeout = 100) public void testLookupHashedFingerprint() { this.assertSummaryDocument( "/summary?lookup=5aa14c08d62913e0057a9ad5863b458c0ce94cee", 1, new String[] { "TorkaZ" }, 0, null); } - @Test() + @Test(timeout = 100) public void testLookupBridgeHashedFingerprint() { this.assertSummaryDocument( "/summary?lookup=1FEDE50ED8DBA1DD9F9165F78C8131E4A44AB756", 0, null, 1, new String[] { "gummy" }); } - @Test() + @Test(timeout = 100) public void testLookupBridgeHashedHashedFingerprint() { this.assertSummaryDocument( "/summary?lookup=CE52F898DB3678BCE33FAC28C92774DE90D618B5", 0, null, 1, new String[] { "gummy" }); } - @Test() + @Test(timeout = 100) public void testLookupBridgeOriginalFingerprint() { this.assertSummaryDocument( "/summary?lookup=0010D49C6DA1E46A316563099F41BFE40B6C7183", 0, null, 0, null); } - @Test() + @Test(timeout = 100) public void testLookupNonExistantFingerprint() { this.assertSummaryDocument( "/summary?lookup=0000000000000000000000000000000000000000", 0, null, 0, null); } - @Test() + @Test(timeout = 100) public void testFingerprintRelayFingerprint() { this.assertSummaryDocument( "/summary?fingerprint=000C5F55BD4814B917CC474BD537F1A3B33CCE2A", 1, new String[] { "TorkaZ" }, 0, null); } - @Test() + @Test(timeout = 100) public void testFingerprintRelayHashedFingerprint() { this.assertSummaryDocument( - "/summary?fingerprint=5aa14c08d62913e0057a9ad5863b458c0ce94cee", + "/summary?fingerprint=4aa14c08d62913e0057a9ad5863b458c0ce94cee", 0, null, 0, null); } - @Test() + @Test(timeout = 100) public void testFingerprintBridgeHashedFingerprint() { this.assertSummaryDocument( "/summary?fingerprint=1FEDE50ED8DBA1DD9F9165F78C8131E4A44AB756", 0, null, 1, new String[] { "gummy" }); } - @Test() + @Test(timeout = 100) public void testFingerprintBridgeHashedHashedFingerprint() { this.assertSummaryDocument( "/summary?fingerprint=CE52F898DB3678BCE33FAC28C92774DE90D618B5", 0, null, 0, null); } - @Test() + @Test(timeout = 100) public void testFingerprintBridgeOriginalFingerprint() { this.assertSummaryDocument( "/summary?fingerprint=0010D49C6DA1E46A316563099F41BFE40B6C7183", 0, null, 0, null); } - @Test() + @Test(timeout = 100) public void testCountryDe() { this.assertSummaryDocument( "/summary?country=de", 1, new String[] { "TorkaZ" }, 0, null); } - @Test() + @Test(timeout = 100) public void testCountryFr() { this.assertSummaryDocument( "/summary?country=fr", 0, null, 0, null); } - @Test() + @Test(timeout = 100) public void testCountryZz() { this.assertSummaryDocument( "/summary?country=zz", 0, null, 0, null); } - @Test() + @Test(timeout = 100) public void testCountryDeUpperCase() { this.assertSummaryDocument( "/summary?country=DE", 1, new String[] { "TorkaZ" }, 0, null); } - @Test() + @Test(timeout = 100) public void testCountryDeu() { this.assertErrorStatusCode( "/summary?country=deu", 400); } - @Test() + @Test(timeout = 100) public void testCountryD() { this.assertErrorStatusCode( "/summary?country=d", 400); } - @Test() + @Test(timeout = 100) public void testCountryA1() { this.assertSummaryDocument( "/summary?country=a1", 1, new String[] { "TimMayTribute" }, 0, null); } - @Test() + @Test(timeout = 100) public void testCountryDeDe() { this.assertSummaryDocument( "/summary?country=de&country=de", 1, new String[] { "TorkaZ" }, 0, null); } - @Test() + @Test(timeout = 100) public void testAsAS8767() { this.assertSummaryDocument( "/summary?as=AS8767", 1, new String[] { "TorkaZ" }, 0, null); } - @Test() + @Test(timeout = 100) public void testAs8767() { this.assertSummaryDocument( "/summary?as=8767", 1, new String[] { "TorkaZ" }, 0, null); } - @Test() + @Test(timeout = 100) public void testAsAs() { this.assertErrorStatusCode( "/summary?as=AS", 400); } - @Test() + @Test(timeout = 100) public void testAsas8767() { this.assertSummaryDocument( "/summary?as=as8767", 1, new String[] { "TorkaZ" }, 0, null); } - @Test() + @Test(timeout = 100) public void testAsAsSpace8767() { this.assertErrorStatusCode( "/summary?as=AS 8767", 400); } - @Test() + @Test(timeout = 100) public void testFlagRunning() { this.assertSummaryDocument( "/summary?flag=Running", 3, null, 1, null); } - @Test() + @Test(timeout = 100) public void testFlagValid() { this.assertSummaryDocument( "/summary?flag=Valid", 3, null, 3, null); } - @Test() + @Test(timeout = 100) public void testFlagFast() { this.assertSummaryDocument( "/summary?flag=Fast", 2, null, 0, null); } - @Test() + @Test(timeout = 100) public void testFlagNamed() { this.assertSummaryDocument( "/summary?flag=Named", 1, null, 0, null); } - @Test() + @Test(timeout = 100) public void testFlagUnnamed() { this.assertSummaryDocument( "/summary?flag=Unnamed", 1, null, 0, null); } - @Test() + @Test(timeout = 100) public void testFlagV2Dir() { this.assertSummaryDocument( "/summary?flag=V2Dir", 2, null, 0, null); } - @Test() + @Test(timeout = 100) public void testFlagGuard() { this.assertSummaryDocument( "/summary?flag=Guard", 0, null, 0, null); } - @Test() + @Test(timeout = 100) public void testFlagCool() { this.assertSummaryDocument( "/summary?flag=Cool", 0, null, 0, null); } - @Test() + @Test(timeout = 100) public void testFirstSeenDaysZeroToTwo() { this.assertSummaryDocument( "/summary?first_seen_days=0-2", 0, null, 0, null); } - @Test() + @Test(timeout = 100) public void testFirstSeenDaysUpToThree() { this.assertSummaryDocument( "/summary?first_seen_days=-3", 0, null, 1, null); } - @Test() + @Test(timeout = 100) public void testFirstSeenDaysThree() { this.assertSummaryDocument( "/summary?first_seen_days=3", 0, null, 1, null); } - @Test() + @Test(timeout = 100) public void testFirstSeenDaysTwoToFive() { this.assertSummaryDocument( "/summary?first_seen_days=2-5", 0, null, 1, null); } - @Test() + @Test(timeout = 100) public void testFirstSeenDaysSevenToSixteen() { this.assertSummaryDocument( "/summary?first_seen_days=7-16", 2, null, 1, null); } - @Test() + @Test(timeout = 100) public void testFirstSeenDaysNinetysevenOrMore() { this.assertSummaryDocument( "/summary?first_seen_days=97-", 0, null, 1, null); } - @Test() + @Test(timeout = 100) public void testFirstSeenDaysNinetyeightOrMore() { this.assertSummaryDocument( "/summary?first_seen_days=98-", 0, null, 0, null); } - @Test() + @Test(timeout = 100) public void testFirstSeenDaysDashDash() { this.assertErrorStatusCode( "/summary?first_seen_days=--", 400); } - @Test() + @Test(timeout = 100) public void testFirstSeenDaysDashOneDash() { this.assertErrorStatusCode( "/summary?first_seen_days=-1-", 400); } - @Test() + @Test(timeout = 100) public void testFirstSeenDaysZeroDotDotOne() { this.assertErrorStatusCode( "/summary?first_seen_days=0..1", 400); } - @Test() + @Test(timeout = 100) public void testFirstSeenDaysElevenDigits() { this.assertErrorStatusCode( "/summary?first_seen_days=12345678901", 400); } - @Test() + @Test(timeout = 100) public void testFirstSeenDaysLargeTenDigitNumber() { this.assertErrorStatusCode( "/summary?first_seen_days=9999999999", 400); } - @Test() + @Test(timeout = 100) public void testFirstSeenDaysMaxInt() { this.assertSummaryDocument( "/summary?last_seen_days=" + String.valueOf(Integer.MAX_VALUE), 0, null, 0, null); } - @Test() + @Test(timeout = 100) public void testFirstSeenDaysMaxIntPlusOne() { this.assertErrorStatusCode( "/summary?first_seen_days=" + String.valueOf(Integer.MAX_VALUE + 1), 400); } - @Test() + @Test(timeout = 100) public void testLastSeenDaysZero() { this.assertSummaryDocument( "/summary?last_seen_days=0", 1, null, 1, null); } - @Test() + @Test(timeout = 100) public void testLastSeenDaysUpToZero() { this.assertSummaryDocument( "/summary?last_seen_days=-0", 1, null, 1, null); } - @Test() + @Test(timeout = 100) public void testLastSeenDaysOneToThree() { this.assertSummaryDocument( "/summary?last_seen_days=1-3", 1, null, 2, null); } - @Test() + @Test(timeout = 100) public void testLastSeenDaysSixOrMore() { this.assertSummaryDocument( "/summary?last_seen_days=6-", 0, null, 0, null); } - @Test() + @Test(timeout = 100) public void testContactSteven() { this.assertSummaryDocument( "/summary?contact=Steven", 1, null, 0, null); } - @Test() + @Test(timeout = 100) public void testContactStevenMurdoch() { this.assertSummaryDocument( "/summary?contact=Steven Murdoch", 1, null, 0, null); } - @Test() + @Test(timeout = 100) public void testContactMurdochSteven() { this.assertSummaryDocument( "/summary?contact=Murdoch Steven", 1, null, 0, null); } - @Test() + @Test(timeout = 100) public void testContactStevenDotMurdoch() { this.assertSummaryDocument( "/summary?contact=Steven.Murdoch", 1, null, 0, null); } - @Test() + @Test(timeout = 100) public void testContactFbTokenFive() { this.assertSummaryDocument( "/summary?contact=<fb-token:5sR_K_zs2wM=>", 1, null, 0, null); } - @Test() + @Test(timeout = 100) public void testContactFbToken() { this.assertSummaryDocument( "/summary?contact=<fb-token:", 2, null, 0, null); } - @Test() + @Test(timeout = 100) public void testContactDash() { this.assertSummaryDocument( "/summary?contact=-", 2, null, 0, null); } - @Test() + @Test(timeout = 100) public void testOrderConsensusWeightAscending() { this.assertSummaryDocument( "/summary?order=" + OrderParameterValues.CONSENSUS_WEIGHT_ASC, 3, @@ -1315,7 +1315,7 @@ public class ResourceServletTest { null); } - @Test() + @Test(timeout = 100) public void testOrderConsensusWeightDescending() { this.assertSummaryDocument( "/summary?order=" + OrderParameterValues.CONSENSUS_WEIGHT_DES, 3, @@ -1323,27 +1323,27 @@ public class ResourceServletTest { null); } - @Test() + @Test(timeout = 100) public void testOrderConsensusWeightAscendingTwice() { this.assertErrorStatusCode( "/summary?order=" + OrderParameterValues.CONSENSUS_WEIGHT_ASC + "," + OrderParameterValues.CONSENSUS_WEIGHT_ASC, 400); } - @Test() + @Test(timeout = 100) public void testOrderConsensusWeightAscendingThenDescending() { this.assertErrorStatusCode( "/summary?order=" + OrderParameterValues.CONSENSUS_WEIGHT_ASC + "," + OrderParameterValues.CONSENSUS_WEIGHT_DES + "", 400); } - @Test() + @Test(timeout = 100) public void testOrderConsensusWeightThenNickname() { this.assertErrorStatusCode( "/summary?order=consensus_weight,nickname", 400); } - @Test() + @Test(timeout = 100) public void testOrderConsensusWeight() { this.assertSummaryDocument( "/summary?order=CONSENSUS_WEIGHT", 3, @@ -1351,7 +1351,7 @@ public class ResourceServletTest { null); } - @Test() + @Test(timeout = 100) public void testOrderConsensusWeightAscendingLimit1() { this.assertSummaryDocument( "/summary?order=" + OrderParameterValues.CONSENSUS_WEIGHT_ASC @@ -1359,7 +1359,7 @@ public class ResourceServletTest { new String[] { "TorkaZ" }, 0, null); } - @Test() + @Test(timeout = 100) public void testOrderConsensusWeightDescendingLimit1() { this.assertSummaryDocument( "/summary?order=" + OrderParameterValues.CONSENSUS_WEIGHT_DES @@ -1367,7 +1367,7 @@ public class ResourceServletTest { new String[] { "Ferrari458" }, 0, null); } - @Test() + @Test(timeout = 100) public void testOrderConsensusWeightFiveTimes() { this.assertErrorStatusCode( "/summary?order=" + OrderParameterValues.CONSENSUS_WEIGHT_ASC + "," @@ -1377,7 +1377,7 @@ public class ResourceServletTest { + OrderParameterValues.CONSENSUS_WEIGHT_ASC, 400); } - @Test() + @Test(timeout = 100) public void testOrderFirstSeenThenConsensusWeight() { this.assertSummaryDocument( "/summary?order=" + OrderParameterValues.FIRST_SEEN_ASC + "," @@ -1386,7 +1386,7 @@ public class ResourceServletTest { new String[] { "gummy", null, "ec2bridgercc7f31fe" }); } - @Test() + @Test(timeout = 100) public void testOrderFirstSeenDescendingThenConsensusWeight() { this.assertSummaryDocument("/summary?order=" + OrderParameterValues.FIRST_SEEN_DES + "," @@ -1395,7 +1395,7 @@ public class ResourceServletTest { new String[] { "ec2bridgercc7f31fe", null, "gummy" }); } - @Test() + @Test(timeout = 100) public void testOrderConsensusWeightThenFirstSeenDescending() { this.assertSummaryDocument( "/summary?order=" + OrderParameterValues.CONSENSUS_WEIGHT_ASC + "," @@ -1404,131 +1404,131 @@ public class ResourceServletTest { null); } - @Test() + @Test(timeout = 100) public void testOffsetOne() { this.assertSkippedReturnedTruncated( "/summary?offset=1", 1, 2, 0, 0, 3, 0); } - @Test() + @Test(timeout = 100) public void testOffsetAllRelays() { this.assertSkippedReturnedTruncated( "/summary?offset=3", 3, 0, 0, 0, 3, 0); } - @Test() + @Test(timeout = 100) public void testOffsetAllRelaysAndOneBridge() { this.assertSkippedReturnedTruncated( "/summary?offset=4", 3, 0, 0, 1, 2, 0); } - @Test() + @Test(timeout = 100) public void testOffsetAllRelaysAndAllBridges() { this.assertSkippedReturnedTruncated( "/summary?offset=6", 3, 0, 0, 3, 0, 0); } - @Test() + @Test(timeout = 100) public void testOffsetMoreThanAllRelaysAndAllBridges() { this.assertSkippedReturnedTruncated( "/summary?offset=7", 3, 0, 0, 3, 0, 0); } - @Test() + @Test(timeout = 100) public void testOffsetZero() { this.assertSkippedReturnedTruncated( "/summary?offset=0", 0, 3, 0, 0, 3, 0); } - @Test() + @Test(timeout = 100) public void testOffsetMinusOne() { this.assertSkippedReturnedTruncated( "/summary?offset=-1", 0, 3, 0, 0, 3, 0); } - @Test() + @Test(timeout = 100) public void testOffsetOneWord() { this.assertErrorStatusCode( "/summary?offset=one", 400); } - @Test() + @Test(timeout = 100) public void testLimitOne() { this.assertSkippedReturnedTruncated( "/summary?limit=1", 0, 1, 2, 0, 0, 3); } - @Test() + @Test(timeout = 100) public void testLimitAllRelays() { this.assertSkippedReturnedTruncated( "/summary?limit=3", 0, 3, 0, 0, 0, 3); } - @Test() + @Test(timeout = 100) public void testLimitAllRelaysAndOneBridge() { this.assertSkippedReturnedTruncated( "/summary?limit=4", 0, 3, 0, 0, 1, 2); } - @Test() + @Test(timeout = 100) public void testLimitAllRelaysAndAllBridges() { this.assertSkippedReturnedTruncated( "/summary?limit=6", 0, 3, 0, 0, 3, 0); } - @Test() + @Test(timeout = 100) public void testLimitMoreThanAllRelaysAndAllBridges() { this.assertSkippedReturnedTruncated( "/summary?limit=7", 0, 3, 0, 0, 3, 0); } - @Test() + @Test(timeout = 100) public void testLimitZero() { this.assertSkippedReturnedTruncated( "/summary?limit=0", 0, 0, 3, 0, 0, 3); } - @Test() + @Test(timeout = 100) public void testLimitMinusOne() { this.assertSkippedReturnedTruncated( "/summary?limit=-1", 0, 0, 3, 0, 0, 3); } - @Test() + @Test(timeout = 100) public void testLimitOneWord() { this.assertErrorStatusCode( "/summary?limit=one", 400); } - @Test() + @Test(timeout = 100) public void testFamilyTorkaZ() { this.assertSummaryDocument( "/summary?family=000C5F55BD4814B917CC474BD537F1A3B33CCE2A", 2, null, 0, null); } - @Test() + @Test(timeout = 100) public void testFamilyFerrari458() { this.assertSummaryDocument( "/summary?family=001C13B3A55A71B977CA65EC85539D79C653A3FC", 2, null, 0, null); } - @Test() + @Test(timeout = 100) public void testFamilyTimMayTribute() { this.assertSummaryDocument( "/summary?family=0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B", 1, null, 0, null); } - @Test() + @Test(timeout = 100) public void testFamilyBridgegummy() { this.assertSummaryDocument( "/summary?family=0000831B236DFF73D409AD17B40E2A728A53994F", 0, null, 0, null); } - @Test() + @Test(timeout = 100) public void testFamily39Characters() { this.assertErrorStatusCode( "/summary?family=00000000000000000000000000000000000000", 400); @@ -1542,7 +1542,7 @@ public class ResourceServletTest { @Test public void testVersion02324() { - this.assertSummaryDocument("/summary?version=0.2.3.24-rc-dev", 1, + this.assertSummaryDocument("/summary?version=0.2.3.24-rc-dev", 0, new String[] { "Ferrari458" }, 0, null); } @@ -1559,29 +1559,29 @@ public class ResourceServletTest { @Test public void testVersion0() { - this.assertSummaryDocument("/summary?version=0", 3, null, 0, null); + this.assertSummaryDocument("/summary?version=0", 2, null, 0, null); } @Test public void testVersion02() { - this.assertSummaryDocument("/summary?version=0.2", 3, null, 0, null); + this.assertSummaryDocument("/summary?version=0.2", 2, null, 0, null); } @Test public void testVersion023() { - this.assertSummaryDocument("/summary?version=0.2.3", 3, null, 0, null); + this.assertSummaryDocument("/summary?version=0.2.3", 2, null, 0, null); } @Test public void testVersion0232() { /* This is correct when comparing strings. */ - this.assertSummaryDocument("/summary?version=0.2.3.2", 3, null, 0, null); + this.assertSummaryDocument("/summary?version=0.2.3.2", 2, null, 0, null); } @Test public void testVersion023Dot() { /* This is also correct when comparing strings. */ - this.assertSummaryDocument("/summary?version=0.2.3.", 3, null, 0, null); + this.assertSummaryDocument("/summary?version=0.2.3.", 2, null, 0, null); } @Test [View Less]

1 0

[onionoo/master] Prepare for 4.1-1.4.1 release.
by karsten＠torproject.org 31 Aug '17

31 Aug '17

commit bfc7e2e33dd9f371c8cd801bb7df099c3fca15dd Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Aug 31 15:39:02 2017 +0200 Prepare for 4.1-1.4.1 release. --- CHANGELOG.md | 7 +++++++ build.xml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 20ddb1c..cf75ee8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# Changes in version 4.1-1.4.1 - 2017-08-31 + + * Medium changes + - Fix a … [View More]

1 0

[user-manual/master] Actually fix build issue
by colin＠torproject.org 31 Aug '17

31 Aug '17

commit 62c322ce4239526e540cf264e47cf4a2afbd9ca6 Author: Colin Childs <colin(a)torproject.org> Date: Thu Aug 31 05:08:31 2017 -0500 Actually fix build issue --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index b044202..d17cb67 100644 --- a/configure.ac +++ b/configure.ac @@ -8,12 +8,12 @@ AC_ARG_WITH(tor-browser-bundle, AC_HELP_STRING([--with-tor-browser-bundle=PROGRAM], [… [View More]

1 0

[sandboxed-tor-browser/master] Use the GCC constructor attribute for stub initialization.
by yawning＠torproject.org 31 Aug '17

31 Aug '17

commit d3e4fd26e46ab258e4a5daa0541c7253989ed35f Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Thu Aug 31 10:03:30 2017 +0000 Use the GCC constructor attribute for stub initialization. Non-portable but this is cleaner. --- ChangeLog | 1 + src/tbb_stub/tbb_stub.c | 11 +---------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0bf64e8..09a23eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ … [View More]Changes in version 0.0.13 - UNRELEASED: * Use lockPref for the IDN override done as part of #22984. * Unset the addon autoupdater URL prefs. * Disable the "Open with" dialog, which will never work. + * Use the GCC constructor attribute for stub initialization. Changes in version 0.0.12 - 2017-08-01: * Bug 22969: Disable the addon blocklist. diff --git a/src/tbb_stub/tbb_stub.c b/src/tbb_stub/tbb_stub.c index 84a14e8..819c8e0 100644 --- a/src/tbb_stub/tbb_stub.c +++ b/src/tbb_stub/tbb_stub.c @@ -52,7 +52,6 @@ #include <stdlib.h> #include <unistd.h> -static pthread_once_t stub_init_once = PTHREAD_ONCE_INIT; static int (*real_connect)(int, const struct sockaddr *, socklen_t) = NULL; static int (*real_socket)(int, int, int) = NULL; static void *(*real_dlopen)(const char *, int) = NULL; @@ -66,9 +65,6 @@ static struct sockaddr_un control_addr; #define TBB_SOCKS_PORT 9150 #define TBB_CONTROL_PORT 9151 - -static void stub_init(void); - int connect(int fd, const struct sockaddr *address, socklen_t address_len) { @@ -80,8 +76,6 @@ connect(int fd, const struct sockaddr *address, socklen_t address_len) return -1; } - pthread_once(&stub_init_once, stub_init); - /* Fast path for non-outgoing sockets. */ if (address->sa_family == AF_LOCAL) { return real_connect(fd, address, address_len); @@ -121,8 +115,6 @@ connect(int fd, const struct sockaddr *address, socklen_t address_len) int socket(int domain, int type, int protocol) { - pthread_once(&stub_init_once, stub_init); - /* Replace AF_INET with AF_LOCAL. */ if (domain == AF_INET) domain = AF_LOCAL; @@ -145,7 +137,6 @@ void * dlopen(const char *filename, int flags) { void *ret; - pthread_once(&stub_init_once, stub_init); if (filename != NULL) { if (has_prefix(filename, "libgnomeui")) @@ -301,7 +292,7 @@ pthread_attr_getstack(const pthread_attr_t *attr, void **stackaddr, size_t *stac } /* Initialize the stub. */ -static void +__attribute__((constructor)) static void stub_init(void) { char *socks_path = secure_getenv("TOR_STUB_SOCKS_SOCKET"); [View Less]

1 0

[user-manual/master] Fix build issue with get-tb-version
by colin＠torproject.org 31 Aug '17

31 Aug '17

commit aad3e6e5f9fad517bae0343ee3508472c0cb265b Author: Colin Childs <colin(a)torproject.org> Date: Thu Aug 31 04:58:32 2017 -0500 Fix build issue with get-tb-version --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b0edfae..b044202 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ AC_ARG_WITH(tor-browser-bundle, AC_HELP_STRING([--with-tor-browser-bundle=PROGRAM], … [View More]

1 0

[tor-browser/tor-browser-52.3.0esr-7.5-2] squash! Bug 19273: Avoid JavaScript patching of the external app helper dialog.
by gk＠torproject.org 31 Aug '17

31 Aug '17

commit 9ecbfca98dc5488527495e3bfde0fabf75a8529a Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 30 16:58:52 2017 -0400 squash! Bug 19273: Avoid JavaScript patching of the external app helper dialog. When handling an external URI or downloading a file, invoke Torbutton's external app blocker component (which will present a download warning dialog unless the user has checked the "Automatically download files from now on" box). For e10s … [View More]compatibility, avoid using a modal dialog and instead use a callback interface (nsIHelperAppWarningLauncher) to allow Torbutton to indicate the user's desire to cancel or continue each request. Other bugs fixed: Bug 21766: Crash with e10s enabled while trying to download a file Bug 21886: Download is stalled in non-e10s mode Bug 22471: Downloading files via the PDF viewer download button is broken Bug 22472: Fix FTP downloads when external helper app dialog is shown Bug 22610: Avoid crashes when canceling external helper app downloads Bug 22618: Downloading pdf file via file:/// is stalling --- uriloader/exthandler/nsExternalHelperAppService.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp index df08905304fb..1c0dd8ee66f7 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -606,7 +606,7 @@ public: NS_DECL_THREADSAFE_ISUPPORTS NS_DECL_NSIHELPERAPPWARNINGLAUNCHER - nsExternalLoadURIHandler(nsIInterfaceRequestor * aWindowContext, + nsExternalLoadURIHandler(nsIInterfaceRequestor *aWindowContext, nsIURI *aURI, nsIHandlerInfo *aHandlerInfo); @@ -669,7 +669,7 @@ NS_IMETHODIMP nsExternalLoadURIHandler::ContinueRequest() bool alwaysAsk = true; mHandlerInfo->GetAlwaysAskBeforeHandling(&alwaysAsk); - // if we are not supposed to ask, and the preferred action is to use + // If we are not supposed to ask, and the preferred action is to use // a helper app or the system default, we just launch the URI. if (!alwaysAsk && (preferredAction == nsIHandlerInfo::useHelperApp || preferredAction == nsIHandlerInfo::useSystemDefault)) @@ -1786,7 +1786,7 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest *request, nsISuppo NS_IMETHODIMP nsExternalAppHandler::ContinueRequest() { // Break our reference cycle with the download warning dialog (set up in - // OnStartRequest) + // OnStartRequest). mWarningDialog = nullptr; // now that the temp file is set up, find out if we need to invoke a dialog @@ -1908,7 +1908,7 @@ NS_IMETHODIMP nsExternalAppHandler::ContinueRequest() NS_IMETHODIMP nsExternalAppHandler::CancelRequest(nsresult aReason) { // Break our reference cycle with the download warning dialog (set up in - // OnStartRequest) + // OnStartRequest). mWarningDialog = nullptr; return Cancel(aReason); [View Less]

1 0

[torbutton/master] fixup! Bug 19273: Avoid JavaScript patching of the external app helper dialog.
by gk＠torproject.org 31 Aug '17

31 Aug '17

commit 8e5e391c71d6c5f3ae80c88e45d1e8522f981214 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 30 12:06:24 2017 -0400 fixup! Bug 19273: Avoid JavaScript patching of the external app helper dialog. Improve the overview/summary comment in external-app-blocker.js. --- src/components/external-app-blocker.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/external-app-blocker.js b/src/components/external-app-blocker.js … [View More]

1 0

[metrics-web/master] Document Onionoo's new version parameter.
by karsten＠torproject.org 31 Aug '17

31 Aug '17

commit 629170c377eb3e4371a286af8441f0ceadfd40e1 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Aug 31 10:43:19 2017 +0200 Document Onionoo's new version parameter. --- website/src/main/resources/web/WEB-INF/onionoo.jsp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/website/src/main/resources/web/WEB-INF/onionoo.jsp b/website/src/main/resources/web/WEB-INF/onionoo.jsp index 21305f4..4f4c68f 100644 --- a/website/src/main/resources/… [View More]

1 0

[metrics-web/master] Remove beta fields of bridge clients objects.
by karsten＠torproject.org 31 Aug '17

31 Aug '17

commit 2f4bc5a653557663a550c0f4bb60e7b99454f8b9 Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Aug 22 08:02:55 2017 +0000 Remove beta fields of bridge clients objects. --- website/src/main/resources/web/WEB-INF/onionoo.jsp | 64 +--------------------- 1 file changed, 2 insertions(+), 62 deletions(-) diff --git a/website/src/main/resources/web/WEB-INF/onionoo.jsp b/website/src/main/resources/web/WEB-INF/onionoo.jsp index 1239198..21305f4 100644 --- a/website/src/main/resources/… [View More]web/WEB-INF/onionoo.jsp +++ b/website/src/main/resources/web/WEB-INF/onionoo.jsp @@ -227,6 +227,8 @@ added response meta data fields "relays_skipped", "relays_truncated", <li>4.0: Extended search parameter to not require leading or enclosing square brackets around IPv6 addresses anymore on February 28, 2017.</li> +<li>4.1: Removed bridge clients objects' beta fields +"countries", "transports", and "versions" on August 30, 2017.</li> </ul> @@ -1836,69 +1838,7 @@ time period and higher data resolution. The unit is number of clients. Contained graph history objects may contain null values if the bridge did not report client statistics for at least 50% of a given time period. -Each graph history object contains the following additional key-value -pairs: - -<ul class="properties"> - -<li> -countries beta -<code class="typeof">object</code> -optional - -Object containing fractions of clients by country in the considered time -period. -Keys are two-letter lower-case country codes as found in a GeoIP database. -Values are numbers between 0 and 1 standing for the fraction of clients by -country. -A country is only included if at least 1% of clients came from this -country. -Omitted if the bridge did not report client statistics by country. -BETA: This field breaks compatibility -with the history objects contained in other documents pretty badly. -It might be removed in the future without notice. - -</li> - -<li> -transports beta -<code class="typeof">object</code> -optional - -Object containing fractions of clients by transport in the considered time -period. -Keys are transport names, or "<OR>" for the default -onion-routing transport protocol. -Values are numbers between 0 and 1 standing for the fraction of clients by -transport. -Omitted if the bridge did not report client statistics by transport. -BETA: This field breaks compatibility -with the history objects contained in other documents pretty badly. -It might be removed in the future without notice. - -</li> - -<li> -versions beta -<code class="typeof">object</code> -optional - -Object containing fractions of clients by IP version in the considered -time period. -Keys are either "v4" for IPv4 or "v6" -for IPv6. -Values are numbers between 0 and 1 standing for the fraction of clients by -version. -Omitted if the bridge did not report client statistics by IP version. -BETA: This field breaks compatibility -with the history objects contained in other documents pretty badly. -It might be removed in the future without notice. - -</li> - -</ul> - </li> </ul> [View Less]

1 0