March 2012 - tor-commits - lists.torproject.org

[metrics-web/master] Disable descriptor.html to see if anyone cares.
by karsten＠torproject.org 08 Mar '12

08 Mar '12

commit 89abd4af90f0040180fc81ce16e4f15339f5c433 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Mar 8 16:05:19 2012 +0100 Disable descriptor.html to see if anyone cares. If not, dump it. It's yet one more thing to maintain. --- etc/web.xml | 2 ++ .../torproject/ernie/web/RelaySearchServlet.java | 2 +- web/robots.txt | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/etc/web.xml b/etc/web.xml index 417ab62..fa6274d 100644 --- a/etc/web.xml +++ b/etc/web.xml @@ -287,6 +287,7 @@ <url-pattern>/extrainfodesc</url-pattern> </servlet-mapping> + <servlet> <servlet-name>Consensus</servlet-name> diff --git a/src/org/torproject/ernie/web/RelaySearchServlet.java b/src/org/torproject/ernie/web/RelaySearchServlet.java index fe7e62b..f93dc14 100644 --- a/src/org/torproject/ernie/web/RelaySearchServlet.java +++ b/src/org/torproject/ernie/web/RelaySearchServlet.java @@ -434,7 +434,7 @@ public class RelaySearchServlet extends HttpServlet { new BigInteger(1, Base64.decodeBase64(parts[3] + "=="))); rawStatusEntryBuilder.append("<tt>r " + parts[1] + " " - + parts[2] + " <a href=\"descriptor.html?desc-id=" + + parts[2] + " <a href=\"serverdesc?desc-id=" + descriptorBase64 + "\" target=\"_blank\">" + parts[3] + "</a> " + parts[4] + " " + parts[5] + " " + parts[6] + " " + parts[7] + " " + parts[8] + "</tt> "); diff --git a/web/robots.txt b/web/robots.txt index 3b8e76e..137673c 100644 --- a/web/robots.txt +++ b/web/robots.txt @@ -5,7 +5,6 @@ Disallow: /relay.html Disallow: /csv/ Disallow: /serverdesc Disallow: /extrainfodesc -Disallow: /descriptor.html Disallow: /consensus Disallow: /votes Disallow: /consensus-health.html

1 0

[metrics-web/master] consensus-health-[12].html are long gone.
by karsten＠torproject.org 08 Mar '12

08 Mar '12

commit 27d7603f8b88f2b8702fcb3a16bed955d8bd0cbd Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Mar 8 15:48:28 2012 +0100 consensus-health-[12].html are long gone. --- etc/web.xml | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/etc/web.xml b/etc/web.xml index e377968..8454e95 100644 --- a/etc/web.xml +++ b/etc/web.xml @@ -330,14 +330,6 @@ <servlet-name>ErnieGeneratedFile</servlet-name> <url-pattern>/consensus-health.html</url-pattern> </servlet-mapping> - <servlet-mapping> - <servlet-name>ErnieGeneratedFile</servlet-name> - <url-pattern>/consensus-health-1.html</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>ErnieGeneratedFile</servlet-name> - <url-pattern>/consensus-health-2.html</url-pattern> - </servlet-mapping> <servlet> <servlet-name>Redirect</servlet-name>

1 0

[metrics-web/master] Take out redirects that were added 19 months ago.
by karsten＠torproject.org 08 Mar '12

08 Mar '12

commit 62ce743e4cb44a70f355f4529c03903a88b1c628 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Mar 8 15:53:58 2012 +0100 Take out redirects that were added 19 months ago. --- etc/web.xml | 43 ------------------- src/org/torproject/ernie/web/RedirectServlet.java | 47 --------------------- 2 files changed, 0 insertions(+), 90 deletions(-) diff --git a/etc/web.xml b/etc/web.xml index 8454e95..417ab62 100644 --- a/etc/web.xml +++ b/etc/web.xml @@ -332,49 +332,6 @@ </servlet-mapping> <servlet> - <servlet-name>Redirect</servlet-name> - <servlet-class> - org.torproject.ernie.web.RedirectServlet - </servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>Redirect</servlet-name> - <url-pattern>/networksize.html</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>Redirect</servlet-name> - <url-pattern>/exit-relays-graphs.html</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>Redirect</servlet-name> - <url-pattern>/bridge-users-graphs.html</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>Redirect</servlet-name> - <url-pattern>/new-users-graphs.html</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>Redirect</servlet-name> - <url-pattern>/consensus-graphs.html</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>Redirect</servlet-name> - <url-pattern>/recurring-users-graphs.html</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>Redirect</servlet-name> - <url-pattern>/torperf-graphs.html</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>Redirect</servlet-name> - <url-pattern>/gettor-graphs.html</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>Redirect</servlet-name> - <url-pattern>/custom-graph.html</url-pattern> - </servlet-mapping> - - <servlet> <servlet-name>GraphData</servlet-name> <servlet-class> org.torproject.ernie.web.GraphDataServlet diff --git a/src/org/torproject/ernie/web/RedirectServlet.java b/src/org/torproject/ernie/web/RedirectServlet.java deleted file mode 100644 index 6b5e2be..0000000 --- a/src/org/torproject/ernie/web/RedirectServlet.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.torproject.ernie.web; - -import javax.servlet.*; -import javax.servlet.http.*; -import java.io.*; -import java.util.*; - -public class RedirectServlet extends HttpServlet { - - private Map<String, String> redirects; - - public void init() { - - /* Initialize map containing redirects. */ - redirects = new HashMap<String, String>(); - redirects.put("networksize.html", "/network.html"); - redirects.put("exit-relays-graphs.html", "/network.html"); - redirects.put("bridge-users-graphs.html", "/users.html"); - redirects.put("new-users-graphs.html", "/users.html"); - redirects.put("consensus-graphs.html", "/network.html"); - redirects.put("recurring-users-graphs.html", "/users.html"); - redirects.put("torperf-graphs.html", "/performance.html"); - redirects.put("gettor-graphs.html", "/packages.html"); - redirects.put("custom-graph.html", "/graphs.html"); - } - - public void doGet(HttpServletRequest request, - HttpServletResponse response) throws IOException, ServletException { - - /* Find out which page was requested. */ - String requestedPage = request.getRequestURI(); - if (requestedPage.contains("/")) { - requestedPage = requestedPage.substring(requestedPage. - lastIndexOf("/") + 1); - } - - /* Make sure we know where to redirect this request. */ - if (!redirects.containsKey(requestedPage)) { - response.sendError(HttpServletResponse.SC_NOT_FOUND, requestedPage); - return; - } - - /* Redirect the request. */ - response.sendRedirect(redirects.get(requestedPage)); - } -} -

1 0

[metrics-web/master] Disable extrainfodesc and votes URLS to see if anyone cares.
by karsten＠torproject.org 08 Mar '12

08 Mar '12

commit 24d6f8fbef9d21a8ddf3ce1b936f767d60c5ebc2 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Mar 8 16:07:24 2012 +0100 Disable extrainfodesc and votes URLS to see if anyone cares. If not, dump them and stop importing them into the database. --- etc/web.xml | 4 ++++ web/robots.txt | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/etc/web.xml b/etc/web.xml index fa6274d..12e35fa 100644 --- a/etc/web.xml +++ b/etc/web.xml @@ -276,6 +276,7 @@ <url-pattern>/serverdesc</url-pattern> </servlet-mapping> +  <servlet> <servlet-name>ErnieGeneratedFile</servlet-name> diff --git a/web/robots.txt b/web/robots.txt index 137673c..7d138ee 100644 --- a/web/robots.txt +++ b/web/robots.txt @@ -4,8 +4,6 @@ Disallow: /routerdetail.html Disallow: /relay.html Disallow: /csv/ Disallow: /serverdesc -Disallow: /extrainfodesc Disallow: /consensus -Disallow: /votes Disallow: /consensus-health.html

1 0

r25513: {website} add a new mirror, update status of the rest. (in website/trunk: . include)
by Andrew Lewman 08 Mar '12

08 Mar '12

Author: phobos Date: 2012-03-08 14:53:26 +0000 (Thu, 08 Mar 2012) New Revision: 25513 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: add a new mirror, update status of the rest. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2012-03-08 05:04:09 UTC (rev 25512) +++ website/trunk/include/mirrors-table.wmi 2012-03-08 14:53:26 UTC (rev 25513) @@ -3,47 +3,47 @@ <td>NL</td> - <td>Amorphis</td> + <td>torproject.nl</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.amorphis.eu/dist/">http</a></td> - <td><a href="http://tor.amorphis.eu/">http</a></td> + <td><a href="http://www.torproject.nl/dist/">http</a></td> + <td><a href="http://www.torproject.nl/">http</a></td> + <td><a href="https://www.torproject.nl/dist/">https</a></td> + <td><a href="https://www.torproject.nl/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> <td>NL</td> - <td>torproject.nl</td> + <td>CCC</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torproject.nl/dist/">http</a></td> - <td><a href="http://www.torproject.nl/">http</a></td> - <td><a href="https://www.torproject.nl/dist/">https</a></td> - <td><a href="https://www.torproject.nl/">https</a></td> + <td><a href="http://tor.ccc.de/dist/">http</a></td> + <td><a href="http://tor.ccc.de/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>NL</td> + <td>IS</td> - <td>CCC</td> + <td>torproject.is</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.ccc.de/dist/">http</a></td> - <td><a href="http://tor.ccc.de/">http</a></td> + <td><a href="http://torproject.is/dist/">http</a></td> + <td><a href="http://torproject.is/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -52,15 +52,15 @@ <tr> - <td>DK</td> + <td>EU</td> - <td>Zentrum der Gesundheit</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.idnr.ws/dist/">http</a></td> - <td><a href="http://tor.idnr.ws/">http</a></td> + <td><a href="http://torproject.jcsh.it/dist/">http</a></td> + <td><a href="http://torproject.jcsh.it/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -120,23 +120,6 @@ <tr> - <td>DE</td> - - <td>torservers</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/dist/">http</a></td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/dist/">https</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>IS</td> <td>myRL.net</td> @@ -358,6 +341,23 @@ <tr> + <td>US</td> + + <td>Xpdm</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://torproj.xpdm.us/dist/">http</a></td> + <td><a href="http://torproj.xpdm.us/">http</a></td> + <td><a href="https://torproj.xpdm.us/dist/">https</a></td> + <td><a href="https://torproj.xpdm.us/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>IL</td> <td>Host4site</td> @@ -375,6 +375,23 @@ <tr> + <td>US</td> + + <td>AskApache</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.askapache.com/dist/">http</a></td> + <td><a href="http://tor.askapache.com/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>FR</td> <td>LazyTiger</td> @@ -426,15 +443,15 @@ <tr> - <td>SE</td> + <td>IS</td> - <td>homosu</td> + <td>TheOnionRouter</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.homosu.net/dist/">http</a></td> - <td><a href="http://tor.homosu.net/">http</a></td> + <td><a href="http://theonionrouter.com/dist/">http</a></td> + <td><a href="http://theonionrouter.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -494,15 +511,15 @@ <tr> - <td>EE</td> + <td>NL</td> - <td>CyberSIDE</td> + <td>Amorphis</td> <td>Up to date</td> <td> - </td> - <td><a href="http://cyberside.net.ee/tor/">http</a></td> - <td><a href="http://cyberside.planet.ee/tor/">http</a></td> + <td><a href="http://tor.amorphis.eu/dist/">http</a></td> + <td><a href="http://tor.amorphis.eu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -511,15 +528,15 @@ <tr> - <td>IS</td> + <td>DK</td> - <td>torproject.is</td> + <td>Zentrum der Gesundheit</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.is/dist/">http</a></td> - <td><a href="http://torproject.is/">http</a></td> + <td><a href="http://tor.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -528,6 +545,23 @@ <tr> + <td>EE</td> + + <td>CyberSIDE</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://cyberside.net.ee/tor/">http</a></td> + <td><a href="http://cyberside.planet.ee/tor/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>LT</td> <td></td> @@ -545,15 +579,15 @@ <tr> - <td>US</td> + <td>SE</td> - <td>AskApache</td> + <td>homosu</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.askapache.com/dist/">http</a></td> - <td><a href="http://tor.askapache.com/">http</a></td> + <td><a href="http://tor.homosu.net/dist/">http</a></td> + <td><a href="http://tor.homosu.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -562,19 +596,19 @@ <tr> - <td>IS</td> + <td>DE</td> - <td>TheOnionRouter</td> + <td>torservers</td> <td>Out of date</td> <td> - </td> - <td><a href="http://theonionrouter.com/dist/">http</a></td> - <td><a href="http://theonionrouter.com/">http</a></td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/dist/">http</a></td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/dist/">https</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> @@ -695,20 +729,3 @@ <td> - </td> <td> - </td> </tr> - -<tr> - - <td>US</td> - - <td>Xpdm</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://torproj.xpdm.us/dist/">http</a></td> - <td><a href="http://torproj.xpdm.us/">http</a></td> - <td><a href="https://torproj.xpdm.us/dist/">https</a></td> - <td><a href="https://torproj.xpdm.us/">https</a></td> - <td> - </td> - <td> - </td> -</tr> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2012-03-08 05:04:09 UTC (rev 25512) +++ website/trunk/update-mirrors.pl 2012-03-08 14:53:26 UTC (rev 25513) @@ -874,6 +874,24 @@ httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", + }, + mirror056 => { + adminContact => "", + orgName => "", + isoCC => "EU", + subRegion => "", + region => "EU", + ipv4 => "True", + ipv6 => "True", + loadBalanced => "No", + httpWebsiteMirror => "http://torproject.jcsh.it/", + httpsWebsiteMirror => "", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "http://torproject.jcsh.it/dist/", + httpsDistMirror => "", + rsyncDistMirror => "", + hiddenServiceMirror => "", } );

