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

[webwml/staging] Fix typo in htaccess
by hiro＠torproject.org 30 Oct '17

30 Oct '17

commit 58fc9a9a7ee63f3533ba637a0812a96c0a20c79b Author: hiromipaw <hiro(a)torproject.org> Date: Fri Oct 27 14:30:32 2017 +0200 Fix typo in htaccess --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index dc40727d..557fbbf0 100644 --- a/.htaccess +++ b/.htaccess @@ -48,7 +48,7 @@ RewriteRule ^getinvolved/research(.*) https://research.torproject.org/ [R=301,L] RewriteRule ^support(.*) https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam/Suppo… [R=301,L] # Newsletter -RewriteRule ^newsletter(.*) https://newsletter.torproject.org [R=3-1,L] +RewriteRule ^newsletter(.*) https://newsletter.torproject.org [R=301,L] # other (feel free to categorize) RewriteRule ^people(.*) /about/corepeople$1 [R=301,L]

1 0

[webwml/staging] remove temp files
by hiro＠torproject.org 30 Oct '17

30 Oct '17

commit bfe079ed8b6f348cdaabc60abeb1642402c40d2e Author: hiromipaw <hiro(a)torproject.org> Date: Fri Oct 27 19:44:41 2017 +0200 remove temp files --- include/#navigation.wmi# | 29 ----------------------------- include/.#navigation.wmi | 1 - 2 files changed, 30 deletions(-) diff --git a/include/#navigation.wmi# b/include/#navigation.wmi# deleted file mode 100644 index 456b4f04..00000000 --- a/include/#navigation.wmi# +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/wml - -## translation metadata -# Revision: $Revision: 22069 $ -# Translation-Priority: 1-high - -<: - # path link text - my @navigation = ( - 'index' , 'Home', - 'about/overview' , 'About Tor', - 'docs/documentation' , 'Documentation', - 'press/press' , 'Press', - '<blog>' , 'Blog', - '<newsletter>' , 'Newsletter', - 'about/contact' , 'Contact', - ); - my @donatenav = ( - 'index' , 'Home', - 'about/overview' , 'About Tor', - 'about/contact' , 'Contact', - ); - my @calltoaction = ( - 'download/download-easy' , 'Download', - 'getinvolved/volunteer' , 'Get Involved', - 'donate/donate-button' , 'Donate', - ); - -:> diff --git a/include/.#navigation.wmi b/include/.#navigation.wmi deleted file mode 120000 index de260ad0..00000000 --- a/include/.#navigation.wmi +++ /dev/null @@ -1 +0,0 @@ -hiro@coruscant.9885:1509102593 \ No newline at end of file

1 0

[nyx/master] Make tests python 3.x compatible
by atagar＠torproject.org 30 Oct '17

30 Oct '17

