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

[tlsdate/master] Add note about Debian GNU/kFreeBSD 8.2-1-amd64 building
by ioerror＠torproject.org 25 Apr '13

25 Apr '13

commit 3ec8a8ae45703453159a7891cc4a7f8aef4c44a3 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Apr 25 09:29:36 2013 -0700 Add note about Debian GNU/kFreeBSD 8.2-1-amd64 building --- INSTALL | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/INSTALL b/INSTALL index e085656..c772929 100644 --- a/INSTALL +++ b/INSTALL @@ -21,8 +21,8 @@ tlsdate should build and might even work on the following Operating Systems: Win32 with Cygwin CYGWIN_NT-6.1 1.7.18(0.263/5/3 Win32 with MinGW Haiku r1alpha4 - GNU/Hurd GNU-Mach 1.3.99-486-dbg/Hurd-0.3 - GNU/kFreeBSD asdfasdf 8.2-1-amd64 + Debian GNU/Hurd GNU-Mach 1.3.99-486-dbg/Hurd-0.3 + Debian GNU/kFreeBSD 8.2-1-amd64 Please file a bug or email the tlsdate team if you have successfully built or use tlsdate on a platform that is not listed. We are specifically looking for

1 0

[tlsdate/master] we now build for x86_64-unknown-kfreebsd8.2-gnu
by ioerror＠torproject.org 25 Apr '13

25 Apr '13

commit ae4be31358a96f6a4813be374c49148fa5b7a069 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Apr 25 09:28:40 2013 -0700 we now build for x86_64-unknown-kfreebsd8.2-gnu --- configure.ac | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 14aead5..92915fd 100644 --- a/configure.ac +++ b/configure.ac @@ -187,8 +187,13 @@ case "$host" in *kfreebsd*-gnu*) dnl This is for Debian GNU/kFreeBSD dnl clock_gettime is either part of libc or unavailable. - AC_CHECK_FUNC([clock_gettime], , - [AC_MSG_ERROR([Your system lacks clock_gettime])]) + dnl Check for clock_gettime. Some systems put it into -lc, while + dnl others use -lrt. Try the first and fallback to the latter. + RT_LIB= + AC_CHECK_FUNC([clock_gettime], [:], + [AC_CHECK_LIB([rt], [clock_gettime], [RT_LIB="-lrt"], + [AC_MSG_ERROR([Your system lacks clock_gettime])])]) + AC_SUBST(RT_LIB) dnl If the autoconf goo picks up a compiler that runs in pre-POSIX mode, dnl the fmemopen prototype is hidden causing the unit tests to segfault. dnl This can happen if gcc is a symlink to gcc46 and is preferred to clang.

1 0

[onionoo/master] Add unit tests for our servlet.
by karsten＠torproject.org 25 Apr '13

25 Apr '13