1 0

[bridgedb/master] 5331 - Add log rotation to BridgeDB
by aagbsn＠torproject.org 08 Mar '12

08 Mar '12

commit 31c55cd3289b606fb44daa336a565bf77b522f96 Author: aagbsn <aagbsn(a)extc.org> Date: Thu Mar 8 05:37:11 2012 -0800 5331 - Add log rotation to BridgeDB Switches BridgeDB logger to use RotatingFileHandler. The defaults are to keep 5 backups, of 10MB each. Adds LOGFILE_COUNT, LOGFILE_ROTATE_SIZE to bridgedb.conf, and sets the default value for LOGLEVEL to WARNING. Thanks to weasel for this patch. --- bridgedb.conf | 7 ++++++- lib/bridgedb/Main.py | 19 ++++++++++++------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/bridgedb.conf b/bridgedb.conf index 5d5dbad..81a2688 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -11,8 +11,13 @@ PIDFILE = "bridgedb.pid" # Either a file to log to, or None if we should log to the console. LOGFILE = "bridgedb.log" + +# Logfile rotation settings +LOGFILE_COUNT = 5 +LOGFILE_ROTATE_SIZE = 10000000 + # One of "DEBUG", "INFO", "WARNING", "ERROR"... -LOGLEVEL = "INFO" +LOGLEVEL = "WARNING" # Files from which we read bridge descriptors, on start and on SIGHUP. BRIDGE_FILES = [ "./bridge-descriptors" ] diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 648accd..8ef6fc0 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -11,6 +11,7 @@ import signal import sys import time import logging +import logging.handlers import gettext from twisted.internet import reactor @@ -110,14 +111,18 @@ def configureLogging(cfg): """ level = getattr(cfg, 'LOGLEVEL', 'WARNING') level = getattr(logging, level) - extra = {} - if getattr(cfg, "LOGFILE"): - extra['filename'] = cfg.LOGFILE - logging.basicConfig(format='%(asctime)s [%(levelname)s] %(message)s', - datefmt="%b %d %H:%M:%S", - level=level, - **extra) + logging.getLogger().setLevel(level) + if getattr(cfg, "LOGFILE"): + logfile_count = getattr(cfg, "LOGFILE_COUNT", 5) + logfile_rotate_size = getattr(cfg, "LOGFILE_ROTATE_SIZE", 10000000) + + handler = logging.handlers.RotatingFileHandler(cfg.LOGFILE, 'a', + logfile_rotate_size, + logfile_count) + formatter = logging.Formatter('%(asctime)s [%(levelname)s] %(message)s', "%b %d %H:%M:%S") + handler.setFormatter(formatter) + logging.getLogger().addHandler(handler) def getKey(fname): """Load the key stored in fname, or create a new 32-byte key and store

1 0

[metrics-web/master] Make ExoneraTor Beta the new default.
by karsten＠torproject.org 08 Mar '12

08 Mar '12

