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

[doctor/master] Remove link to discontinued networkstatus.html.
by karsten＠torproject.org 27 Feb '12

27 Feb '12

commit 23639d39e7c8ec35f36e9b7b6df847cb0a22f8dd Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Feb 27 09:45:40 2012 +0100 Remove link to discontinued networkstatus.html. --- .../torproject/doctor/MetricsWebsiteReport.java | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/doctor/MetricsWebsiteReport.java b/src/org/torproject/doctor/MetricsWebsiteReport.java index ef48405..23e59ab 100644 --- a/src/org/torproject/doctor/MetricsWebsiteReport.java +++ b/src/org/torproject/doctor/MetricsWebsiteReport.java @@ -124,8 +124,6 @@ public class MetricsWebsiteReport { + " <a href=\"status.html\">Status</a>\n" + " <br>\n" + " <font size=\"2\">\n" - + " <a href=\"networkstatus.html\">Network " - + "Status</a>\n" + " <a href=\"exonerator.html\">ExoneraTor</a>\n" + " <a href=\"relay-search.html\">Relay Search</a>\n" + " <a class=\"current\">Consensus Health</a>\n"

1 0

[doctor/master] Remove links to discontinued relay.html.
by karsten＠torproject.org 27 Feb '12

27 Feb '12

commit 845a82b71d563104eda5973f19fb511df4576045 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Feb 27 09:16:40 2012 +0100 Remove links to discontinued relay.html. --- .../torproject/doctor/MetricsWebsiteReport.java | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/org/torproject/doctor/MetricsWebsiteReport.java b/src/org/torproject/doctor/MetricsWebsiteReport.java index 07f6805..ef48405 100644 --- a/src/org/torproject/doctor/MetricsWebsiteReport.java +++ b/src/org/torproject/doctor/MetricsWebsiteReport.java @@ -741,14 +741,11 @@ public class MetricsWebsiteReport { if (this.downloadedConsensus.containsStatusEntry(fingerprint) && this.downloadedConsensus.getStatusEntry(fingerprint).getFlags(). contains("Named") && !Character.isDigit(nickname.charAt(0))) { - this.bw.write(" <td id=\"" + nickname - + "\"><a href=\"relay.html?fingerprint=" - + fingerprint + "\" target=\"_blank\">" - + fingerprint.substring(0, 8) + "</a></td>\n"); + this.bw.write(" <td id=\"" + nickname + "\">" + + fingerprint.substring(0, 8) + "</td>\n"); } else { - this.bw.write(" <td><a href=\"relay.html?fingerprint=" - + fingerprint + "\" target=\"_blank\">" - + fingerprint.substring(0, 8) + "</a></td>\n"); + this.bw.write(" <td>" + + fingerprint.substring(0, 8) + "</td>\n"); } this.bw.write(" <td>" + nickname + "</td>\n"); SortedSet<String> relevantFlags = new TreeSet<String>();

1 0

[metrics-web/master] Discontinue TorStatus-like pages.
by karsten＠torproject.org 27 Feb '12

27 Feb '12

commit cfd767ed67d3bbc71d18e1bd3117d4a0faf97fac Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Feb 27 09:34:17 2012 +0100 Discontinue TorStatus-like pages. These pages put more load on the database than they should. Good thing we finally have a good TorStatus website. --- .../torproject/ernie/web/NetworkStatusServlet.java | 145 ------- src/org/torproject/ernie/web/RelayServlet.java | 393 +------------------- web/WEB-INF/banner.jsp | 4 - web/WEB-INF/networkstatus.jsp | 22 +- web/WEB-INF/relay.jsp | 23 ++ 5 files changed, 29 insertions(+), 558 deletions(-) diff --git a/src/org/torproject/ernie/web/NetworkStatusServlet.java b/src/org/torproject/ernie/web/NetworkStatusServlet.java index c206a19..63d7895 100644 --- a/src/org/torproject/ernie/web/NetworkStatusServlet.java +++ b/src/org/torproject/ernie/web/NetworkStatusServlet.java @@ -1,162 +1,17 @@ package org.torproject.ernie.web; import java.io.*; -import java.sql.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; -import javax.naming.*; import javax.servlet.*; import javax.servlet.http.*; -import javax.sql.*; import org.apache.commons.lang.time.*; public class NetworkStatusServlet extends HttpServlet { - private DataSource ds; - - private Logger logger; - - /** Known parameter values for the sort parameter. */ - private Set<String> validSortParameterValues; - - /** Known parameter values for the order parameter. */ - private Set<String> validOrderParameterValues; - - public void init() { - - /* Initialize logger. */ - this.logger = Logger.getLogger(NetworkStatusServlet.class.toString()); - - /* Look up data source. */ - try { - Context cxt = new InitialContext(); - this.ds = (DataSource) cxt.lookup("java:comp/env/jdbc/tordir"); - this.logger.info("Successfully looked up data source."); - } catch (NamingException e) { - this.logger.log(Level.WARNING, "Could not look up data source", e); - } - - /* Initialize known parameter values. */ - this.validSortParameterValues = new HashSet<String>(Arrays.asList(( - "nickname,bandwidth,orport,dirport,isbadexit,uptime"). - split(","))); - this.validOrderParameterValues = new HashSet<String>( - Arrays.asList(("desc,asc").split(","))); - - } - public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - /* Try to parse parameters and override them with defaults if we - * cannot parse them. */ - String sortParameter = request.getParameter("sort"); - if (sortParameter != null) { - sortParameter = sortParameter.toLowerCase(); - } - if (sortParameter == null || sortParameter.length() < 1 || - !validSortParameterValues.contains(sortParameter)) { - sortParameter = "nickname"; - } - String orderParameter = request.getParameter("order"); - if (orderParameter != null) { - orderParameter = orderParameter.toLowerCase(); - } - if (orderParameter == null || orderParameter.length() < 1 || - !validOrderParameterValues.contains(orderParameter)) { - orderParameter = "asc"; - } - - /* Initialize list containing the results. */ - List<Map<String, Object>> status = - new ArrayList<Map<String, Object>>(); - - /* Connect to the database and retrieve data set. */ - try { - long requestedConnection = System.currentTimeMillis(); - Connection conn = this.ds.getConnection(); - Statement statement = conn.createStatement(); - - String orderBy = ((sortParameter.equals("uptime") || - sortParameter.equals("platform")) - ? "descriptor." : "statusentry.") + sortParameter; - String query = "SELECT statusentry.validafter, " - + "statusentry.nickname, statusentry.fingerprint, " - + "statusentry.descriptor, statusentry.published, " - + "statusentry.address, statusentry.orport, " - + "statusentry.dirport, statusentry.isauthority, " - + "statusentry.isbadexit, statusentry.isbaddirectory, " - + "statusentry.isexit, statusentry.isfast, " - + "statusentry.isguard, statusentry.ishsdir, " - + "statusentry.isnamed, statusentry.isstable, " - + "statusentry.isrunning, statusentry.isunnamed, " - + "statusentry.isvalid, statusentry.isv2dir, " - + "statusentry.isv3dir, statusentry.version, " - + "statusentry.bandwidth, statusentry.ports, " - + "statusentry.rawdesc, descriptor.uptime, " - + "descriptor.platform FROM statusentry JOIN descriptor " - + "ON descriptor.descriptor = statusentry.descriptor " - + "WHERE statusentry.validafter = " - + "(SELECT MAX(validafter) FROM consensus) " - + "ORDER BY " + orderBy + " " + orderParameter.toUpperCase(); - - ResultSet rs = statement.executeQuery(query); - - while (rs.next()) { - Map<String, Object> row = new HashMap<String, Object>(); - row.put("validafter", rs.getTimestamp(1)); - row.put("nickname", rs.getString(2)); - row.put("fingerprint", rs.getString(3)); - row.put("descriptor", rs.getString(4)); - row.put("published", rs.getTimestamp(5)); - row.put("address", rs.getString(6)); - row.put("orport", rs.getInt(7)); - row.put("dirport", rs.getInt(8)); - row.put("isauthority", rs.getBoolean(9)); - row.put("isbadexit", rs.getBoolean(10)); - row.put("isbaddirectory", rs.getBoolean(11)); - row.put("isexit", rs.getBoolean(12)); - row.put("isfast", rs.getBoolean(13)); - row.put("isguard", rs.getBoolean(14)); - row.put("ishsdir", rs.getBoolean(15)); - row.put("isnamed", rs.getBoolean(16)); - row.put("isstable", rs.getBoolean(17)); - row.put("isrunning", rs.getBoolean(18)); - row.put("isunnamed", rs.getBoolean(19)); - row.put("isvalid", rs.getBoolean(20)); - row.put("isv2dir", rs.getBoolean(21)); - row.put("isv3dir", rs.getBoolean(22)); - row.put("version", rs.getString(23)); - row.put("bandwidth", rs.getBigDecimal(24)); - row.put("ports", rs.getString(25)); - row.put("rawdesc", rs.getBytes(26)); - row.put("uptime", DurationFormatUtils.formatDuration( - rs.getBigDecimal(27).longValue() * 1000L, "d'd' HH:mm:ss")); - row.put("platform", rs.getString(28)); - row.put("validafterts", rs.getTimestamp(1).getTime()); - - status.add(row); - } - rs.close(); - statement.close(); - conn.close(); - this.logger.info("Returned a database connection to the pool after " - + (System.currentTimeMillis() - requestedConnection) - + " millis."); - request.setAttribute("status", status); - request.setAttribute("sort", sortParameter); - request.setAttribute("order", (orderParameter.equals("desc")) - ? "asc" : "desc"); - - } catch (SQLException e) { - response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); - this.logger.log(Level.WARNING, "Database error", e); - return; - } - /* Forward the request to the JSP. */ request.getRequestDispatcher("WEB-INF/networkstatus.jsp").forward( request, response); diff --git a/src/org/torproject/ernie/web/RelayServlet.java b/src/org/torproject/ernie/web/RelayServlet.java index 64f343d..79afac3 100644 --- a/src/org/torproject/ernie/web/RelayServlet.java +++ b/src/org/torproject/ernie/web/RelayServlet.java @@ -1,403 +1,18 @@ 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.*; -import org.apache.commons.codec.binary.*; - -import org.apache.commons.lang.*; public class RelayServlet extends HttpServlet { - private SimpleDateFormat dayFormat = - new SimpleDateFormat("yyyy-MM-dd"); - - private DataSource ds; - - private Logger logger; - - public void init() { - - /* Initialize logger. */ - this.logger = Logger.getLogger(RelayServlet.class.toString()); - - /* Initialize date format parser. */ - this.dayFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - - /* Look up data source. */ - try { - Context cxt = new InitialContext(); - this.ds = (DataSource) cxt.lookup("java:comp/env/jdbc/tordir"); - 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 XHTML 1.0 " - + "Transitional//EN\"\n" - + "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n" - + "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n" - + " <head>\n" - + " <meta content=\"text/html; charset=ISO-8859-1\"\n" - + " http-equiv=\"content-type\" />\n" - + " <title>Relay</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" - + " <br/>\n" - + " <font size=\"2\">\n" - + " <a href=\"exonerator.html\">ExoneraTor</a>\n" - + " <a class=\"current\">Relay Search</a>\n" - + " <a href=\"consensus-health.html\">Consensus " - + "Health</a>\n" - + " </font>\n" - + " </td>\n" - + " <td class=\"banner-right\"></td>\n" - + " </tr>\n" - + " </table>\n" - + " <div class=\"main-column\" style=\"margin:5; " - + "Padding:0;\">\n" - + " <h2>Relay</h2>\n"); - } - - private void writeFooter(PrintWriter out) throws IOException { - out.println(" <br/>\n" - + " </div>\n" - + " </div>\n" - + " <div class=\"bottom\" id=\"bottom\">\n" - + " <p>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.</p>\n" - + " <p>\"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.</p>\n" - + " <p>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>.</p>\n" - + " </div>\n" - + " </body>\n" - + "</html>"); - out.close(); - } - public void doGet(HttpServletRequest request, - HttpServletResponse response) throws IOException, - ServletException { - - /* Measure how long it takes to process this request. */ - long started = System.currentTimeMillis(); - - /* Get print writer and start writing response. */ - PrintWriter out = response.getWriter(); - writeHeader(out); - - /* Check fingerprint parameter. */ - String fingerprintParameter = request.getParameter("fingerprint"); - boolean validParameter = true; - if (fingerprintParameter == null || - fingerprintParameter.length() < 8 || - fingerprintParameter.length() > 40) { - validParameter = false; - } else { - Pattern fingerprintPattern = Pattern.compile("^[0-9a-f]{8,40}$"); - if (!fingerprintPattern.matcher(fingerprintParameter.toLowerCase()). - matches()) { - validParameter = false; - } - } - if (!validParameter) { - out.write(" <br/><p>Sorry, \"" - + StringEscapeUtils.escapeHtml(fingerprintParameter) - + "\" is not a valid relay fingerprint. Please provide at " - + "least the first 8 hex characters of a relay " - + "fingerprint.</p>\n"); - writeFooter(out); - return; - } - - /* If we were only given a partial fingerprint, look up all - * fingerprints starting with that part to see if it's unique in the - * last 30 days. */ - String fingerprint = fingerprintParameter.toLowerCase(); - if (fingerprint.length() < 40) { - SortedSet<String> allFingerprints = new TreeSet<String>(); - try { - long requestedConnection = System.currentTimeMillis(); - Connection conn = this.ds.getConnection(); - Statement statement = conn.createStatement(); - String query = "SELECT DISTINCT fingerprint FROM statusentry " - + "WHERE validafter >= '" - + this.dayFormat.format(started - - 30L * 24L * 60L * 60L * 1000L) - + " 00:00:00' AND fingerprint LIKE '" + fingerprint + "%'"; - ResultSet rs = statement.executeQuery(query); - while (rs.next()) { - allFingerprints.add(rs.getString(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) { - out.println("<p><font color=\"red\"><b>Warning: </b></font>We " - + "experienced an unknown database problem while looking up " - + "the relay with fingerprint starting with " - + fingerprintParameter + ". Unfortunately, this is very " - + "likely a <a href=\"https://trac.torproject.org/projects/" - + "tor/ticket/4406\">known problem</a>. If you don't think " - + "these problems are related, please " - + "<a href=\"mailto:tor-assistants@torproject.org\">let us " - + "know</a>!</p>\n"); - writeFooter(out); - return; - } - if (allFingerprints.size() == 0) { - out.write("<p>No relay found with fingerprint starting with " - + fingerprintParameter + " in the last 30 days.</p>"); - writeFooter(out); - return; - } else if (allFingerprints.size() > 1) { - out.println("<p>The fingerprint part " + fingerprintParameter - + " is not unique for relays running in the last 30 days. " - + "Please choose one of the following fingerprints:</p><ul>"); - for (String f : allFingerprints) { - out.println("<li><a href=\"relay.html?fingerprint=" + f + "\">" - + f + "</a></li>"); - } - out.write("</ul><br/>"); - writeFooter(out); - return; - } else { - fingerprint = allFingerprints.first(); - } - } - - /* Print out in which consensuses this relay was last contained. */ - boolean foundRelay = false; - String lastDescriptor = null; - try { - long requestedConnection = System.currentTimeMillis(); - Connection conn = this.ds.getConnection(); - Statement statement = conn.createStatement(); - String query = "SELECT validafter, rawdesc FROM statusentry WHERE " - + "validafter >= '" - + this.dayFormat.format(started - 30L * 24L * 60L * 60L * 1000L) - + " 00:00:00' AND fingerprint = '" + fingerprint - + "' ORDER BY validafter DESC LIMIT 3"; - ResultSet rs = statement.executeQuery(query); - boolean printedDescription = false; - while (rs.next()) { - foundRelay = true; - if (!printedDescription) { - out.println("<p>The relay with fingerprint " - + (fingerprintParameter.length() < 40 ? "starting " : "") - + "with " + fingerprintParameter + " was last " - + "referenced in the following relay lists:</p>"); - printedDescription = true; - } - String validAfter = rs.getTimestamp(1).toString(). - substring(0, 19); - out.println(" <br/><tt>valid-after " - + "<a href=\"consensus?valid-after=" - + validAfter.replaceAll(":", "-").replaceAll(" ", "-") - + "\" target=\"_blank\">" + validAfter + "</a></tt><br/>"); - byte[] rawStatusEntry = rs.getBytes(2); - try { - String statusEntryLines = new String(rawStatusEntry, - "US-ASCII"); - String[] lines = statusEntryLines.split("\n"); - for (String line : lines) { - if (line.startsWith("r ")) { - String[] parts = line.split(" "); - String descriptor = String.format("%040x", - new BigInteger(1, Base64.decodeBase64(parts[3] - + "=="))); - if (lastDescriptor == null) { - lastDescriptor = descriptor; - } - out.println(" <tt>r " + parts[1] + " " + parts[2] + " " - + "<a href=\"descriptor.html?desc-id=" + descriptor - + "\" target=\"_blank\">" + parts[3] + "</a> " - + parts[4] + " " + parts[5] + " " + parts[6] + " " - + parts[7] + " " + parts[8] + "</tt><br/>"); - } else { - out.println(" <tt>" + line + "</tt><br/>"); - } - } - } catch (UnsupportedEncodingException e) { - /* This shouldn't happen, because we know that ASCII is - * supported. */ - } - } - rs.close(); - statement.close(); - conn.close(); - this.logger.info("Returned a database connection to the pool after " - + (System.currentTimeMillis() - requestedConnection) - + " millis."); - } catch (SQLException e) { - out.println("<p><font color=\"red\"><b>Warning: </b></font>We " - + "experienced an unknown database problem while looking up " - + "the relay with fingerprint " - + (fingerprintParameter.length() < 40 ? "starting with " : "") - + fingerprintParameter + ". Unfortunately, this is very likely " - + "a <a href=\"https://trac.torproject.org/projects/tor/ticket" - + "/4406\">known problem</a>. If you don't think these " - + "problems are related, please " - + "<a href=\"mailto:tor-assistants@torproject.org\">let us " - + "know</a>!</p>\n"); - writeFooter(out); - return; - } - - /* If we didn't find this relay, stop here. */ - if (!foundRelay) { - out.write("<p>No relay found with fingerprint " - + (fingerprintParameter.length() < 40 ? "starting with " : "") - + fingerprintParameter + " in the last 30 days.</p>"); - writeFooter(out); - return; - } - - /* Look up last server and extra-info descriptor in the database. */ - String query = null, descriptor = null, nickname = null, - published = null, extrainfo = null; - byte[] rawDescriptor = null, rawExtrainfo = null; - if (lastDescriptor != null) { - try { - long requestedConnection = System.currentTimeMillis(); - Connection conn = this.ds.getConnection(); - Statement statement = conn.createStatement(); - query = "SELECT descriptor, nickname, published, extrainfo, " - + "rawdesc FROM descriptor WHERE descriptor = '" - + lastDescriptor + "'"; - ResultSet rs = statement.executeQuery(query); - if (rs.next()) { - descriptor = rs.getString(1); - nickname = rs.getString(2); - published = rs.getTimestamp(3).toString().substring(0, 19); - extrainfo = rs.getString(4); - rawDescriptor = rs.getBytes(5); - query = "SELECT rawdesc FROM extrainfo WHERE extrainfo = '" - + extrainfo + "'"; - rs = statement.executeQuery(query); - if (rs.next()) { - rawExtrainfo = 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) { - out.write("<br/><p><font color=\"red\"><b>Warning: </b></font>" - + "Internal server error when looking up descriptor. The " - + "query was '" + query + "'. Unfortunately, this is very " - + "likely a <a href=\"https://trac.torproject.org/projects/" - + "tor/ticket/4406\">known problem</a>. If you don't think " - + "these problems are related, please " - + "<a href=\"mailto:tor-assistants@torproject.org\">let us " - + "know</a>!</p>\n"); - writeFooter(out); - return; - } - } - - /* If no descriptor was found, stop here. */ - if (descriptor == null) { - out.write("<p>No descriptor found with identifier " + descriptor - + " which was referenced in the last relay list.</p>"); - writeFooter(out); - return; - } - - /* Print out both server and extra-info descriptor. */ - out.write("<br/><p>The last referenced server descriptor published " - + "by this relay is:</p>"); - String descriptorString = new String(rawDescriptor, "US-ASCII"); - String escapedDescriptorString = StringEscapeUtils.escapeHtml( - descriptorString); - BufferedReader br = new BufferedReader(new StringReader( - escapedDescriptorString)); - String line = null; - while ((line = br.readLine()) != null) { - out.println(" <tt>" + line + "</tt><br/>"); - } - br.close(); - if (rawExtrainfo != null) { - out.println("<br/><p>Together with this server descriptor, the " - + "relay published the following extra-info descriptor:</p>"); - br = new BufferedReader(new StringReader(new String(rawExtrainfo, - "US-ASCII"))); - line = null; - while ((line = br.readLine()) != null) { - out.println(" <tt>" + line + "</tt><br/>"); - } - } - - /* Provide links to raw descriptors, too. */ - out.println("<br/><p>Note that the descriptor" + (rawExtrainfo != null - ? "s have" : " has") + " been converted to ASCII and reformatted " - + "for display purposes. You may also download the raw " - + "<a href=\"serverdesc?desc-id=" + descriptor - + "\" target=\"_blank\">server " + "descriptor</a>" - + (extrainfo != null ? " and <a href=\"extrainfodesc?desc-id=" - + extrainfo + "\" target=\"_blank\">extra-info descriptor</a>" - : "") + " as " + (extrainfo != null ? "they were" : "it was") - + " published to the directory authorities.</p>"); - - /* Display total lookup time on the results page. */ - long searchTime = System.currentTimeMillis() - started; - out.write(" <br/><p>Looking up this relay took us " - + String.format("%d.%03d", searchTime / 1000, searchTime % 1000) - + " seconds.</p>\n"); + HttpServletResponse response) throws IOException, ServletException { - /* Finish writing response. */ - writeFooter(out); + /* Forward the request to the JSP. */ + request.getRequestDispatcher("WEB-INF/relay.jsp").forward( + request, response); } } diff --git a/web/WEB-INF/banner.jsp b/web/WEB-INF/banner.jsp index da3b705..a081423 100644 --- a/web/WEB-INF/banner.jsp +++ b/web/WEB-INF/banner.jsp @@ -42,10 +42,6 @@ currentPage.endsWith("consensus-health.jsp")) { %><br> <font size="2"> - <a <%if (currentPage.endsWith("networkstatus.jsp") || - currentPage.endsWith("routerdetail.jsp")){ - %>class="current"<%} else {%>href="/networkstatus.html"<%} - %>>Network Status</a> <a <%if (currentPage.endsWith("exonerator.jsp")){ %>class="current"<%} else {%>href="/exonerator.html"<%} %>>ExoneraTor</a> diff --git a/web/WEB-INF/networkstatus.jsp b/web/WEB-INF/networkstatus.jsp index 4f47e2a..8f7b379 100644 --- a/web/WEB-INF/networkstatus.jsp +++ b/web/WEB-INF/networkstatus.jsp @@ -12,26 +12,8 @@ <%@ include file="banner.jsp"%> <div class="main-column"> <h2>Tor Metrics Portal: Network Status</h2> - <table> - <tr> - <th><a href="/networkstatus.html?sort=nickname&order=${sort=='nickname'?order:'desc'}">nickname</a></th> - <th><a href="/networkstatus.html?sort=bandwidth&order=${sort=='bandwidth'?order:'desc'}">bandwidth</a></th> - <th><a href="/networkstatus.html?sort=orport&order=${sort=='orport'?order:'desc'}">orport</a></th> - <th><a href="/networkstatus.html?sort=dirport&order=${sort=='dirport'?order:'desc'}">dirport</a></th> - <th><a href="/networkstatus.html?sort=isbadexit&order=${sort=='isbadexit'?order:'desc'}">isbadexit</a></th> - <th><a href="/networkstatus.html?sort=uptime&order=${sort=='uptime'?order:'desc'}">uptime</a></th> - </tr> - <c:forEach var="row" items="${status}"> - <tr> - <td><a href="/routerdetail.html?fingerprint=${row['fingerprint']}">${row['nickname']}</a></td> - <td>${row['bandwidth']}</td> - <td>${row['orport']}</td> - <td>${row['dirport']}</td> - <td>${row['isbadexit']}</td> - <td>${row['uptime']}</td> - </tr> - </c:forEach> - </table> + <br> + <p>Sorry, this page has been discontinued.</p> </div> </div> <div class="bottom" id="bottom"> diff --git a/web/WEB-INF/relay.jsp b/web/WEB-INF/relay.jsp new file mode 100644 index 0000000..952133a --- /dev/null +++ b/web/WEB-INF/relay.jsp @@ -0,0 +1,23 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html> +<head> + <title>Tor Metrics Portal: Relay</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"> + <h2>Tor Metrics Portal: Relay</h2> + <br> + <p>Sorry, this page has been discontinued.</p> + </div> + </div> + <div class="bottom" id="bottom"> + <%@ include file="footer.jsp"%> + </div> +</body> +</html>

1 0

[metrics-web/master] Fix typo.
by karsten＠torproject.org 27 Feb '12

27 Feb '12

commit e048f05cee12a7a3607e5f7c84c27e1de73af559 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Feb 27 08:47:51 2012 +0100 Fix typo. --- web/WEB-INF/formats.jsp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/WEB-INF/formats.jsp b/web/WEB-INF/formats.jsp index b84f9ef..f649554 100644 --- a/web/WEB-INF/formats.jsp +++ b/web/WEB-INF/formats.jsp @@ -94,7 +94,7 @@ descriptors, even though the incentive to do so is probably low. <blockquote> <p> -<i>Server descriptor published by relay <tt>blugmagie</tt> (without +<i>Server descriptor published by relay <tt>blutmagie</tt> (without cryptographic keys and hashes):</i> </p> <p>

1 0

r25481: {website} Removing Andrew from the Audit TBB project (website/trunk/getinvolved/en)
by Damian Johnson 27 Feb '12

27 Feb '12

Author: atagar Date: 2012-02-27 06:16:47 +0000 (Mon, 27 Feb 2012) New Revision: 25481 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Removing Andrew from the Audit TBB project Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2012-02-27 02:57:28 UTC (rev 25480) +++ website/trunk/getinvolved/en/volunteer.wml 2012-02-27 06:16:47 UTC (rev 25481) @@ -661,7 +661,7 @@ <br> Skill Level: <i>Medium</i> <br> - Likely Mentors: <i>Erinn, Jacob, Andrew</i> + Likely Mentors: <i>Erinn and Jacob</i> <p>The Tor Browser Bundle incorporates Tor, Firefox, Polipo, and the Vidalia user interface (and optionally the <a href="http://pidgin.im/">Pidgin</a> Instant Messaging client). Components are pre-configured to operate in a

1 0

[orbot/master] added installer for obfsproxy binary
by n8fr8＠torproject.org 27 Feb '12

27 Feb '12

commit d22ef2b1c53d30c4de19c32fb1ffd8458c7a058a Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Feb 11 22:39:10 2012 -0500 added installer for obfsproxy binary --- .../android/service/TorBinaryInstaller.java | 5 ++++- .../android/service/TorServiceConstants.java | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/android/service/TorBinaryInstaller.java b/src/org/torproject/android/service/TorBinaryInstaller.java index 0d79780..bb51422 100644 --- a/src/org/torproject/android/service/TorBinaryInstaller.java +++ b/src/org/torproject/android/service/TorBinaryInstaller.java @@ -73,7 +73,10 @@ public class TorBinaryInstaller implements TorServiceConstants { is = context.getResources().openRawResource(R.raw.privoxy_config); outFile = new File(installFolder, PRIVOXYCONFIG_ASSET_KEY); streamToFile(is,outFile, false, false); - + + is = context.getResources().openRawResource(R.raw.obfsproxy); + outFile = new File(installFolder, OBFSPROXY_ASSET_KEY); + streamToFile(is,outFile, false, false); return true; } diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index c9d0cb4..8f8fc1b 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -82,6 +82,7 @@ public interface TorServiceConstants { public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INTALLED"; public static final String PREF_BINARY_PRIVOXY_VERSION_INSTALLED = "BINARY_PRIVOXY_VERSION_INTALLED"; - + //obfsproxy + public static final String OBFSPROXY_ASSET_KEY = "obfsproxy"; }

1 0

[orbot/master] updating binaries and config files
by n8fr8＠torproject.org 27 Feb '12

27 Feb '12

commit 834188a22eef636473cedfffd3a2acc17b202d90 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Feb 11 22:38:32 2012 -0500 updating binaries and config files --- res/raw/obfsproxy | Bin 724091 -> 724091 bytes res/raw/tor | Bin 4129189 -> 0 bytes res/raw/torrc | 16 +--------------- res/xml/preferences.xml | 2 +- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/res/raw/obfsproxy b/res/raw/obfsproxy index ccab4ed..4ff390d 100755 Binary files a/res/raw/obfsproxy and b/res/raw/obfsproxy differ diff --git a/res/raw/tor b/res/raw/tor deleted file mode 100755 index 6c9a338..0000000 Binary files a/res/raw/tor and /dev/null differ diff --git a/res/raw/torrc b/res/raw/torrc index 94c3a13..1d25634 100644 --- a/res/raw/torrc +++ b/res/raw/torrc @@ -11,19 +11,5 @@ TransListenAddress 127.0.0.1 TransPort 9040 DNSListenAddress 127.0.0.1 DNSPort 5400 -UseBridges 1 -bridge obfs2 38.229.33.18:42401 -bridge obfs2 85.17.20.242:61264 -bridge obfs2 85.214.131.213:1051 -bridge obfs2 86.59.30.35:45605 -bridge obfs2 91.208.34.7:5353 -bridge obfs2 109.105.109.163:53999 -bridge obfs2 109.163.233.195:1051 -bridge obfs2 128.30.30.25:51420 -bridge obfs2 128.31.0.34:1051 -bridge obfs2 131.215.158.1:29936 -bridge obfs2 173.254.192.38:1051 -bridge obfs2 188.40.20.215:32982 -bridge obfs2 212.112.242.160:49259 -bridge obfs2 213.108.105.129:36609 +UseBridges 1 ClientTransportPlugin obfs2 exec /data/data/org.torproject.android/app_bin/obfsproxy --managed diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 40955db..02beff4 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -92,7 +92,7 @@ android:summary="@string/use_only_these_specified_nodes"/> </PreferenceCategory> <PreferenceCategory android:title="@string/bridges"> -<CheckBoxPreference android:defaultValue="false" +<CheckBoxPreference android:defaultValue="true" android:title="@string/use_bridges" android:key="pref_bridges_enabled" android:summary="@string/enable_alternate_entrance_nodes_into_the_tor_network"></CheckBoxPreference>

1 0

[orbot/master] added HOME export setting for obfsproxy
by n8fr8＠torproject.org 27 Feb '12

27 Feb '12

commit 3ea0d1dcc1ee10c12bf00409a616c473067515bc Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Feb 11 22:41:10 2012 -0500 added HOME export setting for obfsproxy --- src/org/torproject/android/service/TorService.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index e56539d..91e5e96 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -722,7 +722,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst torrcPath = new File(appBinHome, TORRC_TETHER_KEY).getAbsolutePath(); } - String[] torCmd = {fileTor.getAbsolutePath() + " DataDirectory " + appDataHome.getAbsolutePath() + " -f " + torrcPath + " || exit\n"}; + String[] torCmd = { + "export HOME=" + appBinHome.getAbsolutePath(), + fileTor.getAbsolutePath() + " DataDirectory " + appDataHome.getAbsolutePath() + " -f " + torrcPath + " || exit\n" + }; boolean runAsRootFalse = false; boolean waitForProcess = false;

1 0

[orbot/master] added, updated binaries and torrc
by n8fr8＠torproject.org 27 Feb '12

27 Feb '12

commit 2c9d6864764ce679365d4f8f5085232fd6bc3771 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Feb 11 04:06:57 2012 -0500 added, updated binaries and torrc --- res/raw/obfsproxy | Bin 0 -> 724091 bytes res/raw/tor | Bin 0 -> 4129189 bytes res/raw/tor.mp3 | Bin 3466275 -> 0 bytes res/raw/torrc | 19 +++++++++++++++++-- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/res/raw/obfsproxy b/res/raw/obfsproxy new file mode 100755 index 0000000..ccab4ed Binary files /dev/null and b/res/raw/obfsproxy differ diff --git a/res/raw/tor b/res/raw/tor new file mode 100755 index 0000000..6c9a338 Binary files /dev/null and b/res/raw/tor differ diff --git a/res/raw/tor.mp3 b/res/raw/tor.mp3 deleted file mode 100644 index 2a99768..0000000 Binary files a/res/raw/tor.mp3 and /dev/null differ diff --git a/res/raw/torrc b/res/raw/torrc index f3d79d2..94c3a13 100644 --- a/res/raw/torrc +++ b/res/raw/torrc @@ -6,9 +6,24 @@ ControlPort 9051 CookieAuthentication 1 RelayBandwidthRate 20 KBytes RelayBandwidthBurst 20 KBytes -UseBridges 0 AutomapHostsOnResolve 1 TransListenAddress 127.0.0.1 TransPort 9040 DNSListenAddress 127.0.0.1 -DNSPort 5400 \ No newline at end of file +DNSPort 5400 +UseBridges 1 +bridge obfs2 38.229.33.18:42401 +bridge obfs2 85.17.20.242:61264 +bridge obfs2 85.214.131.213:1051 +bridge obfs2 86.59.30.35:45605 +bridge obfs2 91.208.34.7:5353 +bridge obfs2 109.105.109.163:53999 +bridge obfs2 109.163.233.195:1051 +bridge obfs2 128.30.30.25:51420 +bridge obfs2 128.31.0.34:1051 +bridge obfs2 131.215.158.1:29936 +bridge obfs2 173.254.192.38:1051 +bridge obfs2 188.40.20.215:32982 +bridge obfs2 212.112.242.160:49259 +bridge obfs2 213.108.105.129:36609 +ClientTransportPlugin obfs2 exec /data/data/org.torproject.android/app_bin/obfsproxy --managed

1 0

[orbot/master] added filter for bridge and bridge+obfs urls
by n8fr8＠torproject.org 27 Feb '12

27 Feb '12

commit a2653393b07c88eff19217c236596a20c9da576a Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Feb 11 22:40:53 2012 -0500 added filter for bridge and bridge+obfs urls --- AndroidManifest.xml | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 060cc4e..1850135 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="0.2.3.10-alpha-orbot-1.0.7-FINAL" - android:versionCode="32" + android:versionName="0.2.3.11-alpha-1.0.8a-OBFS" + android:versionCode="33" android:installLocation="auto" > <uses-permission android:name="android.permission.INTERNET" /> @@ -24,6 +24,14 @@ <category android:name="android.intent.category.BROWSABLE" /> </intent-filter> + <intent-filter> + <action android:name="android.intent.action.VIEW" /> + <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.BROWSABLE" /> + <data android:scheme="bridge" /> + <data android:scheme="bridge+obfs" /> + </intent-filter> + <intent-filter> <category android:name="android.intent.category.DEFAULT" /> <action android:name="org.torproject.android.REQUEST_HS_PORT" />

1 0