commit c551866e1d24ffdc213c3ecd7e31bc595a899d6c Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Oct 30 10:42:15 2017 -0700 Make tests python 3.x compatible --- test/__init__.py | 7 ++++++- test/cache.py | 6 +++++- test/panel/config.py | 7 ++++++- test/panel/connection.py | 7 ++++++- test/panel/graph.py | 7 ++++++- test/panel/header.py | 7 ++++++- test/panel/interpreter.py | 7 ++++++- test/panel/log.py | 7 ++++++- test/panel/torrc.py | 7 ++++++- test/popups.py | 7 ++++++- test/subwindow.py | 8 ++++++-- test/tracker/connection_tracker.py | 6 +++++- test/tracker/daemon.py | 6 +++++- test/tracker/port_usage_tracker.py | 6 +++++- test/tracker/resource_tracker.py | 8 ++++++-- 15 files changed, 86 insertions(+), 17 deletions(-) diff --git a/test/__init__.py b/test/__init__.py index 4a998f0..7f7f19d 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -10,7 +10,12 @@ import unittest import nyx.curses from nyx import expand_path, chroot, join, uses_settings -from mock import patch, Mock + +try: + # added in python 3.3 + from unittest.mock import Mock, patch +except ImportError: + from mock import Mock, patch __all__ = [ 'arguments', diff --git a/test/cache.py b/test/cache.py index 4c93c75..b6bfffb 100644 --- a/test/cache.py +++ b/test/cache.py @@ -9,7 +9,11 @@ import unittest import nyx -from mock import Mock, patch +try: + # added in python 3.3 + from unittest.mock import Mock, patch +except ImportError: + from mock import Mock, patch class TestCache(unittest.TestCase): diff --git a/test/panel/config.py b/test/panel/config.py index 99bbaec..0bf51ab 100644 --- a/test/panel/config.py +++ b/test/panel/config.py @@ -8,7 +8,12 @@ import nyx.panel.config import test from test import require_curses -from mock import patch + +try: + # added in python 3.3 + from unittest.mock import patch +except ImportError: + from mock import patch EXPECTED_LINE = 'ControlPort 9051 Port providing access to tor...' diff --git a/test/panel/connection.py b/test/panel/connection.py index f075f77..ccc3aa5 100644 --- a/test/panel/connection.py +++ b/test/panel/connection.py @@ -13,7 +13,12 @@ import test from nyx.tracker import Connection from nyx.panel.connection import Category, LineType, Line, Entry from test import require_curses -from mock import Mock, patch + +try: + # added in python 3.3 + from unittest.mock import Mock, patch +except ImportError: + from mock import Mock, patch TIMESTAMP = 1468170303.7 CONNECTION = Connection(TIMESTAMP, False, '127.0.0.1', 3531, '75.119.206.243', 22, 'tcp', False) diff --git a/test/panel/graph.py b/test/panel/graph.py index 513a757..d22d6fb 100644 --- a/test/panel/graph.py +++ b/test/panel/graph.py @@ -12,7 +12,12 @@ import nyx.panel.graph import test from test import require_curses -from mock import patch + +try: + # added in python 3.3 + from unittest.mock import patch +except ImportError: + from mock import patch EXPECTED_BLANK_GRAPH = """ Download: diff --git a/test/panel/header.py b/test/panel/header.py index 1b07799..12db48f 100644 --- a/test/panel/header.py +++ b/test/panel/header.py @@ -14,7 +14,12 @@ import nyx.panel.header import test from test import require_curses -from mock import patch, Mock + +try: + # added in python 3.3 + from unittest.mock import Mock, patch +except ImportError: + from mock import Mock, patch EXPECTED_PANEL = """ nyx - odin (Linux 3.5.0-54-generic) Tor 0.2.8.1-alpha-dev diff --git a/test/panel/interpreter.py b/test/panel/interpreter.py index b24a51f..3e68596 100644 --- a/test/panel/interpreter.py +++ b/test/panel/interpreter.py @@ -9,7 +9,12 @@ import nyx.panel.interpreter import test from test import require_curses -from mock import patch + +try: + # added in python 3.3 + from unittest.mock import patch +except ImportError: + from mock import patch EXPECTED_PANEL = """ Control Interpreter: diff --git a/test/panel/log.py b/test/panel/log.py index 95d7e9d..a05ed4f 100644 --- a/test/panel/log.py +++ b/test/panel/log.py @@ -10,7 +10,12 @@ import test from nyx.log import LogEntry, LogFilters from test import require_curses -from mock import patch, Mock + +try: + # added in python 3.3 + from unittest.mock import Mock, patch +except ImportError: + from mock import Mock, patch EXPECTED_WRAPPED_MSG = """\ 16:41:37 [NOTICE] ho hum, ho hum, ho hum, ho hum, ho hum, ho hum, ho hum, ho diff --git a/test/panel/torrc.py b/test/panel/torrc.py index 732ec63..273f8f3 100644 --- a/test/panel/torrc.py +++ b/test/panel/torrc.py @@ -8,7 +8,12 @@ import nyx.panel.torrc import test from test import require_curses -from mock import patch, Mock + +try: + # added in python 3.3 + from unittest.mock import Mock, patch +except ImportError: + from mock import Mock, patch TORRC = """ ORPort 9050 diff --git a/test/popups.py b/test/popups.py index 3e64914..6aabff4 100644 --- a/test/popups.py +++ b/test/popups.py @@ -11,7 +11,12 @@ import nyx.popups import test from test import require_curses, mock_keybindings -from mock import patch, Mock + +try: + # added in python 3.3 + from unittest.mock import Mock, patch +except ImportError: + from mock import Mock, patch EXPECTED_HELP_POPUP = """ Page 1 Commands:---------------------------------------------------------------+ diff --git a/test/subwindow.py b/test/subwindow.py index bc7ce5a..52bfeb8 100644 --- a/test/subwindow.py +++ b/test/subwindow.py @@ -11,11 +11,15 @@ import nyx.curses import nyx.panel.interpreter import test -from mock import call, Mock - from test import require_curses from nyx.curses import Color, Attr +try: + # added in python 3.3 + from unittest.mock import call, Mock +except ImportError: + from mock import call, Mock + EXPECTED_ADDSTR_WRAP = """ 0123456789 0123456789 0123456789 0123456789 diff --git a/test/tracker/connection_tracker.py b/test/tracker/connection_tracker.py index 50faef1..672240b 100644 --- a/test/tracker/connection_tracker.py +++ b/test/tracker/connection_tracker.py @@ -5,7 +5,11 @@ from nyx.tracker import ConnectionTracker from stem.util import connection -from mock import Mock, patch +try: + # added in python 3.3 + from unittest.mock import Mock, patch +except ImportError: + from mock import Mock, patch STEM_CONNECTIONS = [ connection.Connection('127.0.0.1', 3531, '75.119.206.243', 22, 'tcp', False), diff --git a/test/tracker/daemon.py b/test/tracker/daemon.py index 4a527f7..27f59e1 100644 --- a/test/tracker/daemon.py +++ b/test/tracker/daemon.py @@ -3,7 +3,11 @@ import unittest from nyx.tracker import Daemon -from mock import Mock, patch +try: + # added in python 3.3 + from unittest.mock import Mock, patch +except ImportError: + from mock import Mock, patch class TestDaemon(unittest.TestCase): diff --git a/test/tracker/port_usage_tracker.py b/test/tracker/port_usage_tracker.py index 7e69f21..c4c430a 100644 --- a/test/tracker/port_usage_tracker.py +++ b/test/tracker/port_usage_tracker.py @@ -3,7 +3,11 @@ import unittest from nyx.tracker import Process, PortUsageTracker, _process_for_ports -from mock import Mock, patch +try: + # added in python 3.3 + from unittest.mock import Mock, patch +except ImportError: + from mock import Mock, patch LSOF_OUTPUT = """\ COMMAND PID USER FD TYPE DEVICE SIZE/OFF NODE NAME diff --git a/test/tracker/resource_tracker.py b/test/tracker/resource_tracker.py index 25837f1..3d31c3f 100644 --- a/test/tracker/resource_tracker.py +++ b/test/tracker/resource_tracker.py @@ -3,7 +3,11 @@ import unittest from nyx.tracker import ResourceTracker, _resources_via_ps, _resources_via_proc -from mock import Mock, patch +try: + # added in python 3.3 + from unittest.mock import Mock, patch +except ImportError: + from mock import Mock, patch PS_OUTPUT = """\ TIME ELAPSED RSS %MEM @@ -38,7 +42,7 @@ class TestResourceTracker(unittest.TestCase): resources = daemon.get_value() self.assertEqual(2, daemon.run_counter()) - self.assertEqual(6.600189933523267, resources.cpu_sample) + self.assertTrue(17000 < resources.cpu_sample < 18000) self.assertEqual(250.09374999999997, resources.cpu_average) self.assertEqual(800.3, resources.cpu_total) self.assertEqual(6020, resources.memory_bytes)