commit becc1f24af8d149c6c4a9e5223b7f0f4d4731695 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Mar 8 14:29:47 2012 +0100 Make ExoneraTor Beta the new default. Two major changes: - Results include IP addresses from exit lists, too. - It's not required anymore to specify an exact timestamp, but a date is enough. --- etc/web.xml | 11 - .../ernie/web/ExoneraTorBetaServlet.java | 1015 -------------------- .../torproject/ernie/web/ExoneraTorServlet.java | 552 +++++++---- 3 files changed, 359 insertions(+), 1219 deletions(-) diff --git a/etc/web.xml b/etc/web.xml index fea3df6..e377968 100644 --- a/etc/web.xml +++ b/etc/web.xml @@ -266,17 +266,6 @@ </servlet-mapping> <servlet> - <servlet-name>ExoneraTorBeta</servlet-name> - <servlet-class> - org.torproject.ernie.web.ExoneraTorBetaServlet - </servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>ExoneraTorBeta</servlet-name> - <url-pattern>/exonerator-beta.html</url-pattern> - </servlet-mapping> - - <servlet> <servlet-name>ServerDescriptor</servlet-name> <servlet-class> org.torproject.ernie.web.ServerDescriptorServlet diff --git a/src/org/torproject/ernie/web/ExoneraTorBetaServlet.java b/src/org/torproject/ernie/web/ExoneraTorBetaServlet.java deleted file mode 100644 index f81d522..0000000 --- a/src/org/torproject/ernie/web/ExoneraTorBetaServlet.java +++ /dev/null @@ -1,1015 +0,0 @@ -package org.torproject.ernie.web; - -import java.io.*; -import java.math.*; -import java.sql.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; -import java.util.regex.*; - -import javax.naming.*; -import javax.servlet.*; -import javax.servlet.http.*; -import javax.sql.*; - -import org.apache.commons.codec.binary.*; -import org.apache.commons.lang.*; - -public class ExoneraTorBetaServlet extends HttpServlet { - - private DataSource ds; - - private Logger logger; - - public void init() { - - /* Initialize logger. */ - this.logger = Logger.getLogger( - ExoneraTorBetaServlet.class.toString()); - - /* Look up data source. */ - try { - Context cxt = new InitialContext(); - this.ds = (DataSource) cxt.lookup("java:comp/env/jdbc/exonerator"); - this.logger.info("Successfully looked up data source."); - } catch (NamingException e) { - this.logger.log(Level.WARNING, "Could not look up data source", e); - } - } - - private void writeHeader(PrintWriter out) throws IOException { - out.println("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 " - + "Transitional//EN\">\n" - + "<html>\n" - + " <head>\n" - + " <title>Tor Metrics Portal: ExoneraTor</title>\n" - + " <meta http-equiv=\"content-type\" content=\"text/html; " - + "charset=ISO-8859-1\">\n" - + " <link href=\"/css/stylesheet-ltr.css\" type=\"text/css\" " - + "rel=\"stylesheet\">\n" - + " <link href=\"/images/favicon.ico\" " - + "type=\"image/x-icon\" rel=\"shortcut icon\">\n" - + " </head>\n" - + " <body>\n" - + " <div class=\"center\">\n" - + " <table class=\"banner\" border=\"0\" cellpadding=\"0\" " - + "cellspacing=\"0\" summary=\"\">\n" - + " <tr>\n" - + " <td class=\"banner-left\"><a " - + "href=\"/index.html\"><img src=\"/images/top-left.png\" " - + "alt=\"Click to go to home page\" width=\"193\" " - + "height=\"79\"></a></td>\n" - + " <td class=\"banner-middle\">\n" - + " <a href=\"/\">Home</a>\n" - + " <a href=\"graphs.html\">Graphs</a>\n" - + " <a href=\"research.html\">Research</a>\n" - + " <a href=\"status.html\">Status</a>\n" - + " \n" - + " \n" - + " <a class=\"current\">ExoneraTor</a>\n" - + " <a href=\"relay-search.html\">Relay Search</a>\n" - + " <a href=\"consensus-health.html\">Consensus " - + "Health</a>\n" - + " \n" - + " </td>\n" - + " <td class=\"banner-right\"></td>\n" - + " </tr>\n" - + " </table>\n" - + " <div class=\"main-column\" style=\"margin:5; " - + "Padding:0;\">\n" - + " <h2>ExoneraTor</h2>\n" - + " <h3>or: a website that tells you whether some IP " - + "address was a Tor relay</h3>\n" - + " ExoneraTor tells you whether there was a Tor relay " - + "running on a given IP address at a given time. ExoneraTor " - + "can further find out whether this relay permitted exiting " - + "to a given server and/or TCP port. ExoneraTor learns about " - + "these facts from parsing the public relay lists and relay " - + "descriptors that are collected from the Tor directory " - + "authorities and the exit lists collected by TorDNSEL.\n" - + " \n" - + " This is a BETA version of ExoneraTor. " - + "Beware of bugs. The stable version of ExoneraTor is still " - + "available <a href=\"exonerator.html\">here</a>. The " - + "visible changes in this BETA version are:\n" - + " <ul>\n" - + " <li>Results now include IP addresses from exit " - + "lists, too.</li>\n" - + " <li>It's not required anymore to specify an exact " - + "timestamp, but now a date is enough.</li>\n" - + " </ul> \n" - + " Notice: Note that the " - + "information you are providing below may be leaked to anyone " - + "who can read the network traffic between you and this web " - + "server or who has access to this web server. If you need to " - + "keep the IP addresses and incident times confidential, you " - + "should download the <a href=\"tools.html#exonerator\">Java " - + "or Python version of ExoneraTor</a> and run it on your " - + "local machine.\n" - + " \n"); - } - - private void writeFooter(PrintWriter out) throws IOException { - out.println(" \n" - + " </div>\n" - + " </div>\n" - + " <div class=\"bottom\" id=\"bottom\">\n" - + " This material is supported in part by the National " - + "Science Foundation under Grant No. CNS-0959138. Any " - + "opinions, finding, and conclusions or recommendations " - + "expressed in this material are those of the author(s) and " - + "do not necessarily reflect the views of the National " - + "Science Foundation.\n" - + " \"Tor\" and the \"Onion Logo\" are <a " - + "href=\"https://www.torproject.org/docs/trademark-faq.html.en" - + "\">registered trademarks</a> of The Tor Project, Inc.\n" - + " Data on this site is freely available under a <a " - + "href=\"http://creativecommons.org/publicdomain/zero/1.0/\">" - + "CC0 no copyright declaration</a>: To the extent possible " - + "under law, the Tor Project has waived all copyright and " - + "related or neighboring rights in the data. Graphs are " - + "licensed under a <a " - + "href=\"http://creativecommons.org/licenses/by/3.0/us/\">" - + "Creative Commons Attribution 3.0 United States " - + "License</a>.\n" - + " </div>\n" - + " </body>\n" - + "</html>"); - out.close(); - } - - public void doGet(HttpServletRequest request, - HttpServletResponse response) throws IOException, - ServletException { - - /* Start writing response. */ - PrintWriter out = response.getWriter(); - writeHeader(out); - - /* Open a database connection that we'll use to handle the whole - * request. */ - Connection conn = null; - long requestedConnection = System.currentTimeMillis(); - try { - conn = this.ds.getConnection(); - } catch (SQLException e) { - out.println("Warning: Unable " - + "to connect to the database. If this problem persists, " - + "please <a href=\"mailto:tor-assistants@torproject.org\">let " - + "us know</a>!\n"); - writeFooter(out); - return; - } - - /* Look up first and last consensus in the database. */ - long firstValidAfter = -1L, lastValidAfter = -1L; - try { - Statement statement = conn.createStatement(); - String query = "SELECT MIN(validafter) AS first, " - + "MAX(validafter) AS last FROM consensus"; - ResultSet rs = statement.executeQuery(query); - if (rs.next()) { - firstValidAfter = rs.getTimestamp(1).getTime(); - lastValidAfter = rs.getTimestamp(2).getTime(); - } - rs.close(); - statement.close(); - } catch (SQLException e) { - /* Looks like we don't have any consensuses. */ - } - if (firstValidAfter < 0L || lastValidAfter < 0L) { - out.println("Warning: This " - + "server doesn't have any relay lists available. If this " - + "problem persists, please " - + "<a href=\"mailto:tor-assistants@torproject.org\">let us " - + "know</a>!\n"); - writeFooter(out); - try { - conn.close(); - this.logger.info("Returned a database connection to the pool " - + "after " + (System.currentTimeMillis() - - requestedConnection) + " millis."); - } catch (SQLException e) { - } - return; - } - - out.println("<a name=\"relay\"></a><h3>Was there a Tor relay running " - + "on this IP address?</h3>"); - - /* Parse IP parameter. */ - /* TODO Extend the parsing code to accept IPv6 addresses, too. */ - Pattern ipAddressPattern = Pattern.compile( - "^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\." + - "([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\." + - "([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\." + - "([01]?\\d\\d?|2[0-4]\\d|25[0-5])$"); - String ipParameter = request.getParameter("ip"); - String relayIP = "", ipWarning = ""; - if (ipParameter != null && ipParameter.length() > 0) { - Matcher ipParameterMatcher = ipAddressPattern.matcher(ipParameter); - if (ipParameterMatcher.matches()) { - String[] ipParts = ipParameter.split("\\."); - relayIP = Integer.parseInt(ipParts[0]) + "." - + Integer.parseInt(ipParts[1]) + "." - + Integer.parseInt(ipParts[2]) + "." - + Integer.parseInt(ipParts[3]); - } else { - ipWarning = "\"" + (ipParameter.length() > 20 ? - StringEscapeUtils.escapeHtml(ipParameter.substring(0, 20)) - + "[...]" : StringEscapeUtils.escapeHtml(ipParameter)) - + "\" is not a valid IP address."; - } - } - - /* Parse timestamp parameter. */ - String timestampParameter = request.getParameter("timestamp"); - long timestamp = 0L; - boolean timestampIsDate = false; - String timestampStr = "", timestampWarning = ""; - SimpleDateFormat shortDateTimeFormat = new SimpleDateFormat( - "yyyy-MM-dd HH:mm"); - shortDateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - if (timestampParameter != null && timestampParameter.length() > 0) { - try { - if (timestampParameter.split(" ").length == 1) { - timestamp = dateFormat.parse(timestampParameter).getTime(); - timestampStr = dateFormat.format(timestamp); - timestampIsDate = true; - } else { - timestamp = shortDateTimeFormat.parse(timestampParameter). - getTime(); - timestampStr = shortDateTimeFormat.format(timestamp); - } - if (timestamp < firstValidAfter || timestamp > lastValidAfter) { - timestampWarning = "Please pick a date or timestamp between \"" - + shortDateTimeFormat.format(firstValidAfter) + "\" and \"" - + shortDateTimeFormat.format(lastValidAfter) + "\"."; - timestamp = 0L; - } - } catch (ParseException e) { - /* We have no way to handle this exception, other than leaving - timestampStr at "". */ - timestampWarning = "\"" + (timestampParameter.length() > 20 ? - StringEscapeUtils.escapeHtml(timestampParameter. - substring(0, 20)) + "[...]" : - StringEscapeUtils.escapeHtml(timestampParameter)) - + "\" is not a valid date or timestamp."; - } - } - - /* If either IP address or timestamp is provided, the other one must - * be provided, too. */ - if (relayIP.length() < 1 && timestampStr.length() > 0 && - ipWarning.length() < 1) { - ipWarning = "Please provide an IP address."; - } - if (relayIP.length() > 0 && timestamp < 1 && - timestampWarning.length() < 1) { - timestampWarning = "Please provide a date or timestamp."; - } - - /* Parse target IP parameter. */ - String targetIP = "", targetPort = "", target = ""; - String[] targetIPParts = null; - String targetAddrParameter = request.getParameter("targetaddr"); - String targetAddrWarning = ""; - if (targetAddrParameter != null && targetAddrParameter.length() > 0) { - Matcher targetAddrParameterMatcher = - ipAddressPattern.matcher(targetAddrParameter); - if (targetAddrParameterMatcher.matches()) { - String[] targetAddrParts = targetAddrParameter.split("\\."); - targetIP = Integer.parseInt(targetAddrParts[0]) + "." - + Integer.parseInt(targetAddrParts[1]) + "." - + Integer.parseInt(targetAddrParts[2]) + "." - + Integer.parseInt(targetAddrParts[3]); - target = targetIP; - targetIPParts = targetIP.split("\\."); - } else { - targetAddrWarning = "\"" + (targetAddrParameter.length() > 20 ? - StringEscapeUtils.escapeHtml(targetAddrParameter.substring( - 0, 20)) + "[...]" : StringEscapeUtils.escapeHtml( - targetAddrParameter)) + "\" is not a valid IP address."; - } - } - - /* Parse target port parameter. */ - String targetPortParameter = request.getParameter("targetport"); - String targetPortWarning = ""; - if (targetPortParameter != null && targetPortParameter.length() > 0) { - Pattern targetPortPattern = Pattern.compile("\\d+"); - if (targetPortParameter.length() < 5 && - targetPortPattern.matcher(targetPortParameter).matches() && - !targetPortParameter.equals("0") && - Integer.parseInt(targetPortParameter) < 65536) { - targetPort = targetPortParameter; - if (target != null) { - target += ":" + targetPort; - } else { - target = targetPort; - } - } else { - targetPortWarning = "\"" + (targetPortParameter.length() > 8 ? - StringEscapeUtils.escapeHtml(targetPortParameter. - substring(0, 8)) + "[...]" : - StringEscapeUtils.escapeHtml(targetPortParameter)) - + "\" is not a valid TCP port."; - } - } - - /* If target port is provided, a target address must be provided, - * too. */ - /* TODO Relax this requirement. */ - if (targetPort.length() > 0 && targetIP.length() < 1 && - targetAddrWarning.length() < 1) { - targetAddrWarning = "Please provide an IP address."; - } - - /* Write form with IP address and timestamp. */ - out.println(" <form action=\"#relay\">\n" - + " <input type=\"hidden\" name=\"targetaddr\" " - + (targetIP.length() > 0 ? " value=\"" + targetIP + "\"" : "") - + ">\n" - + " <input type=\"hidden\" name=\"targetPort\"" - + (targetPort.length() > 0 ? " value=\"" + targetPort + "\"" : "") - + ">\n" - + " <table>\n" - + " <tr>\n" - + " <td align=\"right\">IP address in question:" - + "</td>\n" - + " <td><input type=\"text\" name=\"ip\"" - + (relayIP.length() > 0 ? " value=\"" + relayIP + "\"" - : "") - + ">" - + (ipWarning.length() > 0 ? " " - + ipWarning + "" : "") - + "</td>\n" - + " <td>(Ex.: 1.2.3.4)</td>\n" - + " </tr>\n" - + " <tr>\n" - + " <td align=\"right\">Date or timestamp, in " - + "UTC:</td>\n" - + " <td><input type=\"text\" name=\"timestamp\"" - + (timestampStr.length() > 0 ? " value=\"" + timestampStr + "\"" - : "") - + ">" - + (timestampWarning.length() > 0 ? " " - + timestampWarning + "" : "") - + "</td>\n" - + " <td>(Ex.: 2010-01-01 or 2010-01-01 12:00)" - + "</td>\n" - + " </tr>\n" - + " <tr>\n" - + " <td></td>\n" - + " <td>\n" - + " <input type=\"submit\">\n" - + " <input type=\"reset\">\n" - + " </td>\n" - + " <td></td>\n" - + " </tr>\n" - + " </table>\n" - + " </form>\n"); - - if (relayIP.length() < 1 || timestamp < 1) { - writeFooter(out); - try { - conn.close(); - this.logger.info("Returned a database connection to the pool " - + "after " + (System.currentTimeMillis() - - requestedConnection) + " millis."); - } catch (SQLException e) { - } - return; - } - - out.printf("Looking up IP address %s in the relay lists " - + "published ", relayIP); - long timestampFrom, timestampTo; - if (timestampIsDate) { - /* If we only have a date, consider all consensuses published on the - * given date, plus the ones published 3 hours before the given date - * and until 23:59:59. */ - timestampFrom = timestamp - 3L * 60L * 60L * 1000L; - timestampTo = timestamp + (24L * 60L * 60L - 1L) * 1000L; - out.printf("on %s", timestampStr); - } else { - /* If we have an exact timestamp, consider the consensuses published - * in the 3 hours preceding the UTC timestamp. */ - timestampFrom = timestamp - 3L * 60L * 60L * 1000L; - timestampTo = timestamp; - out.printf("between %s and %s UTC", - shortDateTimeFormat.format(timestampFrom), - shortDateTimeFormat.format(timestampTo)); - } - /* If we don't find any relays in the given time interval, also look - * at consensuses published 12 hours before and 12 hours after the - * interval, in case the user got the "UTC" bit wrong. */ - long timestampTooOld = timestampFrom - 12L * 60L * 60L * 1000L; - long timestampTooNew = timestampTo + 12L * 60L * 60L * 1000L; - out.print(" as well as in the relevant exit lists. Clients could " - + "have selected any of these relays to build circuits. " - + "You may follow the links to relay lists and relay descriptors " - + "to grep for the lines printed below and confirm that results " - + "are correct. "); - SimpleDateFormat validAfterTimeFormat = new SimpleDateFormat( - "yyyy-MM-dd HH:mm:ss"); - validAfterTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - String fromValidAfter = validAfterTimeFormat.format(timestampTooOld); - String toValidAfter = validAfterTimeFormat.format(timestampTooNew); - SortedSet<Long> tooOldConsensuses = new TreeSet<Long>(); - SortedSet<Long> relevantConsensuses = new TreeSet<Long>(); - SortedSet<Long> tooNewConsensuses = new TreeSet<Long>(); - try { - Statement statement = conn.createStatement(); - String query = "SELECT validafter FROM consensus " - + "WHERE validafter >= '" + fromValidAfter - + "' AND validafter <= '" + toValidAfter + "'"; - ResultSet rs = statement.executeQuery(query); - while (rs.next()) { - long consensusTime = rs.getTimestamp(1).getTime(); - if (consensusTime < timestampFrom) { - tooOldConsensuses.add(consensusTime); - } else if (consensusTime > timestampTo) { - tooNewConsensuses.add(consensusTime); - } else { - relevantConsensuses.add(consensusTime); - } - } - rs.close(); - statement.close(); - } catch (SQLException e) { - /* Looks like we don't have any consensuses in the requested - * interval. */ - } - SortedSet<Long> allConsensuses = new TreeSet<Long>(); - allConsensuses.addAll(tooOldConsensuses); - allConsensuses.addAll(relevantConsensuses); - allConsensuses.addAll(tooNewConsensuses); - if (allConsensuses.isEmpty()) { - out.println(" No relay lists found!\n" - + " Result is INDECISIVE!\n" - + " We cannot make any statement whether there was " - + "a Tor relay running on IP address " + relayIP - + (timestampIsDate ? " on " : " at ") + timestampStr + "! We " - + "did not find any relevant relay lists at the given time. If " - + "you think this is an error on our side, please " - + "<a href=\"mailto:tor-assistants@torproject.org\">contact " - + "us</a>!\n"); - writeFooter(out); - try { - conn.close(); - this.logger.info("Returned a database connection to the pool " - + "after " + (System.currentTimeMillis() - - requestedConnection) + " millis."); - } catch (SQLException e) { - } - return; - } - - /* Search for status entries with the given IP address as onion - * routing address, plus status entries of relays having an exit list - * entry with the given IP address as exit address. */ - SortedMap<Long, SortedMap<String, String>> statusEntries = - new TreeMap<Long, SortedMap<String, String>>(); - SortedSet<Long> positiveConsensusesNoTarget = new TreeSet<Long>(); - SortedMap<String, Set<Long>> relevantDescriptors = - new TreeMap<String, Set<Long>>(); - try { - CallableStatement cs = conn.prepareCall( - "{call search_statusentries_by_address_date(?, ?)}"); - cs.setString(1, relayIP); - cs.setDate(2, new java.sql.Date(timestamp)); - ResultSet rs = cs.executeQuery(); - while (rs.next()) { - byte[] rawstatusentry = rs.getBytes(1); - String descriptor = rs.getString(2); - long validafter = rs.getTimestamp(3).getTime(); - positiveConsensusesNoTarget.add(validafter); - if (!relevantDescriptors.containsKey(descriptor)) { - relevantDescriptors.put(descriptor, new HashSet<Long>()); - } - relevantDescriptors.get(descriptor).add(validafter); - String fingerprint = rs.getString(4); - boolean orAddressMatches = rs.getString(5).equals(relayIP); - String exitaddress = rs.getString(6); - String rLine = new String(rawstatusentry); - rLine = rLine.substring(0, rLine.indexOf("\n")); - String[] parts = rLine.split(" "); - String htmlString = "r " + parts[1] + " " + parts[2] + " " - + "<a href=\"serverdesc?desc-id=" + descriptor + "\" " - + "target=\"_blank\">" + parts[3] + "</a> " + parts[4] - + " " + parts[5] + " " + (orAddressMatches ? "" : "") - + parts[6] + (orAddressMatches ? "" : "") + " " + parts[7] - + " " + parts[8] + "\n"; - if (exitaddress != null && exitaddress.length() > 0) { - long scanned = rs.getTimestamp(7).getTime(); - htmlString += " [ExitAddress " + exitaddress - + " " + validAfterTimeFormat.format(scanned) - + "]\n"; - } - if (!statusEntries.containsKey(validafter)) { - statusEntries.put(validafter, new TreeMap<String, String>()); - } - statusEntries.get(validafter).put(fingerprint, htmlString); - } - rs.close(); - cs.close(); - } catch (SQLException e) { - /* Nothing found. */ - } - - /* Print out what we found. */ - SimpleDateFormat validAfterUrlFormat = new SimpleDateFormat( - "yyyy-MM-dd-HH-mm-ss"); - validAfterUrlFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - out.print("<pre><code>"); - for (long consensus : allConsensuses) { - if (relevantConsensuses.contains(consensus)) { - String validAfterDatetime = validAfterTimeFormat.format( - consensus); - String validAfterString = validAfterUrlFormat.format(consensus); - out.print("valid-after " - + "<a href=\"consensus?valid-after=" - + validAfterString + "\" target=\"_blank\">" - + validAfterDatetime + "</a>\n"); - if (statusEntries.containsKey(consensus)) { - for (String htmlString : - statusEntries.get(consensus).values()) { - out.print(htmlString); - } - } - out.print("\n"); - } - } - out.print("</code></pre>"); - if (relevantDescriptors.isEmpty()) { - out.printf(" None found!\n" - + " Result is NEGATIVE with high certainty!\n" - + " We did not find IP " - + "address " + relayIP + " in any of the relay or exit lists " - + "that were published between %s and %s.\n", - dateFormat.format(timestampTooOld), - dateFormat.format(timestampTooNew)); - /* Run another query to find out if there are relays running on - * other IP addresses in the same /24 network and tell the user - * about it. */ - SortedSet<String> addressesInSameNetwork = new TreeSet<String>(); - String[] relayIPParts = relayIP.split("\\."); - byte[] address24Bytes = new byte[3]; - address24Bytes[0] = (byte) Integer.parseInt(relayIPParts[0]); - address24Bytes[1] = (byte) Integer.parseInt(relayIPParts[1]); - address24Bytes[2] = (byte) Integer.parseInt(relayIPParts[2]); - String address24 = Hex.encodeHexString(address24Bytes); - try { - CallableStatement cs = conn.prepareCall( - "{call search_addresses_in_same_24 (?, ?)}"); - cs.setString(1, address24); - cs.setDate(2, new java.sql.Date(timestamp)); - ResultSet rs = cs.executeQuery(); - while (rs.next()) { - Map<String, String> resultEntry = new HashMap<String, String>(); - String address = rs.getString(1); - addressesInSameNetwork.add(address); - } - rs.close(); - cs.close(); - } catch (SQLException e) { - /* No other addresses in the same /24 found. */ - } - if (!addressesInSameNetwork.isEmpty()) { - out.print(" The following other IP addresses of Tor " - + "relays in the same /24 network were found in relay and/or " - + "exit lists around the time that could be related to IP " - + "address " + relayIP + ":\n"); - out.print(" <ul>\n"); - for (String s : addressesInSameNetwork) { - out.print(" <li>" + s + "</li>\n"); - } - out.print(" </ul>\n"); - } - writeFooter(out); - try { - conn.close(); - this.logger.info("Returned a database connection to the pool " - + "after " + (System.currentTimeMillis() - - requestedConnection) + " millis."); - } catch (SQLException e) { - } - return; - } - - /* Print out result. */ - boolean inMostRelevantConsensuses = false, - inOtherRelevantConsensus = false, - inTooOldConsensuses = false, - inTooNewConsensuses = false; - for (long match : positiveConsensusesNoTarget) { - if (timestampIsDate && - dateFormat.format(match).equals(timestampStr)) { - inMostRelevantConsensuses = true; - } else if (!timestampIsDate && - match == relevantConsensuses.last()) { - inMostRelevantConsensuses = true; - } else if (relevantConsensuses.contains(match)) { - inOtherRelevantConsensus = true; - } else if (tooOldConsensuses.contains(match)) { - inTooOldConsensuses = true; - } else if (tooNewConsensuses.contains(match)) { - inTooNewConsensuses = true; - } - } - if (inMostRelevantConsensuses) { - out.print(" Result is POSITIVE with high certainty!" - + "\n" - + " We found one or more relays on IP address " - + relayIP + " in "); - if (timestampIsDate) { - out.print("relay list published on " + timestampStr); - } else { - out.print("the most recent relay list preceding " + timestampStr); - } - out.print(" that clients were likely to know.\n"); - } else { - if (inOtherRelevantConsensus) { - out.println(" Result is POSITIVE " - + "with moderate certainty!\n"); - out.println("We found one or more relays on IP address " - + relayIP + ", but not in "); - if (timestampIsDate) { - out.print("a relay list published on " + timestampStr); - } else { - out.print("the most recent relay list preceding " + timestampStr); - } - out.print(". A possible reason for the relay being missing in a " - + "relay list might be that some of the directory " - + "authorities had difficulties connecting to the relay. " - + "However, clients might still have used the relay.\n"); - } else { - out.println(" Result is NEGATIVE " - + "with high certainty!\n"); - out.println(" We did not find any relay on IP address " - + relayIP - + " in the relay lists 3 hours preceding " + timestampStr - + ".\n"); - if (inTooOldConsensuses || inTooNewConsensuses) { - if (inTooOldConsensuses && !inTooNewConsensuses) { - out.println(" Note that we found a matching relay " - + "in relay lists that were published between 15 and 3 " - + "hours before " + timestampStr + ".\n"); - } else if (!inTooOldConsensuses && inTooNewConsensuses) { - out.println(" Note that we found a matching relay " - + "in relay lists that were published up to 12 hours " - + "after " + timestampStr + ".\n"); - } else { - out.println(" Note that we found a matching relay " - + "in relay lists that were published between 15 and 3 " - + "hours before and in relay lists that were published " - + "up to 12 hours after " + timestampStr + ".\n"); - } - if (timestampIsDate) { - out.println("Be sure to try out the previous/next day or " - + "provide an exact timestamp in UTC."); - } else { - out.println("Make sure that the timestamp you " - + "provided is correctly converted to the UTC " - + "timezone."); - } - } - /* We didn't find any descriptor. No need to look up targets. */ - writeFooter(out); - try { - conn.close(); - this.logger.info("Returned a database connection to the pool " - + "after " + (System.currentTimeMillis() - - requestedConnection) + " millis."); - } catch (SQLException e) { - } - return; - } - } - - /* Second part: target */ - out.println(" <a name=\"exit\"></a><h3>Was this relay configured " - + "to permit exiting to a given target?</h3>"); - - out.println(" <form action=\"#exit\">\n" - + " <input type=\"hidden\" name=\"timestamp\"\n" - + " value=\"" + timestampStr + "\">\n" - + " <input type=\"hidden\" name=\"ip\" " - + "value=\"" + relayIP + "\">\n" - + " <table>\n" - + " <tr>\n" - + " <td align=\"right\">Target address:</td>\n" - + " <td><input type=\"text\" name=\"targetaddr\"" - + (targetIP.length() > 0 ? " value=\"" + targetIP + "\"" : "") - + "\">" - + (targetAddrWarning.length() > 0 ? " " - + targetAddrWarning + "" : "") - + "</td>\n" - + " <td>(Ex.: 4.3.2.1)</td>\n" - + " </tr>\n" - + " <tr>\n" - + " <td align=\"right\">Target port:</td>\n" - + " <td><input type=\"text\" name=\"targetport\"" - + (targetPort.length() > 0 ? " value=\"" + targetPort + "\"" - : "") - + ">" - + (targetPortWarning.length() > 0 ? " " - + targetPortWarning + "" : "") - + "</td>\n" - + " <td>(Ex.: 80)</td>\n" - + " </tr>\n" - + " <tr>\n" - + " <td></td>\n" - + " <td>\n" - + " <input type=\"submit\">\n" - + " <input type=\"reset\">\n" - + " </td>\n" - + " <td></td>\n" - + " </tr>\n" - + " </table>\n" - + " </form>\n"); - - if (targetIP.length() < 1) { - writeFooter(out); - try { - conn.close(); - this.logger.info("Returned a database connection to the pool " - + "after " + (System.currentTimeMillis() - - requestedConnection) + " millis."); - } catch (SQLException e) { - } - return; - } - - /* Parse router descriptors to check exit policies. */ - out.println("Searching the relay descriptors published by the " - + "relay on IP address " + relayIP + " to find out whether this " - + "relay permitted exiting to " + target + ". You may follow the " - + "links above to the relay descriptors and grep them for the " - + "lines printed below to confirm that results are correct."); - SortedSet<Long> positiveConsensuses = new TreeSet<Long>(); - Set<String> missingDescriptors = new HashSet<String>(); - Set<String> descriptors = relevantDescriptors.keySet(); - for (String descriptor : descriptors) { - byte[] rawDescriptor = null; - try { - String query = "SELECT rawdescriptor FROM descriptor " - + "WHERE descriptor = '" + descriptor + "'"; - Statement statement = conn.createStatement(); - ResultSet rs = statement.executeQuery(query); - if (rs.next()) { - rawDescriptor = rs.getBytes(1); - } - rs.close(); - statement.close(); - } catch (SQLException e) { - /* Consider this descriptors as 'missing'. */ - continue; - } - if (rawDescriptor != null && rawDescriptor.length > 0) { - missingDescriptors.remove(descriptor); - String rawDescriptorString = new String(rawDescriptor, - "US-ASCII"); - try { - BufferedReader br = new BufferedReader( - new StringReader(rawDescriptorString)); - String line = null, routerLine = null, publishedLine = null; - StringBuilder acceptRejectLines = new StringBuilder(); - boolean foundMatch = false; - while ((line = br.readLine()) != null) { - if (line.startsWith("router ")) { - routerLine = line; - } else if (line.startsWith("published ")) { - publishedLine = line; - } else if (line.startsWith("reject ") || - line.startsWith("accept ")) { - if (foundMatch) { - out.println(line); - continue; - } - boolean ruleAccept = line.split(" ")[0].equals("accept"); - String ruleAddress = line.split(" ")[1].split(":")[0]; - if (!ruleAddress.equals("*")) { - if (!ruleAddress.contains("/") && - !ruleAddress.equals(targetIP)) { - /* IP address does not match. */ - acceptRejectLines.append(line + "\n"); - continue; - } - String[] ruleIPParts = ruleAddress.split("/")[0]. - split("\\."); - int ruleNetwork = ruleAddress.contains("/") ? - Integer.parseInt(ruleAddress.split("/")[1]) : 32; - for (int i = 0; i < 4; i++) { - if (ruleNetwork == 0) { - break; - } else if (ruleNetwork >= 8) { - if (ruleIPParts[i].equals(targetIPParts[i])) { - ruleNetwork -= 8; - } else { - break; - } - } else { - int mask = 255 ^ 255 >>> ruleNetwork; - if ((Integer.parseInt(ruleIPParts[i]) & mask) == - (Integer.parseInt(targetIPParts[i]) & mask)) { - ruleNetwork = 0; - } - break; - } - } - if (ruleNetwork > 0) { - /* IP address does not match. */ - acceptRejectLines.append(line + "\n"); - continue; - } - } - String rulePort = line.split(" ")[1].split(":")[1]; - if (targetPort.length() < 1 && !ruleAccept && - !rulePort.equals("*")) { - /* With no port given, we only consider reject :* rules as - matching. */ - acceptRejectLines.append(line + "\n"); - continue; - } - if (targetPort.length() > 0 && !rulePort.equals("*") && - rulePort.contains("-")) { - int fromPort = Integer.parseInt(rulePort.split("-")[0]); - int toPort = Integer.parseInt(rulePort.split("-")[1]); - int targetPortInt = Integer.parseInt(targetPort); - if (targetPortInt < fromPort || - targetPortInt > toPort) { - /* Port not contained in interval. */ - continue; - } - } - if (targetPort.length() > 0) { - if (!rulePort.equals("*") && - !rulePort.contains("-") && - !targetPort.equals(rulePort)) { - /* Ports do not match. */ - acceptRejectLines.append(line + "\n"); - continue; - } - } - boolean relevantMatch = false; - for (long match : relevantDescriptors.get(descriptor)) { - if (relevantConsensuses.contains(match)) { - relevantMatch = true; - } - } - if (relevantMatch) { - String[] routerParts = routerLine.split(" "); - out.println("<pre><code>" + routerParts[0] + " " - + routerParts[1] + " " + routerParts[2] + " " - + routerParts[3] + " " + routerParts[4] + " " - + routerParts[5]); - String[] publishedParts = publishedLine.split(" "); - out.println(publishedParts[0] + " " - + publishedParts[1] + " " + publishedParts[2] - + ""); - out.print(acceptRejectLines.toString()); - out.println("" + line + ""); - foundMatch = true; - } - if (ruleAccept) { - positiveConsensuses.addAll( - relevantDescriptors.get(descriptor)); - } - } - } - br.close(); - if (foundMatch) { - out.println("</code></pre>"); - } - } catch (IOException e) { - /* Could not read descriptor string. */ - continue; - } - } - } - - /* Print out result. */ - inMostRelevantConsensuses = false; - inOtherRelevantConsensus = false; - inTooOldConsensuses = false; - inTooNewConsensuses = false; - for (long match : positiveConsensuses) { - if (timestampIsDate && - dateFormat.format(match).equals(timestampStr)) { - inMostRelevantConsensuses = true; - } else if (!timestampIsDate && match == relevantConsensuses.last()) { - inMostRelevantConsensuses = true; - } else if (relevantConsensuses.contains(match)) { - inOtherRelevantConsensus = true; - } else if (tooOldConsensuses.contains(match)) { - inTooOldConsensuses = true; - } else if (tooNewConsensuses.contains(match)) { - inTooNewConsensuses = true; - } - } - if (inMostRelevantConsensuses) { - out.print(" Result is POSITIVE with high certainty!" - + "\n" - + " We found one or more relays on IP address " - + relayIP + " permitting exit to " + target + " in "); - if (timestampIsDate) { - out.print("relay list published on " + timestampStr); - } else { - out.print("the most recent relay list preceding " + timestampStr); - } - out.print(" that clients were likely to know.\n"); - writeFooter(out); - try { - conn.close(); - this.logger.info("Returned a database connection to the pool " - + "after " + (System.currentTimeMillis() - - requestedConnection) + " millis."); - } catch (SQLException e) { - } - return; - } - boolean resultIndecisive = target.length() > 0 - && !missingDescriptors.isEmpty(); - if (resultIndecisive) { - out.println(" Result is INDECISIVE!\n" - + " At least one referenced descriptor could not be " - + "found. This is a rare case, but one that (apparently) " - + "happens. We cannot make any good statement about exit " - + "relays without these descriptors. The following descriptors " - + "are missing:"); - for (String desc : missingDescriptors) - out.println(" " + desc + "\n"); - } - if (inOtherRelevantConsensus) { - if (!resultIndecisive) { - out.println(" Result is POSITIVE " - + "with moderate certainty!\n"); - } - out.println("We found one or more relays on IP address " - + relayIP + " permitting exit to " + target + ", but not in "); - if (timestampIsDate) { - out.print("a relay list published on " + timestampStr); - } else { - out.print("the most recent relay list preceding " + timestampStr); - } - out.print(". A possible reason for the relay being missing in a " - + "relay list might be that some of the directory authorities " - + "had difficulties connecting to the relay. However, clients " - + "might still have used the relay.\n"); - } else { - if (!resultIndecisive) { - out.println(" Result is NEGATIVE " - + "with high certainty!\n"); - } - out.println(" We did not find any relay on IP address " - + relayIP + " permitting exit to " + target - + " in the relay list 3 hours preceding " + timestampStr - + ".\n"); - if (inTooOldConsensuses || inTooNewConsensuses) { - if (inTooOldConsensuses && !inTooNewConsensuses) { - out.println(" Note that we found a matching relay in " - + "relay lists that were published between 15 and 3 " - + "hours before " + timestampStr + ".\n"); - } else if (!inTooOldConsensuses && inTooNewConsensuses) { - out.println(" Note that we found a matching relay in " - + "relay lists that were published up to 12 hours after " - + timestampStr + ".\n"); - } else { - out.println(" Note that we found a matching relay in " - + "relay lists that were published between 15 and 3 " - + "hours before and in relay lists that were published up " - + "to 12 hours after " + timestampStr + ".\n"); - } - if (timestampIsDate) { - out.println("Be sure to try out the previous/next day or " - + "provide an exact timestamp in UTC."); - } else { - out.println("Make sure that the timestamp you provided is " - + "correctly converted to the UTC timezone."); - } - } - } - if (target != null) { - if (positiveConsensuses.isEmpty() && - !positiveConsensusesNoTarget.isEmpty()) { - out.println(" Note that although the found relay(s) did " - + "not permit exiting to " + target + ", there have been one " - + "or more relays running at the given time."); - } - } - try { - conn.close(); - this.logger.info("Returned a database connection to the pool " - + "after " + (System.currentTimeMillis() - - requestedConnection) + " millis."); - } catch (SQLException e) { - } - writeFooter(out); - } -} - diff --git a/src/org/torproject/ernie/web/ExoneraTorServlet.java b/src/org/torproject/ernie/web/ExoneraTorServlet.java index aa46367..d2d33f4 100644 --- a/src/org/torproject/ernie/web/ExoneraTorServlet.java +++ b/src/org/torproject/ernie/web/ExoneraTorServlet.java @@ -30,7 +30,7 @@ public class ExoneraTorServlet extends HttpServlet { /* Look up data source. */ try { Context cxt = new InitialContext(); - this.ds = (DataSource) cxt.lookup("java:comp/env/jdbc/tordir"); + this.ds = (DataSource) cxt.lookup("java:comp/env/jdbc/exonerator"); this.logger.info("Successfully looked up data source."); } catch (NamingException e) { this.logger.log(Level.WARNING, "Could not look up data source", e); @@ -86,7 +86,7 @@ public class ExoneraTorServlet extends HttpServlet { + "to a given server and/or TCP port. ExoneraTor learns about " + "these facts from parsing the public relay lists and relay " + "descriptors that are collected from the Tor directory " - + "authorities.\n" + + "authorities and the exit lists collected by TorDNSEL.\n" + " \n" + " Notice: Note that the " + "information you are providing below may be leaked to anyone " @@ -136,11 +136,24 @@ public class ExoneraTorServlet extends HttpServlet { PrintWriter out = response.getWriter(); writeHeader(out); + /* Open a database connection that we'll use to handle the whole + * request. */ + Connection conn = null; + long requestedConnection = System.currentTimeMillis(); + try { + conn = this.ds.getConnection(); + } catch (SQLException e) { + out.println("Warning: Unable " + + "to connect to the database. If this problem persists, " + + "please <a href=\"mailto:tor-assistants@torproject.org\">let " + + "us know</a>!\n"); + writeFooter(out); + return; + } + /* Look up first and last consensus in the database. */ long firstValidAfter = -1L, lastValidAfter = -1L; try { - long requestedConnection = System.currentTimeMillis(); - Connection conn = this.ds.getConnection(); Statement statement = conn.createStatement(); String query = "SELECT MIN(validafter) AS first, " + "MAX(validafter) AS last FROM consensus"; @@ -151,10 +164,6 @@ public class ExoneraTorServlet extends HttpServlet { } rs.close(); statement.close(); - conn.close(); - this.logger.info("Returned a database connection to the pool after " - + (System.currentTimeMillis() - requestedConnection) - + " millis."); } catch (SQLException e) { /* Looks like we don't have any consensuses. */ } @@ -165,6 +174,13 @@ public class ExoneraTorServlet extends HttpServlet { + "<a href=\"mailto:tor-assistants@torproject.org\">let us " + "know</a>!\n"); writeFooter(out); + try { + conn.close(); + this.logger.info("Returned a database connection to the pool " + + "after " + (System.currentTimeMillis() + - requestedConnection) + " millis."); + } catch (SQLException e) { + } return; } @@ -172,6 +188,7 @@ public class ExoneraTorServlet extends HttpServlet { + "on this IP address?</h3>"); /* Parse IP parameter. */ + /* TODO Extend the parsing code to accept IPv6 addresses, too. */ Pattern ipAddressPattern = Pattern.compile( "^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\." + "([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\." + @@ -198,19 +215,29 @@ public class ExoneraTorServlet extends HttpServlet { /* Parse timestamp parameter. */ String timestampParameter = request.getParameter("timestamp"); long timestamp = 0L; + boolean timestampIsDate = false; String timestampStr = "", timestampWarning = ""; SimpleDateFormat shortDateTimeFormat = new SimpleDateFormat( "yyyy-MM-dd HH:mm"); shortDateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); if (timestampParameter != null && timestampParameter.length() > 0) { try { - timestamp = shortDateTimeFormat.parse(timestampParameter). - getTime(); - timestampStr = shortDateTimeFormat.format(timestamp); + if (timestampParameter.split(" ").length == 1) { + timestamp = dateFormat.parse(timestampParameter).getTime(); + timestampStr = dateFormat.format(timestamp); + timestampIsDate = true; + } else { + timestamp = shortDateTimeFormat.parse(timestampParameter). + getTime(); + timestampStr = shortDateTimeFormat.format(timestamp); + } if (timestamp < firstValidAfter || timestamp > lastValidAfter) { - timestampWarning = "Please pick a value between \"" + timestampWarning = "Please pick a date or timestamp between \"" + shortDateTimeFormat.format(firstValidAfter) + "\" and \"" + shortDateTimeFormat.format(lastValidAfter) + "\"."; + timestamp = 0L; } } catch (ParseException e) { /* We have no way to handle this exception, other than leaving @@ -219,7 +246,7 @@ public class ExoneraTorServlet extends HttpServlet { StringEscapeUtils.escapeHtml(timestampParameter. substring(0, 20)) + "[...]" : StringEscapeUtils.escapeHtml(timestampParameter)) - + "\" is not a valid timestamp."; + + "\" is not a valid date or timestamp."; } } @@ -229,9 +256,9 @@ public class ExoneraTorServlet extends HttpServlet { ipWarning.length() < 1) { ipWarning = "Please provide an IP address."; } - if (relayIP.length() > 0 && timestampStr.length() < 1 && + if (relayIP.length() > 0 && timestamp < 1 && timestampWarning.length() < 1) { - timestampWarning = "Please provide a timestamp."; + timestampWarning = "Please provide a date or timestamp."; } /* Parse target IP parameter. */ @@ -284,13 +311,14 @@ public class ExoneraTorServlet extends HttpServlet { /* If target port is provided, a target address must be provided, * too. */ + /* TODO Relax this requirement. */ if (targetPort.length() > 0 && targetIP.length() < 1 && targetAddrWarning.length() < 1) { targetAddrWarning = "Please provide an IP address."; } /* Write form with IP address and timestamp. */ - out.println(" <form action=\"exonerator.html#relay\">\n" + out.println(" <form action=\"#relay\">\n" + " <input type=\"hidden\" name=\"targetaddr\" " + (targetIP.length() > 0 ? " value=\"" + targetIP + "\"" : "") + ">\n" @@ -311,7 +339,8 @@ public class ExoneraTorServlet extends HttpServlet { + " <td>(Ex.: 1.2.3.4)</td>\n" + " </tr>\n" + " <tr>\n" - + " <td align=\"right\">Timestamp, in UTC:</td>\n" + + " <td align=\"right\">Date or timestamp, in " + + "UTC:</td>\n" + " <td><input type=\"text\" name=\"timestamp\"" + (timestampStr.length() > 0 ? " value=\"" + timestampStr + "\"" : "") @@ -319,7 +348,8 @@ public class ExoneraTorServlet extends HttpServlet { + (timestampWarning.length() > 0 ? " " + timestampWarning + "" : "") + "</td>\n" - + " <td>(Ex.: 2010-01-01 12:00)</td>\n" + + " <td>(Ex.: 2010-01-01 or 2010-01-01 12:00)" + + "</td>\n" + " </tr>\n" + " <tr>\n" + " <td></td>\n" @@ -332,191 +362,278 @@ public class ExoneraTorServlet extends HttpServlet { + " </table>\n" + " </form>\n"); - if (relayIP.length() < 1 || timestampStr.length() < 1) { + if (relayIP.length() < 1 || timestamp < 1) { writeFooter(out); + try { + conn.close(); + this.logger.info("Returned a database connection to the pool " + + "after " + (System.currentTimeMillis() + - requestedConnection) + " millis."); + } catch (SQLException e) { + } return; } - /* Look up relevant consensuses. */ - long timestampTooOld = timestamp - 15L * 60L * 60L * 1000L; - long timestampFrom = timestamp - 3L * 60L * 60L * 1000L; - long timestampTooNew = timestamp + 12L * 60L * 60L * 1000L; - out.printf("Looking up IP address %s in the relay lists published " - + "between %s and %s. " - + "Clients could have used any of these relay lists to " - + "select relays for their paths and build circuits using them. " + out.printf("Looking up IP address %s in the relay lists " + + "published ", relayIP); + long timestampFrom, timestampTo; + if (timestampIsDate) { + /* If we only have a date, consider all consensuses published on the + * given date, plus the ones published 3 hours before the given date + * and until 23:59:59. */ + timestampFrom = timestamp - 3L * 60L * 60L * 1000L; + timestampTo = timestamp + (24L * 60L * 60L - 1L) * 1000L; + out.printf("on %s", timestampStr); + } else { + /* If we have an exact timestamp, consider the consensuses published + * in the 3 hours preceding the UTC timestamp. */ + timestampFrom = timestamp - 3L * 60L * 60L * 1000L; + timestampTo = timestamp; + out.printf("between %s and %s UTC", + shortDateTimeFormat.format(timestampFrom), + shortDateTimeFormat.format(timestampTo)); + } + /* If we don't find any relays in the given time interval, also look + * at consensuses published 12 hours before and 12 hours after the + * interval, in case the user got the "UTC" bit wrong. */ + long timestampTooOld = timestampFrom - 12L * 60L * 60L * 1000L; + long timestampTooNew = timestampTo + 12L * 60L * 60L * 1000L; + out.print(" as well as in the relevant exit lists. Clients could " + + "have selected any of these relays to build circuits. " + "You may follow the links to relay lists and relay descriptors " + "to grep for the lines printed below and confirm that results " - + "are correct. ", relayIP, - shortDateTimeFormat.format(timestampFrom), timestampStr); + + "are correct. "); SimpleDateFormat validAfterTimeFormat = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss"); validAfterTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); String fromValidAfter = validAfterTimeFormat.format(timestampTooOld); String toValidAfter = validAfterTimeFormat.format(timestampTooNew); - SortedMap<Long, String> tooOldConsensuses = - new TreeMap<Long, String>(); - SortedMap<Long, String> relevantConsensuses = - new TreeMap<Long, String>(); - SortedMap<Long, String> tooNewConsensuses = - new TreeMap<Long, String>(); + SortedSet<Long> tooOldConsensuses = new TreeSet<Long>(); + SortedSet<Long> relevantConsensuses = new TreeSet<Long>(); + SortedSet<Long> tooNewConsensuses = new TreeSet<Long>(); try { - long requestedConnection = System.currentTimeMillis(); - Connection conn = this.ds.getConnection(); Statement statement = conn.createStatement(); - String query = "SELECT validafter, rawdesc FROM consensus " + String query = "SELECT validafter FROM consensus " + "WHERE validafter >= '" + fromValidAfter + "' AND validafter <= '" + toValidAfter + "'"; ResultSet rs = statement.executeQuery(query); while (rs.next()) { long consensusTime = rs.getTimestamp(1).getTime(); - String rawConsensusString = new String(rs.getBytes(2), "US-ASCII"); if (consensusTime < timestampFrom) { - tooOldConsensuses.put(consensusTime, rawConsensusString); - } else if (consensusTime > timestamp) { - tooNewConsensuses.put(consensusTime, rawConsensusString); + tooOldConsensuses.add(consensusTime); + } else if (consensusTime > timestampTo) { + tooNewConsensuses.add(consensusTime); } else { - relevantConsensuses.put(consensusTime, rawConsensusString); + relevantConsensuses.add(consensusTime); } } rs.close(); statement.close(); - conn.close(); - this.logger.info("Returned a database connection to the pool after " - + (System.currentTimeMillis() - requestedConnection) - + " millis."); } catch (SQLException e) { /* Looks like we don't have any consensuses in the requested - interval. */ + * interval. */ } - SortedMap<Long, String> allConsensuses = new TreeMap<Long, String>(); - allConsensuses.putAll(tooOldConsensuses); - allConsensuses.putAll(relevantConsensuses); - allConsensuses.putAll(tooNewConsensuses); + SortedSet<Long> allConsensuses = new TreeSet<Long>(); + allConsensuses.addAll(tooOldConsensuses); + allConsensuses.addAll(relevantConsensuses); + allConsensuses.addAll(tooNewConsensuses); if (allConsensuses.isEmpty()) { out.println(" No relay lists found!\n" + " Result is INDECISIVE!\n" + " We cannot make any statement whether there was " - + "a Tor relay running on IP address " - + relayIP + " at " + timestampStr + "! We " - + "did not find any relevant relay lists preceding the given " - + "time. If you think this is an error on our side, please " + + "a Tor relay running on IP address " + relayIP + + (timestampIsDate ? " on " : " at ") + timestampStr + "! We " + + "did not find any relevant relay lists at the given time. If " + + "you think this is an error on our side, please " + "<a href=\"mailto:tor-assistants@torproject.org\">contact " + "us</a>!\n"); writeFooter(out); + try { + conn.close(); + this.logger.info("Returned a database connection to the pool " + + "after " + (System.currentTimeMillis() + - requestedConnection) + " millis."); + } catch (SQLException e) { + } return; } - /* Parse consensuses to find descriptors belonging to the IP - address. */ + /* Search for status entries with the given IP address as onion + * routing address, plus status entries of relays having an exit list + * entry with the given IP address as exit address. */ + SortedMap<Long, SortedMap<String, String>> statusEntries = + new TreeMap<Long, SortedMap<String, String>>(); SortedSet<Long> positiveConsensusesNoTarget = new TreeSet<Long>(); - Set<String> addressesInSameNetwork = new HashSet<String>(); SortedMap<String, Set<Long>> relevantDescriptors = new TreeMap<String, Set<Long>>(); + try { + CallableStatement cs = conn.prepareCall( + "{call search_statusentries_by_address_date(?, ?)}"); + cs.setString(1, relayIP); + cs.setDate(2, new java.sql.Date(timestamp)); + ResultSet rs = cs.executeQuery(); + while (rs.next()) { + byte[] rawstatusentry = rs.getBytes(1); + String descriptor = rs.getString(2); + long validafter = rs.getTimestamp(3).getTime(); + positiveConsensusesNoTarget.add(validafter); + if (!relevantDescriptors.containsKey(descriptor)) { + relevantDescriptors.put(descriptor, new HashSet<Long>()); + } + relevantDescriptors.get(descriptor).add(validafter); + String fingerprint = rs.getString(4); + boolean orAddressMatches = rs.getString(5).equals(relayIP); + String exitaddress = rs.getString(6); + String rLine = new String(rawstatusentry); + rLine = rLine.substring(0, rLine.indexOf("\n")); + String[] parts = rLine.split(" "); + String htmlString = "r " + parts[1] + " " + parts[2] + " " + + "<a href=\"serverdesc?desc-id=" + descriptor + "\" " + + "target=\"_blank\">" + parts[3] + "</a> " + parts[4] + + " " + parts[5] + " " + (orAddressMatches ? "" : "") + + parts[6] + (orAddressMatches ? "" : "") + " " + parts[7] + + " " + parts[8] + "\n"; + if (exitaddress != null && exitaddress.length() > 0) { + long scanned = rs.getTimestamp(7).getTime(); + htmlString += " [ExitAddress " + exitaddress + + " " + validAfterTimeFormat.format(scanned) + + "]\n"; + } + if (!statusEntries.containsKey(validafter)) { + statusEntries.put(validafter, new TreeMap<String, String>()); + } + statusEntries.get(validafter).put(fingerprint, htmlString); + } + rs.close(); + cs.close(); + } catch (SQLException e) { + /* Nothing found. */ + } + + /* Print out what we found. */ SimpleDateFormat validAfterUrlFormat = new SimpleDateFormat( "yyyy-MM-dd-HH-mm-ss"); validAfterUrlFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - for (Map.Entry<Long, String> e : allConsensuses.entrySet()) { - long consensus = e.getKey(); - if (relevantConsensuses.containsKey(consensus)) { - long validAfterTime = -1L; + out.print("<pre><code>"); + for (long consensus : allConsensuses) { + if (relevantConsensuses.contains(consensus)) { String validAfterDatetime = validAfterTimeFormat.format( consensus); String validAfterString = validAfterUrlFormat.format(consensus); - out.println(" <tt>valid-after " + out.print("valid-after " + "<a href=\"consensus?valid-after=" + validAfterString + "\" target=\"_blank\">" - + validAfterDatetime + "</a></tt> "); - } - String rawConsensusString = e.getValue(); - BufferedReader br = new BufferedReader(new StringReader( - rawConsensusString)); - String line = null; - while ((line = br.readLine()) != null) { - if (!line.startsWith("r ")) { - continue; - } - String[] parts = line.split(" "); - String address = parts[6]; - if (address.equals(relayIP)) { - String hex = String.format("%040x", new BigInteger(1, - Base64.decodeBase64(parts[3] + "=="))); - if (!relevantDescriptors.containsKey(hex)) { - relevantDescriptors.put(hex, new HashSet<Long>()); - } - relevantDescriptors.get(hex).add(consensus); - positiveConsensusesNoTarget.add(consensus); - if (relevantConsensuses.containsKey(consensus)) { - out.println(" <tt>r " + parts[1] + " " + parts[2] + " " - + "<a href=\"serverdesc?desc-id=" + hex + "\" " - + "target=\"_blank\">" + parts[3] + "</a> " + parts[4] - + " " + parts[5] + " " + parts[6] + " " + parts[7] - + " " + parts[8] + "</tt> "); - } - } else { - if (relayIP.startsWith(address.substring(0, - address.lastIndexOf(".")))) { - addressesInSameNetwork.add(address); + + validAfterDatetime + "</a>\n"); + if (statusEntries.containsKey(consensus)) { + for (String htmlString : + statusEntries.get(consensus).values()) { + out.print(htmlString); } } + out.print("\n"); } - br.close(); } + out.print("</code></pre>"); if (relevantDescriptors.isEmpty()) { out.printf(" None found!\n" - + " Result is NEGATIVE with moderate certainty!\n" + + " Result is NEGATIVE with high certainty!\n" + " We did not find IP " - + "address " + relayIP + " in any of the relay lists that were " - + "published between %s and %s.\n\nA possible " - + "reason for false negatives is that the relay is using a " - + "different IP address when generating a descriptor than for " - + "exiting to the Internet. We hope to provide better checks " - + "for this case in the future.\n", - shortDateTimeFormat.format(timestampTooOld), - shortDateTimeFormat.format(timestampTooNew)); + + "address " + relayIP + " in any of the relay or exit lists " + + "that were published between %s and %s.\n", + dateFormat.format(timestampTooOld), + dateFormat.format(timestampTooNew)); + /* Run another query to find out if there are relays running on + * other IP addresses in the same /24 network and tell the user + * about it. */ + SortedSet<String> addressesInSameNetwork = new TreeSet<String>(); + String[] relayIPParts = relayIP.split("\\."); + byte[] address24Bytes = new byte[3]; + address24Bytes[0] = (byte) Integer.parseInt(relayIPParts[0]); + address24Bytes[1] = (byte) Integer.parseInt(relayIPParts[1]); + address24Bytes[2] = (byte) Integer.parseInt(relayIPParts[2]); + String address24 = Hex.encodeHexString(address24Bytes); + try { + CallableStatement cs = conn.prepareCall( + "{call search_addresses_in_same_24 (?, ?)}"); + cs.setString(1, address24); + cs.setDate(2, new java.sql.Date(timestamp)); + ResultSet rs = cs.executeQuery(); + while (rs.next()) { + Map<String, String> resultEntry = new HashMap<String, String>(); + String address = rs.getString(1); + addressesInSameNetwork.add(address); + } + rs.close(); + cs.close(); + } catch (SQLException e) { + /* No other addresses in the same /24 found. */ + } if (!addressesInSameNetwork.isEmpty()) { - out.println(" The following other IP addresses of Tor " - + "relays were found in the mentioned relay lists that " - + "are in the same /24 network and that could be related to " - + "IP address " + relayIP + ":\n"); + out.print(" The following other IP addresses of Tor " + + "relays in the same /24 network were found in relay and/or " + + "exit lists around the time that could be related to IP " + + "address " + relayIP + ":\n"); + out.print(" <ul>\n"); for (String s : addressesInSameNetwork) { - out.println(" " + s + "\n"); + out.print(" <li>" + s + "</li>\n"); } + out.print(" </ul>\n"); } writeFooter(out); + try { + conn.close(); + this.logger.info("Returned a database connection to the pool " + + "after " + (System.currentTimeMillis() + - requestedConnection) + " millis."); + } catch (SQLException e) { + } return; } /* Print out result. */ - Set<Long> matches = positiveConsensusesNoTarget; - if (matches.contains(relevantConsensuses.lastKey())) { - out.println(" Result is POSITIVE with high certainty!" + boolean inMostRelevantConsensuses = false, + inOtherRelevantConsensus = false, + inTooOldConsensuses = false, + inTooNewConsensuses = false; + for (long match : positiveConsensusesNoTarget) { + if (timestampIsDate && + dateFormat.format(match).equals(timestampStr)) { + inMostRelevantConsensuses = true; + } else if (!timestampIsDate && + match == relevantConsensuses.last()) { + inMostRelevantConsensuses = true; + } else if (relevantConsensuses.contains(match)) { + inOtherRelevantConsensus = true; + } else if (tooOldConsensuses.contains(match)) { + inTooOldConsensuses = true; + } else if (tooNewConsensuses.contains(match)) { + inTooNewConsensuses = true; + } + } + if (inMostRelevantConsensuses) { + out.print(" Result is POSITIVE with high certainty!" + "\n" + " We found one or more relays on IP address " - + relayIP - + " in the most recent relay list preceding " + timestampStr - + " that clients were likely to know.\n"); - } else { - boolean inOtherRelevantConsensus = false, - inTooOldConsensuses = false, - inTooNewConsensuses = false; - for (long match : matches) { - if (relevantConsensuses.containsKey(match)) { - inOtherRelevantConsensus = true; - } else if (tooOldConsensuses.containsKey(match)) { - inTooOldConsensuses = true; - } else if (tooNewConsensuses.containsKey(match)) { - inTooNewConsensuses = true; - } + + relayIP + " in "); + if (timestampIsDate) { + out.print("relay list published on " + timestampStr); + } else { + out.print("the most recent relay list preceding " + timestampStr); } + out.print(" that clients were likely to know.\n"); + } else { if (inOtherRelevantConsensus) { out.println(" Result is POSITIVE " + "with moderate certainty!\n"); out.println("We found one or more relays on IP address " - + relayIP + ", but not in the relay list immediately " - + "preceding " + timestampStr + ". A possible reason for the " - + "relay being missing in the last relay list preceding the " - + "given time might be that some of the directory " + + relayIP + ", but not in "); + if (timestampIsDate) { + out.print("a relay list published on " + timestampStr); + } else { + out.print("the most recent relay list preceding " + timestampStr); + } + out.print(". A possible reason for the relay being missing in a " + + "relay list might be that some of the directory " + "authorities had difficulties connecting to the relay. " + "However, clients might still have used the relay.\n"); } else { @@ -529,22 +646,36 @@ public class ExoneraTorServlet extends HttpServlet { if (inTooOldConsensuses || inTooNewConsensuses) { if (inTooOldConsensuses && !inTooNewConsensuses) { out.println(" Note that we found a matching relay " - + "in relay lists that were published between 5 and 3 " + + "in relay lists that were published between 15 and 3 " + "hours before " + timestampStr + ".\n"); } else if (!inTooOldConsensuses && inTooNewConsensuses) { out.println(" Note that we found a matching relay " - + "in relay lists that were published up to 2 hours " + + "in relay lists that were published up to 12 hours " + "after " + timestampStr + ".\n"); } else { out.println(" Note that we found a matching relay " - + "in relay lists that were published between 5 and 3 " + + "in relay lists that were published between 15 and 3 " + "hours before and in relay lists that were published " - + "up to 2 hours after " + timestampStr + ".\n"); + + "up to 12 hours after " + timestampStr + ".\n"); + } + if (timestampIsDate) { + out.println("Be sure to try out the previous/next day or " + + "provide an exact timestamp in UTC."); + } else { + out.println("Make sure that the timestamp you " + + "provided is correctly converted to the UTC " + + "timezone."); } - out.println("Make sure that the timestamp you provided is " - + "in the correct timezone: UTC (or GMT)."); } + /* We didn't find any descriptor. No need to look up targets. */ writeFooter(out); + try { + conn.close(); + this.logger.info("Returned a database connection to the pool " + + "after " + (System.currentTimeMillis() + - requestedConnection) + " millis."); + } catch (SQLException e) { + } return; } } @@ -553,7 +684,7 @@ public class ExoneraTorServlet extends HttpServlet { out.println(" <a name=\"exit\"></a><h3>Was this relay configured " + "to permit exiting to a given target?</h3>"); - out.println(" <form action=\"exonerator.html#exit\">\n" + out.println(" <form action=\"#exit\">\n" + " <input type=\"hidden\" name=\"timestamp\"\n" + " value=\"" + timestampStr + "\">\n" + " <input type=\"hidden\" name=\"ip\" " @@ -593,6 +724,13 @@ public class ExoneraTorServlet extends HttpServlet { if (targetIP.length() < 1) { writeFooter(out); + try { + conn.close(); + this.logger.info("Returned a database connection to the pool " + + "after " + (System.currentTimeMillis() + - requestedConnection) + " millis."); + } catch (SQLException e) { + } return; } @@ -608,28 +746,23 @@ public class ExoneraTorServlet extends HttpServlet { for (String descriptor : descriptors) { byte[] rawDescriptor = null; try { - long requestedConnection = System.currentTimeMillis(); - Connection conn = this.ds.getConnection(); - Statement statement = conn.createStatement(); - String query = "SELECT rawdesc FROM descriptor " + String query = "SELECT rawdescriptor FROM descriptor " + "WHERE descriptor = '" + descriptor + "'"; + Statement statement = conn.createStatement(); ResultSet rs = statement.executeQuery(query); if (rs.next()) { rawDescriptor = rs.getBytes(1); } rs.close(); statement.close(); - conn.close(); - this.logger.info("Returned a database connection to the pool " - + "after " + (System.currentTimeMillis() - - requestedConnection) + " millis."); } catch (SQLException e) { /* Consider this descriptors as 'missing'. */ continue; } if (rawDescriptor != null && rawDescriptor.length > 0) { missingDescriptors.remove(descriptor); - String rawDescriptorString = new String(rawDescriptor, "US-ASCII"); + String rawDescriptorString = new String(rawDescriptor, + "US-ASCII"); try { BufferedReader br = new BufferedReader( new StringReader(rawDescriptorString)); @@ -644,7 +777,7 @@ public class ExoneraTorServlet extends HttpServlet { } else if (line.startsWith("reject ") || line.startsWith("accept ")) { if (foundMatch) { - out.println("<tt> " + line + "</tt> "); + out.println(line); continue; } boolean ruleAccept = line.split(" ")[0].equals("accept"); @@ -653,7 +786,7 @@ public class ExoneraTorServlet extends HttpServlet { if (!ruleAddress.contains("/") && !ruleAddress.equals(targetIP)) { /* IP address does not match. */ - acceptRejectLines.append("<tt> " + line + "</tt> \n"); + acceptRejectLines.append(line + "\n"); continue; } String[] ruleIPParts = ruleAddress.split("/")[0]. @@ -680,7 +813,7 @@ public class ExoneraTorServlet extends HttpServlet { } if (ruleNetwork > 0) { /* IP address does not match. */ - acceptRejectLines.append("<tt> " + line + "</tt> \n"); + acceptRejectLines.append(line + "\n"); continue; } } @@ -689,7 +822,7 @@ public class ExoneraTorServlet extends HttpServlet { !rulePort.equals("*")) { /* With no port given, we only consider reject :* rules as matching. */ - acceptRejectLines.append("<tt> " + line + "</tt> \n"); + acceptRejectLines.append(line + "\n"); continue; } if (targetPort.length() > 0 && !rulePort.equals("*") && @@ -708,28 +841,28 @@ public class ExoneraTorServlet extends HttpServlet { !rulePort.contains("-") && !targetPort.equals(rulePort)) { /* Ports do not match. */ - acceptRejectLines.append("<tt> " + line + "</tt> \n"); + acceptRejectLines.append(line + "\n"); continue; } } boolean relevantMatch = false; for (long match : relevantDescriptors.get(descriptor)) { - if (relevantConsensuses.containsKey(match)) { + if (relevantConsensuses.contains(match)) { relevantMatch = true; } } if (relevantMatch) { String[] routerParts = routerLine.split(" "); - out.println(" <tt>" + routerParts[0] + " " + out.println("<pre><code>" + routerParts[0] + " " + routerParts[1] + " " + routerParts[2] + " " + routerParts[3] + " " + routerParts[4] + " " - + routerParts[5] + "</tt> "); + + routerParts[5]); String[] publishedParts = publishedLine.split(" "); - out.println("<tt>" + publishedParts[0] + " " + out.println(publishedParts[0] + " " + publishedParts[1] + " " + publishedParts[2] - + "</tt> "); - out.println(acceptRejectLines.toString()); - out.println("<tt>" + line + "</tt> "); + + ""); + out.print(acceptRejectLines.toString()); + out.println("" + line + ""); foundMatch = true; } if (ruleAccept) { @@ -739,6 +872,9 @@ public class ExoneraTorServlet extends HttpServlet { } } br.close(); + if (foundMatch) { + out.println("</code></pre>"); + } } catch (IOException e) { /* Could not read descriptor string. */ continue; @@ -747,15 +883,43 @@ public class ExoneraTorServlet extends HttpServlet { } /* Print out result. */ - matches = positiveConsensuses; - if (matches.contains(relevantConsensuses.lastKey())) { - out.println(" Result is POSITIVE with high certainty!" - + "\n" + inMostRelevantConsensuses = false; + inOtherRelevantConsensus = false; + inTooOldConsensuses = false; + inTooNewConsensuses = false; + for (long match : positiveConsensuses) { + if (timestampIsDate && + dateFormat.format(match).equals(timestampStr)) { + inMostRelevantConsensuses = true; + } else if (!timestampIsDate && match == relevantConsensuses.last()) { + inMostRelevantConsensuses = true; + } else if (relevantConsensuses.contains(match)) { + inOtherRelevantConsensus = true; + } else if (tooOldConsensuses.contains(match)) { + inTooOldConsensuses = true; + } else if (tooNewConsensuses.contains(match)) { + inTooNewConsensuses = true; + } + } + if (inMostRelevantConsensuses) { + out.print(" Result is POSITIVE with high certainty!" + + "\n" + " We found one or more relays on IP address " - + relayIP + " permitting exit to " + target - + " in the most recent relay list preceding " + timestampStr - + " that clients were likely to know.\n"); + + relayIP + " permitting exit to " + target + " in "); + if (timestampIsDate) { + out.print("relay list published on " + timestampStr); + } else { + out.print("the most recent relay list preceding " + timestampStr); + } + out.print(" that clients were likely to know.\n"); writeFooter(out); + try { + conn.close(); + this.logger.info("Returned a database connection to the pool " + + "after " + (System.currentTimeMillis() + - requestedConnection) + " millis."); + } catch (SQLException e) { + } return; } boolean resultIndecisive = target.length() > 0 @@ -770,30 +934,22 @@ public class ExoneraTorServlet extends HttpServlet { for (String desc : missingDescriptors) out.println(" " + desc + "\n"); } - boolean inOtherRelevantConsensus = false, inTooOldConsensuses = false, - inTooNewConsensuses = false; - for (long match : matches) { - if (relevantConsensuses.containsKey(match)) { - inOtherRelevantConsensus = true; - } else if (tooOldConsensuses.containsKey(match)) { - inTooOldConsensuses = true; - } else if (tooNewConsensuses.containsKey(match)) { - inTooNewConsensuses = true; - } - } if (inOtherRelevantConsensus) { if (!resultIndecisive) { out.println(" Result is POSITIVE " + "with moderate certainty!\n"); } out.println("We found one or more relays on IP address " - + relayIP + " permitting exit to " + target + ", but not in " - + "the relay list immediately preceding " + timestampStr - + ". A possible reason for the relay being missing in the last " - + "relay list preceding the given time might be that some of " - + "the directory authorities had difficulties connecting to " - + "the relay. However, clients might still have used the " - + "relay.\n"); + + relayIP + " permitting exit to " + target + ", but not in "); + if (timestampIsDate) { + out.print("a relay list published on " + timestampStr); + } else { + out.print("the most recent relay list preceding " + timestampStr); + } + out.print(". A possible reason for the relay being missing in a " + + "relay list might be that some of the directory authorities " + + "had difficulties connecting to the relay. However, clients " + + "might still have used the relay.\n"); } else { if (!resultIndecisive) { out.println(" Result is NEGATIVE " @@ -806,20 +962,25 @@ public class ExoneraTorServlet extends HttpServlet { if (inTooOldConsensuses || inTooNewConsensuses) { if (inTooOldConsensuses && !inTooNewConsensuses) { out.println(" Note that we found a matching relay in " - + "relay lists that were published between 5 and 3 " + + "relay lists that were published between 15 and 3 " + "hours before " + timestampStr + ".\n"); } else if (!inTooOldConsensuses && inTooNewConsensuses) { out.println(" Note that we found a matching relay in " - + "relay lists that were published up to 2 hours after " + + "relay lists that were published up to 12 hours after " + timestampStr + ".\n"); } else { out.println(" Note that we found a matching relay in " - + "relay lists that were published between 5 and 3 " + + "relay lists that were published between 15 and 3 " + "hours before and in relay lists that were published up " - + "to 2 hours after " + timestampStr + ".\n"); + + "to 12 hours after " + timestampStr + ".\n"); + } + if (timestampIsDate) { + out.println("Be sure to try out the previous/next day or " + + "provide an exact timestamp in UTC."); + } else { + out.println("Make sure that the timestamp you provided is " + + "correctly converted to the UTC timezone."); } - out.println("Make sure that the timestamp you provided is " - + "in the correct timezone: UTC (or GMT)."); } } if (target != null) { @@ -830,8 +991,13 @@ public class ExoneraTorServlet extends HttpServlet { + "or more relays running at the given time."); } } - - /* Finish writing response. */ + try { + conn.close(); + this.logger.info("Returned a database connection to the pool " + + "after " + (System.currentTimeMillis() + - requestedConnection) + " millis."); + } catch (SQLException e) { + } writeFooter(out); } }

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 08 Mar '12

08 Mar '12

commit cc2062c2ffc6061403cef4997f8a446bb2d48e4a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 8 12:15:15 2012 +0000 Update translations for vidalia_completed --- eu/vidalia_eu.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eu/vidalia_eu.po b/eu/vidalia_eu.po index 83370de..30c6b11 100644 --- a/eu/vidalia_eu.po +++ b/eu/vidalia_eu.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-03-08 11:38+0000\n" +"PO-Revision-Date: 2012-03-08 11:49+0000\n" "Last-Translator: Antxon Baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -3490,7 +3490,7 @@ msgstr "Ezarpenak gorde. Ezgaituta badago oraingo Tor instantziari bakarrik apli msgctxt "TorrcDialog" msgid "Cut" -msgstr "Moztu" +msgstr "Ebaki" msgctxt "TorrcDialog" msgid "Copy" @@ -3526,7 +3526,7 @@ msgstr "Huts Torera konektatzen" msgctxt "TorrcDialog" msgid "Selection is empty. Please select some text, or check \"Apply all\"" -msgstr "Ez da ezer hautatu. Mesedez hautatu testu zati bat, edo gaitu \"Dena aplikatu\"" +msgstr "Ez da ezer hautatu. Mesedez hautatu testu zati bat, edo gaitu \"Aplikatu dena\"" msgctxt "TorrcDialog" msgid "Error at line %1: \"%2\""

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 08 Mar '12

08 Mar '12

commit 9ccd4c1da9affd768d072651c07364643bacfec9 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 8 12:15:11 2012 +0000 Update translations for vidalia --- eu/vidalia_eu.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eu/vidalia_eu.po b/eu/vidalia_eu.po index 83370de..30c6b11 100755 --- a/eu/vidalia_eu.po +++ b/eu/vidalia_eu.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-03-08 11:38+0000\n" +"PO-Revision-Date: 2012-03-08 11:49+0000\n" "Last-Translator: Antxon Baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -3490,7 +3490,7 @@ msgstr "Ezarpenak gorde. Ezgaituta badago oraingo Tor instantziari bakarrik apli msgctxt "TorrcDialog" msgid "Cut" -msgstr "Moztu" +msgstr "Ebaki" msgctxt "TorrcDialog" msgid "Copy" @@ -3526,7 +3526,7 @@ msgstr "Huts Torera konektatzen" msgctxt "TorrcDialog" msgid "Selection is empty. Please select some text, or check \"Apply all\"" -msgstr "Ez da ezer hautatu. Mesedez hautatu testu zati bat, edo gaitu \"Dena aplikatu\"" +msgstr "Ez da ezer hautatu. Mesedez hautatu testu zati bat, edo gaitu \"Aplikatu dena\"" msgctxt "TorrcDialog" msgid "Error at line %1: \"%2\""

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 08 Mar '12

08 Mar '12

commit a3d4e2940e3f2650618622bb4f1ccb3800e6857e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 8 11:45:13 2012 +0000 Update translations for vidalia_completed --- eu/vidalia_eu.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eu/vidalia_eu.po b/eu/vidalia_eu.po index 631456f..83370de 100644 --- a/eu/vidalia_eu.po +++ b/eu/vidalia_eu.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-03-08 11:07+0000\n" +"PO-Revision-Date: 2012-03-08 11:38+0000\n" "Last-Translator: Antxon Baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -3586,7 +3586,7 @@ msgstr "Mapeatze portu errelea eguneratzen" msgctxt "UPNPTestDialog" msgid "Test completed successfully!" -msgstr "Froga arrakastaz bukatu da!" +msgstr "Froga arrakastaz burutu da!" msgctxt "UPNPTestDialog" msgid "Testing UPnP Support" @@ -3606,7 +3606,7 @@ msgctxt "UpdateProcess" msgid "" "Vidalia was unable to check for available software updates because Tor's " "update process exited unexpectedly." -msgstr "Vidaliak ezin izan du eskuragarri egon daitzekeen software eguneraketak begiratu Toren eguneraketa prozesua ustekabean irten delako." +msgstr "Vidaliak ezin izan du eskuragarri egon daitezkeen software eguneraketak begiratu Toren eguneraketa prozesua ustekabean irten delako." msgctxt "UpdateProgressDialog" msgid "Checking for available updates..." @@ -3734,11 +3734,11 @@ msgstr "Vidaliak datu fitxategientzako erabiltzen duen direktorioa ezartzen du." msgctxt "Vidalia" msgid "Sets the name and location of Vidalia's pidfile." -msgstr "Vidaliaren pidfitxaren izena eta kokalekua ezartzen ditu." +msgstr "Vidaliaren pidfitxategiaren izena eta kokalekua ezartzen ditu." msgctxt "Vidalia" msgid "Sets the name and location of Vidalia's logfile." -msgstr "Vidaliaren erregistro-fitxaren izena eta kokalekua ezartzen ditu." +msgstr "Vidaliaren erregistro-fitxategiaren izena eta kokalekua ezartzen ditu." msgctxt "Vidalia" msgid "Sets the verbosity of Vidalia's logging."

1 0