commit 674a50b6321917ad70076d768cae5d911371f017 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Apr 25 15:29:57 2013 +0200 Add unit tests for our servlet. --- INSTALL | 1 + build.xml | 22 + src/org/torproject/onionoo/CurrentNodes.java | 5 +- src/org/torproject/onionoo/ResourceServlet.java | 102 ++- .../torproject/onionoo/ResourceServletTest.java | 1171 ++++++++++++++++++++ 5 files changed, 1274 insertions(+), 27 deletions(-) diff --git a/INSTALL b/INSTALL index f4ad7ca..ccc4049 100644 --- a/INSTALL +++ b/INSTALL @@ -32,6 +32,7 @@ directory: - Apache Commons Lang 2.6 - Servlet API, e.g., from Tomcat 6 - Tor Metrics Descriptor Library, metrics-lib +- Gson 2.2.3 (so far only required for testing) Attempt to compile the Java sources to make sure that everything works correctly: diff --git a/build.xml b/build.xml index 770fbf0..523d301 100644 --- a/build.xml +++ b/build.xml @@ -1,5 +1,6 @@ <project default="run" name="onionoo" basedir="."> <property name="sources" value="src"/> + <property name="tests" value="test"/> <property name="classes" value="classes"/> <property name="libs" value="lib"/> <property name="config" value="etc"/> @@ -36,6 +37,27 @@ <classpath refid="classpath"/> </javac> </target> + <target name="test" depends="compile"> + <javac destdir="${classes}" + srcdir="${tests}" + source="1.5" + target="1.5" + debug="true" + deprecation="true" + optimize="false" + failonerror="true" + includeantruntime="false"> + <classpath refid="classpath"/> + </javac> + <junit fork="true" haltonfailure="true" printsummary="off"> + <classpath refid="classpath"/> + <formatter type="plain" usefile="false"/> + <batchtest> + <fileset dir="${classes}" + includes="**/*Test.class"/> + </batchtest> + </junit> + </target> <target name="war" depends="compile"> <war destfile="${warfile}" diff --git a/src/org/torproject/onionoo/CurrentNodes.java b/src/org/torproject/onionoo/CurrentNodes.java index db4305d..80b76c5 100644 --- a/src/org/torproject/onionoo/CurrentNodes.java +++ b/src/org/torproject/onionoo/CurrentNodes.java @@ -822,7 +822,7 @@ public class CurrentNodes { private SortedMap<String, Node> knownRelays = new TreeMap<String, Node>(); public SortedMap<String, Node> getCurrentRelays() { - long cutoff = System.currentTimeMillis() + long cutoff = this.lastValidAfterMillis - 7L * 24L * 60L * 60L * 1000L; SortedMap<String, Node> currentRelays = new TreeMap<String, Node>(); for (Map.Entry<String, Node> e : this.knownRelays.entrySet()) { @@ -836,8 +836,7 @@ public class CurrentNodes { private SortedMap<String, Node> knownBridges = new TreeMap<String, Node>(); public SortedMap<String, Node> getCurrentBridges() { - long cutoff = System.currentTimeMillis() - - 7L * 24L * 60L * 60L * 1000L; + long cutoff = this.lastPublishedMillis - 7L * 24L * 60L * 60L * 1000L; SortedMap<String, Node> currentBridges = new TreeMap<String, Node>(); for (Map.Entry<String, Node> e : this.knownBridges.entrySet()) { if (e.getValue().getLastSeenMillis() >= cutoff) { diff --git a/src/org/torproject/onionoo/ResourceServlet.java b/src/org/torproject/onionoo/ResourceServlet.java index 0588ef5..1ddb364 100644 --- a/src/org/torproject/onionoo/ResourceServlet.java +++ b/src/org/torproject/onionoo/ResourceServlet.java @@ -35,17 +35,21 @@ public class ResourceServlet extends HttpServlet { private boolean maintenanceMode = false; - private File summaryFile; - - private String outDirString; + private File outDir; public void init(ServletConfig config) throws ServletException { super.init(config); - this.maintenanceMode = config.getInitParameter("maintenance") != null + boolean maintenanceMode = + config.getInitParameter("maintenance") != null && config.getInitParameter("maintenance").equals("1"); - if (!this.maintenanceMode) { - this.outDirString = config.getInitParameter("outDir"); - this.summaryFile = new File(outDirString, "summary"); + File outDir = new File(config.getInitParameter("outDir")); + this.init(maintenanceMode, outDir); + } + + protected void init(boolean maintenanceMode, File outDir) { + this.maintenanceMode = maintenanceMode; + this.outDir = outDir; + if (!maintenanceMode) { this.readSummaryFile(); } } @@ -62,11 +66,13 @@ public class ResourceServlet extends HttpServlet { bridgesByFirstSeenDays = null, relaysByLastSeenDays = null, bridgesByLastSeenDays = null; private void readSummaryFile() { + File summaryFile = new File(outDir, "summary"); if (!summaryFile.exists()) { readSummaryFile = false; return; } if (summaryFile.lastModified() > this.summaryFileLastModified) { + long summaryFileLastModified = summaryFile.lastModified(); List<String> relaysByConsensusWeight = new ArrayList<String>(); Map<String, String> relayFingerprintSummaryLines = new HashMap<String, String>(), @@ -81,7 +87,7 @@ public class ResourceServlet extends HttpServlet { relaysByLastSeenDays = new TreeMap<Integer, Set<String>>(), bridgesByLastSeenDays = new TreeMap<Integer, Set<String>>(); CurrentNodes cn = new CurrentNodes(); - cn.readRelaySearchDataFile(this.summaryFile); + cn.readRelaySearchDataFile(summaryFile); cn.setRelayRunningBits(); cn.setBridgeRunningBits(); SimpleDateFormat dateTimeFormat = new SimpleDateFormat( @@ -92,7 +98,6 @@ public class ResourceServlet extends HttpServlet { this.bridgesPublishedString = dateTimeFormat.format( cn.getLastPublishedMillis()); List<String> orderRelaysByConsensusWeight = new ArrayList<String>(); - long now = System.currentTimeMillis(); for (Node entry : cn.getCurrentRelays().values()) { String fingerprint = entry.getFingerprint().toUpperCase(); String hashedFingerprint = entry.getHashedFingerprint(). @@ -129,8 +134,8 @@ public class ResourceServlet extends HttpServlet { relaysByFlag.get(flagLowerCase).add(fingerprint); relaysByFlag.get(flagLowerCase).add(hashedFingerprint); } - int daysSinceFirstSeen = (int) ((now - entry.getFirstSeenMillis()) - / 86400000L); + int daysSinceFirstSeen = (int) ((summaryFileLastModified + - entry.getFirstSeenMillis()) / 86400000L); if (!relaysByFirstSeenDays.containsKey(daysSinceFirstSeen)) { relaysByFirstSeenDays.put(daysSinceFirstSeen, new HashSet<String>()); @@ -138,8 +143,8 @@ public class ResourceServlet extends HttpServlet { relaysByFirstSeenDays.get(daysSinceFirstSeen).add(fingerprint); relaysByFirstSeenDays.get(daysSinceFirstSeen).add( hashedFingerprint); - int daysSinceLastSeen = (int) ((now - entry.getLastSeenMillis()) - / 86400000L); + int daysSinceLastSeen = (int) ((summaryFileLastModified + - entry.getLastSeenMillis()) / 86400000L); if (!relaysByLastSeenDays.containsKey(daysSinceLastSeen)) { relaysByLastSeenDays.put(daysSinceLastSeen, new HashSet<String>()); @@ -160,8 +165,8 @@ public class ResourceServlet extends HttpServlet { String line = this.formatBridgeSummaryLine(entry); bridgeFingerprintSummaryLines.put(hashedFingerprint, line); bridgeFingerprintSummaryLines.put(hashedHashedFingerprint, line); - int daysSinceFirstSeen = (int) ((now - entry.getFirstSeenMillis()) - / 86400000L); + int daysSinceFirstSeen = (int) ((summaryFileLastModified + - entry.getFirstSeenMillis()) / 86400000L); if (!bridgesByFirstSeenDays.containsKey(daysSinceFirstSeen)) { bridgesByFirstSeenDays.put(daysSinceFirstSeen, new HashSet<String>()); @@ -170,8 +175,8 @@ public class ResourceServlet extends HttpServlet { hashedFingerprint); bridgesByFirstSeenDays.get(daysSinceFirstSeen).add( hashedHashedFingerprint); - int daysSinceLastSeen = (int) ((now - entry.getLastSeenMillis()) - / 86400000L); + int daysSinceLastSeen = (int) ((summaryFileLastModified + - entry.getLastSeenMillis()) / 86400000L); if (!bridgesByLastSeenDays.containsKey(daysSinceLastSeen)) { bridgesByLastSeenDays.put(daysSinceLastSeen, new HashSet<String>()); @@ -230,13 +235,64 @@ public class ResourceServlet extends HttpServlet { if (this.maintenanceMode) { return super.getLastModified(request); } else { - this.readSummaryFile(); - return this.summaryFileLastModified; + return this.getLastModified(); + } + } + + private long getLastModified() { + this.readSummaryFile(); + return this.summaryFileLastModified; + } + + protected static class HttpServletRequestWrapper { + private HttpServletRequest request; + protected HttpServletRequestWrapper(HttpServletRequest request) { + this.request = request; + } + protected String getRequestURI() { + return this.request.getRequestURI(); + } + protected Map getParameterMap() { + return this.request.getParameterMap(); + } + protected String[] getParameterValues(String parameterKey) { + return this.request.getParameterValues(parameterKey); + } + } + + protected static class HttpServletResponseWrapper { + private HttpServletResponse response = null; + protected HttpServletResponseWrapper(HttpServletResponse response) { + this.response = response; + } + protected void sendError(int errorStatusCode) throws IOException { + this.response.sendError(errorStatusCode); + } + protected void setHeader(String headerName, String headerValue) { + this.response.setHeader(headerName, headerValue); + } + protected void setContentType(String contentType) { + this.response.setContentType(contentType); + } + protected void setCharacterEncoding(String characterEncoding) { + this.response.setCharacterEncoding(characterEncoding); + } + protected PrintWriter getWriter() throws IOException { + return this.response.getWriter(); } } public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { + HttpServletRequestWrapper requestWrapper = + new HttpServletRequestWrapper(request); + HttpServletResponseWrapper responseWrapper = + new HttpServletResponseWrapper(response); + this.doGet(requestWrapper, responseWrapper); + } + + public void doGet(HttpServletRequestWrapper request, + HttpServletResponseWrapper response) throws IOException { if (this.maintenanceMode) { response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE); @@ -848,8 +904,7 @@ public class ResourceServlet extends HttpServlet { return ""; } fingerprint = fingerprint.substring(0, 40); - File detailsFile = new File(this.outDirString + "details/" - + fingerprint); + File detailsFile = new File(this.outDir, "details/" + fingerprint); StringBuilder sb = new StringBuilder(); String detailsLines = null; if (detailsFile.exists()) { @@ -893,7 +948,7 @@ public class ResourceServlet extends HttpServlet { return ""; } fingerprint = fingerprint.substring(0, 40); - File bandwidthFile = new File(this.outDirString + "bandwidth/" + File bandwidthFile = new File(this.outDir, "bandwidth/" + fingerprint); StringBuilder sb = new StringBuilder(); String bandwidthLines = null; @@ -928,8 +983,7 @@ public class ResourceServlet extends HttpServlet { return ""; } fingerprint = fingerprint.substring(0, 40); - File weightsFile = new File(this.outDirString + "weights/" - + fingerprint); + File weightsFile = new File(this.outDir, "weights/" + fingerprint); StringBuilder sb = new StringBuilder(); String weightsLines = null; if (weightsFile.exists()) { diff --git a/test/org/torproject/onionoo/ResourceServletTest.java b/test/org/torproject/onionoo/ResourceServletTest.java new file mode 100644 index 0000000..76b8a0d --- /dev/null +++ b/test/org/torproject/onionoo/ResourceServletTest.java @@ -0,0 +1,1171 @@ +/* Copyright 2013 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.onionoo; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.SortedMap; +import java.util.TreeMap; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; +import org.torproject.onionoo.ResourceServlet.HttpServletRequestWrapper; +import org.torproject.onionoo.ResourceServlet.HttpServletResponseWrapper; + +import com.google.gson.Gson; + +public class ResourceServletTest { + + private static class ResourceServletTestHelper { + + private File tempOutDir; + + private SortedMap<String, String> + relays = new TreeMap<String, String>(), + bridges = new TreeMap<String, String>(); + + private long lastModified = 1366806142000L; // 2013-04-24 12:22:22 + + private boolean maintenanceMode = false; + + private class TestingHttpServletRequestWrapper + extends HttpServletRequestWrapper { + private String requestURI; + private Map<String, String[]> parameterMap; + private TestingHttpServletRequestWrapper(String requestURI, + Map<String, String[]> parameterMap) { + super(null); + this.requestURI = requestURI; + this.parameterMap = parameterMap == null + ? new HashMap<String, String[]>() : parameterMap; + } + protected String getRequestURI() { + return this.requestURI; + } + protected Map getParameterMap() { + return this.parameterMap; + } + protected String[] getParameterValues(String parameterKey) { + return this.parameterMap.get(parameterKey); + } + } + + private class TestingHttpServletResponseWrapper extends + HttpServletResponseWrapper { + private TestingHttpServletResponseWrapper() { + super(null); + } + private int errorStatusCode; + protected void sendError(int errorStatusCode) throws IOException { + this.errorStatusCode = errorStatusCode; + } + private Map<String, String> headers = new HashMap<String, String>(); + protected void setHeader(String headerName, String headerValue) { + this.headers.put(headerName, headerValue); + } + protected void setContentType(String contentType) { + } + protected void setCharacterEncoding(String characterEncoding) { + } + private StringWriter stringWriter; + protected PrintWriter getWriter() throws IOException { + if (this.stringWriter == null) { + this.stringWriter = new StringWriter(); + return new PrintWriter(this.stringWriter); + } else { + throw new IOException("Can only request writer once"); + } + } + private String getWrittenContent() { + return this.stringWriter == null ? null + : this.stringWriter.toString(); + } + } + + private TestingHttpServletRequestWrapper request; + + private TestingHttpServletResponseWrapper response; + + private String responseString; + + private SummaryDocument summaryDocument; + + private ResourceServletTestHelper(File tempOutDir, String requestURI, + Map<String, String[]> parameterMap) { + this.tempOutDir = tempOutDir; + this.relays = new TreeMap<String, String>(); + this.relays.put("000C5F55", "r TorkaZ " + + "000C5F55BD4814B917CC474BD537F1A3B33CCE2A " + + "62.216.201.221;;62.216.201.222+62.216.201.223 " + + "2013-04-19 05:00:00 9001 0 Running,Valid 20 de null -1 " + + "reject 1-65535 2013-04-18 05:00:00 2013-04-19 05:00:00 " + + "AS8767"); + this.relays.put("001C13B3", "r Ferrari458 " + + "001C13B3A55A71B977CA65EC85539D79C653A3FC " + + "68.38.171.200;[2001:4f8:3:2e::51]:9001; " + + "2013-04-24 12:00:00 9001 9030 " + + "Fast,Named,Running,V2Dir,Valid 1140 us " + + "c-68-38-171-200.hsd1.pa.comcast.net 1366805763009 reject " + + "1-65535 2013-02-12 16:00:00 2013-02-26 18:00:00 AS7922"); + this.relays.put("0025C136", "r TimMayTribute " + + "0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B 89.69.68.246;; " + + "2013-04-22 20:00:00 9001 9030 " + + "Fast,Running,Unnamed,V2Dir,Valid 63 a1 null -1 reject " + + "1-65535 2013-04-16 18:00:00 2013-04-16 18:00:00 AS6830"); + this.bridges.put("0000831B", "b ec2bridgercc7f31fe " + + "0000831B236DFF73D409AD17B40E2A728A53994F 10.199.7.176;; " + + "2013-04-21 18:07:03 443 0 Valid -1 ?? null -1 null null " + + "2013-04-20 15:37:04 null null null"); + this.bridges.put("0002D9BD", "b Unnamed " + + "0002D9BDBBC230BD9C78FF502A16E0033EF87E0C 10.0.52.84;; " + + "2013-04-20 17:37:04 443 0 Valid -1 ?? null -1 null " + + "null 2013-04-14 07:07:05 null null null"); + this.bridges.put("0010D49C", "b gummy " + + "1FEDE50ED8DBA1DD9F9165F78C8131E4A44AB756 10.63.169.98;; " + + "2013-04-24 01:07:04 9001 0 Running,Valid -1 ?? null -1 null " + + "null 2013-01-16 21:07:04 null null null"); + this.request = new TestingHttpServletRequestWrapper(requestURI, + parameterMap); + this.response = new TestingHttpServletResponseWrapper(); + } + + private void runTest() { + try { + this.writeSummaryFile(); + this.makeRequest(); + this.parseResponse(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + private void writeSummaryFile() throws IOException { + File summaryFile = new File(this.tempOutDir, "summary"); + BufferedWriter bw = new BufferedWriter(new FileWriter(summaryFile)); + for (String relay : relays.values()) { + bw.write(relay + "\n"); + } + for (String bridge : bridges.values()) { + bw.write(bridge + "\n"); + } + bw.close(); + summaryFile.setLastModified(this.lastModified); + } + + private void makeRequest() throws IOException { + ResourceServlet rs = new ResourceServlet(); + rs.init(maintenanceMode, this.tempOutDir); + rs.doGet(this.request, this.response); + } + + private void parseResponse() { + this.responseString = this.response.getWrittenContent(); + if (this.responseString != null) { + Gson gson = new Gson(); + this.summaryDocument = gson.fromJson(this.responseString, + SummaryDocument.class); + } + } + + private static void assertErrorStatusCode(File tempOutDir, + String requestURI, int errorStatusCode) { + ResourceServletTestHelper helper = new ResourceServletTestHelper( + tempOutDir, requestURI, null); + helper.runTest(); + assertEquals(errorStatusCode, helper.response.errorStatusCode); + } + + private static void assertErrorStatusCode(File tempOutDir, + String requestURI, String parameterKey, String[] parameterValues, + int errorStatusCode) { + Map<String, String[]> parameters = new HashMap<String, String[]>(); + parameters.put(parameterKey, parameterValues); + ResourceServletTestHelper helper = new ResourceServletTestHelper( + tempOutDir, requestURI, parameters); + helper.runTest(); + assertEquals(errorStatusCode, helper.response.errorStatusCode); + } + + private static void assertSummaryDocument(File tempOutDir, + String requestURI, String parameterKey, String[] parameterValues, + int expectedRelaysNumber, String[] expectedRelaysNicknames, + int expectedBridgesNumber, String[] expectedBridgesNicknames) { + Map<String, String[]> parameters = new HashMap<String, String[]>(); + parameters.put(parameterKey, parameterValues); + ResourceServletTestHelper helper = new ResourceServletTestHelper( + tempOutDir, requestURI, parameters); + helper.runTest(); + assertNotNull(helper.summaryDocument); + assertEquals(expectedRelaysNumber, + helper.summaryDocument.relays.length); + if (expectedRelaysNicknames != null) { + for (int i = 0; i < expectedRelaysNumber; i++) { + assertEquals(expectedRelaysNicknames[i], + helper.summaryDocument.relays[i].n); + } + } + assertEquals(expectedBridgesNumber, + helper.summaryDocument.bridges.length); + if (expectedBridgesNicknames != null) { + for (int i = 0; i < expectedBridgesNumber; i++) { + assertEquals(expectedBridgesNicknames[i], + helper.summaryDocument.bridges[i].n); + } + } + } + } + + @Rule + public TemporaryFolder tempFolder = new TemporaryFolder(); + + private File tempOutDir; + + @Before + public void createTempOutDir() throws IOException { + tempOutDir = this.tempFolder.newFolder("out"); + } + + private static class SummaryDocument { + private String relays_published; + private RelaySummary[] relays; + private String bridges_published; + private BridgeSummary[] bridges; + } + + private static class RelaySummary { + private String n; + private String f; + private String[] a; + private boolean r; + } + + private static class BridgeSummary { + private String n; + private String h; + private boolean r; + } + + @Test() + public void testValidSummaryRelay() throws IOException { + ResourceServletTestHelper helper = new ResourceServletTestHelper( + this.tempOutDir, "/summary", null); + helper.relays.clear(); + helper.relays.put("000C5F55", "r TorkaZ " + + "000C5F55BD4814B917CC474BD537F1A3B33CCE2A 62.216.201.221;; " + + "2013-04-19 05:00:00 9001 0 Running,Valid 20 de null -1 " + + "reject 1-65535 2013-04-18 05:00:00 2013-04-19 05:00:00 " + + "AS8767"); + helper.runTest(); + assertEquals("2013-04-19 05:00:00", + helper.summaryDocument.relays_published); + assertEquals(1, helper.summaryDocument.relays.length); + RelaySummary relay = helper.summaryDocument.relays[0]; + assertEquals("TorkaZ", relay.n); + assertEquals("000C5F55BD4814B917CC474BD537F1A3B33CCE2A", relay.f); + assertEquals(1, relay.a.length); + assertEquals("62.216.201.221", relay.a[0]); + assertTrue(relay.r); + } + + @Test() + public void testValidSummaryBridge() { + ResourceServletTestHelper helper = new ResourceServletTestHelper( + this.tempOutDir, "/summary", null); + helper.bridges.clear(); + helper.bridges.put("0000831", "b ec2bridgercc7f31fe " + + "0000831B236DFF73D409AD17B40E2A728A53994F 10.199.7.176;; " + + "2013-04-21 18:07:03 443 0 Valid -1 ?? null -1 null null " + + "2013-04-20 15:37:04 null null null"); + helper.runTest(); + assertEquals("2013-04-21 18:07:03", + helper.summaryDocument.bridges_published); + assertEquals(1, helper.summaryDocument.bridges.length); + BridgeSummary bridge = helper.summaryDocument.bridges[0]; + assertEquals("ec2bridgercc7f31fe", bridge.n); + assertEquals("0000831B236DFF73D409AD17B40E2A728A53994F", bridge.h); + assertFalse(bridge.r); + } + + @Test() + public void testNonExistantDocumentType() { + ResourceServletTestHelper.assertErrorStatusCode( + this.tempOutDir, "/doesnotexist", 400); + } + + @Test() + public void testSUMMARYDocument() { + ResourceServletTestHelper.assertErrorStatusCode( + this.tempOutDir, "/SUMMARY", 400); + } + + @Test() + public void testTypeRelay() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "type", new String[] { "relay" }, 3, null, 0, null); + } + + @Test() + public void testTypeBridge() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "type", new String[] { "bridge" }, 0, null, 3, null); + } + + @Test() + public void testTypeBridgerelay() { + ResourceServletTestHelper.assertErrorStatusCode(this.tempOutDir, + "/summary", "type", new String[] { "bridgerelay" }, 400); + } + + @Test() + public void testTypeRelayBridge() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "type", new String[] { "relay", "bridge" }, 3, null, + 0, null); + } + + @Test() + public void testTypeBridgeRelay() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "type", new String[] { "bridge", "relay" }, 0, null, + 3, null); + } + + @Test() + public void testTypeRelayRelay() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "type", new String[] { "relay", "relay" }, 3, null, 0, + null); + } + + @Test() + public void testTYPERelay() { + ResourceServletTestHelper.assertErrorStatusCode(this.tempOutDir, + "/summary", "TYPE", new String[] { "relay" }, 400); + } + + @Test() + public void testTypeRELAY() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "type", new String[] { "RELAY" }, 3, null, 0, null); + } + + @Test() + public void testRunningTrue() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "running", new String[] { "true" }, 1, + new String[] { "Ferrari458" }, 1, new String[] { "gummy" }); + } + + @Test() + public void testRunningFalse() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "running", new String[] { "false" }, 2, null, 2, + null); + } + + @Test() + public void testRunningTruefalse() { + ResourceServletTestHelper.assertErrorStatusCode(this.tempOutDir, + "/summary", "running", new String[] { "truefalse" }, 400); + } + + @Test() + public void testRunningTrueFalse() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "running", new String[] { "true", "false" }, 1, + new String[] { "Ferrari458" }, 1, new String[] { "gummy" }); + } + + @Test() + public void testRunningFalseTrue() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "running", new String[] { "false", "true" }, 2, null, + 2, null); + } + + @Test() + public void testRunningTrueTrue() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "running", new String[] { "true", "true" }, 1, + new String[] { "Ferrari458" }, 1, new String[] { "gummy" }); + } + + @Test() + public void testRUNNINGTrue() { + ResourceServletTestHelper.assertErrorStatusCode(this.tempOutDir, + "/summary", "RUNNING", new String[] { "true" }, 400); + } + + @Test() + public void testRunningTRUE() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "running", new String[] { "TRUE" }, 1, null, 1, null); + } + + @Test() + public void testSearchTorkaZ() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", new String[] { "TorkaZ" }, 1, + new String[] { "TorkaZ" }, 0, null); + } + + @Test() + public void testSearchTorkaX() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", new String[] { "TorkaX" }, 0, null, 0, + null); + } + + @Test() + public void testSearchOrkaZ() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", new String[] { "orkaZ" }, 1, + new String[] { "TorkaZ" }, 0, null); + } + + @Test() + public void testSearchTorka() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", new String[] { "Torka" }, 1, + new String[] { "TorkaZ" }, 0, null); + } + + @Test() + public void testSearchTORKAZ() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", new String[] { "TORKAZ" }, 1, + new String[] { "TorkaZ" }, 0, null); + } + + @Test() + public void testSearchDollarFingerprint() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", + new String[] { "$000C5F55BD4814B917CC474BD537F1A3B33CCE2A" }, 1, + new String[] { "TorkaZ" }, 0, null); + } + + @Test() + public void testSearchFingerprint() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", + new String[] { "000C5F55BD4814B917CC474BD537F1A3B33CCE2A" }, 1, + new String[] { "TorkaZ" }, 0, null); + } + + @Test() + public void testSearchDollarFingerprint39() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", + new String[] { "$000C5F55BD4814B917CC474BD537F1A3B33CCE2" }, 1, + new String[] { "TorkaZ" }, 0, null); + } + + @Test() + public void testSearchDollarFingerprintLowerCase39() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", + new String[] { "$000c5f55bd4814b917cc474bd537f1a3b33cce2" }, 1, + new String[] { "TorkaZ" }, 0, null); + } + + @Test() + public void testSearchFingerprintLowerCase39() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", + new String[] { "000c5f55bd4814b917cc474bd537f1a3b33cce2" }, 1, + new String[] { "TorkaZ" }, 0, null); + } + + @Test() + public void testSearchDollarHashedFingerprint() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", + new String[] { "$5aa14c08d62913e0057a9ad5863b458c0ce94cee" }, 1, + new String[] { "TorkaZ" }, 0, null); + } + + @Test() + public void testSearchDollarHashedFingerprint39() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", + new String[] { "$5aa14c08d62913e0057a9ad5863b458c0ce94ce" }, 1, + new String[] { "TorkaZ" }, 0, null); + } + + @Test() + public void testSearchDollarHashedFingerprint41() { + ResourceServletTestHelper.assertErrorStatusCode(this.tempOutDir, + "/summary", "search", + new String[] { "$5aa14c08d62913e0057a9ad5863b458c0ce94ceee" }, + 400); + } + + @Test() + public void testSearchIp() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", new String[] { "62.216.201.221" }, 1, + new String[] { "TorkaZ" }, 0, null); + } + + @Test() + public void testSearchIp24Network() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", new String[] { "62.216.201" }, 1, + new String[] { "TorkaZ" }, 0, null); + } + + @Test() + public void testSearchIpExit() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", new String[] { "62.216.201.222" }, 1, + new String[] { "TorkaZ" }, 0, null); + } + + @Test() + public void testSearchIpv6() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", new String[] { "[2001:4f8:3:2e::51]" }, 1, + new String[] { "Ferrari458" }, 0, null); + } + + @Test() + public void testSearchIpv6Slash64() { + /* TODO This request should return one bridge. */ + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", new String[] { "[2001:4f8:3:2e::]" }, 0, + null, 0, null); + } + + @Test() + public void testSearchIpv6Uncompressed() { + /* TODO This request should return one bridge. */ + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", + new String[] { "[2001:04f8:0003:002e:0000:0000:0000:0051]" }, 0, + null, 0, null); + } + + @Test() + public void testSearchIpv6UpperCase() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", new String[] { "[2001:4F8:3:2E::51]" }, 1, + new String[] { "Ferrari458" }, 0, null); + } + + @Test() + public void testSearchIpv6ThreeColons() { + /* TODO This request should fail with a 400 status code, because the + * given IPv6 address is invalid. */ + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", new String[] { "[2001:4f8:3:2e:::51]" }, 0, + null, 0, null); + } + + @Test() + public void testSearchIpv6FiveHex() { + /* TODO This request should fail with a 400 status code, because the + * given IPv6 address is invalid. */ + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", new String[] { "[20014:f80:3:2e::51]" }, 0, + null, 0, null); + } + + @Test() + public void testSearchIpv6NineGroups() { + /* TODO This request should fail with a 400 status code, because the + * given IPv6 address is invalid. */ + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", new String[] { "[1:2:3:4:5:6:7:8:9]" }, 0, + null, 0, null); + } + + @Test() + public void testSearchIpv6TcpPort() { + ResourceServletTestHelper.assertErrorStatusCode(this.tempOutDir, + "/summary", "search", new String[] { "[2001:4f8:3:2e::51]:9001" }, + 400); + } + + @Test() + public void testSearchGummy() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", new String[] { "gummy" }, 0, null, 1, + new String[] { "gummy" }); + } + + @Test() + public void testSearchGummi() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", new String[] { "gummi" }, 0, null, 0, null); + } + + @Test() + public void testSearchUmmy() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", new String[] { "ummy" }, 0, null, 1, + new String[] { "gummy" }); + } + + @Test() + public void testSearchGumm() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", new String[] { "gumm" }, 0, null, 1, + new String[] { "gummy" }); + } + + @Test() + public void testSearchGUMMY() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", new String[] { "GUMMY" }, 0, null, 1, + new String[] { "gummy" }); + } + + @Test() + public void testSearchBridgeDollarHashedFingerprint() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", + new String[] { "$1FEDE50ED8DBA1DD9F9165F78C8131E4A44AB756" }, 0, + null, 1, new String[] { "gummy" }); + } + + @Test() + public void testSearchBridgeHashedFingerprint() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", + new String[] { "1FEDE50ED8DBA1DD9F9165F78C8131E4A44AB756" }, 0, + null, 1, new String[] { "gummy" }); + } + + @Test() + public void testSearchBridgeDollarHashedFingerprint39() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", + new String[] { "$1FEDE50ED8DBA1DD9F9165F78C8131E4A44AB75" }, 0, + null, 1, new String[] { "gummy" }); + } + + @Test() + public void testSearchBridgeDollarHashedFingerprintLowerCase39() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", + new String[] { "$1fede50ed8dba1dd9f9165f78c8131e4a44ab75" }, 0, + null, 1, new String[] { "gummy" }); + } + + @Test() + public void testSearchBridgeHashedFingerprintLowerCase39() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", + new String[] { "1fede50ed8dba1dd9f9165f78c8131e4a44ab75" }, 0, + null, 1, new String[] { "gummy" }); + } + + @Test() + public void testSearchBridgeDollarHashedHashedFingerprint() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", + new String[] { "$CE52F898DB3678BCE33FAC28C92774DE90D618B5" }, 0, + null, 1, new String[] { "gummy" }); + } + + @Test() + public void testSearchBridgeDollarHashedHashedFingerprint39() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", + new String[] { "$CE52F898DB3678BCE33FAC28C92774DE90D618B" }, 0, + null, 1, new String[] { "gummy" }); + } + + @Test() + public void testSearchBridgeDollarOriginalFingerprint() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "search", + new String[] { "$0010D49C6DA1E46A316563099F41BFE40B6C7183" }, 0, + null, 0, null); + } + + @Test() + public void testSearchUnderscore() { + ResourceServletTestHelper.assertErrorStatusCode(this.tempOutDir, + "/summary", "search", new String[] { "_" }, 400); + } + + @Test() + public void testLookupFingerprint() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "lookup", + new String[] { "000C5F55BD4814B917CC474BD537F1A3B33CCE2A" }, 1, + new String[] { "TorkaZ" }, 0, null); + } + + @Test() + public void testLookupDollarFingerprint() { + ResourceServletTestHelper.assertErrorStatusCode(this.tempOutDir, + "/summary", "lookup", + new String[] { "$000C5F55BD4814B917CC474BD537F1A3B33CCE2A" }, + 400); + } + + @Test() + public void testLookupDollarFingerprint39() { + ResourceServletTestHelper.assertErrorStatusCode(this.tempOutDir, + "/summary", "lookup", + new String[] { "$000C5F55BD4814B917CC474BD537F1A3B33CCE2" }, 400); + } + + @Test() + public void testLookupFingerprintLowerCase39() { + ResourceServletTestHelper.assertErrorStatusCode(this.tempOutDir, + "/summary", "lookup", + new String[] { "000c5f55bd4814b917cc474bd537f1a3b33cce2" }, 400); + } + + @Test() + public void testLookupHashedFingerprint() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "lookup", + new String[] { "5aa14c08d62913e0057a9ad5863b458c0ce94cee" }, 1, + new String[] { "TorkaZ" }, 0, null); + } + + @Test() + public void testLookupBridgeHashedFingerprint() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "lookup", + new String[] { "1FEDE50ED8DBA1DD9F9165F78C8131E4A44AB756" }, 0, + null, 1, new String[] { "gummy" }); + } + + @Test() + public void testSearchBridgeHashedHashedFingerprint() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "lookup", + new String[] { "CE52F898DB3678BCE33FAC28C92774DE90D618B5" }, 0, + null, 1, new String[] { "gummy" }); + } + + @Test() + public void testLookupBridgeOriginalFingerprint() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "lookup", + new String[] { "0010D49C6DA1E46A316563099F41BFE40B6C7183" }, 0, + null, 0, null); + } + + @Test() + public void testCountryDe() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "country", new String[] { "de" }, 1, + new String[] { "TorkaZ" }, 0, null); + } + + @Test() + public void testCountryFr() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "country", new String[] { "fr" }, 0, null, 0, null); + } + + @Test() + public void testCountryZz() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "country", new String[] { "zz" }, 0, null, 0, null); + } + + @Test() + public void testCountryDE() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "country", new String[] { "DE" }, 1, + new String[] { "TorkaZ" }, 0, null); + } + + @Test() + public void testCountryDeu() { + ResourceServletTestHelper.assertErrorStatusCode(this.tempOutDir, + "/summary", "country", new String[] { "deu" }, 400); + } + + @Test() + public void testCountryD() { + ResourceServletTestHelper.assertErrorStatusCode(this.tempOutDir, + "/summary", "country", new String[] { "d" }, 400); + } + + @Test() + public void testCountryA1() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "country", new String[] { "a1" }, 1, + new String[] { "TimMayTribute" }, 0, null); + } + + @Test() + public void testCountryDeDe() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "country", new String[] { "de", "de" }, 1, + new String[] { "TorkaZ" }, 0, null); + } + + @Test() + public void testAsAS8767() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "as", new String[] { "AS8767" }, 1, + new String[] { "TorkaZ" }, 0, null); + } + + @Test() + public void testAs8767() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "as", new String[] { "8767" }, 1, + new String[] { "TorkaZ" }, 0, null); + } + + @Test() + public void testAsAS() { + ResourceServletTestHelper.assertErrorStatusCode(this.tempOutDir, + "/summary", "as", new String[] { "AS" }, 400); + } + + @Test() + public void testAsas8767() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "as", new String[] { "as8767" }, 1, + new String[] { "TorkaZ" }, 0, null); + } + + @Test() + public void testAsASSpace8767() { + ResourceServletTestHelper.assertErrorStatusCode(this.tempOutDir, + "/summary", "as", new String[] { "AS 8767" }, 400); + } + + @Test() + public void testFlagRunning() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "flag", new String[] { "Running" }, 3, null, 0, null); + } + + @Test() + public void testFlagValid() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "flag", new String[] { "Valid" }, 3, null, 0, null); + } + + @Test() + public void testFlagFast() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "flag", new String[] { "Fast" }, 2, null, 0, null); + } + + @Test() + public void testFlagNamed() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "flag", new String[] { "Named" }, 1, null, 0, null); + } + + @Test() + public void testFlagUnnamed() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "flag", new String[] { "Unnamed" }, 1, null, 0, null); + } + + @Test() + public void testFlagV2Dir() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "flag", new String[] { "V2Dir" }, 2, null, 0, null); + } + + @Test() + public void testFlagGuard() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "flag", new String[] { "Guard" }, 0, null, 0, null); + } + + @Test() + public void testFlagCool() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "flag", new String[] { "Cool" }, 0, null, 0, null); + } + + @Test() + public void testFirstSeenDaysZeroToTwo() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "first_seen_days", new String[] { "0-2" }, 0, null, 0, + null); + } + + @Test() + public void testFirstSeenDaysUpToThree() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "first_seen_days", new String[] { "-3" }, 0, null, 1, + null); + } + + @Test() + public void testFirstSeenDaysThree() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "first_seen_days", new String[] { "3" }, 0, null, 1, + null); + } + + @Test() + public void testFirstSeenDaysTwoToFive() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "first_seen_days", new String[] { "2-5" }, 0, null, 1, + null); + } + + @Test() + public void testFirstSeenDaysSixToSixteen() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "first_seen_days", new String[] { "6-16" }, 2, null, + 1, null); + } + + @Test() + public void testFirstSeenDaysNinetysevenOrMore() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "first_seen_days", new String[] { "97-" }, 0, null, 1, + null); + } + + @Test() + public void testFirstSeenDaysNinetyeightOrMore() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "first_seen_days", new String[] { "98-" }, 0, null, 0, + null); + } + + @Test() + public void testFirstSeenDaysDashDash() { + ResourceServletTestHelper.assertErrorStatusCode(this.tempOutDir, + "/summary", "first_seen_days", new String[] { "--" }, 400); + } + + @Test() + public void testFirstSeenDaysDashOneDash() { + ResourceServletTestHelper.assertErrorStatusCode(this.tempOutDir, + "/summary", "first_seen_days", new String[] { "-1-" }, 400); + } + + @Test() + public void testFirstSeenDaysZeroDotDotOne() { + ResourceServletTestHelper.assertErrorStatusCode(this.tempOutDir, + "/summary", "first_seen_days", new String[] { "0..1" }, 400); + } + + @Test() + public void testFirstSeenDaysElevenDigits() { + ResourceServletTestHelper.assertErrorStatusCode(this.tempOutDir, + "/summary", "first_seen_days", new String[] { "12345678901" }, + 400); + } + + @Test() + public void testFirstSeenDaysLargeTenDigitNumber() { + ResourceServletTestHelper.assertErrorStatusCode(this.tempOutDir, + "/summary", "first_seen_days", new String[] { "9999999999" }, + 400); + } + + @Test() + public void testFirstSeenDaysMaxInt() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "last_seen_days", + new String[] { String.valueOf(Integer.MAX_VALUE) }, 0, null, 0, + null); + } + + @Test() + public void testFirstSeenDaysMaxIntPlusOne() { + ResourceServletTestHelper.assertErrorStatusCode(this.tempOutDir, + "/summary", "first_seen_days", + new String[] { String.valueOf(Integer.MAX_VALUE + 1) }, 400); + } + + @Test() + public void testLastSeenDaysZero() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "last_seen_days", new String[] { "0" }, 1, null, 1, + null); + } + + @Test() + public void testLastSeenDaysUpToZero() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "last_seen_days", new String[] { "-0" }, 1, null, 1, + null); + } + + @Test() + public void testLastSeenDaysOneToThree() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "last_seen_days", new String[] { "1-3" }, 1, null, 2, + null); + } + + @Test() + public void testLastSeenDaysSixOrMore() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "last_seen_days", new String[] { "6-" }, 0, null, 0, + null); + } + + @Test() + public void testOrderConsensusWeightAscending() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "order", new String[] { "consensus_weight" }, 3, + new String[] { "TorkaZ", "TimMayTribute", "Ferrari458" }, 3, + null); + } + + @Test() + public void testOrderConsensusWeightDescending() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "order", new String[] { "-consensus_weight" }, 3, + new String[] { "Ferrari458", "TimMayTribute", "TorkaZ" }, 3, + null); + } + + @Test() + public void testOrderConsensusWeightAscendingTwice() { + ResourceServletTestHelper.assertErrorStatusCode(this.tempOutDir, + "/summary", "order", + new String[] { "consensus_weight,consensus_weight" }, 400); + } + + @Test() + public void testOrderConsensusWeightAscendingThenDescending() { + ResourceServletTestHelper.assertErrorStatusCode(this.tempOutDir, + "/summary", "order", + new String[] { "consensus_weight,-consensus_weight" }, 400); + } + + @Test() + public void testOrderConsensusWeightThenNickname() { + ResourceServletTestHelper.assertErrorStatusCode(this.tempOutDir, + "/summary", "order", new String[] { "consensus_weight,nickname" }, + 400); + } + + @Test() + public void testOrderCONSENSUS_WEIGHT() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "order", new String[] { "CONSENSUS_WEIGHT" }, 3, + new String[] { "TorkaZ", "TimMayTribute", "Ferrari458" }, 3, + null); + } + + @Test() + public void testOffsetOne() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "offset", new String[] { "1" }, 2, null, 3, null); + } + + @Test() + public void testOffsetAllRelays() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "offset", new String[] { "3" }, 0, null, 3, null); + } + + @Test() + public void testOffsetAllRelaysAndOneBridge() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "offset", new String[] { "4" }, 0, null, 2, null); + } + + @Test() + public void testOffsetAllRelaysAndAllBridges() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "offset", new String[] { "6" }, 0, null, 0, null); + } + + @Test() + public void testOffsetMoreThanAllRelaysAndAllBridges() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "offset", new String[] { "7" }, 0, null, 0, null); + } + + @Test() + public void testOffsetZero() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "offset", new String[] { "0" }, 3, null, 3, null); + } + + @Test() + public void testOffsetMinusOne() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "offset", new String[] { "-1" }, 3, null, 3, null); + } + + @Test() + public void testOffsetOneWord() { + ResourceServletTestHelper.assertErrorStatusCode(this.tempOutDir, + "/summary", "offset", new String[] { "one" }, 400); + } + + @Test() + public void testLimitOne() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "limit", new String[] { "1" }, 1, null, 0, null); + } + + @Test() + public void testLimitAllRelays() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "limit", new String[] { "3" }, 3, null, 0, null); + } + + @Test() + public void testLimitAllRelaysAndOneBridge() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "limit", new String[] { "4" }, 3, null, 1, null); + } + + @Test() + public void testLimitAllRelaysAndAllBridges() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "limit", new String[] { "6" }, 3, null, 3, null); + } + + @Test() + public void testLimitMoreThanAllRelaysAndAllBridges() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "limit", new String[] { "7" }, 3, null, 3, null); + } + + @Test() + public void testLimitZero() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "limit", new String[] { "0" }, 0, null, 0, null); + } + + @Test() + public void testLimitMinusOne() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary", "limit", new String[] { "-1" }, 0, null, 0, null); + } + + @Test() + public void testLimitOneWord() { + ResourceServletTestHelper.assertErrorStatusCode(this.tempOutDir, + "/summary", "limit", new String[] { "one" }, 400); + } +} +