1 0

[nyx/master] Nyx cpu usage metric incorrect
by atagar＠torproject.org 30 Oct '17

30 Oct '17

commit 46d782d0da7042b390b3fb3210895206860fd4dd Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Oct 30 10:23:50 2017 -0700 Nyx cpu usage metric incorrect Hey, it's only a couple orders of magnitude. ... *sigh*. --- nyx/panel/header.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nyx/panel/header.py b/nyx/panel/header.py index b1cbfbf..09e3838 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -283,7 +283,7 @@ class Sampling(object): 'nyx_total_cpu_time': nyx_total_cpu_time, 'tor_cpu': '%0.1f' % (100 * tor_resources.cpu_sample), - 'nyx_cpu': '%0.1f' % (nyx_cpu), + 'nyx_cpu': '%0.1f' % (100 * nyx_cpu), 'memory': stem.util.str_tools.size_label(tor_resources.memory_bytes) if tor_resources.memory_bytes > 0 else 0, 'memory_percent': '%0.1f' % (100 * tor_resources.memory_percent),

1 0

[nyx/master] Fix tor cpu usage metric
by atagar＠torproject.org 30 Oct '17

30 Oct '17

commit 436016d1babd304e6159c63c80bebc15a3302cd4 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Oct 30 10:15:43 2017 -0700 Fix tor cpu usage metric Why did we divide by that? Weird. Because of it we always showed tor's cpu usage as 0%. --- nyx/tracker.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nyx/tracker.py b/nyx/tracker.py index 83159f5..ad033d5 100644 --- a/nyx/tracker.py +++ b/nyx/tracker.py @@ -661,9 +661,10 @@ class ResourceTracker(Daemon): try: resolver = _resources_via_proc if self._use_proc else _resources_via_ps total_cpu_time, uptime, memory_in_bytes, memory_in_percent = resolver(process_pid) + now = time.time() if self._resources: - cpu_sample = (total_cpu_time - self._resources.cpu_total) / self._resources.cpu_total + cpu_sample = (total_cpu_time - self._resources.cpu_total) / (now - self._resources.timestamp) else: cpu_sample = 0.0 # we need a prior datapoint to give a sampling @@ -673,7 +674,7 @@ class ResourceTracker(Daemon): cpu_total = total_cpu_time, memory_bytes = memory_in_bytes, memory_percent = memory_in_percent, - timestamp = time.time(), + timestamp = now, ) self._failure_count = 0

