- tor-commits - lists.torproject.org

[metrics-web/master] Add and update redirects.
by karsten＠torproject.org 20 Jan '16

20 Jan '16

commit df2c34c9d9e903b96728c8e57dd81f8d7588954f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jan 20 09:29:40 2016 +0100 Add and update redirects. --- website/etc/web.xml | 134 +++----------------- .../org/torproject/metrics/web/GraphsServlet.java | 21 --- .../torproject/metrics/web/RedirectServlet.java | 65 ++++++++++ .../torproject/metrics/web/ResearchServlet.java | 21 --- .../web/graphs/LegacyGraphsSubpagesServlet.java | 54 -------- .../metrics/web/research/ResearchDataServlet.java | 21 --- .../web/research/ResearchFormatsServlet.java | 22 ---- .../web/research/ResearchPapersServlet.java | 22 ---- .../metrics/web/research/ResearchStatsServlet.java | 19 +-- .../metrics/web/research/ResearchToolsServlet.java | 22 ---- .../metrics/web/status/ConsensusHealthServlet.java | 22 ---- .../metrics/web/status/ExoneraTorServlet.java | 21 --- .../metrics/web/status/RelaySearchServlet.java | 22 ---- website/web/WEB-INF/dir.jsp | 25 ---- website/web/WEB-INF/network.jsp | 39 ------ website/web/WEB-INF/performance.jsp | 37 ------ website/web/WEB-INF/stats.jsp | 39 ------ website/web/WEB-INF/users.jsp | 43 ------- website/web/robots.txt | 4 - 19 files changed, 86 insertions(+), 567 deletions(-) diff --git a/website/etc/web.xml b/website/etc/web.xml index 87dec8f..2081067 100644 --- a/website/etc/web.xml +++ b/website/etc/web.xml @@ -18,17 +18,6 @@ </servlet-mapping> <servlet> - <servlet-name>Graphs</servlet-name> - <servlet-class> - org.torproject.metrics.web.GraphsServlet - </servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>Graphs</servlet-name> - <url-pattern>/graphs.html</url-pattern> - </servlet-mapping> - - <servlet> <servlet-name>GraphsSubpages</servlet-name> <servlet-class> org.torproject.metrics.web.graphs.GraphsSubpagesServlet @@ -73,19 +62,6 @@ </servlet-mapping> <servlet> - <servlet-name>LegacyGraphsSubpages</servlet-name> - <servlet-class> - org.torproject.metrics.web.graphs.LegacyGraphsSubpagesServlet - </servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>LegacyGraphsSubpages</servlet-name> - <url-pattern>/network.html</url-pattern> - <url-pattern>/users.html</url-pattern> - <url-pattern>/performance.html</url-pattern> - </servlet-mapping> - - <servlet> <servlet-name>Bubbles</servlet-name> <servlet-class> org.torproject.metrics.web.graphs.BubblesServlet @@ -97,67 +73,6 @@ </servlet-mapping> <servlet> - <servlet-name>Research</servlet-name> - <servlet-class> - org.torproject.metrics.web.ResearchServlet - </servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>Research</servlet-name> - <url-pattern>/research.html</url-pattern> - </servlet-mapping> - - <servlet> - <servlet-name>ResearchData</servlet-name> - <servlet-class> - org.torproject.metrics.web.research.ResearchDataServlet - </servlet-class> - <init-param> - <param-name>localDataDir</param-name> - <param-value> - /srv/metrics.torproject.org/db/data/ - </param-value> - </init-param> - </servlet> - <servlet-mapping> - <servlet-name>ResearchData</servlet-name> - <url-pattern>/data.html</url-pattern> - </servlet-mapping> - - <servlet> - <servlet-name>ResearchPapers</servlet-name> - <servlet-class> - org.torproject.metrics.web.research.ResearchPapersServlet - </servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>ResearchPapers</servlet-name> - <url-pattern>/papers.html</url-pattern> - </servlet-mapping> - - <servlet> - <servlet-name>ResearchTools</servlet-name> - <servlet-class> - org.torproject.metrics.web.research.ResearchToolsServlet - </servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>ResearchTools</servlet-name> - <url-pattern>/tools.html</url-pattern> - </servlet-mapping> - - <servlet> - <servlet-name>ResearchFormats</servlet-name> - <servlet-class> - org.torproject.metrics.web.research.ResearchFormatsServlet - </servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>ResearchFormats</servlet-name> - <url-pattern>/formats.html</url-pattern> - </servlet-mapping> - - <servlet> <servlet-name>ResearchStats</servlet-name> <servlet-class> org.torproject.metrics.web.research.ResearchStatsServlet @@ -172,18 +87,6 @@ <servlet-mapping> <servlet-name>ResearchStats</servlet-name> <url-pattern>/stats/*</url-pattern> - <url-pattern>/stats.html</url-pattern> - </servlet-mapping> - - <servlet> - <servlet-name>RelaySearch</servlet-name> - <servlet-class> - org.torproject.metrics.web.status.RelaySearchServlet - </servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>RelaySearch</servlet-name> - <url-pattern>/relay-search.html</url-pattern> </servlet-mapping> <servlet> @@ -263,36 +166,37 @@ </servlet-mapping> <servlet> - <servlet-name>ExoneraTor</servlet-name> + <servlet-name>AboutServlet</servlet-name> <servlet-class> - org.torproject.metrics.web.status.ExoneraTorServlet + org.torproject.metrics.web.AboutServlet </servlet-class> </servlet> <servlet-mapping> - <servlet-name>ExoneraTor</servlet-name> - <url-pattern>/exonerator.html</url-pattern> + <servlet-name>AboutServlet</servlet-name> + <url-pattern>/about.html</url-pattern> </servlet-mapping> <servlet> - <servlet-name>ConsensusHealthServlet</servlet-name> + <servlet-name>RedirectServlet</servlet-name> <servlet-class> - org.torproject.metrics.web.status.ConsensusHealthServlet + org.torproject.metrics.web.RedirectServlet </servlet-class> </servlet> <servlet-mapping> - <servlet-name>ConsensusHealthServlet</servlet-name> + <servlet-name>RedirectServlet</servlet-name> <url-pattern>/consensus-health.html</url-pattern> - </servlet-mapping> - - <servlet> - <servlet-name>AboutServlet</servlet-name> - <servlet-class> - org.torproject.metrics.web.AboutServlet - </servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>AboutServlet</servlet-name> - <url-pattern>/about.html</url-pattern> + <url-pattern>/data.html</url-pattern> + <url-pattern>/exonerator.html</url-pattern> + <url-pattern>/formats.html</url-pattern> + <url-pattern>/graphs.html</url-pattern> + <url-pattern>/network.html</url-pattern> + <url-pattern>/papers.html</url-pattern> + <url-pattern>/performance.html</url-pattern> + <url-pattern>/relay-search.html</url-pattern> + <url-pattern>/research.html</url-pattern> + <url-pattern>/stats.html</url-pattern> + <url-pattern>/tools.html</url-pattern> + <url-pattern>/users.html</url-pattern> </servlet-mapping> <welcome-file-list> diff --git a/website/src/org/torproject/metrics/web/GraphsServlet.java b/website/src/org/torproject/metrics/web/GraphsServlet.java deleted file mode 100644 index 228a14a..0000000 --- a/website/src/org/torproject/metrics/web/GraphsServlet.java +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2011, 2012, 2014 The Tor Project - * See LICENSE for licensing information */ -package org.torproject.metrics.web; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -@SuppressWarnings("serial") -public class GraphsServlet extends HttpServlet { - - public void doGet(HttpServletRequest request, - HttpServletResponse response) throws IOException, ServletException { - response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY); - response.setHeader("Location", "https://metrics.torproject.org/"); - } -} - diff --git a/website/src/org/torproject/metrics/web/RedirectServlet.java b/website/src/org/torproject/metrics/web/RedirectServlet.java new file mode 100644 index 0000000..7c627d7 --- /dev/null +++ b/website/src/org/torproject/metrics/web/RedirectServlet.java @@ -0,0 +1,65 @@ +/* Copyright 2016 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.metrics.web; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@SuppressWarnings("serial") +public class RedirectServlet extends HttpServlet { + + /* Available permanent internal and external redirects. */ + private Map<String, String> redirects = new HashMap<String, String>(); + + public RedirectServlet() { + + /* Internal redirects: */ + this.redirects.put("/metrics/graphs.html", + "/?type=gr&level=bs&level=ad"); + this.redirects.put("/metrics/network.html", + "/?tag=rl&tag=br&level=bs&level=ad"); + this.redirects.put("/metrics/performance.html", + "/?tag=pf&level=bs&level=ad"); + this.redirects.put("/metrics/stats.html", + "/?type=dt&level=bs&level=ad"); + this.redirects.put("/metrics/users.html", + "/?tag=cl&level=bs&level=ad"); + + /* External redirects: */ + this.redirects.put("/metrics/consensus-health.html", + "https://consensus-health.torproject.org/"); + this.redirects.put("/metrics/data.html", + "https://collector.torproject.org/"); + this.redirects.put("/metrics/exonerator.html", + "https://exonerator.torproject.org/"); + this.redirects.put("/metrics/formats.html", + "https://collector.torproject.org/#data-formats"); + this.redirects.put("/metrics/papers.html", + "https://research.torproject.org/techreports.html"); + this.redirects.put("/metrics/relay-search.html", + "https://atlas.torproject.org/"); + this.redirects.put("/metrics/research.html", + "https://research.torproject.org/"); + this.redirects.put("/metrics/tools.html", + "https://collector.torproject.org/#related-work"); + } + + public void doGet(HttpServletRequest request, + HttpServletResponse response) throws IOException, ServletException { + String redirect = this.redirects.get(request.getRequestURI()); + if (redirect == null) { + response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + return; + } else { + response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY); + response.setHeader("Location", redirect); + } + } +} + diff --git a/website/src/org/torproject/metrics/web/ResearchServlet.java b/website/src/org/torproject/metrics/web/ResearchServlet.java deleted file mode 100644 index 020d9c5..0000000 --- a/website/src/org/torproject/metrics/web/ResearchServlet.java +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2011--2014 The Tor Project - * See LICENSE for licensing information */ -package org.torproject.metrics.web; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -@SuppressWarnings("serial") -public class ResearchServlet extends HttpServlet { - - public void doGet(HttpServletRequest request, - HttpServletResponse response) throws IOException, ServletException { - response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY); - response.setHeader("Location", "https://research.torproject.org/"); - } -} - diff --git a/website/src/org/torproject/metrics/web/graphs/LegacyGraphsSubpagesServlet.java b/website/src/org/torproject/metrics/web/graphs/LegacyGraphsSubpagesServlet.java deleted file mode 100644 index 1fd1333..0000000 --- a/website/src/org/torproject/metrics/web/graphs/LegacyGraphsSubpagesServlet.java +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright 2014 The Tor Project - * See LICENSE for licensing information */ -package org.torproject.metrics.web.graphs; - -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -@SuppressWarnings("serial") -public class LegacyGraphsSubpagesServlet extends HttpServlet { - - /* Available graphs subpages with corresponding JSP to which requests - * are forwarded. */ - private Map<String, String> availableGraphsSubpages; - - public LegacyGraphsSubpagesServlet() { - this.availableGraphsSubpages = new HashMap<String, String>(); - this.availableGraphsSubpages.put("network.html", - "WEB-INF/network.jsp"); - this.availableGraphsSubpages.put("users.html", "WEB-INF/users.jsp"); - this.availableGraphsSubpages.put("performance.html", - "WEB-INF/performance.jsp"); - } - - public void doGet(HttpServletRequest request, - HttpServletResponse response) throws IOException, ServletException { - - /* Find out which graph subpage was requested and look up which JSP - * handles this subpage. */ - String requestedPage = request.getRequestURI(); - if (requestedPage == null) { - response.sendError(HttpServletResponse.SC_BAD_REQUEST); - return; - } - if (requestedPage.contains("/")) { - requestedPage = requestedPage.substring(requestedPage. - lastIndexOf("/") + 1); - } - if (!availableGraphsSubpages.containsKey(requestedPage)) { - response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); - return; - } - String jsp = availableGraphsSubpages.get(requestedPage); - - /* Forward the request to the JSP that does all the hard work. */ - request.getRequestDispatcher(jsp).forward(request, response); - } -} - diff --git a/website/src/org/torproject/metrics/web/research/ResearchDataServlet.java b/website/src/org/torproject/metrics/web/research/ResearchDataServlet.java deleted file mode 100644 index 578d052..0000000 --- a/website/src/org/torproject/metrics/web/research/ResearchDataServlet.java +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2011--2014 The Tor Project - * See LICENSE for licensing information */ -package org.torproject.metrics.web.research; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -@SuppressWarnings("serial") -public class ResearchDataServlet extends HttpServlet { - - public void doGet(HttpServletRequest request, - HttpServletResponse response) throws IOException, ServletException { - response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY); - response.setHeader("Location", "https://collector.torproject.org/"); - } -} - diff --git a/website/src/org/torproject/metrics/web/research/ResearchFormatsServlet.java b/website/src/org/torproject/metrics/web/research/ResearchFormatsServlet.java deleted file mode 100644 index 95ce1bb..0000000 --- a/website/src/org/torproject/metrics/web/research/ResearchFormatsServlet.java +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2011--2014 The Tor Project - * See LICENSE for licensing information */ -package org.torproject.metrics.web.research; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -@SuppressWarnings("serial") -public class ResearchFormatsServlet extends HttpServlet { - - public void doGet(HttpServletRequest request, - HttpServletResponse response) throws IOException, ServletException { - response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY); - response.setHeader("Location", - "https://collector.torproject.org/formats.html"); - } -} - diff --git a/website/src/org/torproject/metrics/web/research/ResearchPapersServlet.java b/website/src/org/torproject/metrics/web/research/ResearchPapersServlet.java deleted file mode 100644 index 2aaa14a..0000000 --- a/website/src/org/torproject/metrics/web/research/ResearchPapersServlet.java +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2011--2014 The Tor Project - * See LICENSE for licensing information */ -package org.torproject.metrics.web.research; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -@SuppressWarnings("serial") -public class ResearchPapersServlet extends HttpServlet { - - public void doGet(HttpServletRequest request, - HttpServletResponse response) throws IOException, ServletException { - response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY); - response.setHeader("Location", - "https://research.torproject.org/techreports.html"); - } -} - diff --git a/website/src/org/torproject/metrics/web/research/ResearchStatsServlet.java b/website/src/org/torproject/metrics/web/research/ResearchStatsServlet.java index 6504ee0..1e045c1 100644 --- a/website/src/org/torproject/metrics/web/research/ResearchStatsServlet.java +++ b/website/src/org/torproject/metrics/web/research/ResearchStatsServlet.java @@ -52,8 +52,6 @@ public class ResearchStatsServlet extends HttpServlet { String requestURI = request.getRequestURI(); if (requestURI.equals("/metrics/stats/")) { this.writeDirectoryListing(request, response); - } else if (requestURI.equals("/metrics/stats.html")) { - this.writeStatisticsPage(request, response); } else { File statsFile = this.determineStatsFile(request); if (statsFile == null) { @@ -67,25 +65,12 @@ public class ResearchStatsServlet extends HttpServlet { private void writeDirectoryListing(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - request.setAttribute("directory", "/stats"); - request.setAttribute("extension", ".csv"); - request.setAttribute("files", this.availableStatisticsFiles); - request.getRequestDispatcher("/WEB-INF/dir.jsp").forward(request, - response); - } - - private void writeStatisticsPage(HttpServletRequest request, - HttpServletResponse response) throws IOException, ServletException { - request.getRequestDispatcher("/WEB-INF/stats.jsp").forward(request, - response); + response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY); + response.setHeader("Location", "/?type=dt&level=ad"); } private File determineStatsFile(HttpServletRequest request) { String requestedStatsFile = request.getRequestURI(); - if (requestedStatsFile.equals("/metrics/stats/") || - requestedStatsFile.equals("/metrics/stats.html")) { - return null; - } if (requestedStatsFile.endsWith(".csv")) { requestedStatsFile = requestedStatsFile.substring(0, requestedStatsFile.length() - ".csv".length()); diff --git a/website/src/org/torproject/metrics/web/research/ResearchToolsServlet.java b/website/src/org/torproject/metrics/web/research/ResearchToolsServlet.java deleted file mode 100644 index 45346c5..0000000 --- a/website/src/org/torproject/metrics/web/research/ResearchToolsServlet.java +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2011--2014 The Tor Project - * See LICENSE for licensing information */ -package org.torproject.metrics.web.research; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -@SuppressWarnings("serial") -public class ResearchToolsServlet extends HttpServlet { - - public void doGet(HttpServletRequest request, - HttpServletResponse response) throws IOException, ServletException { - response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY); - response.setHeader("Location", - "https://collector.torproject.org/#references"); - } -} - diff --git a/website/src/org/torproject/metrics/web/status/ConsensusHealthServlet.java b/website/src/org/torproject/metrics/web/status/ConsensusHealthServlet.java deleted file mode 100644 index fea0c91..0000000 --- a/website/src/org/torproject/metrics/web/status/ConsensusHealthServlet.java +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2011--2014 The Tor Project - * See LICENSE for licensing information */ -package org.torproject.metrics.web.status; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -@SuppressWarnings("serial") -public class ConsensusHealthServlet extends HttpServlet { - - public void doGet(HttpServletRequest request, - HttpServletResponse response) throws IOException, ServletException { - response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY); - response.setHeader("Location", - "https://consensus-health.torproject.org"); - } -} - diff --git a/website/src/org/torproject/metrics/web/status/ExoneraTorServlet.java b/website/src/org/torproject/metrics/web/status/ExoneraTorServlet.java deleted file mode 100644 index fdcb177..0000000 --- a/website/src/org/torproject/metrics/web/status/ExoneraTorServlet.java +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2011--2014 The Tor Project - * See LICENSE for licensing information */ -package org.torproject.metrics.web.status; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -@SuppressWarnings("serial") -public class ExoneraTorServlet extends HttpServlet { - - public void doGet(HttpServletRequest request, - HttpServletResponse response) throws IOException, ServletException { - response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY); - response.setHeader("Location", "https://exonerator.torproject.org"); - } -} - diff --git a/website/src/org/torproject/metrics/web/status/RelaySearchServlet.java b/website/src/org/torproject/metrics/web/status/RelaySearchServlet.java deleted file mode 100644 index d3b189b..0000000 --- a/website/src/org/torproject/metrics/web/status/RelaySearchServlet.java +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2011--2014 The Tor Project - * See LICENSE for licensing information */ -package org.torproject.metrics.web.status; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -@SuppressWarnings("serial") -public class RelaySearchServlet extends HttpServlet { - - public void doGet(HttpServletRequest request, - HttpServletResponse response) throws IOException, - ServletException { - response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY); - response.setHeader("Location", "https://atlas.torproject.org"); - } -} - diff --git a/website/web/WEB-INF/dir.jsp b/website/web/WEB-INF/dir.jsp deleted file mode 100644 index 4c7a20d..0000000 --- a/website/web/WEB-INF/dir.jsp +++ /dev/null @@ -1,25 +0,0 @@ -<%@ 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 — Index of ${directory}</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><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Index of ${directory}</h2> - <br> - <c:forEach var="file" items="${files}" > - <a href="${directory}/${file}${extension}">${file}${extension}</a><br> - </c:forEach> - </div> - </div> - <div class="bottom" id="bottom"> - <%@ include file="footer.jsp"%> - </div> -</body> -</html> diff --git a/website/web/WEB-INF/network.jsp b/website/web/WEB-INF/network.jsp deleted file mode 100644 index 99d11f9..0000000 --- a/website/web/WEB-INF/network.jsp +++ /dev/null @@ -1,39 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<html> -<head> - <title>Tor Metrics — Servers</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><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Servers</h2> -<br> - -<p>The graphs on this page have moved to their own subpages. -This is part of an effort to make navigation on this website more intuitive. -In the future, this page will go away, and all graphs/tables can be searched more easily from the start page. -Sorry for any inconvenience caused by this.</p> - -<ul> -<li><a href="networksize.html">Graph: Relays and bridges in the network</a></li> -<li><a href="relayflags.html">Graph: Relays with Exit, Fast, Guard, Stable, and HSDir flags</a></li> -<li><a href="versions.html">Graph: Relays by version</a></li> -<li><a href="platforms.html">Graph: Relays by platform</a></li> -<li><a href="cloudbridges.html">Graph: Tor Cloud bridges</a></li> -<li><a href="servers-data.html">Data: Number of relays and bridges</a></li> -</ul> - - </div> - </div> - <div class="bottom" id="bottom"> - <%@ include file="footer.jsp"%> - </div> -</body> -</html> diff --git a/website/web/WEB-INF/performance.jsp b/website/web/WEB-INF/performance.jsp deleted file mode 100644 index 4ab0fb3..0000000 --- a/website/web/WEB-INF/performance.jsp +++ /dev/null @@ -1,37 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<html> -<head> - <title>Tor Metrics — Performance</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><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Performance</h2> -<br> -<p>The graphs on this page have moved to their own subpages. -This is part of an effort to make navigation on this website more intuitive. -In the future, this page will go away, and all graphs/tables can be searched more easily from the start page. -Sorry for any inconvenience caused by this.</p> - -<ul> -<li><a href="torperf.html">Graph: Time to download files over Tor</a></li> -<li><a href="torperf-failures.html">Graph: Timeouts and failures of downloading files over Tor</a></li> -<li><a href="connbidirect.html">Graph: Fraction of connections used uni-/bidirectionally</a></li> -<li><a href="torperf-data.html">Data: Performance of downloading static files over Tor</a></li> -<li><a href="connbidirect2-data.html">Data: Fraction of connections used uni-/bidirectionally</a></li> -</ul> - - </div> - </div> - <div class="bottom" id="bottom"> - <%@ include file="footer.jsp"%> - </div> -</body> -</html> diff --git a/website/web/WEB-INF/stats.jsp b/website/web/WEB-INF/stats.jsp deleted file mode 100644 index 3e5026a..0000000 --- a/website/web/WEB-INF/stats.jsp +++ /dev/null @@ -1,39 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<html> -<head> - <title>Tor Metrics — Statistics</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><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Statistics</h2> -<br> -<p>The data file specifications on this page have moved to their own subpages. -This is part of an effort to make navigation on this website more intuitive. -In the future, this page will go away, and all data files can be searched more easily from the start page. -Sorry for any inconvenience caused by this.</p> - -<ul> -<li><a href="servers-data.html">Data: Number of relays and bridges</a></li> -<li><a href="bandwidth-data.html">Data: Bandwidth provided and consumed by relays</a></li> -<li><a href="advbwdist-data.html">Data: Advertised bandwidth distribution and n-th fastest relays</a></li> -<li><a href="clients-data.html">Data: Estimated number of clients in the Tor network</a></li> -<li><a href="torperf-data.html">Data: Performance of downloading static files over Tor</a></li> -<li><a href="connbidirect2-data.html">Data: Fraction of connections used uni-/bidirectionally</a></li> -</ul> - - </div> - </div> - <div class="bottom" id="bottom"> - <%@ include file="footer.jsp"%> - </div> -</body> -</html> -</body> -</html> - diff --git a/website/web/WEB-INF/users.jsp b/website/web/WEB-INF/users.jsp deleted file mode 100644 index 25e8f02..0000000 --- a/website/web/WEB-INF/users.jsp +++ /dev/null @@ -1,43 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<html> -<head> - <title>Tor Metrics — Users</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><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Users</h2> -<br> - -<p>The graphs and tables on this page have moved to their own subpages. -This is part of an effort to make navigation on this website more intuitive. -In the future, this page will go away, and all graphs/tables can be searched more easily from the start page. -Sorry for any inconvenience caused by this.</p> - -<ul> -<li><a href="userstats-relay-country.html">Graph: Direct users by country</a></li> -<li><a href="userstats-relay-table.html">Table: Top-10 countries by directly connecting users</a></li> -<li><a href="userstats-censorship-events.html">Table: Top-10 countries by possible censorship events</a></li> -<li><a href="userstats-bridge-country.html">Graph: Bridge users by country</a></li> -<li><a href="userstats-bridge-table.html">Table: Top-10 countries by bridge users</a></li> -<li><a href="userstats-bridge-transport.html">Graph: Bridge users by transport</a></li> -<li><a href="userstats-bridge-version.html">Graph: Bridge users by IP version</a></li> -<li><a href="oxford-anonymous-internet.html">Link: Tor users as percentage of larger Internet population</a></li> -<li><a href="clients-data.html">Data: Estimated number of clients in the Tor network</a></li> -</ul> - - </div> - </div> - <div class="bottom" id="bottom"> - <%@ include file="footer.jsp"%> - </div> -</body> -</html> diff --git a/website/web/robots.txt b/website/web/robots.txt deleted file mode 100644 index 99c6c29..0000000 --- a/website/web/robots.txt +++ /dev/null @@ -1,4 +0,0 @@ -User-agent: * -Disallow: /relay.html -Disallow: /csv/ -

1 0

[tor-browser-bundle/hardened-builds] Bug 18104: Add new default obfs4 bridge, noether, and renumber the others.
by gk＠torproject.org 20 Jan '16

20 Jan '16

commit a1efda4e4c74b18440c3a091cfecdb8ab34f62d3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jan 19 20:10:49 2016 +0000 Bug 18104: Add new default obfs4 bridge, noether, and renumber the others. --- Bundle-Data/PTConfigs/bridge_prefs.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 685c651..f79a7fc 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -21,10 +21,11 @@ pref("extensions.torlauncher.default_bridge.fte-ipv6.2", "fte [2001:49f0:d00a:1: pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com");

1 0

[tor-browser-bundle/master] Bug 18104: Add new default obfs4 bridge, noether, and renumber the others.
by gk＠torproject.org 20 Jan '16

20 Jan '16

commit 92dcbb1e9c64c045dcca43005cb95a5e06fef762 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jan 19 20:10:49 2016 +0000 Bug 18104: Add new default obfs4 bridge, noether, and renumber the others. --- Bundle-Data/PTConfigs/bridge_prefs.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 685c651..f79a7fc 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -21,10 +21,11 @@ pref("extensions.torlauncher.default_bridge.fte-ipv6.2", "fte [2001:49f0:d00a:1: pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com");

1 0

[snowflake/master] s/facilitator/broker/
by arlo＠torproject.org 20 Jan '16

20 Jan '16

commit 5c166f50156d6ca05d896b9b04d45aac02147bf3 Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Jan 19 21:52:03 2016 -0800 s/facilitator/broker/ --- README.md | 6 +++--- broker/config.go | 6 +++--- broker/snowflake-broker.go | 6 +++--- proxy/snowflake.coffee | 8 ++++---- server/http.go | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index f0b7678..4213ba7 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ A Pluggable Transport using WebRTC - Successfully bootstraps over WebRTC, both directly to a server plugin, as well as through the browser which proxies WebRTC to websocket. -- Needs work on signaling with the facilitator. +- Needs work on signaling with the broker. ### Usage @@ -15,10 +15,10 @@ There are currently two ways to try this: - Through a browser snowflake proxy. Using the server plugin uses an HTTP server that simulates the interaction -that a client would have with a facilitator. +that a client would have with a broker. Using the browser proxy (which will soon be the only way) requires copy and pasting between 3 terminals and a browser tab. -Once a signalling facilitator is implemented +Once a signaling broker is implemented ([issue #1](https://github.com/keroserene/snowflake/issues/1)) this will become much simpler to use. diff --git a/broker/config.go b/broker/config.go index 55d1e69..7e250aa 100644 --- a/broker/config.go +++ b/broker/config.go @@ -10,7 +10,7 @@ $ torify ~/go_appengine/appcfg.py --no_cookies -A $YOUR_APP_ID update . */ package snowflake_broker -// host:port/basepath of the facilitator you want to register with -// for example, fp-facilitator.org or example.com:12345/facilitator +// host:port/basepath of the broker you want to register with +// for example, fp-broker.org or example.com:12345/broker // https:// and /reg/ will be prepended and appended respectively. -const SNOWFLAKE_FACILITATOR = "" +const SNOWFLAKE_BROKER = "" diff --git a/broker/snowflake-broker.go b/broker/snowflake-broker.go index 784f2da..6bcff63 100644 --- a/broker/snowflake-broker.go +++ b/broker/snowflake-broker.go @@ -51,7 +51,7 @@ func regHandler(w http.ResponseWriter, r *http.Request) { // TODO: Get browser snowflake to talkto this appengine instance // so it can reply with an answer, and not just the offer again :) - // TODO: Real facilitator which matches clients and snowflake proxies. + // TODO: Real broker which matches clients and snowflake proxies. w.Write(body) } @@ -59,7 +59,7 @@ func init() { http.HandleFunc("/robots.txt", robotsTxtHandler) http.HandleFunc("/ip", ipHandler) http.HandleFunc("/reg/", regHandler) - // if SNOWFLAKE_FACILITATOR == "" { - // panic("SNOWFLAKE_FACILITATOR empty; did you forget to edit config.go?") + // if SNOWFLAKE_BROKER == "" { + // panic("SNOWFLAKE_BROKER empty; did you forget to edit config.go?") // } } diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index df7c163..a7f64a8 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -77,7 +77,7 @@ class Snowflake @rateLimit = new BucketRateLimit(rateLimitBytes * RATE_LIMIT_HISTORY, RATE_LIMIT_HISTORY) - # TODO: Should fetch from facilitator later. + # TODO: Should fetch from broker later. setRelayAddr: (relayAddr) -> addr = Parse.address relayAddr if !addr @@ -116,10 +116,10 @@ class Snowflake promise = @proxyPair.pc.createAnswer next promise.then next if promise - # Poll facilitator when this snowflake can support more clients. + # Poll broker when this snowflake can support more clients. proxyMain: -> if @proxyPairs.length >= MAX_NUM_CLIENTS * CONNECTIONS_PER_CLIENT - setTimeout(@proxyMain, @facilitator_poll_interval * 1000) + setTimeout(@proxyMain, @broker_poll_interval * 1000) return params = [['r', '1']] params.push ['transport', 'websocket'] @@ -185,7 +185,7 @@ Interface = $input.focus() # Signalling channel - just tells user to copy paste to the peer. -# Eventually this should go over the facilitator. +# Eventually this should go over the broker. Signalling = send: (msg) -> log '---- Please copy the below to peer ----\n' diff --git a/server/http.go b/server/http.go index 99e03d0..f0ecb88 100644 --- a/server/http.go +++ b/server/http.go @@ -1,5 +1,5 @@ // An HTTP-based signaling channel for the WebRTC server. It imitates the -// facilitator as seen by clients, but it doesn't connect them to an +// broker as seen by clients, but it doesn't connect them to an // intermediate WebRTC proxy, rather connects them directly to this WebRTC // server. This code should be deleted when we have proxies in place.

1 0

[snowflake/master] Skip creating the named pipe on the client if we're using http signaling
by arlo＠torproject.org 20 Jan '16

20 Jan '16

commit 0abb3bd8567aa4dd902030a896ec6edba5b68518 Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Jan 19 21:44:23 2016 -0800 Skip creating the named pipe on the client if we're using http signaling * Blocks waiting on the open for write (`cat > signal`), at least for me. --- client/snowflake.go | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/client/snowflake.go b/client/snowflake.go index 61fd46c..076080d 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -331,19 +331,21 @@ func main() { log.Println("starting") - // This FIFO receives signaling messages. - err = syscall.Mkfifo("signal", 0600) - if err != nil { - if err.(syscall.Errno) != syscall.EEXIST { + if offerURL == "" { + // This FIFO receives signaling messages. + err = syscall.Mkfifo("signal", 0600) + if err != nil { + if err.(syscall.Errno) != syscall.EEXIST { + log.Fatal(err) + } + } + signalFile, err := os.OpenFile("signal", os.O_RDONLY, 0600) + if err != nil { log.Fatal(err) } + defer signalFile.Close() + go readSignalingMessages(signalFile) } - signalFile, err := os.OpenFile("signal", os.O_RDONLY, 0600) - if err != nil { - log.Fatal(err) - } - defer signalFile.Close() - go readSignalingMessages(signalFile) webrtc.SetLoggingVerbosity(1)

1 0

[snowflake/master] add --meek flag to client to toggle the domain fronted rendezvous
by arlo＠torproject.org 20 Jan '16

20 Jan '16

commit b4a07c4192841ded1906e3e74a5e4fec6b5c3f65 Author: Serene Han <keroserene+git(a)gmail.com> Date: Tue Jan 19 17:21:07 2016 -0800 add --meek flag to client to toggle the domain fronted rendezvous --- README.md | 7 +++++++ client/meek-webrtc.go | 34 +++++++++++++++------------------- client/snowflake.go | 46 +++++++++++++++++++++++----------------------- 3 files changed, 45 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index 7b6ca9f..f0b7678 100644 --- a/README.md +++ b/README.md @@ -88,4 +88,11 @@ snowflake to just use a default relay. ### More +To try using the Meek signaling channel (which will soon be fully ready), +add the `--meek` flag like so: + +``` +ClientTransportPlugin snowflake exec ./client --meek +``` + More documentation on the way. diff --git a/client/meek-webrtc.go b/client/meek-webrtc.go index 927d4bf..172c1b5 100644 --- a/client/meek-webrtc.go +++ b/client/meek-webrtc.go @@ -1,5 +1,5 @@ -// Exchange WebRTC SessionDescriptions over meek. -// Much of this source is extracted from meek-client.go. +// Exchange WebRTC SessionDescriptions over a domain-fronted HTTP +// signalling channel. package main import ( @@ -16,29 +16,26 @@ import ( // roundtrip, including variables that may come from SOCKS args or from the // command line. type RequestInfo struct { - // What to put in the X-Session-ID header. - // SessionID string - // The URL to request. + // What to put in the X-Session-ID header - SessionID string + // The desired potentially filtered URL to request. URL *url.URL // The Host header to put in the HTTP request (optional and may be // different from the host name in URL). Host string } -func NewRequestInfo(meekUrl string, front string) *RequestInfo { +func NewRequestInfo(targetUrl string, front string) *RequestInfo { info := new(RequestInfo) - requestUrl, err := url.Parse(meekUrl) + requestUrl, err := url.Parse(targetUrl) if nil != err { return nil } info.URL = requestUrl info.Host = front - // info.URL.Host = front - // info.Host = info.URL.Host return info } -// Meek Signalling Channel +// Meek Signalling Channel. type MeekChannel struct { info *RequestInfo // Used to make all requests. @@ -58,24 +55,23 @@ func NewMeekChannel(info *RequestInfo) *MeekChannel { } // Do an HTTP roundtrip using the payload data in buf. -func (m *MeekChannel) roundTripHTTP(buf []byte) (*http.Response, error) { +func (mc *MeekChannel) roundTripHTTP(buf []byte) (*http.Response, error) { // Compose an innocent looking request. - req, err := http.NewRequest("POST", m.info.Host+"/reg/123", bytes.NewReader(buf)) + req, err := http.NewRequest("POST", mc.info.Host+"/reg/123", bytes.NewReader(buf)) if nil != err { return nil, err } - // Set actually desired target host. - req.Host = m.info.URL.String() + // Set actually desired host in the request. + req.Host = mc.info.URL.String() // req.Header.Set("X-Session-Id", m.info.SessionID) - return m.transport.RoundTrip(req) + return mc.transport.RoundTrip(req) } // Send an SDP offer to the meek facilitator, and wait for an SDP answer from // the assigned proxy in the response. -func (m *MeekChannel) Negotiate(offer *webrtc.SessionDescription) ( +func (mc *MeekChannel) Negotiate(offer *webrtc.SessionDescription) ( *webrtc.SessionDescription, error) { - buf := []byte(offer.Serialize()) - resp, err := m.roundTripHTTP(buf) + resp, err := mc.roundTripHTTP([]byte(offer.Serialize())) if nil != err { return nil, err } @@ -85,11 +81,11 @@ func (m *MeekChannel) Negotiate(offer *webrtc.SessionDescription) ( if nil != err { return nil, err } - log.Println("MeekChannel Body: ", string(body)) answer := webrtc.DeserializeSessionDescription(string(body)) return answer, nil } + // Simple interim non-fronting HTTP POST negotiation, to be removed when more // general fronting is present. func sendOfferHTTP(url string, offer *webrtc.SessionDescription) (*webrtc.SessionDescription, error) { diff --git a/client/snowflake.go b/client/snowflake.go index 7da1e15..cf08c9e 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -25,14 +25,15 @@ import ( // Hard-coded meek signalling channel for now. // TODO: expose as param const ( - MEEK_URL = "snowflake-reg.appspot.com" - FRONT_DOMAIN = "https://www.google.com" - // FRONT_DOMAIN = "https://www.google.com" + // Go fully requires the protocol to make url spec + FRONT_URL = "https://www.google.com" + BROKER_URL = "snowflake-reg.appspot.com" ) var ptInfo pt.ClientInfo var logFile *os.File var offerURL string +var meekEnabled bool // When a connection handler starts, +1 is written to this channel; when it // ends, -1 is written. @@ -160,7 +161,6 @@ func dialWebRTC(config *webrtc.Configuration, meek *MeekChannel) ( close(openChan) } dc.OnMessage = func(msg []byte) { - // log.Printf("OnMessage channel %d %+q", len(msg), msg) log.Printf("OnMessage <--- %d bytes", len(msg)) n, err := pw.Write(msg) if err != nil { @@ -180,20 +180,22 @@ func dialWebRTC(config *webrtc.Configuration, meek *MeekChannel) ( fmt.Fprintln(logFile, "\n"+offer.Serialize()+"\n") log.Printf("----------------") go func() { - // log.Printf("Sending offer via meek...") - // answer, err := meek.Negotiate(pc.LocalDescription()) - // if nil != err { - // log.Printf("Signalling error: %s", err) - // } - // if nil == answer { - // log.Printf("No answer received from meek channel.") - // } else { - // // TODO: Once this is correct, uncomment and remove copy-paste - // // signalling. - // log.Println("Recieved answer from Meek channel: \n", - // answer.Serialize()) - // // signalChan <- answer - // } + if meekEnabled { + log.Println("Sending offer via meek channel...\nTarget URL: ", BROKER_URL, + "\nFront URL: ", FRONT_URL) + answer, err := meek.Negotiate(pc.LocalDescription()) + if nil != err { + log.Printf("MeekChannel signaling error: %s", err) + } + if nil == answer { + log.Printf("MeekChannel: No answer received.") + } else { + log.Println("Recieved answer from Meek channel: \n\n", + answer.Serialize(), "\n") + // TODO: Once this is correct, uncomment and remove copy-paste stuff. + // signalChan <- answer + } + } if offerURL != "" { answer, err := sendOfferHTTP(offerURL, offer) if err != nil { @@ -253,15 +255,12 @@ func handler(conn *pt.SocksConn) error { }() defer conn.Close() - // go func() { - // }() // Prepare meek signalling channel. - info := NewRequestInfo(MEEK_URL, FRONT_DOMAIN) + info := NewRequestInfo(BROKER_URL, FRONT_URL) meek := NewMeekChannel(info) config := webrtc.NewConfiguration( webrtc.OptionIceServer("stun:stun.l.google.com:19302")) - // remote, err := dialWebRTC(config, nil) remote, err := dialWebRTC(config, meek) if err != nil { conn.Reject() @@ -322,7 +321,8 @@ func readSignalingMessages(f *os.File) { func main() { var err error - flag.StringVar(&offerURL, "url", "", "do signaling through URL") + flag.StringVar(&offerURL, "url", "", "do signalling through URL") + flag.BoolVar(&meekEnabled, "meek", false, "use domain fronted signaling") flag.Parse() logFile, err = os.OpenFile("snowflake.log", os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600)

1 0

[snowflake/master] consolidate RequestInfo into MeekChannel with a simplified Negotiate method
by arlo＠torproject.org 20 Jan '16

20 Jan '16

commit 5e9b23de9e1878eee073ef63664f12e3949708ba Author: Serene Han <keroserene+git(a)gmail.com> Date: Tue Jan 19 18:06:40 2016 -0800 consolidate RequestInfo into MeekChannel with a simplified Negotiate method --- client/meek-webrtc.go | 80 +++++++++++++++++++++---------------------------- client/snowflake.go | 9 ++---- 2 files changed, 37 insertions(+), 52 deletions(-) diff --git a/client/meek-webrtc.go b/client/meek-webrtc.go index 172c1b5..df59e98 100644 --- a/client/meek-webrtc.go +++ b/client/meek-webrtc.go @@ -1,5 +1,5 @@ // Exchange WebRTC SessionDescriptions over a domain-fronted HTTP -// signalling channel. +// signaling channel. package main import ( @@ -12,71 +12,60 @@ import ( "github.com/keroserene/go-webrtc" ) -// RequestInfo encapsulates all the configuration used for a request–response -// roundtrip, including variables that may come from SOCKS args or from the -// command line. -type RequestInfo struct { - // What to put in the X-Session-ID header - SessionID string - // The desired potentially filtered URL to request. - URL *url.URL +// Meek Signalling Channel. +type MeekChannel struct { // The Host header to put in the HTTP request (optional and may be // different from the host name in URL). - Host string + Host string + Method string + trueURL *url.URL + externalUrl string + transport http.Transport // Used to make all requests. } -func NewRequestInfo(targetUrl string, front string) *RequestInfo { - info := new(RequestInfo) - requestUrl, err := url.Parse(targetUrl) +// Construct a new MeekChannel, where +// |broker| is the URL of the facilitating program which assigns proxies +// to clients, and +// |front| is URL of the front domain. +func NewMeekChannel(broker string, front string) *MeekChannel { + targetUrl, err := url.Parse(broker) if nil != err { return nil } - info.URL = requestUrl - info.Host = front - return info -} + mc := new(MeekChannel) + mc.Host = front + mc.Method = "POST" -// Meek Signalling Channel. -type MeekChannel struct { - info *RequestInfo - // Used to make all requests. - transport http.Transport -} + mc.trueURL = targetUrl + mc.externalUrl = front + "/reg/test" // TODO: Have a better suffix. -func NewMeekChannel(info *RequestInfo) *MeekChannel { - m := new(MeekChannel) // We make a copy of DefaultTransport because we want the default Dial // and TLSHandshakeTimeout settings. But we want to disable the default - // ProxyFromEnvironment setting. Proxy is overridden below if - // options.ProxyURL is set. - m.transport = *http.DefaultTransport.(*http.Transport) - m.transport.Proxy = nil - m.info = info - return m + // ProxyFromEnvironment setting. + mc.transport = *http.DefaultTransport.(*http.Transport) + mc.transport.Proxy = nil + return mc } -// Do an HTTP roundtrip using the payload data in buf. -func (mc *MeekChannel) roundTripHTTP(buf []byte) (*http.Response, error) { - // Compose an innocent looking request. - req, err := http.NewRequest("POST", mc.info.Host+"/reg/123", bytes.NewReader(buf)) +// Roundtrip HTTP POST using WebRTC SessionDescriptions. +// +// Sends an SDP offer to the meek broker, which assigns a proxy and responds +// with an SDP answer from a designated remote WebRTC peer. +func (mc *MeekChannel) Negotiate(offer *webrtc.SessionDescription) ( + *webrtc.SessionDescription, error) { + data := bytes.NewReader([]byte(offer.Serialize())) + request, err := http.NewRequest(mc.Method, mc.externalUrl, data) if nil != err { return nil, err } - // Set actually desired host in the request. - req.Host = mc.info.URL.String() - // req.Header.Set("X-Session-Id", m.info.SessionID) - return mc.transport.RoundTrip(req) -} - -// Send an SDP offer to the meek facilitator, and wait for an SDP answer from -// the assigned proxy in the response. -func (mc *MeekChannel) Negotiate(offer *webrtc.SessionDescription) ( - *webrtc.SessionDescription, error) { - resp, err := mc.roundTripHTTP([]byte(offer.Serialize())) + request.Host = mc.trueURL.String() + resp, err := mc.transport.RoundTrip(request) if nil != err { return nil, err } defer resp.Body.Close() log.Println("MeekChannel Response: ", resp) + body, err := ioutil.ReadAll(resp.Body) if nil != err { return nil, err @@ -85,7 +74,6 @@ func (mc *MeekChannel) Negotiate(offer *webrtc.SessionDescription) ( return answer, nil } - // Simple interim non-fronting HTTP POST negotiation, to be removed when more // general fronting is present. func sendOfferHTTP(url string, offer *webrtc.SessionDescription) (*webrtc.SessionDescription, error) { diff --git a/client/snowflake.go b/client/snowflake.go index cf08c9e..61fd46c 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -26,8 +26,8 @@ import ( // TODO: expose as param const ( // Go fully requires the protocol to make url spec - FRONT_URL = "https://www.google.com" - BROKER_URL = "snowflake-reg.appspot.com" + FRONT_URL = "https://www.google.com" + BROKER_URL = "snowflake-reg.appspot.com" ) var ptInfo pt.ClientInfo @@ -255,12 +255,9 @@ func handler(conn *pt.SocksConn) error { }() defer conn.Close() - // Prepare meek signalling channel. - info := NewRequestInfo(BROKER_URL, FRONT_URL) - meek := NewMeekChannel(info) - config := webrtc.NewConfiguration( webrtc.OptionIceServer("stun:stun.l.google.com:19302")) + meek := NewMeekChannel(BROKER_URL, FRONT_URL) remote, err := dialWebRTC(config, meek) if err != nil { conn.Reject()

1 0

[snowflake/master] rename rendezvous to broker
by arlo＠torproject.org 20 Jan '16

20 Jan '16

commit 62e6704d1f3cbafd843369da6a53d97a2b8eb615 Author: Serene Han <keroserene+git(a)gmail.com> Date: Tue Jan 19 18:07:59 2016 -0800 rename rendezvous to broker --- broker/app.yaml | 10 +++++++ broker/config.go | 16 +++++++++++ broker/snowflake-broker.go | 65 +++++++++++++++++++++++++++++++++++++++++++ rendezvous/app.yaml | 10 ------- rendezvous/config.go | 16 ----------- rendezvous/snowflake-reg.go | 65 ------------------------------------------- 6 files changed, 91 insertions(+), 91 deletions(-) diff --git a/broker/README.md b/broker/README.md new file mode 100644 index 0000000..e69de29 diff --git a/broker/app.yaml b/broker/app.yaml new file mode 100644 index 0000000..14fcf0a --- /dev/null +++ b/broker/app.yaml @@ -0,0 +1,10 @@ +# override this with appcfg.py -A $YOUR_APP_ID +application: snowflake-reg +version: 1 +runtime: go +api_version: go1 + +handlers: +- url: /.* + script: _go_app + secure: always diff --git a/broker/config.go b/broker/config.go new file mode 100644 index 0000000..55d1e69 --- /dev/null +++ b/broker/config.go @@ -0,0 +1,16 @@ +/* +This is the server-side code that runs on Google App Engine for the +"appspot" registration method. + +See doc/appspot-howto.txt for more details about setting up an +application, and advice on running one. + +To upload a new version: +$ torify ~/go_appengine/appcfg.py --no_cookies -A $YOUR_APP_ID update . +*/ +package snowflake_broker + +// host:port/basepath of the facilitator you want to register with +// for example, fp-facilitator.org or example.com:12345/facilitator +// https:// and /reg/ will be prepended and appended respectively. +const SNOWFLAKE_FACILITATOR = "" diff --git a/broker/snowflake-broker.go b/broker/snowflake-broker.go new file mode 100644 index 0000000..784f2da --- /dev/null +++ b/broker/snowflake-broker.go @@ -0,0 +1,65 @@ +package snowflake_broker + +import ( + // "io" + "io/ioutil" + "log" + "net" + "net/http" + "path" + + // "appengine" + // "appengine/urlfetch" +) + +// This is an intermediate step - a basic hardcoded appengine rendezvous +// to a single browser snowflake. + +var snowflakeProxy = "" + +func robotsTxtHandler(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Content-Type", "text/plain; charset=utf-8") + w.Write([]byte("User-agent: *\nDisallow:\n")) +} + +func ipHandler(w http.ResponseWriter, r *http.Request) { + remoteAddr := r.RemoteAddr + if net.ParseIP(remoteAddr).To4() == nil { + remoteAddr = "[" + remoteAddr + "]" + } + w.Header().Set("Content-Type", "text/plain; charset=utf-8") + w.Write([]byte(remoteAddr)) +} + +/* +Expects a WebRTC SDP offer in the Request to give to an assigned +snowflake proxy, which responds with the SDP answer to be sent in +the HTTP response back to the client. +*/ +func regHandler(w http.ResponseWriter, r *http.Request) { + // TODO: Maybe don't pass anything on path, since it will always be bidirectional + dir, _ := path.Split(path.Clean(r.URL.Path)) + if dir != "/reg/" { + http.NotFound(w, r) + return + } + body, err := ioutil.ReadAll(r.Body) + if nil != err { + return + log.Println("Invalid data.") + } + + // TODO: Get browser snowflake to talkto this appengine instance + // so it can reply with an answer, and not just the offer again :) + // TODO: Real facilitator which matches clients and snowflake proxies. + w.Write(body) +} + +func init() { + http.HandleFunc("/robots.txt", robotsTxtHandler) + http.HandleFunc("/ip", ipHandler) + http.HandleFunc("/reg/", regHandler) + // if SNOWFLAKE_FACILITATOR == "" { + // panic("SNOWFLAKE_FACILITATOR empty; did you forget to edit config.go?") + // } +} diff --git a/rendezvous/README.md b/rendezvous/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/rendezvous/app.yaml b/rendezvous/app.yaml deleted file mode 100644 index 14fcf0a..0000000 --- a/rendezvous/app.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# override this with appcfg.py -A $YOUR_APP_ID -application: snowflake-reg -version: 1 -runtime: go -api_version: go1 - -handlers: -- url: /.* - script: _go_app - secure: always diff --git a/rendezvous/config.go b/rendezvous/config.go deleted file mode 100644 index eabbe65..0000000 --- a/rendezvous/config.go +++ /dev/null @@ -1,16 +0,0 @@ -/* -This is the server-side code that runs on Google App Engine for the -"appspot" registration method. - -See doc/appspot-howto.txt for more details about setting up an -application, and advice on running one. - -To upload a new version: -$ torify ~/go_appengine/appcfg.py --no_cookies -A $YOUR_APP_ID update . -*/ -package snowflake_reg - -// host:port/basepath of the facilitator you want to register with -// for example, fp-facilitator.org or example.com:12345/facilitator -// https:// and /reg/ will be prepended and appended respectively. -const SNOWFLAKE_FACILITATOR = "" diff --git a/rendezvous/snowflake-reg.go b/rendezvous/snowflake-reg.go deleted file mode 100644 index 094612d..0000000 --- a/rendezvous/snowflake-reg.go +++ /dev/null @@ -1,65 +0,0 @@ -package snowflake_reg - -import ( - // "io" - "io/ioutil" - "log" - "net" - "net/http" - "path" - - // "appengine" - // "appengine/urlfetch" -) - -// This is an intermediate step - a basic hardcoded appengine rendezvous -// to a single browser snowflake. - -var snowflakeProxy = "" - -func robotsTxtHandler(w http.ResponseWriter, r *http.Request) { - w.Header().Set("Content-Type", "text/plain; charset=utf-8") - w.Write([]byte("User-agent: *\nDisallow:\n")) -} - -func ipHandler(w http.ResponseWriter, r *http.Request) { - remoteAddr := r.RemoteAddr - if net.ParseIP(remoteAddr).To4() == nil { - remoteAddr = "[" + remoteAddr + "]" - } - w.Header().Set("Content-Type", "text/plain; charset=utf-8") - w.Write([]byte(remoteAddr)) -} - -/* -Expects a WebRTC SDP offer in the Request to give to an assigned -snowflake proxy, which responds with the SDP answer to be sent in -the HTTP response back to the client. -*/ -func regHandler(w http.ResponseWriter, r *http.Request) { - // TODO: Maybe don't pass anything on path, since it will always be bidirectional - dir, _ := path.Split(path.Clean(r.URL.Path)) - if dir != "/reg/" { - http.NotFound(w, r) - return - } - body, err := ioutil.ReadAll(r.Body) - if nil != err { - return - log.Println("Invalid data.") - } - - // TODO: Get browser snowflake to talkto this appengine instance - // so it can reply with an answer, and not just the offer again :) - // TODO: Real facilitator which matches clients and snowflake proxies. - w.Write(body) -} - -func init() { - http.HandleFunc("/robots.txt", robotsTxtHandler) - http.HandleFunc("/ip", ipHandler) - http.HandleFunc("/reg/", regHandler) - // if SNOWFLAKE_FACILITATOR == "" { - // panic("SNOWFLAKE_FACILITATOR empty; did you forget to edit config.go?") - // } -}

1 0

[tor/master] Use correct u64 int ops instead of regular int ops, in order to avoid warnings on 32bit clang
by nickm＠torproject.org 20 Jan '16

20 Jan '16

commit 3e738211d4301829a7b00fbfd2e57e4f6d671011 Author: Ola Bini <ola(a)olabini.se> Date: Tue Jan 19 11:11:01 2016 -0500 Use correct u64 int ops instead of regular int ops, in order to avoid warnings on 32bit clang --- src/test/test_options.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/test_options.c b/src/test/test_options.c index 18e3e91..ed05811 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -2308,7 +2308,7 @@ test_options_validate__bandwidth(void *ignored) "RelayBandwidthRate 1000\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, 0); - tt_int_op(tdata->opt->RelayBandwidthBurst, OP_EQ, 1000); + tt_u64_op(tdata->opt->RelayBandwidthBurst, OP_EQ, 1000); tor_free(msg); free_options_test_data(tdata); @@ -2316,7 +2316,7 @@ test_options_validate__bandwidth(void *ignored) "RelayBandwidthBurst 1001\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, 0); - tt_int_op(tdata->opt->RelayBandwidthRate, OP_EQ, 1001); + tt_u64_op(tdata->opt->RelayBandwidthRate, OP_EQ, 1001); tor_free(msg); free_options_test_data(tdata); @@ -2347,7 +2347,7 @@ test_options_validate__bandwidth(void *ignored) ); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, 0); - tt_int_op(tdata->opt->BandwidthRate, OP_EQ, 1001); + tt_u64_op(tdata->opt->BandwidthRate, OP_EQ, 1001); tor_free(msg); free_options_test_data(tdata); @@ -2359,7 +2359,7 @@ test_options_validate__bandwidth(void *ignored) ); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, 0); - tt_int_op(tdata->opt->BandwidthBurst, OP_EQ, 1001); + tt_u64_op(tdata->opt->BandwidthBurst, OP_EQ, 1001); tor_free(msg); free_options_test_data(tdata);

1 0

[tor/master] Make sure that tests for domain sockets only run on OSes with domain sockets
by nickm＠torproject.org 20 Jan '16

20 Jan '16

commit 32946e2c9652d28c988466cfc7c3e6ca6007b114 Author: Ola Bini <ola(a)olabini.se> Date: Tue Jan 19 11:14:41 2016 -0500 Make sure that tests for domain sockets only run on OSes with domain sockets --- src/test/test_options.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/test_options.c b/src/test/test_options.c index ed05811..91aae68 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -3221,6 +3221,7 @@ test_options_validate__control(void *ignored) "controller as soon as possible.\n"); tor_free(msg); +#ifdef HAVE_SYS_UN_H free_options_test_data(tdata); tdata = get_options_test_data(TEST_OPTIONS_DEFAULT_VALUES "ControlSocket unix:/tmp WorldWritable\n" @@ -3282,6 +3283,7 @@ test_options_validate__control(void *ignored) "can reconfigure your Tor. That's bad! You should upgrade your " "Tor controller as soon as possible.\n"); tor_free(msg); +#endif free_options_test_data(tdata); tdata = get_options_test_data(TEST_OPTIONS_DEFAULT_VALUES

1 0