[metrics-web/master] Change exonerator page to simple redirect. - tor-commits

3 Jun 2014

commit b8f93d6199c07c81eb54fbba4a04f3c1b03a3473
Author: Karsten Loesing karsten.loesing@gmx.net
Date:   Tue Jun 3 10:03:56 2014 +0200
Change exonerator page to simple redirect.
---
 .../metrics/web/status/ExoneraTorServlet.java      |    5 +--
 website/web/WEB-INF/banner.jsp                     |    4 --
 website/web/WEB-INF/error.jsp                      |    1 -
 website/web/WEB-INF/exonerator.jsp                 |   45 --------------------
 website/web/WEB-INF/status.jsp                     |    6 +--
 5 files changed, 5 insertions(+), 56 deletions(-)

diff --git a/website/src/org/torproject/metrics/web/status/ExoneraTorServlet.java b/website/src/org/torproject/metrics/web/status/ExoneraTorServlet.java
index 30a2ff8..980a2ba 100644
--- a/website/src/org/torproject/metrics/web/status/ExoneraTorServlet.java
+++ b/website/src/org/torproject/metrics/web/status/ExoneraTorServlet.java
@@ -16,9 +16,8 @@ public class ExoneraTorServlet extends HttpServlet {
   public void doGet(HttpServletRequest request,
       HttpServletResponse response) throws IOException, ServletException {
-    /* Forward the request to the JSP that does all the hard work. */
-    request.getRequestDispatcher("WEB-INF/exonerator.jsp").forward(
-        request, response);
+    /* Forward to the actual ExoneraTor service. */
+    response.sendRedirect("https://exonerator.torproject.org");
   }
 }
diff --git a/website/web/WEB-INF/banner.jsp b/website/web/WEB-INF/banner.jsp
index ef0798c..5f6a43f 100644
--- a/website/web/WEB-INF/banner.jsp
+++ b/website/web/WEB-INF/banner.jsp
@@ -35,13 +35,9 @@
             %>>Performance</a>
       </font>
     <%} else if (currentPage.endsWith("status.jsp") ||
-                 currentPage.endsWith("exonerator.jsp") ||
                  currentPage.endsWith("relay-search.jsp")) {
      %><br>
       <font size="2">
-        <a <%if (currentPage.endsWith("exonerator.jsp")){
-            %>class="current"<%} else {%>href="/exonerator.html"<%}
-            %>>ExoneraTor</a>
         <a <%if (currentPage.endsWith("relay-search.jsp")){
             %>class="current"<%} else {%>href="/relay-search.html"<%}
             %>>Relay Search</a>
diff --git a/website/web/WEB-INF/error.jsp b/website/web/WEB-INF/error.jsp
index 3a65ed6..1626035 100644
--- a/website/web/WEB-INF/error.jsp
+++ b/website/web/WEB-INF/error.jsp
@@ -57,7 +57,6 @@ Maybe you find what you're looking for on our sitemap:
 </ul></li>
 <li><a href="status.html">Status</a>
 <ul>
-<li><a href="exonerator.html">ExoneraTor</a></li>
 <li><a href="relay-search.html">Relay Search</a></li>
 </ul></li>
 </ul>
diff --git a/website/web/WEB-INF/exonerator.jsp b/website/web/WEB-INF/exonerator.jsp
deleted file mode 100644
index 0eefe99..0000000
--- a/website/web/WEB-INF/exonerator.jsp
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-  <title>Tor Metrics Portal: ExoneraTor</title>
-  <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
-  <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet">
-  <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon">
-</head>
-<body>
-  <div class="center">
-    <%@ include file="banner.jsp"%>
-  <div class="main-column" style="margin:5; Padding:0;">
-    <h2>ExoneraTor</h2>
-    <h3>or: a website that tells you whether a given IP address was a Tor
-    relay</h3>
-    <br>
-    <p>Just because you see an Internet connection from a particular IP
-    address does not mean you know <i>who</i> originated the traffic. Tor
-    anonymizes Internet traffic by "<a href="https://www.torproject.org/about/overview#thesolution">onion
-    routing</a>," sending packets through a series of encrypted hops
-    before they reach their destination. Therefore, if you see traffic
-    from a Tor node, you may be seeing traffic that originated from
-    someone using Tor, rather than from the node operator itself. The Tor
-    Project and Tor node operators have no records of the traffic that
-    passes over the network, but we do maintain current and historical
-    records of which IP addresses are part of the Tor network.</p>
-    <br>
-    <p>ExoneraTor tells you whether there was a Tor relay running on a
-    given IP address at a given time. ExoneraTor can further indicate
-    whether this relay permitted exiting to a given server and/or TCP
-    port. ExoneraTor learns these facts by parsing the public relay lists
-    and relay descriptors that are collected from the Tor directory
-    authorities and the exit lists collected by TorDNSEL. By inputting an
-    IP address and time, you can determine whether that IP was then a part
-    of the Tor network.</p>
-    <br>
-    <p><font color="red"><b>Notice:</b> This service has moved to:
-    <a href="https://exonerator.torproject.org/">https://exonerator.torproject.org/</a></font></p>
-  </div>
-  </div>
-  <div class="bottom" id="bottom">
-    <%@ include file="footer.jsp"%>
-  </div>
-</body>
-</html>
diff --git a/website/web/WEB-INF/status.jsp b/website/web/WEB-INF/status.jsp
index 504d9f4..0187c82 100644
--- a/website/web/WEB-INF/status.jsp
+++ b/website/web/WEB-INF/status.jsp
@@ -14,9 +14,9 @@
         <br>
         <p>The network data collected by the Tor Metrics Project can be
         used to analyze the Tor network status from a few years ago until
-        an hour ago. There are currently two applications for this data:
-        The <a href="exonerator.html">ExoneraTor</a> tells you whether
-        some IP address was a Tor relay at a given time, and the
+        an hour ago. There is currently one application for this data
+        available on this site:
+        The
         <a href="relay-search.html">Relay Search</a> lets you search the
         descriptor archive for a relay.
     </div>

    