commit ef05c30ad3ffd27acfd0ee8315f509d585e2b423 Author: Karsten Loesing <karsten.loesing@gmx.net> Date: Fri Dec 23 11:02:10 2016 +0100 Update content on secondary navigation pages. --- website/web/WEB-INF/about.jsp | 29 ++++++---------- website/web/WEB-INF/development.jsp | 41 +++++++++++----------- website/web/WEB-INF/news.jsp | 11 +++--- website/web/WEB-INF/operation.jsp | 48 ++++++++++++++++++-------- website/web/WEB-INF/research.jsp | 36 ++++++-------------- website/web/WEB-INF/sources.jsp | 68 ++++++++----------------------------- 6 files changed, 95 insertions(+), 138 deletions(-) diff --git a/website/web/WEB-INF/about.jsp b/website/web/WEB-INF/about.jsp index f51dc6a..208b80f 100644 --- a/website/web/WEB-INF/about.jsp +++ b/website/web/WEB-INF/about.jsp @@ -13,45 +13,36 @@ </div> <div class="container"> - <h1>About <a href="#about" name="about" class="anchor">#</a></h1> - - <p>Tor metrics are updated daily to provide transparency for Tor users, give feedback for developers, and measure evidence of network anomalies.</p> + <p>You're curious who has put together all this information, and you're thinking about contributing? Here we tell you a bit about the Tor metrics team and give you some pointers for joining our team.</p> </div> <div class="container"> - - <br> - <h2>Philosophy <a href="#philosophy" name="philosophy" class="anchor">#</a></h2> - <p>We only use public, non-sensitive data for metrics. Each metric goes through a rigorous review and discussion process before appearing here. We never publish statistics—or aggregate statistics—of sensitive data, such as unencrypted contents of traffic.</p> + </div> - <br> - + <div class="container"> <h2>Contributing <a href="#contributing" name="contributing" class="anchor">#</a></h2> + <p>Collecting and processing new data won't likely happen without your help! If you really want to see something measured here, we would be happy to work with you. Learn more about contributing on our <a href="https://trac.torproject.org/projects/tor/wiki/org/teams/MetricsTeam" target="_blank">team wiki page</a>.</p> + </div> - <p>Collecting and processing new data won't likely happen without your help! If you really want to see something measured here, we would be happy to work with you. (Link to Trac wiki page)</p> - - <br> - + <div class="container"> <h2>Contact <a href="#contact" name="contact" class="anchor">#</a></h2> + <p>If you have any questions or suggestions, contact us at <a href="mailto:metrics-team@lists.torproject.org">metrics-team@lists.torproject.org</a>, which is a <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/metrics-team" target="_blank">public mailing list</a>.</p> + </div> - <p>If you have any questions, contact us at <a href="mailto:metrics-team@lists.torproject.org">metrics-team@lists.torproject.org</a>.</p> - - <br> - + <div class="container"> <h2>Testimonials <a href="#testimonials" name="testimonials" class="anchor">#</a></h2> <blockquote> <p class="mb-0"> Metrics are a critical part of any security technology. If you don't know how the technology works in practice, you can't find and fix problems. You can't improve the security. You can't make it work better. This isn't glamorous or sexy work, but it's essential. This is especially true for security and privacy, where our preconceived notions of threats and usage are regularly wrong—and knowing what's really going on is the difference between security and insecurity.<br><br> Tor is doing cutting-edge work in the anonymity space, and Tor metrics are already proven to provide critical information for research and development. It's one of the few open data sets available for how, why, where, and when people use anonymizing technologies.<br><br> Tor's metrics project increases the transparency of Tor's work. This helps users understand how Tor works. With good network metrics, you can look back for indicators and anomalies at the time a privacy issue was reported. You can also extrapolate and look forward to prevent related issues in the future. This helps alleviate users' security concerns, and helps others contribute to security issues in the network and browser.<br><br> - Finally, Tor metrics are the ammunition that lets Tor and other security advocates argue for a more private and secure Internet from a position of data, rather than just dogma or perspective. It's where the real world influences Tor. + Finally, Tor metrics are the ammunition that lets Tor and other security advocates argue for a more private and secure Internet from a position of data, rather than just dogma or perspective. It's where the real world influences Tor.” </p> <footer class="blockquote-footer">Bruce Schneier (June 1, 2016)</footer> </blockquote> - </div> <jsp:include page="bottom.jsp"/> diff --git a/website/web/WEB-INF/development.jsp b/website/web/WEB-INF/development.jsp index 183df9c..ad20927 100644 --- a/website/web/WEB-INF/development.jsp +++ b/website/web/WEB-INF/development.jsp @@ -13,26 +13,27 @@ </div> <div class="container"> - <h1>Development</h1> -<ul> -<li><a href="https://play.google.com/store/apps/details?id=com.networksaremadeofstring.anonionooid">AnOnionooid</a> is an Android app that helps find and explore Tor relays and bridges.</li> -<li>Tor's <a href="https://gitweb.torproject.org/tor.git/tree/scripts/maint/updateFallbackDirs.py">fallback directories script</a> generates a list of stable directories.</li> -<li><a href="https://github.com/duk3luk3/onion-py">OnionPy</a> provides memcached support to cache queried data.</li> -<li><a href="https://nos-oignons.net/Services/index.en.html">Nos oignons</a> visualizes bandwidth histories of their relays.</li> -<li><a href="https://metrics.torproject.org/uncharted-data-flow.html">metrics-lib</a> is a Java library to fetch and pars -e Tor descriptors.</li> -<li><a href="https://stem.torproject.org/">Stem</a> is a Python library that parses Tor descriptors.</li> -<li><a href="https://github.com/meejah/txtorcon">Txtorcon</a> is an asynchronous Tor controller library written in Twiste -d Python.</li> -<li><a href="https://github.com/NullHypothesis/zoossh">Zoossh</a> is a parser written in Go for Tor-specific data formats -.</li> -<li><a href="https://savannah.nongnu.org/projects/koninoo/">koninoo</a> is a simple Java command line interface for query -ing Onionoo data.</li> -<li><a href="https://gitweb.torproject.org/user/phw/exitmap.git">Exitmap</a> is a fast and extensible scanner for Tor exi -t relays.</li> -<li><a href="https://gitweb.torproject.org/user/phw/sybilhunter.git/">Sybilhunter</a> attempts to detect Sybil attacks on - the Tor network.</li> -</ul> + <h1>Development <a href="#development" name="development" class="anchor">#</a></h1> + <p>You're a developer and want to write a tool that uses Tor network data? Here we're collecting programming libraries, APIs, and links to other code bases to get inspiration from.</p> + </div> + + <div class="container"> + <h2>Parsing libraries <a href="#libraries" name="libraries" class="anchor">#</a></h2> + <p>The following libraries help you with parsing Tor network data from the <a href="https://collector.torproject.org/" target="_blank">CollecTor</a> service.</p> + <ul> + <li><a href="https://dist.torproject.org/descriptor/" target="_blank">metrics-lib</a> is a Java library to fetch and parse Tor descriptors.</li> + <li><a href="https://stem.torproject.org/" target="_blank">Stem</a> is a Python library that parses Tor descriptors.</li> + <li><a href="https://github.com/NullHypothesis/zoossh" target="_blank">Zoossh</a> is a parser written in Go for Tor-specific data formats.</li> + </ul> + </div> + + <div class="container"> + <h2>Query support <a href="#query" name="query" class="anchor">#</a></h2> + <p>The following tools help you with querying Tor network data from the <a href="https://onionoo.torproject.org/" target="_blank">Onionoo</a> service.</p> + <ul> + <li><a href="https://savannah.nongnu.org/projects/koninoo/" target="_blank">koninoo</a> is a simple Java command line interface for querying Onionoo data.</li> + <li><a href="https://github.com/duk3luk3/onion-py" target="_blank">OnionPy</a> provides memcached support to cache queried data.</li> + </ul> </div> <jsp:include page="bottom.jsp"/> diff --git a/website/web/WEB-INF/news.jsp b/website/web/WEB-INF/news.jsp index a15009e..c5d86a0 100644 --- a/website/web/WEB-INF/news.jsp +++ b/website/web/WEB-INF/news.jsp @@ -14,20 +14,17 @@ <div class="container"> <h1>News <a href="#news" name="news" class="anchor">#</a></h1> - <p>We collect reports of events and aggregate them here for your convenience. The process is usually pretty informal. Someone tells us of an event, reports it to us, and we aggregate them here. If you know of any event that may have caused a measurement anomaly, help us add it to this list.</p> + <p>You're a journalist or more generally a person who wants to know what's going on in the Tor network? We're collecting unusual events in the Tor network together with any insights we have into what we think has happened.</p> </div> - <div class="container"> <c:forEach var="category" items="${news}" varStatus="status"> - <c:if test="${not status.first}"><hr></c:if> + <div class="container"> <h2>${category.key[0]} <a href="#${category.key[1]}" name="${category.key[1]}" class="anchor">#</a></h2> <c:forEach var="entry" items="${category.value}"> - <p>${entry[0]}</p> - <br> + <p>${entry[0]}<br></p> </c:forEach> - </c:forEach> - </div> + </c:forEach> <jsp:include page="bottom.jsp"/> diff --git a/website/web/WEB-INF/operation.jsp b/website/web/WEB-INF/operation.jsp index 8888183..5ee2b77 100644 --- a/website/web/WEB-INF/operation.jsp +++ b/website/web/WEB-INF/operation.jsp @@ -13,20 +13,40 @@ </div> <div class="container"> - <h1>Operation</h1> -<ul> -<li><a href="https://exonerator.torproject.org/">ExoneraTor</a> tells you if an IP was used by a Tor relay on a given date.</li> -<li><a href="https://atlas.torproject.org/">Atlas</a> displays data about single relays and bridges in the Tor network.</li> -<li><a href="https://compass.torproject.org/">Compass</a> groups current relays in different ways to measure Tor's network diversity.</li> -<li><a href="https://oniontip.com/">OnionTip</a> distributes bitcoin donations to relays that can receive them.</li> -<li><a href="https://consensus-health.torproject.org/">Consensus Health</a> displays information about the current directory consensus and votes.</li> -<li><a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-consensus-health">Consensus Issues</a> emails directory authority operators about consensus problems.</li> -<li><a href="https://onionview.codeplex.com/">Check</a> uses<a href="https://www.torproject.org/projects/tordnsel.html.en">TorDNSEL</a> data to tell users whether they are using Tor or not.</li> -<li><a href="http://lists.infolabe.net/lists/listinfo/infolabe-anomalies">OII's anomaly detection system</a> ranks countries by how anomalous their Tor usage is.</li> -<li><a href="https://tor-explorer-10kapart2016.azurewebsites.net/">Tor Explorer</a> displays data on each individual Tor node.</li> -<li>A <a href="https://duckduckgo.com/">DuckDuckGo</a> search with "tor node" keywords displays Tor node details.</li> -<li><a href="https://onionview.codeplex.com/">OnionView</a> plots the location of active Tor nodes on an interactive map of the world.</li> -</ul> + <h1>Operation <a href="#operation" name="operation" class="anchor">#</a></h1> + <p>You're operating a Tor relay or bridge, or you're affected in some way by somebody else operating one? Here you can learn everything about currently running Tor nodes or even about nodes that have been running in the past.</p> + </div> + + <div class="container"> + <h2>Network archive <a href="#archive" name="archive" class="anchor">#</a></h2> + <p>The following tool lets you browse the network archive for relays running in the past.</p> + <ul> + <li><a href="https://exonerator.torproject.org/" target="_blank">ExoneraTor</a> tells you if an IP was used by a Tor relay on a given date.</li> + </ul> + </div> + + <div class="container"> + <h2>Network status <a href="#status" name="status" class="anchor">#</a></h2> + <p>The following tools let you explore currently running relays and bridges.</p> + <ul> + <li><a href="https://play.google.com/store/apps/details?id=com.networksaremadeofstring.an..." target="_blank">AnOnionooid</a> is an Android app that helps find and explore Tor relays and bridges.</li> + <li><a href="https://atlas.torproject.org/" target="_blank">Atlas</a> displays data about single relays and bridges in the Tor network.</li> + <li><a href="https://compass.torproject.org/" target="_blank">Compass</a> groups current relays in different ways to measure Tor's network diversity.</li> + <li><a href="https://consensus-health.torproject.org/" target="_blank">Consensus Health</a> displays information about the current directory consensus and votes.</li> + <li><a href="https://duckduckgo.com/" target="_blank">DuckDuckGo</a> displays Tor node details when including the keywords "tor node" in a search.</li> + <li><a href="https://oniontip.com/" target="_blank">OnionTip</a> distributes bitcoin donations to relays that can receive them.</li> + <li><a href="https://onionview.codeplex.com/" target="_blank">OnionView</a> plots the location of active Tor nodes on an interactive map of the world.</li> + <li><a href="https://tor-explorer-10kapart2016.azurewebsites.net/" target="_blank">Tor Explorer</a> displays data on each individual Tor node.</li> + </ul> + </div> + + <div class="container"> + <h2>Network health notifications <a href="#health" name="health" class="anchor">#</a></h2> + <p>The following tools inform you of any problems with relays and bridges.</p> + <ul> + <li><a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-consensus-health" target="_blank">Consensus Issues</a> emails directory authority operators about consensus problems.</li> + <li><a href="http://lists.infolabe.net/lists/listinfo/infolabe-anomalies" target="_blank">OII's anomaly detection system</a> ranks countries by how anomalous their Tor usage is.</li> + </ul> </div> <jsp:include page="bottom.jsp"/> diff --git a/website/web/WEB-INF/research.jsp b/website/web/WEB-INF/research.jsp index 82e1680..57438fc 100644 --- a/website/web/WEB-INF/research.jsp +++ b/website/web/WEB-INF/research.jsp @@ -14,16 +14,12 @@ <div class="container"> <h1>Research <a href="#research" name="research" class="anchor">#</a></h1> - <p>Tor started out as a research project! We encourage research on all things Tor.</p> - <p>Look around the papers section below for some ideas on what others have researched in the past. Contact <a href="mailto:#">[some general email list here, torproject?]</a> if you want to discuss ideas.</p> - + <p>You're a researcher and want to write a paper related to the public, deployed Tor network? Here you'll find other relevant papers to cite, technical reports to understand all the details, and existing tools to conduct research on the Tor network.</p> </div> <div class="container"> - - <h2>Feel free to use our data for your research! <a href="#use" name="use" class="anchor">#</a></h2> - - <p>If you do, please cite <a href="https://metrics.torproject.org/" target="_self">https://metrics.torproject.org/</a> or the following <a href="http://freehaven.net/anonbib/#wecsr10measuring-tor" target="_blank">paper</a>:</p> + <h2>Citation <a href="#cite" name="cite" class="anchor">#</a></h2> + <p>Feel free to use our data for your research. If you do, please cite <a href="https://metrics.torproject.org/" target="_self">https://metrics.torproject.org/</a> or the following <a href="http://freehaven.net/anonbib/#wecsr10measuring-tor" target="_blank">paper</a>:</p> <p><pre> @inproceedings{wecsr10measuring-tor, title = {A Case Study on Measuring Statistical Data in the {T}or Anonymity Network}, @@ -36,30 +32,20 @@ series = {LNCS}, }</pre></p> <p>Thank you for acknowledging this work through a citation.</p> - </div> <div class="container"> - - <h2>Want to collect your own data for research? <a href="#collect" name="collect" class="anchor">#</a></h2> - <p>Look at the <a href="sources.html">sources page</a> for services that collect Tor-related data.</p> - + <h2>Technical reports <a href="#techreports" name="techreports" class="anchor">#</a></h2> + <p>From time to time we're writing <a href="https://research.torproject.org/techreports.html" target="_blank">technical reports</a> with further details on how we collect statistics in the Tor network or how we use them to learn new interesting facts. Be sure to take a look!</p> </div> - <div class="container"> - - <h2>Research Papers <a href="#research" name="research" class="anchor">#</a></h2> - <p>Here are some Tor-related papers. (...) If we're missing yours, let us know!</p> - - </div> - - <div class="container"> -<ul> -<li><a href="https://torps.github.io/">TorPS</a> simulates changes to Tor's path selection algorithm using archived data.</li> -<li><a href="https://shadow.github.io/">Shadow</a> uses archived Tor directory data to generate realistic network topolog -ies.</li> -</ul> + <h2>Research tools <a href="#tools" name="tools" class="anchor">#</a></h2> + <p>The following tools are primarily useful if you want to do research using Tor network data.</p> + <ul> + <li><a href="https://torps.github.io/" target="_blank">TorPS</a> simulates changes to Tor's path selection algorithm using archived data.</li> + <li><a href="https://shadow.github.io/" target="_blank">Shadow</a> uses archived Tor directory data to generate realistic network topologies.</li> + </ul> </div> <jsp:include page="bottom.jsp"/> diff --git a/website/web/WEB-INF/sources.jsp b/website/web/WEB-INF/sources.jsp index de71883..ff320bd 100644 --- a/website/web/WEB-INF/sources.jsp +++ b/website/web/WEB-INF/sources.jsp @@ -21,15 +21,13 @@ <h2>Network archives <a href="#archive" name="archive" class="anchor">#</a></h2> <p>We get our data from the network archives below.</p> <div class="row"> - <div class="col-md-3 col-sm-4 col-xs-6"> <a href="https://collector.torproject.org/" target="_blank"> <div class="logo" style="background-image:url(images/collector-logo.png);"></div> <h2>CollecTor</h2> - <p>collects data from various nodes and services in the public Tor network.</p> + <p>collects and archives data from various nodes and services in the public Tor network.</p> </a> </div> - <div class="col-md-3 col-sm-4 col-xs-6"> <a href="https://ooni.torproject.org/" target="_blank"> <div class="logo" style="background-image:url(images/ooni-logo.png);"></div> @@ -37,64 +35,28 @@ <p>detects censorship, surveillance, and traffic manipulation on the internet.</p> </a> </div> - </div> </div> - <div class="container tools"> + <div class="container"> <h2>Measurement tools <a href="#measurement" name="measurement" class="anchor">#</a></h2> - <p>The following tools perform active measurements in the Tor network. (They don't have pretty logos yet, but they are all uniquely useful!)</p> - <div class="row"> - - <div class="col-md-2 col-sm-3 col-xs-4"> - <a href="https://www.torproject.org/projects/tordnsel.html.en" target="_blank"> - <div class="logo" style="background-image:url(images/default-logo.png);"></div> - <h3>TorDNSEL</h3> - <p>publishes lists of IP addresses of multi-homed Tor exits.</p> - </a> - </div> - - <div class="col-md-2 col-sm-3 col-xs-4"> - <a href="https://gitweb.torproject.org/torperf.git" target="_blank"> - <div class="logo" style="background-image:url(images/default-logo.png);"></div> - <h3>Torperf</h3> - <p>measures Tor performance with a set of utilities and Python scripts.</p> - </a> - </div> - - <div class="col-md-2 col-sm-3 col-xs-4"> - <a href="https://github.com/robgjansen/onionperf" target="_blank"> - <div class="logo" style="background-image:url(images/default-logo.png);"></div> - <h3>OnionPerf</h3> - <p>measures the performance of onion services.</p> - </a> - </div> - - </div> + <p>The following tools perform active measurements in the Tor network.</p> + <ul> + <li><a href="https://gitweb.torproject.org/user/phw/exitmap.git" target="_blank">Exitmap</a> is a fast and extensible scanner for Tor exit relays.</li> + <li><a href="https://www.torproject.org/projects/tordnsel.html.en" target="_blank">TorDNSEL</a> publishes lists of IP addresses of multi-homed Tor exits.</li> + <li><a href="https://gitweb.torproject.org/torperf.git" target="_blank">Torperf</a> measures Tor performance with a set of utilities and Python scripts.</li> + <li><a href="https://github.com/robgjansen/onionperf" target="_blank">OnionPerf</a> measures the performance of onion services.</li> + <li><a href="https://gitweb.torproject.org/user/phw/sybilhunter.git/" target="_blank">Sybilhunter</a> attempts to detect Sybil attacks onthe Tor network.</li> + </ul> </div> - <div class="container tools"> + <div class="container"> <h2>Pre-aggregated data <a href="#aggregated" name="aggregated" class="anchor">#</a></h2> <p>Sometimes the data from the original sources can be hard to process. If you want to take a little shortcut, try out the following pre-aggregated statistics.</p> - <div class="row"> - - <div class="col-md-2 col-sm-3 col-xs-4"> - <a href="stats.html"> - <div class="logo" style="background-image:url(images/default-logo.png);"></div> - <h3>CSV files</h3> - <p>are available with aggregated statistics of visualizations on this site.</p> - </a> - </div> - - <div class="col-md-2 col-sm-3 col-xs-4"> - <a href="https://onionoo.torproject.org/" target="_blank"> - <div class="logo" style="background-image:url(images/default-logo.png);"></div> - <h3>Onionoo</h3> - <p>provides current and historical data about relays and bridges via a web-based API.</p> - </a> - </div> - - </div> + <ul> + <li><a href="stats.html">CSV files</a> are available with aggregated statistics of visualizations on this site.</li> + <li><a href="https://onionoo.torproject.org/" target="_blank">Onionoo</a> provides current and historical data about relays and bridges via a web-based API.</li> + </ul> </div> <jsp:include page="bottom.jsp"/>