1 0

[nyx/master] Better logging when tracker has an unexpected exception
by atagar＠torproject.org 30 Oct '17

30 Oct '17

commit 494a39edce76bf3863290c20419891b7bae80409 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Oct 30 10:08:07 2017 -0700 Better logging when tracker has an unexpected exception We shouldn't silently swallow errors. Opting for notice runlevel so they're visible to users by default so they can be reported. --- nyx/tracker.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nyx/tracker.py b/nyx/tracker.py index c2c4714..83159f5 100644 --- a/nyx/tracker.py +++ b/nyx/tracker.py @@ -396,7 +396,10 @@ class Daemon(threading.Thread): with self._process_lock: if self._process_pid is not None: - is_successful = self._task(self._process_pid, self._process_name) + try: + is_successful = self._task(self._process_pid, self._process_name) + except Exception as exc: + stem.util.log.notice('BUG: Unexpected exception from %s: %s' % (type(self).__name__, exc)) else: is_successful = False

1 0

[torspec/master] Control-spec: document which signals have POSIX equivalents
by nickm＠torproject.org 30 Oct '17

30 Oct '17

commit 4c383824b8b120a3289d0d94bc8ff1545046c216 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 30 13:01:51 2017 -0400 Control-spec: document which signals have POSIX equivalents --- control-spec.txt | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 19eabcf..aea406c 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -428,14 +428,14 @@ The meaning of the signals are: - RELOAD -- Reload: reload config items. (like HUP) + RELOAD -- Reload: reload config items. SHUTDOWN -- Controlled shutdown: if server is an OP, exit immediately. If it's an OR, close listeners and exit after - ShutdownWaitLength seconds. (like INT) + ShutdownWaitLength seconds. DUMP -- Dump stats: log information about open connections and - circuits. (like USR1) - DEBUG -- Debug: switch all open logs to loglevel debug. (like USR2) - HALT -- Immediate shutdown: clean up and exit now. (like TERM) + circuits. + DEBUG -- Debug: switch all open logs to loglevel debug. + HALT -- Immediate shutdown: clean up and exit now. CLEARDNSCACHE -- Forget the client-side cached IPs for all hostnames. NEWNYM -- Switch to clean circuits, so new application requests don't share any circuits with old ones. Also clears @@ -447,6 +447,16 @@ closes the socket if it was asked to close immediately), or "552 Unrecognized signal" if the signal is unrecognized. + Note that not all of these signals have POSIX signal equivalents. The + ones that do are as below. You may also use these POSIX names for the + signal that have them. + + RELOAD: HUP + SHUTDOWN: INT + HALT: TERM + DUMP: USR1 + DEBUG: USR2 + 3.8. MAPADDRESS Sent from the client to the server. The syntax is:

