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

[torspec/master] Tweaks/additions to ntor proposal:
by nickm＠torproject.org 06 Dec '12

06 Dec '12

commit 630b334bb0727653f561b477e3cd1ce8a7905c04 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 6 02:03:10 2012 -0500 Tweaks/additions to ntor proposal: * Specify node IDs as ID_LENGTH bytes long. * Make t_key not be a prefix of m_expand. Cosmetic but why not. * Rename the directory identifier for the keys. * Specify where they go in the microdescriptor * Change the handshake type to 0x0002, so that 0x0001 can be reserved for CREATE_FAST. * Explain how to stuff these in EXTEND/EXTENDED/CREATE/CREATE2 cells, so clients can use ntor even when the previous node doesn't grok EXTEND2. * Add test vectors which I hope are right for HKDF-SHA256. --- proposals/216-ntor-handshake.txt | 52 ++++++++++++++++++++++++++++++++++--- 1 files changed, 47 insertions(+), 5 deletions(-) diff --git a/proposals/216-ntor-handshake.txt b/proposals/216-ntor-handshake.txt index 2ee9b14..cb36ea1 100644 --- a/proposals/216-ntor-handshake.txt +++ b/proposals/216-ntor-handshake.txt @@ -36,6 +36,8 @@ Notation: Let KEYID be a collision-resistant (but not necessarily preimage-resistant) hash function on members of G, of output length H_LENGTH bytes. + Let each node have a unique identifier, ID_LENGTH bytes in length. + Instantiation: Let's call this PROTOID "ntor-curve25519-sha256-1" (We might want to make @@ -43,7 +45,7 @@ Instantiation: Set H(x,t) == HMAC_SHA256 with message x and key t. So H_LENGTH == 32. Set t_mac == PROTOID | ":mac" - t_key == PROTOID | ":key" + t_key == PROTOID | ":key_extract" t_verify == PROTOID | ":verify" Set EXP(a,b) == curve25519(.,b,a), and g == 9 . Let KEYGEN() do the @@ -64,7 +66,7 @@ Protocol: To send a create cell, the client generates a keypair x,X = KEYGEN(), and sends a CREATE cell with contents: - NODEID: ID -- H_LENGTH bytes + NODEID: ID -- ID_LENGTH bytes KEYID: KEYID(B) -- H_LENGTH bytes CLIENT_PK: X -- G_LENGTH bytes @@ -148,20 +150,60 @@ Integrating with the rest of Tor: Add a new optional entry to router descriptors and microdescriptors: - "onion-key-ntor" SP Base64Key NL + "ntor-onion-key" SP Base64Key NL where Base64Key is a base-64 encoded 32-byte value, with padding omitted. - Add a new consensus method to tell servers to copy "onion-key-ntor" + Add a new consensus method to tell servers to copy "ntor-onion-key" entries to from router descriptors to microdescriptors. + In microdescriptors, "ntor-onion-key" can go right after the "onion-key" + line. + Add a "UseNTorHandshake" configuration option and a corresponding consensus parameter to control whether clients use the ntor handshake. If the configuration option is "auto", clients should obey the consensus parameter. Have the configuration default be "auto" and the consensus value initially be "0". - Reserve the handshake type [00 01] for this handshake in CREATE2 and + Reserve the handshake type [00 02] for this handshake in CREATE2 and EXTEND2 cells. + Specify that this handshake type can be used in EXTEND/EXTENDED/ + CREATE/CREATED cells as follows: instead of a 190-byte TAP onionskin, send + the 16-byte string "ntorNTORntorNTOR", followed by the client's ntor + message. Instead of a 148-byte TAP response, send the server's ntor + response. (We need this so that a client can extend from an 0.2.3 server, + which doesn't know about CREATE2/CREATED2/EXTEND/EXTENDED2.) + +Test vectors for HKDF-SHA256: + + These are some test vectors for HKDF-SHA256 using the values for M_EXPAND + and T_KEY above, taking 100 bytes of key material. + + INPUT: "" (The empty string) + OUTPUT: d3490ed48b12a48f9547861583573fe3f19aafe3 + f81dc7fc75eeed96d741b3290f941576c1f9f0b2 + d463d1ec7ab2c6bf71cdd7f826c6298c00dbfe67 + 11635d7005f0269493edf6046cc7e7dcf6abe0d2 + 0c77cf363e8ffe358927817a3d3e73712cee28d8 + + INPUT: "Tor" (546f72) + OUTPUT: 5521492a85139a8d9107a2d5c0d9c91610d0f959 + 89975ebee6c02a4f8d622a6cfdf9b7c7edd3832e + 2760ded1eac309b76f8d66c4a3c4d6225429b3a0 + 16e3c3d45911152fc87bc2de9630c3961be9fdb9 + f93197ea8e5977180801926d3321fa21513e59ac + + INPUT: "AN ALARMING ITEM TO FIND ON YOUR CREDIT-RATING STATEMENT" + (414e20414c41524d494e47204954454d20544f2046494e44204f4e20 + 594f5552204352454449542d524154494e472053544154454d454e54) + OUTPUT: a2aa9b50da7e481d30463adb8f233ff06e9571a0 + ca6ab6df0fb206fa34e5bc78d063fc291501beec + 53b36e5a0e434561200c5f8bd13e0f88b3459600 + b4dc21d69363e2895321c06184879d94b18f0784 + 11be70b767c7fc40679a9440a0c95ea83a23efbf + + +

1 0

[flashproxy/master] Add -D option to websockify command.
by dcf＠torproject.org 06 Dec '12

06 Dec '12

commit 93649eeed9e88142b7b6a01fc06f4fde12039953 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 5 21:24:23 2012 -0800 Add -D option to websockify command. This causes it to background itself. --- init.d/websockify | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/init.d/websockify b/init.d/websockify index 22a5450..b43f2ea 100755 --- a/init.d/websockify +++ b/init.d/websockify @@ -29,7 +29,7 @@ case "$1" in start) [ -x $WEBSOCKIFY ] || exit 1 echo -n $"Starting websockify server: " - cd $VARDIR && daemon --user "$USER" --pidfile $PIDFILE "$WEBSOCKIFY" :"$WEBSOCKIFY_PORT" "$LOCAL_ADDRESS" + cd $VARDIR && daemon --user "$USER" --pidfile $PIDFILE "$WEBSOCKIFY" -D :"$WEBSOCKIFY_PORT" "$LOCAL_ADDRESS" RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/websockify

1 0

r25935: {} tonight's presentation for northeastern grad students (in projects/presentations: . images)
by Andrew Lewman 06 Dec '12

06 Dec '12

Author: phobos Date: 2012-12-06 05:21:37 +0000 (Thu, 06 Dec 2012) New Revision: 25935 Added: projects/presentations/2012-12-05-NEU-AnonComms-outline.txt projects/presentations/2012-12-05-NEU-AnonComms.pdf projects/presentations/images/envelopes.jpg projects/presentations/images/iograph-torproject-website.png projects/presentations/images/obfsproxy_diagram.png projects/presentations/images/wwwhatranorg.jpg Log: tonight's presentation for northeastern grad students Added: projects/presentations/2012-12-05-NEU-AnonComms-outline.txt =================================================================== --- projects/presentations/2012-12-05-NEU-AnonComms-outline.txt (rev 0) +++ projects/presentations/2012-12-05-NEU-AnonComms-outline.txt 2012-12-06 05:21:37 UTC (rev 25935) @@ -0,0 +1,288 @@ +% Anonymous Communications +% Andrew Lewman andrew(a)torproject.org +% December 05, 2012 + +# Who is this guy? + +501(c)(3) non-profit organization dedicated to the research and development of technologies for online anonymity and privacy + +[https://www.torproject.org](https://www.torproject.org) + +\begin{center} +\includegraphics[keepaspectratio,width=\textwidth, height=.8\textheight]{images/2009-oval_sticker_new} +\end{center} + +# Three hours of this guy talking? + +Let's hope not. + +Ask questions; early and often. + +# Agenda + - Definitions and Concepts of Anonymity + - What data? + - Attacks against anonymity + - Deployed Systems (Centralized and Decentralized) + +# What is Anonymity? +\begin{center} +\includegraphics[keepaspectratio,width=\textwidth, height=.8\textheight]{images/2llg3ts.jpg} +\end{center} + +# Definitions: Anonymity + + - a set of all possible subjects + - state of not being identifiable within anonymity set + +# Definitions: Unlinkability + + - unlinkability of two or more items of interest from the adversary's perspective + - items can be messages, people, events, actions, etc + +# Definitions: Unobservability + + - state of items of interest being indistinguishable from any items of interest + +# Definitions: Pseudonymity + + - identifiers of sets of subjects + +# Definitions: Traffic Analysis + + - The who, what, when of traffic + - Think of the post office + +# Definitions: Steganography + + - the art and science of writing hidden messages in such a way that no one, apart from the sender and intended recipient, suspects the existence of the message, a form of security through obscurity. -- [Wikipedia](https://en.wikipedia.org/wiki/Steganography) + - alice or bob are talking, but to whom? + +# Definitions: Cryptography + - protecting content in transit + - does nothing to hide the traffic of items of interest + +# What data to protect? + + - bits of info which put together deanonymize you + - Names of individuals + - location address (street, IP address, zipcode, etc) + - operating system info + - language info + - amount of data sent + - amount of data received + - traffic timing (heartbeats) + +# Anonymity Loves Company + - make the set of users as large and coherent as possible to create a large anonymity set + +# Attacking Anonymity: Timing Analysis + - An attack used to analyze the time properties of data transfer between items of interest. + - When was data sent? + - How much was data sent? + - How long did it take to send the data? + - When was data received? + - wireshark demo + +# Attacking Anonymity: Timing Analysis + +\begin{center} +\includegraphics[keepaspectratio,width=\textwidth, height=.8\textheight]{images/iograph-torproject-website.png} +\end{center} + +# Attacking Anonymity: Statistical Disclosure + + - Also called an intersection attack + - trying to identify mutually disjoint sets of recipients + - exponential time involved per number of messages to be analyzed + +# Attacking Anonymity: Tagging + + - tagging (make one item of interest unique) + +# Attacking Anonymity: Traffic Confirmation + + - who sends, how often, and when + - etherape demo + +# Centralized Systems + + - cheap, easy, ubiquitous + - PPTP, IPSec, SSL, SSH, XMPP common protocols + +# Proxy and VPN Servers + - proxy server works on your behalf + - VPN is virtual private network + - proxy for the network layers (layers 2 or 3 of OSI model) + +# Proxy and VPN Servers + +\begin{center} +\includegraphics[keepaspectratio,width=\textwidth, height=.8\textheight]{images/single_hop_relay.jpg} +\end{center} + +# Trusting the provider + + - trusting the provider + - promises, contracts, mistakes + - some may filter or clean data before passing on to destination + +# Trusting the provider + +\begin{center} +\includegraphics[keepaspectratio,width=\textwidth, height=.8\textheight]{images/evil_single_hop_relay.jpg} +\end{center} + +# Irrelevant provider + + - Single machine, or cluster of machines, are connected to a network + - If the proxy provider won't cooperate, use the network around it. + +# Irrelevant provider + +\begin{center} +\includegraphics[keepaspectratio,width=\textwidth, height=.8\textheight]{images/data_snooping_single_hop_relay.jpg} +\end{center} + +# Decentralized Systems + +## Mix Networks + - cascades (JonDos/JonDonym) + - routes (tor) + +## Similar Routing networks + - I2P - Garlic routing, closed network, anonymity and reputation + - Freenet - closed network, anonymity, distributed file storage and sharing + - GNUnet - closed network, anonymity, distributed file storage and sharing + +# Break? + +Anyone need a bio-break for 10 minutes? + +\begin{center} +\includegraphics[keepaspectratio,width=\textwidth, height=.8\textheight]{images/wwwhatranorg} +\end{center} + +# What is Tor? + + - online anonymity software and network + - open source, freely available (3-clause BSD license) + - active research environment: + +Drexel, Univ of Waterloo, Georgia Tech, Princeton, Boston University, University College London, Univ of Minnesota, National Science Foundation, Naval Research Labs, Cambridge UK, Bamberg Germany, MIT... + + - increasingly diverse toolset: + +Tor, Tor Browser Bundle, Tails Live System, Orbot/OrWeb, Tor Weather, Tor auto-responder, Secure Updater, Arm, Tor2Web, and so on. + +# Who uses Tor? + +\parbox{8cm}{\sloppy \setbeamercolor{background}[\includegraphics[keepaspectratio,width=\textwidth, height=.8\textheight]{images/anonymousman}} +\parbox{3cm}{\sloppy +\begin{flushleft} +\begin{itemize} +\begin{small} +\item Normal people +\item Journalists +\item Law Enforcement +\item Human Rights Activists +\item Business Execs +\item Militaries +\item Abuse Victims +\end{small} +\end{itemize} +\end{flushleft} +} + +# How many people use Tor? + +estimated 500k to 900k daily users + +\begin{center} +\includegraphics[keepaspectratio,width=\textwidth, height=.8\textheight]{images/huge-crowd} +\end{center} + +# How does Tor work? + +\begin{center} +\includegraphics[keepaspectratio,width=\textwidth, height=.8\textheight]{images/tor-network} +\end{center} + +# How does Tor work? + +\begin{center} +\includegraphics[keepaspectratio,width=\textwidth, height=.8\textheight]{images/tor-safe-selection} +\end{center} + +# How does Tor work? + +\begin{center} +\includegraphics[keepaspectratio,width=\textwidth, height=.8\textheight]{images/tor-safe-path} +\end{center} + +# How does Tor work? + +\begin{center} +\includegraphics[keepaspectratio,width=\textwidth, height=.8\textheight]{images/tor-keys1} +\end{center} + +# Attacks on Tor + + - First hop can learn your IP address. + - Last hop can watch your traffic. + +# Attacks on Tor + + - Adversary can block all Tor nodes by IP address and TCP port + - our answer is to use non-public relays called Bridges + - Adversary can legally harass last hop; DMCA, Child Abuse Materials, Threats, etc + - Adversary can run relays, use network to restrict access to other relays + +# Attacks on Tor + + - Deep Packet Inspection + +\begin{center} +\includegraphics[keepaspectratio,width=\textwidth, height=.8\textheight]{images/procera-evolved-dpi} +\end{center} + +# Attacks on Tor + +\includegraphics[keepaspectratio,width=\textwidth, height=.8\textheight]{images/iran-ssl-dpi-26-seconds-to-death} + +# The Future: Usability + + Who are our users? What do they understand about anonymity, Tor, and privacy online? + Can we guide them to make smarter decisions? + How do we educate them before they start? + +# The Future: Obfsproxy & Pluggable Transports + + Obfuscating proxy for network traffic + +\begin{center} +\includegraphics[keepaspectratio,width=\textwidth, height=.8\textheight]{images/obfsproxy_diagram.png} +\end{center} + +# The Future: Scaling + + Why not 10,000 relays? Why not 1 million? 10 million? + Need privacy-preserving Scalable Distributed Hash Table designs + +# The Future: IPv6 + + Basic support for IPv6 clients and relays works now. + Need support for IPv6 destinations and pure IPv6 relays + +# The Future: UDP + + Tor only transports TCP packets now. + This limits usable applications + Need to support real-time video and audio chats over Tor. + +# Thanks! + +\begin{center} +\includegraphics[keepaspectratio,width=\textwidth, height=.8\textheight]{images/thankyou_img} +\end{center} + +Visit [https://www.torproject.org](https://www.torproject.org) for more information, links, and ideas. Property changes on: projects/presentations/2012-12-05-NEU-AnonComms-outline.txt ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native Added: projects/presentations/2012-12-05-NEU-AnonComms.pdf =================================================================== (Binary files differ) Property changes on: projects/presentations/2012-12-05-NEU-AnonComms.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/presentations/images/envelopes.jpg =================================================================== (Binary files differ) Property changes on: projects/presentations/images/envelopes.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: projects/presentations/images/iograph-torproject-website.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/iograph-torproject-website.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/obfsproxy_diagram.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/obfsproxy_diagram.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/wwwhatranorg.jpg =================================================================== (Binary files differ) Property changes on: projects/presentations/images/wwwhatranorg.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg

1 0

[ooni-probe/master] Update to match suggestion by Art
by ioerror＠torproject.org 05 Dec '12

05 Dec '12

commit 03076bc639c8dc3e15a6fb4509fdb611042e7b9a Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Dec 6 02:20:15 2012 +0630 Update to match suggestion by Art --- nettests/third_party/netalyzr.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nettests/third_party/netalyzr.py b/nettests/third_party/netalyzr.py index 01c57f8..b3a0a3d 100644 --- a/nettests/third_party/netalyzr.py +++ b/nettests/third_party/netalyzr.py @@ -33,9 +33,9 @@ class NetalyzrWrapperTest(nettest.NetTestCase): def blocking_call(self): try: - result = threads.blockingCallFromThread(reactor, os.system(self.run_me)) + result = threads.blockingCallFromThread(reactor, os.system, self.run_me) except: - print "Please check " + self.output_file + "for Netalyzr output" + log.debug("Netalyzr had an error, please see the log file: %s" % self.output_file) finally: reactor.callFromThread(reactor.stop) self.clean_up() @@ -43,6 +43,7 @@ class NetalyzrWrapperTest(nettest.NetTestCase): def clean_up(self): self.report['netalyzr_report'] = self.output_file log.debug("finished running NetalzrWrapper") + log.debug("Please check %s for Netalyzr output" % self.output_file) def test_run_netalyzr(self): """

1 0

[ooni-probe/master] Update nettests/third_party/netalyzr.py to properly run and not hang
by ioerror＠torproject.org 05 Dec '12

05 Dec '12

commit 1aa7c70e7cea0d7912aa01d39e52282bc643ebff Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Dec 6 01:54:06 2012 +0630 Update nettests/third_party/netalyzr.py to properly run and not hang nettests/third_party/netalyzr.py now runs properly though the status output is incorrectly shown to be 100% at all times. --- nettests/third_party/netalyzr.py | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/nettests/third_party/netalyzr.py b/nettests/third_party/netalyzr.py index 6ce5a9f..01c57f8 100644 --- a/nettests/third_party/netalyzr.py +++ b/nettests/third_party/netalyzr.py @@ -10,6 +10,7 @@ from ooni import nettest from ooni.utils import log import time import os +from twisted.internet import reactor, threads, defer class NetalyzrWrapperTest(nettest.NetTestCase): name = "NetalyzrWrapper" @@ -30,6 +31,19 @@ class NetalyzrWrapperTest(nettest.NetTestCase): self.output_file.strip() self.run_me = program + " 2>&1 >> " + self.output_file + def blocking_call(self): + try: + result = threads.blockingCallFromThread(reactor, os.system(self.run_me)) + except: + print "Please check " + self.output_file + "for Netalyzr output" + finally: + reactor.callFromThread(reactor.stop) + self.clean_up() + + def clean_up(self): + self.report['netalyzr_report'] = self.output_file + log.debug("finished running NetalzrWrapper") + def test_run_netalyzr(self): """ This test simply wraps netalyzr and runs it from command line @@ -41,7 +55,4 @@ class NetalyzrWrapperTest(nettest.NetTestCase): # (currently there is no progress because the stdout of os.system is # trapped by twisted) and to include the link to the netalyzr report # directly in the OONI report, perhaps even downloading it. - os.system(self.run_me) - self.report['netalyzr_report'] = self.output_file - log.debug("finished running NetalzrWrapper") - + reactor.callInThread(self.blocking_call)

1 0

[onionoo/master] Fix off-by-one error in offset parameter.
by karsten＠torproject.org 05 Dec '12

05 Dec '12

commit ffd88279ab2dd03b367d878cee6207a82857196a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Dec 5 20:06:39 2012 +0100 Fix off-by-one error in offset parameter. With 10 relays and 10 bridges, setting an offset of 11 should have returned 9 bridges (relays are removed first), but it return 10. An offset of 12 would have returned 9 bridges, and so on. Here's why: we erroneously added a null value to the set of relays before applying the offset parameter. After throwing out the last relay we threw out that null value instead of the first bridge. --- src/org/torproject/onionoo/ResourceServlet.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/onionoo/ResourceServlet.java b/src/org/torproject/onionoo/ResourceServlet.java index 9a2e353..bc075b0 100644 --- a/src/org/torproject/onionoo/ResourceServlet.java +++ b/src/org/torproject/onionoo/ResourceServlet.java @@ -279,7 +279,7 @@ public class ResourceServlet extends HttpServlet { orderedRelays.add(filteredRelays.remove(relay)); } } - for (String relay : filteredRelays.values()) { + for (String relay : filteredRelays.keySet()) { if (!orderedRelays.contains(filteredRelays.get(relay))) { orderedRelays.add(filteredRelays.remove(relay)); }

1 0

[onionoo/master] Further specify limit and offset parameters.
by karsten＠torproject.org 05 Dec '12

05 Dec '12

commit 3edf098d09aefc3655b74e39cdb4b3a0b7e4006c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Dec 5 20:16:13 2012 +0100 Further specify limit and offset parameters. --- web/index.html | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/web/index.html b/web/index.html index 4df3d7a..e29c0b8 100755 --- a/web/index.html +++ b/web/index.html @@ -683,9 +683,11 @@ undefined. </td></tr> <tr><td>offset</td><td>Skip the given number of relays and/or bridges. +Relays are skipped first, then bridges. </td></tr> <tr><td>limit</td><td>Limit result to the given number of relays and/or bridges. +Relays are kept first, then bridges. When used together with offset, the offsetting step precedes the limiting step. </td></tr>

1 0

[onionoo/master] Specify how we handle multiple parameter values.
by karsten＠torproject.org 05 Dec '12

05 Dec '12

commit a999d69bad8a1a93e142f703d38f02a0853fa5ab Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Dec 5 17:06:43 2012 +0100 Specify how we handle multiple parameter values. --- web/index.html | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/web/index.html b/web/index.html index 1af4904..4df3d7a 100755 --- a/web/index.html +++ b/web/index.html @@ -616,6 +616,8 @@ of relay and/or bridge documents to be included in the response. If multiple parameters are specified, they are combined using a logical AND operation, meaning that only the intersection of relays and bridges matching all parameters is returned. +If the same parameter is specified more than once, only the first +parameter value is considered. <table border="0" cellpadding="4" cellspacing="0" summary=""> <colgroup> @@ -657,7 +659,9 @@ Filtering by country code is case-insensitive. </td></tr> </table> Relay and/or bridge documents in the response can be ordered and -limited by providing further parameters. +limited by providing further parameters. +If the same parameter is specified more than once, only the first +parameter value is considered. <table border="0" cellpadding="4" cellspacing="0" summary=""> <colgroup> <col width="150">

1 0

[onionoo/master] Actually support searching for hashed full fingerprints.
by karsten＠torproject.org 05 Dec '12

05 Dec '12

commit a80dc1252344b83271d0a03d31ad24e0ee67268f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Dec 5 19:36:42 2012 +0100 Actually support searching for hashed full fingerprints. The spec says that we support looking up and searching for hashed full fingerprints, but only the former was implemented. Implement the latter, too. --- src/org/torproject/onionoo/ResourceServlet.java | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/onionoo/ResourceServlet.java b/src/org/torproject/onionoo/ResourceServlet.java index 149f169..9a2e353 100644 --- a/src/org/torproject/onionoo/ResourceServlet.java +++ b/src/org/torproject/onionoo/ResourceServlet.java @@ -428,7 +428,15 @@ public class ResourceServlet extends HttpServlet { private void filterBySearchTerms(Map<String, String> filteredRelays, Map<String, String> filteredBridges, String[] searchTerms) { for (String searchTerm : searchTerms) { - filterBySearchTerm(filteredRelays, filteredBridges, searchTerm); + if (searchTerm.startsWith("$") && searchTerm.length() == 41) { + this.filterByFingerprint(filteredRelays, filteredBridges, + searchTerm.substring(1).toUpperCase()); + } else if (!searchTerm.startsWith("$") && searchTerm.length() == 40) { + this.filterByFingerprint(filteredRelays, filteredBridges, + searchTerm.toUpperCase()); + } else { + filterBySearchTerm(filteredRelays, filteredBridges, searchTerm); + } } }

1 0

[onionoo/master] Ensure that IPv6 hex characters are always lower-case.
by karsten＠torproject.org 05 Dec '12

05 Dec '12

commit 2324448000154571c60e768f28d910a98e45d973 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Dec 5 16:38:41 2012 +0100 Ensure that IPv6 hex characters are always lower-case. --- src/org/torproject/onionoo/DetailDataWriter.java | 12 ++++++------ src/org/torproject/onionoo/ResourceServlet.java | 4 ++-- web/index.html | 4 ++++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/org/torproject/onionoo/DetailDataWriter.java b/src/org/torproject/onionoo/DetailDataWriter.java index af0a0b9..7d0ab15 100644 --- a/src/org/torproject/onionoo/DetailDataWriter.java +++ b/src/org/torproject/onionoo/DetailDataWriter.java @@ -569,8 +569,8 @@ public class DetailDataWriter { int addressesWritten = 0; for (String orAddress : orAddresses) { orAddressesAndPortsBuilder.append( - (addressesWritten++ > 0 ? "," : "") + "\"" + orAddress - + "\""); + (addressesWritten++ > 0 ? "," : "") + "\"" + + orAddress.toLowerCase() + "\""); } String lastSeen = dateTimeFormat.format(entry.getLastSeenMillis()); String firstSeen = dateTimeFormat.format( @@ -699,8 +699,8 @@ public class DetailDataWriter { sb.append(",\n\"exit_addresses\":["); int written = 0; for (String exitAddress : entry.getExitAddresses()) { - sb.append((written++ > 0 ? "," : "") + "\"" + exitAddress - + "\""); + sb.append((written++ > 0 ? "," : "") + "\"" + + exitAddress.toLowerCase() + "\""); } sb.append("]"); } @@ -838,8 +838,8 @@ public class DetailDataWriter { int addressesWritten = 0; for (String orAddress : orAddresses) { orAddressesAndPortsBuilder.append( - (addressesWritten++ > 0 ? "," : "") + "\"" + orAddress - + "\""); + (addressesWritten++ > 0 ? "," : "") + "\"" + + orAddress.toLowerCase() + "\""); } StringBuilder sb = new StringBuilder(); sb.append("{\"version\":1,\n" diff --git a/src/org/torproject/onionoo/ResourceServlet.java b/src/org/torproject/onionoo/ResourceServlet.java index 512b7ca..149f169 100644 --- a/src/org/torproject/onionoo/ResourceServlet.java +++ b/src/org/torproject/onionoo/ResourceServlet.java @@ -123,8 +123,8 @@ public class ResourceServlet extends HttpServlet { StringBuilder addressesBuilder = new StringBuilder(); int written = 0; for (String address : addresses) { - addressesBuilder.append((written++ > 0 ? "," : "") + "\"" + address - + "\""); + addressesBuilder.append((written++ > 0 ? "," : "") + "\"" + + address.toLowerCase() + "\""); } return String.format("{%s\"f\":\"%s\",\"a\":[%s],\"r\":%s}", (nickname == null ? "" : "\"n\":\"" + nickname + "\","), diff --git a/web/index.html b/web/index.html index ae084f1..1af4904 100755 --- a/web/index.html +++ b/web/index.html @@ -61,6 +61,7 @@ Required field.</li> <li>"a": Array of IPv4 or IPv6 addresses where the relay accepts onion-routing connections or which the relay used to exit to the Internet in the past 24 hours. +IPv6 hex characters are all lower-case. Required field.</li> <li>"r": Boolean field saying whether this relay was listed as running in the last relay network status consensus. @@ -113,9 +114,11 @@ hexadecimal characters. Required field.</li> <li>"or_addresses": Array of IPv4 or IPv6 addresses and TCP ports or port lists where the relay accepts onion-routing connections. +IPv6 hex characters are all lower-case. Required field.</li> <li>"exit_addresses": Array of IPv4 or IPv6 addresses that the relay used to exit to the Internet in the past 24 hours. +IPv6 hex characters are all lower-case. Only those addresses are listed that are different from onion-routing addresses. Optional field. @@ -316,6 +319,7 @@ Required field.</li> <li>"or_addresses": Array of sanitized IPv4 or IPv6 addresses and TCP ports or port lists where the bridge accepts onion-routing connections. +IPv6 hex characters are all lower-case. Sanitized IP addresses are always in 10/8 or [fd9f:2e19:3bcf/48] IP networks and are only useful to learn which IP version the bridge uses and to detect whether the bridge changed its

1 0