1 0

[onionoo/master] Make more parameter names case-insensitive.
by karsten＠torproject.org 25 Apr '13

25 Apr '13

commit 91cfd08df1bfa34ae8c64113ceb7248df0a85d9b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Apr 25 15:22:04 2013 +0200 Make more parameter names case-insensitive. --- src/org/torproject/onionoo/ResourceServlet.java | 7 ++++--- web/index.html | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/org/torproject/onionoo/ResourceServlet.java b/src/org/torproject/onionoo/ResourceServlet.java index f36a377..0588ef5 100644 --- a/src/org/torproject/onionoo/ResourceServlet.java +++ b/src/org/torproject/onionoo/ResourceServlet.java @@ -294,7 +294,7 @@ public class ResourceServlet extends HttpServlet { Map<String, String> filteredBridges = new HashMap<String, String>( this.bridgeFingerprintSummaryLines); if (parameterMap.containsKey("type")) { - String typeParameterValue = parameterMap.get("type"); + String typeParameterValue = parameterMap.get("type").toLowerCase(); boolean relaysRequested = true; if (typeParameterValue.equals("bridge")) { relaysRequested = false; @@ -305,7 +305,8 @@ public class ResourceServlet extends HttpServlet { this.filterByType(filteredRelays, filteredBridges, relaysRequested); } if (parameterMap.containsKey("running")) { - String runningParameterValue = parameterMap.get("running"); + String runningParameterValue = + parameterMap.get("running").toLowerCase(); boolean runningRequested = true; if (runningParameterValue.equals("false")) { runningRequested = false; @@ -395,7 +396,7 @@ public class ResourceServlet extends HttpServlet { List<String> orderedRelays = new ArrayList<String>(); List<String> orderedBridges = new ArrayList<String>(); if (parameterMap.containsKey("order")) { - String orderParameter = parameterMap.get("order"); + String orderParameter = parameterMap.get("order").toLowerCase(); boolean descending = false; if (orderParameter.startsWith("-")) { descending = true; diff --git a/web/index.html b/web/index.html index e8df242..b726bd2 100755 --- a/web/index.html +++ b/web/index.html @@ -629,10 +629,12 @@ parameter value is considered. <tr><td><b>type</b></td><td>Return only relay (parameter value <b>relay</b>) or only bridge documents (parameter value <b>bridge</b>). +Parameter values are case-insensitive. </td></tr> <tr><td><b>running</b></td><td>Return only running (parameter value <b>true</b>) or only non-running relays and/or bridges (paramter value <b>false</b>). +Parameter values are case-insensitive. </td></tr> <tr><td><b>search</b></td><td>Return only relays with the parameter value matching (part of a) nickname, (possibly $-prefixed) beginning of a @@ -712,6 +714,7 @@ of fields in ascending or descening order. Results are first ordered by the first list element, then by the second, and so on. Possible fields for ordering are: <b>consensus_weight</b>. +Field names are case-insensitive. Ascending order is the default; descending order is selected by prepending fields with a minus sign (<b>-</b>). Relays or bridges which don't have any value for a field to be ordered by

1 0

[translation/tsum_completed] Update translations for tsum_completed
by translation＠torproject.org 25 Apr '13

25 Apr '13

commit 10e16fc298adbd01916240f32eecae73c495286d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 25 13:15:18 2013 +0000 Update translations for tsum_completed --- fr/short-user-manual_fr_noimg.xhtml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fr/short-user-manual_fr_noimg.xhtml b/fr/short-user-manual_fr_noimg.xhtml index b996279..696e2b8 100644 --- a/fr/short-user-manual_fr_noimg.xhtml +++ b/fr/short-user-manual_fr_noimg.xhtml @@ -12,10 +12,10 @@ <p>L'image ci-dessus montre comment se passe la navigation sur différents sites à travers Tor. Les écrans verts représentent les relais du réseau Tor, tandis que les trois clés représentent les couches de chiffrement entre l'utilisateur et chaque relai.</p> <p>Tor va anonymiser l'origine de votre trafic, et il va chiffrer tout ce qu'il y a entre vous et le réseau Tor. Tor va aussi chiffrer votre trafic à l'intérieur du réseau Tor, mais il ne peut pas chiffrer le trafic entre le réseau Tor et la destination finale.</p> <p>Si vous échangez des informations sensibles, par exemple lorsque vous vous connectez à un site avec un nom d'utilisateur et un mot de passe, assurez-vous que vous utilisez bien le protocole HTTPS (par exemple <strong>https</strong>://torproject.org/, et non <strong>http</strong>//torproject.org/).</p> - <h2 id="how-to-download-tor">Comment télécharger Tor ?</h2> - <p>Le lot que nous recommandons est le <a href="https://www.torproject.org/projects/torbrowser.html">Tor Browser Bundle (lot du navigateur Tor)</a>. Ce lot contient un navigateur préconfiguré pour utiliser le web de façon sécurisée à travers Tor, et ne nécessite aucune installation. Il suffit simplement de télécharger l'archive, de l'extraire et de démarrer Tor.</p> + <h2 id="how-to-download-tor">Comment télécharger Tor</h2> + <p>Le pack que nous recommandons est le <a href="https://www.torproject.org/projects/torbrowser.html">Tor Browser Bundle</a> (pack du navigateur Tor). Ce pack contient un navigateur préconfiguré pour utiliser le web de façon sécurisée à travers Tor, et ne nécessite aucune installation. Il suffit simplement de télécharger l'archive, de l'extraire et de démarrer Tor.</p> <p>ll y a deux façons d'obtenir les logiciels de Tor. Vous pouvez soit les télécharger à partir du <a href="https://www.torproject.org/">site du projet Tor</a>, soit utiliser GetTor, le répondeur automatique de courriel.</p> - <h3 id="how-to-get-tor-via-email">Comment obtenir Tor par courriel ?</h3> + <h3 id="how-to-get-tor-via-email">Comment obtenir Tor par courriel</h3> <p>Pour recevoir la version française du Tor Browser Bundle pour Windows, envoyez un courriel à gettor+fr(a)torproject.org avec <strong>windows</strong> dans le corps du message. Vous pouvez laisser le sujet vide.</p> <p>Vous pouvez aussi demander le Tor Browser Bundle pour Mac OS X (pour cela écrire <strong>macos-i386</strong>), et Linux (écrire <strong>linux-i386</strong> pour les systèmes 32 bits ou <strong>linux-x86_64</strong> pour les systèmes 64 bits).</p> <p>Si vous voulez une autre traduction de Tor, écrivez <strong>help</strong> dans votre message. Vous recevrez ensuite un courriel avec des instructions et une liste des langues disponibles.</p>

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 25 Apr '13

25 Apr '13

commit 630c86baba8acc6e8585c2f2ffc757b89e93637f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 25 13:15:13 2013 +0000 Update translations for tsum --- fr/short-user-manual_fr_noimg.xhtml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fr/short-user-manual_fr_noimg.xhtml b/fr/short-user-manual_fr_noimg.xhtml index b996279..696e2b8 100644 --- a/fr/short-user-manual_fr_noimg.xhtml +++ b/fr/short-user-manual_fr_noimg.xhtml @@ -12,10 +12,10 @@ <p>L'image ci-dessus montre comment se passe la navigation sur différents sites à travers Tor. Les écrans verts représentent les relais du réseau Tor, tandis que les trois clés représentent les couches de chiffrement entre l'utilisateur et chaque relai.</p> <p>Tor va anonymiser l'origine de votre trafic, et il va chiffrer tout ce qu'il y a entre vous et le réseau Tor. Tor va aussi chiffrer votre trafic à l'intérieur du réseau Tor, mais il ne peut pas chiffrer le trafic entre le réseau Tor et la destination finale.</p> <p>Si vous échangez des informations sensibles, par exemple lorsque vous vous connectez à un site avec un nom d'utilisateur et un mot de passe, assurez-vous que vous utilisez bien le protocole HTTPS (par exemple <strong>https</strong>://torproject.org/, et non <strong>http</strong>//torproject.org/).</p> - <h2 id="how-to-download-tor">Comment télécharger Tor ?</h2> - <p>Le lot que nous recommandons est le <a href="https://www.torproject.org/projects/torbrowser.html">Tor Browser Bundle (lot du navigateur Tor)</a>. Ce lot contient un navigateur préconfiguré pour utiliser le web de façon sécurisée à travers Tor, et ne nécessite aucune installation. Il suffit simplement de télécharger l'archive, de l'extraire et de démarrer Tor.</p> + <h2 id="how-to-download-tor">Comment télécharger Tor</h2> + <p>Le pack que nous recommandons est le <a href="https://www.torproject.org/projects/torbrowser.html">Tor Browser Bundle</a> (pack du navigateur Tor). Ce pack contient un navigateur préconfiguré pour utiliser le web de façon sécurisée à travers Tor, et ne nécessite aucune installation. Il suffit simplement de télécharger l'archive, de l'extraire et de démarrer Tor.</p> <p>ll y a deux façons d'obtenir les logiciels de Tor. Vous pouvez soit les télécharger à partir du <a href="https://www.torproject.org/">site du projet Tor</a>, soit utiliser GetTor, le répondeur automatique de courriel.</p> - <h3 id="how-to-get-tor-via-email">Comment obtenir Tor par courriel ?</h3> + <h3 id="how-to-get-tor-via-email">Comment obtenir Tor par courriel</h3> <p>Pour recevoir la version française du Tor Browser Bundle pour Windows, envoyez un courriel à gettor+fr(a)torproject.org avec <strong>windows</strong> dans le corps du message. Vous pouvez laisser le sujet vide.</p> <p>Vous pouvez aussi demander le Tor Browser Bundle pour Mac OS X (pour cela écrire <strong>macos-i386</strong>), et Linux (écrire <strong>linux-i386</strong> pour les systèmes 32 bits ou <strong>linux-x86_64</strong> pour les systèmes 64 bits).</p> <p>Si vous voulez une autre traduction de Tor, écrivez <strong>help</strong> dans votre message. Vous recevrez ensuite un courriel avec des instructions et une liste des langues disponibles.</p>

1 0

[onionoo/master] Support V2Dir (and V3Dir) flags in flag parameter.
by karsten＠torproject.org 25 Apr '13

25 Apr '13

commit 02d39ecafc4b7e249b3bed33a51da76b334ab3f4 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Apr 25 13:58:01 2013 +0200 Support V2Dir (and V3Dir) flags in flag parameter. Generally, allow digits in flag names. --- src/org/torproject/onionoo/ResourceServlet.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/onionoo/ResourceServlet.java b/src/org/torproject/onionoo/ResourceServlet.java index 8c0b625..f36a377 100644 --- a/src/org/torproject/onionoo/ResourceServlet.java +++ b/src/org/torproject/onionoo/ResourceServlet.java @@ -537,7 +537,7 @@ public class ResourceServlet extends HttpServlet { } private static Pattern flagPattern = - Pattern.compile("^[a-zA-Z]{1,20}$"); + Pattern.compile("^[a-zA-Z0-9]{1,20}$"); private String parseFlagParameter(String parameter) { if (!flagPattern.matcher(parameter).matches()) { return null;

1 0

[translation/tsum_completed] Update translations for tsum_completed
by translation＠torproject.org 25 Apr '13

25 Apr '13

commit 1d6757661a4f5021478357f8e04b8a2857ebc1b8 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 25 10:15:17 2013 +0000 Update translations for tsum_completed --- fr/short-user-manual_fr_noimg.xhtml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/short-user-manual_fr_noimg.xhtml b/fr/short-user-manual_fr_noimg.xhtml index d1edfc5..b996279 100644 --- a/fr/short-user-manual_fr_noimg.xhtml +++ b/fr/short-user-manual_fr_noimg.xhtml @@ -7,8 +7,8 @@ <h1 id="the-short-user-manual">Le court manuel d'utilisation</h1> <p>Ce manuel d'utilisation contient les informations relatives au téléchargement de Tor, comment l'utiliser et que faire si Tor n'arrive pas à se connecter au réseau. Si vous ne trouvez pas la réponse à votre question dans ce document, envoyez un email à help-fr(a)rt.torproject.org.</p> <p>Veuillez noter que le support que nous fournissons se fait de façon bénévole et que nous reçevons chaque jour beaucoup d'emails. Ne vous inquiétez pas si nous ne vous répondons pas immédiatement.</p> - <h2 id="how-tor-works">Comment fonctionne Tor ?</h2> - <p>Tor est un réseau de tunnels virtuels qui vous permet d'améliorer la confidentialité et la sécurité de vos échanges sur Internet. Tor fonctionne en faisant passer votre traffic réseau à travers trois serveurs avant de l'envoyer vers l'Internet public. Ces serveurs, aussi appelés <em>relais</em>, sont choisis aléatoirement au sein du réseau Tor,</p> + <h2 id="how-tor-works">Comment fonctionne Tor</h2> + <p>Tor est un réseau de tunnels virtuels qui vous permet d'améliorer la confidentialité et la sécurité de vos échanges sur Internet. Tor fonctionne en faisant passer votre trafic réseau à travers trois serveurs avant de l'envoyer vers l'Internet public. Ces serveurs, aussi appelés <em>relais</em>, sont choisis aléatoirement au sein du réseau Tor,</p> <p>L'image ci-dessus montre comment se passe la navigation sur différents sites à travers Tor. Les écrans verts représentent les relais du réseau Tor, tandis que les trois clés représentent les couches de chiffrement entre l'utilisateur et chaque relai.</p> <p>Tor va anonymiser l'origine de votre trafic, et il va chiffrer tout ce qu'il y a entre vous et le réseau Tor. Tor va aussi chiffrer votre trafic à l'intérieur du réseau Tor, mais il ne peut pas chiffrer le trafic entre le réseau Tor et la destination finale.</p> <p>Si vous échangez des informations sensibles, par exemple lorsque vous vous connectez à un site avec un nom d'utilisateur et un mot de passe, assurez-vous que vous utilisez bien le protocole HTTPS (par exemple <strong>https</strong>://torproject.org/, et non <strong>http</strong>//torproject.org/).</p>

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 25 Apr '13

25 Apr '13

commit f6fdac19f177776c6fe7b1905fddc680efef0167 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 25 10:15:13 2013 +0000 Update translations for tsum --- fr/short-user-manual_fr_noimg.xhtml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/short-user-manual_fr_noimg.xhtml b/fr/short-user-manual_fr_noimg.xhtml index d1edfc5..b996279 100644 --- a/fr/short-user-manual_fr_noimg.xhtml +++ b/fr/short-user-manual_fr_noimg.xhtml @@ -7,8 +7,8 @@ <h1 id="the-short-user-manual">Le court manuel d'utilisation</h1> <p>Ce manuel d'utilisation contient les informations relatives au téléchargement de Tor, comment l'utiliser et que faire si Tor n'arrive pas à se connecter au réseau. Si vous ne trouvez pas la réponse à votre question dans ce document, envoyez un email à help-fr(a)rt.torproject.org.</p> <p>Veuillez noter que le support que nous fournissons se fait de façon bénévole et que nous reçevons chaque jour beaucoup d'emails. Ne vous inquiétez pas si nous ne vous répondons pas immédiatement.</p> - <h2 id="how-tor-works">Comment fonctionne Tor ?</h2> - <p>Tor est un réseau de tunnels virtuels qui vous permet d'améliorer la confidentialité et la sécurité de vos échanges sur Internet. Tor fonctionne en faisant passer votre traffic réseau à travers trois serveurs avant de l'envoyer vers l'Internet public. Ces serveurs, aussi appelés <em>relais</em>, sont choisis aléatoirement au sein du réseau Tor,</p> + <h2 id="how-tor-works">Comment fonctionne Tor</h2> + <p>Tor est un réseau de tunnels virtuels qui vous permet d'améliorer la confidentialité et la sécurité de vos échanges sur Internet. Tor fonctionne en faisant passer votre trafic réseau à travers trois serveurs avant de l'envoyer vers l'Internet public. Ces serveurs, aussi appelés <em>relais</em>, sont choisis aléatoirement au sein du réseau Tor,</p> <p>L'image ci-dessus montre comment se passe la navigation sur différents sites à travers Tor. Les écrans verts représentent les relais du réseau Tor, tandis que les trois clés représentent les couches de chiffrement entre l'utilisateur et chaque relai.</p> <p>Tor va anonymiser l'origine de votre trafic, et il va chiffrer tout ce qu'il y a entre vous et le réseau Tor. Tor va aussi chiffrer votre trafic à l'intérieur du réseau Tor, mais il ne peut pas chiffrer le trafic entre le réseau Tor et la destination finale.</p> <p>Si vous échangez des informations sensibles, par exemple lorsque vous vous connectez à un site avec un nom d'utilisateur et un mot de passe, assurez-vous que vous utilisez bien le protocole HTTPS (par exemple <strong>https</strong>://torproject.org/, et non <strong>http</strong>//torproject.org/).</p>

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 25 Apr '13

25 Apr '13

commit f13b0e31600e93b6b8eb79b186bcc3162376dd78 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 25 09:15:37 2013 +0000 Update translations for vidalia_help --- eu/server.po | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/eu/server.po b/eu/server.po index 5fb9fc5..dd2eb32 100644 --- a/eu/server.po +++ b/eu/server.po @@ -1,13 +1,14 @@ # # Translators: -# Antxon Baldarra <baldarra(a)euskalerria.org>, 2012-2013 +# Antxon Baldarra <baldarra(a)lavabit.com>, 2012-2013 +# Antxon Baldarra <baldarra(a)lavabit.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2013-04-17 14:38+0000\n" -"Last-Translator: Antxon Baldarra <baldarra(a)euskalerria.org>\n" +"PO-Revision-Date: 2013-04-25 09:03+0000\n" +"Last-Translator: Antxon Baldarra <baldarra(a)lavabit.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -352,7 +353,7 @@ msgid "" "connections to your computer from other computers on the Internet. If you " "want to run a Tor relay, however, other Tor clients and relays must be able " "to connect to your relay through your home router or firewall." -msgstr "" +msgstr "Etxe erabiltzaile asko <i>bideratzaile</i> baten bitartez konektatzen dira Internetera, eta honek sare lokal batean hainbat ordenagailuk Internet konexio berbera elkarbatzea baimentzen du. Erabiltzaile batzuk Interneten zehar dauden beste ordenagailuetatik zure ordenagailura doazen sarrera konexioak blokeatzen dituen <i>sueten</i> baten atzean egon daitezke ere. Hala ere, Tor errele bat exekutatu nahi baduzu, beste Tor erabiltzaile eta erreleek zure errelera konektatu ahal behar dute zure etxeko bideratzaile edo suetenaren zehar." #. type: Content of: <html><body><p> #: en/server.html:200 @@ -373,7 +374,7 @@ msgid "" "your relay. Not all routers support automatic port forwarding, though. You " "can use the <i>Test</i> button next to the checkbox to find out if Vidalia " "is able to automatically set up port forwarding for you." -msgstr "" +msgstr "<i>Saiatu automatikoki ataka jarraipena konfiguratzen</i> etiketa duen kutxa markatzen baduzu, Vidaliak zure sare konexio lokalean ataka jarraipena automatikoki konfiguratzen saiatuko da, modu horretan beste Tor erabiltzaileek zure errelera konektatu ahal daitezen. Hala ere, Bideratzaile guztiek ez dute ataka jarraipena onartzen. <i>Test</i> botoia erabili dezakezu kontrol-kutxaren alboan Vidaliak automatikoki ataka jarraipena zuretzako konfiguratu dezakeen jakiteko." #. type: Content of: <html><body><p> #: en/server.html:217

1 0