1 0

[onionoo/master] Increase test timeout from 100 to 200ms.
by karsten＠torproject.org 30 Oct '17

30 Oct '17

commit efa4cd87935e7ce0a6979506b53a44c32b932c2b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Oct 30 17:00:24 2017 +0100 Increase test timeout from 100 to 200ms. The testCountryDeDe typically requires around 80 to 100ms to complete, which makes our test timeout of 100ms somewhat optimistic. The reason is that it's the first test method that is run in this test class, and it takes some time to initialize the test environment. This is just a hotfix, but it's also not really a serious problem, so maybe it'll just do. --- src/test/java/org/torproject/onionoo/server/ResourceServletTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java index 1588f8a..e41eecc 100644 --- a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java +++ b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java @@ -1104,7 +1104,7 @@ public class ResourceServletTest { null); } - @Test(timeout = 100) + @Test(timeout = 200) public void testCountryDeDe() { this.assertSummaryDocument( "/summary?country=de&country=de", 1, new String[] { "TorkaZ" }, 0,

1 0

[onionoo/master] Support quoted qualified search terms.
by karsten＠torproject.org 30 Oct '17

30 Oct '17

commit 75981fe7d03091c78f901e1589288be4a27ce56c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Oct 19 14:46:28 2017 +0200 Support quoted qualified search terms. With this patch, the "search" parameter does not only accept unquoted qualified search terms like `search=contact:John Doe` where "John" would be looked up in the contact line and "Doe" in the nickname or base64-encoded fingerprint. It also accepts quoted qualified search terms like `search=contact:"John Doe"` where "John Doe" would be looked up in the contact line. It further accepts escaped double quotes (\") within quoted qualified search terms. Implements #21366. --- CHANGELOG.md | 8 ++++- .../torproject/onionoo/server/ResourceServlet.java | 38 ++++++++++++++++++++-- .../onionoo/server/ResourceServletTest.java | 36 +++++++++++++++++++- 3 files changed, 77 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca17fa7..74f29b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,10 @@ -# Changes in version 4.2-1.6.1 - 2017-10-2? +# Changes in version 4.3-1.7.0 - 2017-1?-?? + + * Medium changes + - Support quoted qualified search terms. + + +# Changes in version 4.2-1.6.1 - 2017-10-26 * Medium changes - Fix two NullPointerExceptions caused by accessing optional parts diff --git a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java index 31244c2..2fff913 100644 --- a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java +++ b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java @@ -3,6 +3,8 @@ package org.torproject.onionoo.server; +import org.apache.commons.lang3.StringUtils; + import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; @@ -169,6 +171,12 @@ public class ResourceServlet extends HttpServlet { } if (!parameterMap.containsKey(parameterKey)) { String parameterValue = parts[1]; + if (parameterValue.startsWith("\"") + && parameterValue.endsWith("\"")) { + parameterValue = parameterValue + .substring(1, parameterValue.length() - 1) + .replaceAll("\\\\\"", "\""); + } parameterMap.put(parameterKey, parameterValue); } } else { @@ -388,7 +396,7 @@ public class ResourceServlet extends HttpServlet { + "^[0-9a-zA-Z+/]{1,27}$|" /* Base64 fingerprint. */ + "^[0-9a-zA-Z\\.]{1,19}$|" /* Nickname or IPv4 address. */ + ipv6AddressPatternString + "|" /* IPv6 address. */ - + "^[a-zA-Z_]+:\\p{Graph}+$" /* Qualified search term. */); + + "^[a-zA-Z_]+:\"?[\\p{Graph} ]+\"?$"); /* Qualified search term. */ protected static String[] parseSearchParameters(String queryString) { Matcher searchQueryStringMatcher = searchQueryStringPattern.matcher( @@ -398,15 +406,39 @@ public class ResourceServlet extends HttpServlet { return null; } String parameter = searchQueryStringMatcher.group(1); - String[] searchParameters = + String[] spaceSeparatedParts = parameter.replaceAll("%20", " ").split(" "); + List<String> searchParameters = new ArrayList<>(); + StringBuilder doubleQuotedSearchTerm = null; + for (String spaceSeparatedPart : spaceSeparatedParts) { + if ((StringUtils.countMatches(spaceSeparatedPart, '"') + - StringUtils.countMatches(spaceSeparatedPart, "\\\"")) % 2 == 0) { + if (null == doubleQuotedSearchTerm) { + searchParameters.add(spaceSeparatedPart); + } else { + doubleQuotedSearchTerm.append(' ').append(spaceSeparatedPart); + } + } else { + if (null == doubleQuotedSearchTerm) { + doubleQuotedSearchTerm = new StringBuilder(spaceSeparatedPart); + } else { + doubleQuotedSearchTerm.append(' ').append(spaceSeparatedPart); + searchParameters.add(doubleQuotedSearchTerm.toString()); + doubleQuotedSearchTerm = null; + } + } + } + if (null != doubleQuotedSearchTerm) { + /* Opening double quote is not followed by closing double quote. */ + return null; + } for (String searchParameter : searchParameters) { if (!searchParameterPattern.matcher(searchParameter).matches()) { /* Illegal search term. */ return null; } } - return searchParameters; + return searchParameters.toArray(new String[0]); } private static Pattern fingerprintParameterPattern = diff --git a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java index 303cf21..1588f8a 100644 --- a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java +++ b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java @@ -169,7 +169,7 @@ public class ResourceServletTest { new TreeSet<>(Arrays.asList(new String[] { "Fast", "Running", "Unnamed", "V2Dir", "Valid" })), 63L, "a1", DateTimeHelper.parse("2013-04-16 18:00:00"), "AS6830", - "1024D/51E2A1C7 steven j. murdoch " + "1024d/51e2a1c7 \"steven j. murdoch\" " + "<tor+steven.murdoch(a)cl.cam.ac.uk> <fb-token:5sr_k_zs2wm=>", new TreeSet<String>(), new TreeSet<String>(), "0.2.3.25"); this.relays.put("0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B", @@ -933,6 +933,40 @@ public class ResourceServletTest { } @Test(timeout = 100) + public void testSearchDoubleQuotedEmailAddress() { + this.assertSummaryDocument( + "/summary?search=contact:\"klaus dot zufall at gmx dot de\"", 1, + new String[] { "TorkaZ" }, 0, null); + } + + @Test(timeout = 100) + public void testSearchDoubleQuotedContactAndNickname() { + this.assertSummaryDocument( + "/summary?search=contact:\"dot de\" TorkaZ", 1, + new String[] { "TorkaZ" }, 0, null); + } + + @Test(timeout = 100) + public void testSearchMissingEndingDoubleQuote() { + this.assertErrorStatusCode( + "/summary?search=contact:\"klaus dot zufall at gmx dot de", 400); + } + + @Test(timeout = 100) + public void testSearchEvenNumberOfDoubleQuotes() { + this.assertSummaryDocument( + "/summary?search=contact:\"\"\" \"\"\"", 0, + null, 0, null); + } + + @Test(timeout = 100) + public void testSearchContactEscapedDoubleQuotes() { + this.assertSummaryDocument( + "/summary?search=contact:\"1024D/51E2A1C7 \\\"Steven J. Murdoch\\\"\"", + 1, new String[] { "TimMayTribute" }, 0, null); + } + + @Test(timeout = 100) public void testLookupFingerprint() { this.assertSummaryDocument( "/summary?lookup=000C5F55BD4814B917CC474BD537F1A3B33CCE2A", 1,

1 0

[onionoo/master] Bump version to 4.2-1.6.1-dev.
by karsten＠torproject.org 30 Oct '17

30 Oct '17

commit 0cb09d1ebfd76f797a3bb530e10a22350d1c4a5a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Oct 26 21:52:01 2017 +0200 Bump version to 4.2-1.6.1-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 25477df..3e70421 100644 --- a/build.xml +++ b/build.xml @@ -10,7 +10,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="4.2"/> <property name="release.version" - value="${onionoo.protocol.version}-1.6.1"/> + value="${onionoo.protocol.version}-1.6.1-dev"/> <property name="metricslibversion" value="2.1.1"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0