- tor-commits - lists.torproject.org

[torflow/master] Allow SSL tests to have a port.
by mikeperry＠torproject.org 15 Sep '11

15 Sep '11

commit 3b2a461cd8a3095a6b53f44101444ba51276397a Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Sep 15 00:27:54 2011 -0700 Allow SSL tests to have a port. This should fix bug 2697 by allowing us to scan for failures on port 80 SSL hosts. Also use the new TorCtl.connect() method. --- NetworkScanners/ExitAuthority/soat.py | 48 ++++++++++++++++++++++----------- 1 files changed, 32 insertions(+), 16 deletions(-) diff --git a/NetworkScanners/ExitAuthority/soat.py b/NetworkScanners/ExitAuthority/soat.py index 5bcf590..7688be1 100755 --- a/NetworkScanners/ExitAuthority/soat.py +++ b/NetworkScanners/ExitAuthority/soat.py @@ -453,6 +453,14 @@ def _ssl_request(address, method='TLSv1_METHOD'): ''' initiate an ssl connection and return the server certificate ''' address=str(address) # Unicode hostnames not supported.. + if address.rfind(":") != -1: + # FIXME: %-encoding? + port = int(address[address.rfind(":")+1:]) + address_name = address[:address.rfind(":")] + else: + port = 443 + address_name = address + # specify the context ctx = SSL.Context(getattr(SSL,method)) @@ -468,7 +476,7 @@ def _ssl_request(address, method='TLSv1_METHOD'): c = SSL.Connection(ctx, s) c.set_connect_state() signal.alarm(int(read_timeout)) # raise a timeout after read_timeout - c.connect((address, 443)) # DNS OK. + c.connect((address_name, port)) # DNS OK. # XXX: A PEM encoded certificate request was a bizarre and fingerprintable # thing to send here. All we actually need to do is perform a handshake, # but it might be good to make a simple GET request to further limit @@ -643,14 +651,15 @@ class Test: if netloc.rfind(":") != -1: # FIXME: %-encoding? port = netloc[netloc.rfind(":")+1:] - try: - if int(port) != self.port: - plog("DEBUG", "Unusable port "+port+" in "+url) - return False - except: - traceback.print_exc() - plog("WARN", "Unparseable port "+port+" in "+url) - return False + # I think port restrictions are silly, come to think of it.. + #try: + # if int(port) != self.port: + # plog("DEBUG", "Unusable port "+port+" in "+url) + # return False + #except: + # traceback.print_exc() + # plog("WARN", "Unparseable port "+port+" in "+url) + # return False if valid_schemes and scheme not in valid_schemes: plog("DEBUG", "Unusable scheme "+scheme+" in "+url) return False @@ -1515,6 +1524,14 @@ class BaseSSLTest(Test): address_file = DataHandler.safeFilename(shortaddr) ssl_file_name = ssl_certs_dir + address_file + '.ssl' + if address.rfind(":") != -1: + # FIXME: %-encoding? + port = address[address.rfind(":")+1:] + address_name = address[:address.rfind(":")] + else: + port = 443 + address_name = address + # load the original cert and compare # if we don't have the original cert yet, get it try: @@ -1527,14 +1544,14 @@ class BaseSSLTest(Test): # Make 3 resolution attempts for attempt in xrange(1,4): try: - resolved = socket.getaddrinfo(address, 443, socket.AF_INET, socket.SOCK_STREAM, socket.IPPROTO_TCP) + resolved = socket.getaddrinfo(address_name, 443, socket.AF_INET, socket.SOCK_STREAM, socket.IPPROTO_TCP) break except socket.gaierror: plog("NOTICE", "Local resolution failure #%d for %s" % (attempt, address)) for res in resolved: if res[4][0] not in check_ips: - check_ips.append(res[4][0]) + check_ips.append(res[4][0]+":"+str(port)) if not check_ips: plog("WARN", "Local resolution failure for "+address) @@ -1697,7 +1714,7 @@ class FixedTargetSSLTest(FixedTargetTest, BaseSSLTest): def __init__(self, targets): BaseSSLTest.__init__(self) # We ask for hostnames only, please - utargets = [t for t in targets if self._is_useable_url(t, [''])] + utargets = [t for t in targets if self._is_useable_url(t)] FixedTargetTest.__init__(self, utargets) # Search Based Tests @@ -2579,11 +2596,10 @@ def cleanup(c, l, f): def setup_handler(out_dir, cookie_file, fixed_exits=[]): plog('INFO', 'Connecting to Tor at '+TorUtil.control_host+":"+str(TorUtil.control_port)) - s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - s.connect((TorUtil.control_host,TorUtil.control_port)) - c = PathSupport.Connection(s) + + c = TorCtl.connect(TorUtil.control_host, TorUtil.control_port, ConnClass=PathSupport.Connection) c.debug(file(out_dir+"/control.log", "w", buffering=0)) - c.authenticate_cookie(file(cookie_file, "r")) + l = c.get_option("__LeaveStreamsUnattached")[0][1] h = ExitScanHandler(c, __selmgr, PathSupport.SmartSocket.StreamSelector, fixed_exits)

1 0

r25075: {website} add 0.2.2.33 & 0.2.3.4-alpha win/osx packages and update dow (in website/trunk: download/en include)
by Erinn Clark 15 Sep '11

15 Sep '11

Author: erinn Date: 2011-09-15 00:59:43 +0000 (Thu, 15 Sep 2011) New Revision: 25075 Modified: website/trunk/download/en/download.wml website/trunk/include/versions.wmi Log: add 0.2.2.33 & 0.2.3.4-alpha win/osx packages and update download page accordingly Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2011-09-14 20:33:11 UTC (rev 25074) +++ website/trunk/download/en/download.wml 2011-09-15 00:59:43 UTC (rev 25075) @@ -71,10 +71,11 @@  <div class="package"> <div class="downloads"> - <a class="button" href="../dist/vidalia-bundles/vidalia-bridge-bundle-<version-win32-bridge-bundle-stable>.exe"><span class="strong">Download</span><span class="normal">Vidalia Bridge Bundle (Beta)</span></a> + <a class="button" href="<package-win32-bridge-bundle-stable>"><span class="strong">Download</span><span class="normal">Vidalia Bridge Bundle (Beta)</span></a> <div class="sig"> - (<a href="../dist/vidalia-bundles/vidalia-bridge-bundle-<version-win32-bridge-bundle-stable>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + (<a href="<package-win32-bridge-bundle-stable>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> + <a class="additional" href="<package-win32-bridge-bundle-alpha>">Download Unstable</a> (<a href="<package-win32-bridge-bundle-alpha>.asc">sig</a>) </div> <h2>Vidalia Bridge Bundle</h2> @@ -84,10 +85,11 @@  <div class="package"> <div class="downloads"> - <a class="button" href="https://archive.torproject.org/tor-package-archive/technology-preview/vidal…<version-win32-relay-bundle-stable>.exe"><span class="strong">Download</span><span class="normal">Vidalia Relay Bundle (Beta)</span></a> + <a class="button" href="<package-win32-relay-bundle-stable>.exe"><span class="strong">Download</span><span class="normal">Vidalia Relay Bundle (Beta)</span></a> <div class="sig"> - (<a href="https://archive.torproject.org/tor-package-archive/technology-preview/vidal…<version-win32-relay-bundle-stable>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + (<a href="<package-win32-relay-bundle-stable>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> + <a class="additional" href="<package-win32-relay-bundle-alpha>">Download Unstable</a> (<a href="<package-win32-relay-bundle-alpha>.asc">sig</a>) </div> <h2>Vidalia Relay Bundle</h2> @@ -97,10 +99,11 @@  <div class="package"> <div class="downloads"> - <a class="button" href="https://archive.torproject.org/tor-package-archive/technology-preview/vidal…<version-win32-exit-bundle-stable>.exe"><span class="strong">Download</span><span class="normal">Vidalia Exit Bundle (Beta)</span></a> + <a class="button" href="<package-win32-exit-bundle-stable>.exe"><span class="strong">Download</span><span class="normal">Vidalia Exit Bundle (Beta)</span></a> <div class="sig"> - (<a href="https://archive.torproject.org/tor-package-archive/technology-preview/vidal…<version-win32-exit-bundle-stable>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + (<a href="<package-win32-exit-bundle-stable>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> + <a class="additional" href="<package-win32-exit-bundle-alpha>">Download Unstable</a> (<a href="<package-win32-exit-bundle-alpha>.asc">sig</a>) </div> <h2>Vidalia Exit Bundle</h2> Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-09-14 20:33:11 UTC (rev 25074) +++ website/trunk/include/versions.wmi 2011-09-15 00:59:43 UTC (rev 25075) @@ -1,28 +1,32 @@ <define-tag version-stable whitespace=delete>0.2.2.33</define-tag> <define-tag version-alpha whitespace=delete>0.2.3.4-alpha</define-tag> -<define-tag version-win32-stable whitespace=delete>0.2.2.32</define-tag> -<define-tag version-win32-alpha whitespace=delete>0.2.2.32</define-tag> +<define-tag version-win32-stable whitespace=delete>0.2.2.33</define-tag> +<define-tag version-win32-alpha whitespace=delete>0.2.3.4-alpha</define-tag> -<define-tag version-win32-bundle-stable whitespace=delete>0.2.2.32</define-tag> -<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.32</define-tag> +<define-tag version-win32-bundle-stable whitespace=delete>0.2.2.33</define-tag> +<define-tag version-win32-bundle-alpha whitespace=delete>0.2.3.4-alpha</define-tag> -<define-tag version-win32-bridge-bundle-stable whitespace=delete>0.2.2.32-<version-vidalia-stable></define-tag> -<define-tag version-win32-relay-bundle-stable whitespace=delete>0.2.2.32-<version-vidalia-stable>-1</define-tag> -<define-tag version-win32-exit-bundle-stable whitespace=delete>0.2.2.32-<version-vidalia-stable>-2</define-tag> +<define-tag version-win32-bridge-bundle-stable whitespace=delete>0.2.2.33-<version-vidalia-stable></define-tag> +<define-tag version-win32-relay-bundle-stable whitespace=delete>0.2.2.33-<version-vidalia-stable></define-tag> +<define-tag version-win32-exit-bundle-stable whitespace=delete>0.2.2.33-<version-vidalia-stable>-2</define-tag> -<define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.2.32</define-tag> -<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.2.32</define-tag> +<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.3.4-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.3.4-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.3.4-alpha-<version-vidalia-stable></define-tag> -<define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.2.32</define-tag> -<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.2.32</define-tag> +<define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.2.33</define-tag> +<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.3.4-alpha</define-tag> -<define-tag version-osx-x86-stable whitespace=delete>0.2.2.32</define-tag> -<define-tag version-osx-x86-alpha whitespace=delete>0.2.2.32</define-tag> +<define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.2.33</define-tag> +<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.3.4-alpha</define-tag> -<define-tag version-osx-ppc-stable whitespace=delete>0.2.2.32</define-tag> -<define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.32</define-tag> +<define-tag version-osx-x86-stable whitespace=delete>0.2.2.33</define-tag> +<define-tag version-osx-x86-alpha whitespace=delete>0.2.3.4-alpha</define-tag> +<define-tag version-osx-ppc-stable whitespace=delete>0.2.2.33</define-tag> +<define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.4-alpha</define-tag> + <define-tag version-torbrowserbundle whitespace=delete>2.2.32-4</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.2.32</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.14-stable, zlib-1.2.5, openssl-1.0.0d</define-tag> @@ -58,11 +62,26 @@ <define-tag package-win32-stable whitespace=delete>/dist/win32/tor-<version-win32-stable>-win32.exe</define-tag> <define-tag package-win32-alpha whitespace=delete>/dist/win32/tor-<version-win32-alpha>-win32.exe</define-tag> -<define-tag file-win32-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.14-1.exe</define-tag> +<define-tag file-win32-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag> <define-tag package-win32-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-stable></define-tag> <define-tag file-win32-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> <define-tag package-win32-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag> +<define-tag file-win32-bridge-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag> +<define-tag package-win32-bridge-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-stable></define-tag> +<define-tag file-win32-bridge-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> +<define-tag package-win32-bridge-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag> + +<define-tag file-win32-relay-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag> +<define-tag package-win32-relay-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-stable></define-tag> +<define-tag file-win32-relay-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> +<define-tag package-win32-relay-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag> + +<define-tag file-win32-exit-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag> +<define-tag package-win32-exit-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-stable></define-tag> +<define-tag file-win32-exit-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> +<define-tag package-win32-exit-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag> + <define-tag file-osx-x86-bundle-stable whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-stable>-0.2.14-i386.dmg</define-tag> <define-tag package-osx-x86-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-osx-x86-bundle-stable></define-tag> <define-tag file-osx-x86-bundle-alpha whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-alpha>-0.2.14-i386.dmg</define-tag>

1 0

r25074: {website} add the org for Host4site (website/trunk)
by Andrew Lewman 14 Sep '11

14 Sep '11

Author: phobos Date: 2011-09-14 20:33:11 +0000 (Wed, 14 Sep 2011) New Revision: 25074 Modified: website/trunk/update-mirrors.pl Log: add the org for Host4site Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2011-09-14 20:04:36 UTC (rev 25073) +++ website/trunk/update-mirrors.pl 2011-09-14 20:33:11 UTC (rev 25074) @@ -663,7 +663,7 @@ }, mirror041 => { adminContact => "", - orgName => "", + orgName => "Host4site", isoCC => "IL", subRegion => "", region => "IL",

1 0

r25073: {website} update the mirrors table with the new mirrors. (website/trunk/include)
by Andrew Lewman 14 Sep '11

14 Sep '11

Author: phobos Date: 2011-09-14 20:04:36 +0000 (Wed, 14 Sep 2011) New Revision: 25073 Modified: website/trunk/include/mirrors-table.wmi Log: update the mirrors table with the new mirrors. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2011-09-14 20:01:24 UTC (rev 25072) +++ website/trunk/include/mirrors-table.wmi 2011-09-14 20:04:36 UTC (rev 25073) @@ -1,32 +1,32 @@ <tr> - <td>FR</td> + <td>NL</td> - <td>BarkerJr</td> + <td>CCC</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.oignon.net/dist/">http</a></td> - <td><a href="http://www.oignon.net/">http</a></td> - <td><a href="https://www.oignon.net/dist/">https</a></td> - <td><a href="https://www.oignon.net/">https</a></td> + <td><a href="http://tor.ccc.de/dist/">http</a></td> + <td><a href="http://tor.ccc.de/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>NL</td> + <td>DK</td> - <td>Amorphis</td> + <td>Zentrum der Gesundheit</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.amorphis.eu/dist/">http</a></td> - <td><a href="http://tor.amorphis.eu/">http</a></td> + <td><a href="http://tor.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -35,15 +35,15 @@ <tr> - <td>AT</td> + <td>EE</td> - <td>cyberarmy</td> + <td>CyberSIDE</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.cyberarmy.at/dist">http</a></td> - <td><a href="http://tor.cyberarmy.at">http</a></td> + <td><a href="http://cyberside.net.ee/tor/">http</a></td> + <td><a href="http://cyberside.planet.ee/tor/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -52,15 +52,15 @@ <tr> - <td>US</td> + <td>IS</td> - <td>searchprivate</td> + <td>torproject.is</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.searchprivate.com/dist">http</a></td> - <td><a href="http://tor.searchprivate.com">http</a></td> + <td><a href="http://torproject.is/dist">http</a></td> + <td><a href="http://torproject.is/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -69,32 +69,49 @@ <tr> - <td>NL</td> + <td>US</td> - <td>CCC</td> + <td>BarkerJr</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.ccc.de/dist/">http</a></td> - <td><a href="http://tor.ccc.de/">http</a></td> + <td><a href="http://www.torproject.us/dist/">http</a></td> + <td><a href="http://www.torproject.us/">http</a></td> + <td><a href="https://www.torproject.us/dist/">https</a></td> + <td><a href="https://www.torproject.us/">https</a></td> <td> - </td> + <td><a href="rsync://rsync.torproject.us/tor">rsync</a></td> +</tr> + +<tr> + + <td>DE</td> + + <td>torservers</td> + + <td>Up to date</td> + <td> - </td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/dist">http</a></td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/dist">https</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>DK</td> + <td>IR</td> - <td>Zentrum der Gesundheit</td> + <td>Ninjas</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.idnr.ws/dist/">http</a></td> - <td><a href="http://tor.idnr.ws/">http</a></td> + <td><a href="http://onion.anonymo.us.org/dist/">http</a></td> + <td><a href="http://onion.anonymo.us.org/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -103,15 +120,15 @@ <tr> - <td>EE</td> + <td>AT</td> - <td>CyberSIDE</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://cyberside.net.ee/tor/">http</a></td> - <td><a href="http://cyberside.planet.ee/tor/">http</a></td> + <td><a href="http://tor.webersiedlung.at/dist/">http</a></td> + <td><a href="http://tor.webersiedlung.at/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -120,15 +137,15 @@ <tr> - <td>IS</td> + <td>AT</td> - <td>torproject.is</td> + <td>cyberarmy</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.is/dist">http</a></td> - <td><a href="http://torproject.is/">http</a></td> + <td><a href="http://tor.cyberarmy.at/dist">http</a></td> + <td><a href="http://tor.cyberarmy.at">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -137,15 +154,15 @@ <tr> - <td>DE</td> + <td>US</td> - <td>chaos darmstadt</td> + <td>searchprivate</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/dist/">http</a></td> - <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/">http</a></td> + <td><a href="http://tor.searchprivate.com/dist">http</a></td> + <td><a href="http://tor.searchprivate.com">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -154,19 +171,19 @@ <tr> - <td>US</td> + <td>DE</td> - <td>BarkerJr</td> + <td>chaos darmstadt</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torproject.us/dist/">http</a></td> - <td><a href="http://www.torproject.us/">http</a></td> - <td><a href="https://www.torproject.us/dist/">https</a></td> - <td><a href="https://www.torproject.us/">https</a></td> + <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/dist/">http</a></td> + <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/">http</a></td> <td> - </td> - <td><a href="rsync://rsync.torproject.us/tor">rsync</a></td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> @@ -190,81 +207,98 @@ <td>DE</td> - <td>torservers</td> + <td>beme it</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/dist">http</a></td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/dist">https</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> + <td><a href="http://tor.beme-it.de/dist/">http</a></td> + <td><a href="http://tor.beme-it.de/">http</a></td> + <td><a href="https://tor.beme-it.de/dist/">https</a></td> + <td><a href="https://tor.beme-it.de/">https</a></td> <td> - </td> - <td> - </td> + <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td> </tr> <tr> - <td>IR</td> + <td>US</td> - <td>Ninjas</td> + <td>NW Linux</td> <td>Up to date</td> <td> - </td> - <td><a href="http://onion.anonymo.us.org/dist/">http</a></td> - <td><a href="http://onion.anonymo.us.org/">http</a></td> + <td><a href="http://torproject.nwlinux.us/dist">http</a></td> + <td><a href="http://torproject.nwlinux.us">http</a></td> <td> - </td> <td> - </td> <td> - </td> + <td><a href="rsync://nwlinux.us/tor-web">rsync</a></td> +</tr> + +<tr> + + <td>US</td> + + <td>Xpdm</td> + + <td>Up to date</td> + <td> - </td> + <td><a href="http://torproj.xpdm.us/dist/">http</a></td> + <td><a href="http://torproj.xpdm.us/">http</a></td> + <td><a href="https://torproj.xpdm.us/dist/">https</a></td> + <td><a href="https://torproj.xpdm.us/">https</a></td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>DE</td> + <td>IL</td> - <td>beme it</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.beme-it.de/dist/">http</a></td> - <td><a href="http://tor.beme-it.de/">http</a></td> - <td><a href="https://tor.beme-it.de/dist/">https</a></td> - <td><a href="https://tor.beme-it.de/">https</a></td> + <td><a href="http://mirror.host4site.co.il/torproject.org/dist">http</a></td> + <td><a href="http://mirror.host4site.co.il/torproject.org/">http</a></td> <td> - </td> - <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>US</td> + <td>FR</td> - <td>NW Linux</td> + <td>LazyTiger</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.nwlinux.us/dist">http</a></td> - <td><a href="http://torproject.nwlinux.us">http</a></td> + <td><a href="http://tor.taiga-san.net/dist">http</a></td> + <td><a href="http://tor.taiga-san.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> - <td><a href="rsync://nwlinux.us/tor-web">rsync</a></td> + <td> - </td> </tr> <tr> - <td>AT</td> + <td>IS</td> - <td></td> + <td>TheOnionRouter</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.webersiedlung.at/dist/">http</a></td> - <td><a href="http://tor.webersiedlung.at/">http</a></td> + <td><a href="http://theonionrouter.com/dist/">http</a></td> + <td><a href="http://theonionrouter.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -273,19 +307,19 @@ <tr> - <td>US</td> + <td>INT</td> - <td>Xpdm</td> + <td>CoralCDN</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproj.xpdm.us/dist/">http</a></td> - <td><a href="http://torproj.xpdm.us/">http</a></td> - <td><a href="https://torproj.xpdm.us/dist/">https</a></td> - <td><a href="https://torproj.xpdm.us/">https</a></td> + <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> @@ -307,32 +341,32 @@ <tr> - <td>FR</td> + <td>DE</td> - <td>LazyTiger</td> + <td>[[:bbs:]]</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.taiga-san.net/dist">http</a></td> - <td><a href="http://tor.taiga-san.net/">http</a></td> + <td><a href="http://tor.blingblingsquad.net/dist">http</a></td> + <td><a href="http://tor.blingblingsquad.net/">http</a></td> + <td><a href="https://tor.blingblingsquad.net/dist">https</a></td> + <td><a href="https://tor.blingblingsquad.net/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>IS</td> + <td>NL</td> - <td>TheOnionRouter</td> + <td>Amorphis</td> <td>Up to date</td> <td> - </td> - <td><a href="http://theonionrouter.com/dist/">http</a></td> - <td><a href="http://theonionrouter.com/">http</a></td> + <td><a href="http://tor.amorphis.eu/dist/">http</a></td> + <td><a href="http://tor.amorphis.eu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -358,36 +392,53 @@ <tr> - <td>LT</td> + <td>DE</td> <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.vesta.nu/dist">http</a></td> - <td><a href="http://tor.vesta.nu">http</a></td> + <td><a href="http://tor.key-server.org/dist">http</a></td> + <td><a href="http://tor.key-server.org">http</a></td> + <td><a href="https://tor.key-server.org/dist">https</a></td> + <td><a href="https://tor.key-server.org">https</a></td> <td> - </td> <td> - </td> +</tr> + +<tr> + + <td>DE</td> + + <td></td> + + <td>Up to date</td> + <td> - </td> + <td><a href="http://tor.freie-re.de/dist">http</a></td> + <td><a href="http://tor.freie-re.de">http</a></td> <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>DE</td> + <td>LT</td> - <td>[[:bbs:]]</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.blingblingsquad.net/dist">http</a></td> - <td><a href="http://tor.blingblingsquad.net/">http</a></td> - <td><a href="https://tor.blingblingsquad.net/dist">https</a></td> - <td><a href="https://tor.blingblingsquad.net/">https</a></td> + <td><a href="http://tor.vesta.nu/dist">http</a></td> + <td><a href="http://tor.vesta.nu">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> @@ -396,7 +447,7 @@ <td>India Tor Fans</td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> <td><a href="http://www.torproject.org.in/dist/">http</a></td> @@ -443,36 +494,36 @@ <tr> - <td>NL</td> + <td>FR</td> - <td></td> + <td>BarkerJr</td> - <td>Out of date</td> + <td>Unknown</td> <td> - </td> + <td><a href="http://www.oignon.net/dist/">http</a></td> + <td><a href="http://www.oignon.net/">http</a></td> + <td><a href="https://www.oignon.net/dist/">https</a></td> + <td><a href="https://www.oignon.net/">https</a></td> <td> - </td> <td> - </td> - <td><a href="https://www.coevoet.nl/tor/dist">https</a></td> - <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>INT</td> + <td>NL</td> - <td>CoralCDN</td> + <td></td> - <td>Unknown</td> + <td>Up to date</td> <td> - </td> - <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> - <td><a href="http://www.torproject.org.nyud.net/">http</a></td> <td> - </td> <td> - </td> + <td><a href="https://www.coevoet.nl/tor/dist">https</a></td> <td> - </td> <td> - </td> + <td> - </td> </tr> <tr>

1 0

r25072: {website} add http://mirror.host4site.co.il/torproject.org/ (website/trunk)
by Andrew Lewman 14 Sep '11

14 Sep '11

Author: phobos Date: 2011-09-14 20:01:24 +0000 (Wed, 14 Sep 2011) New Revision: 25072 Modified: website/trunk/update-mirrors.pl Log: add http://mirror.host4site.co.il/torproject.org/ Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2011-09-14 19:59:52 UTC (rev 25071) +++ website/trunk/update-mirrors.pl 2011-09-14 20:01:24 UTC (rev 25072) @@ -660,6 +660,24 @@ httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", + }, + mirror041 => { + adminContact => "", + orgName => "", + isoCC => "IL", + subRegion => "", + region => "IL", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "http://mirror.host4site.co.il/torproject.org/", + httpsWebsiteMirror => "", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "http://mirror.host4site.co.il/torproject.org/dist", + httpsDistMirror => "", + rsyncDistMirror => "", + hiddenServiceMirror => "", } );

1 0

r25071: {website} add http://tor.freie-re.de mirrors. (website/trunk)
by Andrew Lewman 14 Sep '11

14 Sep '11

Author: phobos Date: 2011-09-14 19:59:52 +0000 (Wed, 14 Sep 2011) New Revision: 25071 Modified: website/trunk/update-mirrors.pl Log: add http://tor.freie-re.de mirrors. Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2011-09-14 19:56:32 UTC (rev 25070) +++ website/trunk/update-mirrors.pl 2011-09-14 19:59:52 UTC (rev 25071) @@ -642,6 +642,24 @@ httpsDistMirror => "https://tor.key-server.org/dist", rsyncDistMirror => "", hiddenServiceMirror => "", + }, + mirror040 => { + adminContact => "", + orgName => "", + isoCC => "DE", + subRegion => "", + region => "DE", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "http://tor.freie-re.de", + httpsWebsiteMirror => "", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "http://tor.freie-re.de/dist", + httpsDistMirror => "", + rsyncDistMirror => "", + hiddenServiceMirror => "", } );

1 0

r25070: {website} add tor-key-server mirror. (website/trunk)
by Andrew Lewman 14 Sep '11

14 Sep '11

Author: phobos Date: 2011-09-14 19:56:32 +0000 (Wed, 14 Sep 2011) New Revision: 25070 Modified: website/trunk/update-mirrors.pl Log: add tor-key-server mirror. Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2011-09-14 06:41:12 UTC (rev 25069) +++ website/trunk/update-mirrors.pl 2011-09-14 19:56:32 UTC (rev 25070) @@ -624,6 +624,24 @@ httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", + }, + mirror039 => { + adminContact => "", + orgName => "", + isoCC => "DE", + subRegion => "", + region => "DE", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "http://tor.key-server.org", + httpsWebsiteMirror => "https://tor.key-server.org", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "http://tor.key-server.org/dist", + httpsDistMirror => "https://tor.key-server.org/dist", + rsyncDistMirror => "", + hiddenServiceMirror => "", } );

1 0

[metrics-web/master] Add an option to not cut off the last day(s) in a graph.
by karsten＠torproject.org 14 Sep '11

14 Sep '11

commit 9677fbdaa5c0892bd54364277654264b6dd51480 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Sep 14 21:14:25 2011 +0200 Add an option to not cut off the last day(s) in a graph. Note that we cut off the last day(s) for a reason. The data may be wrong. Whatever you do there, it's your own risk. Don't blame the metrics guy! --- rserve/graphs.R | 6 +++- .../ernie/web/GraphParameterChecker.java | 23 +++++++++++++++++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/rserve/graphs.R b/rserve/graphs.R index 7f417a0..1b5fd43 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -617,12 +617,14 @@ plot_relayflags <- function(start, end, flags, granularity, path, dpi) { ggsave(filename = path, width = 8, height = 5, dpi = as.numeric(dpi)) } -plot_direct_users <- function(start, end, country, events, path, dpi) { +plot_direct_users <- function(start, end, country, events, path, nocutoff, + dpi) { drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, r, bwp, brn, bwn, brp, bwr, brr ", "FROM user_stats WHERE date >= '", start, "' AND date <= '", end, - "' AND date < (SELECT MAX(date) FROM user_stats) - 1 ", + "' ", ifelse(nocutoff == "off", + " AND date < (SELECT MAX(date) FROM user_stats) - 1 ", ""), " AND country = '", ifelse(country == "all", "zy", country), "'", sep = "") rs <- dbSendQuery(con, q) diff --git a/src/org/torproject/ernie/web/GraphParameterChecker.java b/src/org/torproject/ernie/web/GraphParameterChecker.java index 8189f19..81091e4 100644 --- a/src/org/torproject/ernie/web/GraphParameterChecker.java +++ b/src/org/torproject/ernie/web/GraphParameterChecker.java @@ -50,7 +50,7 @@ public class GraphParameterChecker { this.availableGraphs.put("bwhist-flags", "start,end,filename,dpi"); this.availableGraphs.put("dirbytes", "start,end,filename,dpi"); this.availableGraphs.put("direct-users", - "start,end,country,events,filename,dpi"); + "start,end,country,events,filename,nocutoff,dpi"); this.availableGraphs.put("bridge-users", "start,end,country,filename,dpi"); this.availableGraphs.put("gettor", "start,end,language,filename,dpi"); @@ -74,6 +74,7 @@ public class GraphParameterChecker { this.knownParameterValues.put("language", "all,en,zh_CN,fa"); this.knownParameterValues.put("source", "all,siv,moria,torperf"); this.knownParameterValues.put("filesize", "50kb,1mb,5mb"); + this.knownParameterValues.put("nocutoff", "on,off"); this.knownParameterValues.put("dpi", "72,150,300"); } @@ -301,6 +302,26 @@ public class GraphParameterChecker { } } + /* Parse whether the last day(s) of a time series should be cut off. + * This parameter can either be "on" or "off," where "off" is the + * default. */ + if (supportedGraphParameters.contains("nocutoff")) { + String[] nocutoffParameter = (String[]) requestParameters.get( + "nocutoff"); + List<String> knownValues = Arrays.asList( + this.knownParameterValues.get("nocutoff").split(",")); + if (nocutoffParameter != null) { + if (nocutoffParameter.length != 1 || + nocutoffParameter[0].length() == 0 || + !knownValues.contains(nocutoffParameter[0])) { + return null; + } + } else { + nocutoffParameter = new String[] { "off" }; + } + recognizedGraphParameters.put("nocutoff", nocutoffParameter); + } + /* Parse graph resolution in dpi. The default is 72. */ if (supportedGraphParameters.contains("dpi")) { String[] dpiParameter = (String[]) requestParameters.get("dpi");

1 0

[arm/master] Covering tor config options with /help
by atagar＠torproject.org 14 Sep '11

14 Sep '11

commit aa7fee5d5d92e33e81a169c254c4fc80a3ce0947 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Sep 14 09:56:04 2011 -0700 Covering tor config options with /help Issuing '/help [tor config option]' (for instance '/help exitpolicy') will provide usage information and the man page description for the option. --- src/util/torConfig.py | 14 +++++++------- src/util/torInterpretor.py | 24 ++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/src/util/torConfig.py b/src/util/torConfig.py index 557dc09..b2cf345 100644 --- a/src/util/torConfig.py +++ b/src/util/torConfig.py @@ -77,7 +77,8 @@ class ManPageEntry: Information provided about a tor configuration option in its man page entry. """ - def __init__(self, index, category, argUsage, description): + def __init__(self, option, index, category, argUsage, description): + self.option = option self.index = index self.category = category self.argUsage = argUsage @@ -168,7 +169,7 @@ def loadOptionDescriptions(loadPath = None, checkVersion = True): if inputFileContents: loadedLine = inputFileContents.pop(0) else: break - CONFIG_DESCRIPTIONS[option.lower()] = ManPageEntry(indexArg, category, argument, description.rstrip()) + CONFIG_DESCRIPTIONS[option.lower()] = ManPageEntry(option, indexArg, category, argument, description.rstrip()) except IndexError: CONFIG_DESCRIPTIONS.clear() raise IOError("input file format is invalid") @@ -209,7 +210,7 @@ def loadOptionDescriptions(loadPath = None, checkVersion = True): # noise). strippedDescription = lastDescription.strip() if lastOption and (not validOptions or lastOption.lower() in validOptions): - CONFIG_DESCRIPTIONS[lastOption.lower()] = ManPageEntry(optionCount, lastCategory, lastArg, strippedDescription) + CONFIG_DESCRIPTIONS[lastOption.lower()] = ManPageEntry(lastOption, optionCount, lastCategory, lastArg, strippedDescription) optionCount += 1 lastDescription = "" @@ -271,9 +272,8 @@ def saveOptionDescriptions(path): torVersion = torTools.getConn().getInfo("version", "") outputFile.write("Tor Version %s\n" % torVersion) for i in range(len(sortedOptions)): - option = sortedOptions[i] - manEntry = getConfigDescription(option) - outputFile.write("%s\nindex: %i\n%s\n%s\n%s\n" % (manEntry.category, manEntry.index, option, manEntry.argUsage, manEntry.description)) + manEntry = getConfigDescription(sortedOptions[i]) + outputFile.write("%s\nindex: %i\n%s\n%s\n%s\n" % (manEntry.category, manEntry.index, manEntry.option, manEntry.argUsage, manEntry.description)) if i != len(sortedOptions) - 1: outputFile.write(PERSIST_ENTRY_DIVIDER) outputFile.close() @@ -281,7 +281,7 @@ def saveOptionDescriptions(path): def getConfigSummary(option): """ - Provides a short summary description of th configuration option. If none is + Provides a short summary description of the configuration option. If none is known then this proivdes None. Arguments: diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index 3908d6e..5733f8a 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -9,7 +9,7 @@ import readline import version -from util import connections, enum, hostnames, torTools +from util import connections, enum, hostnames, torConfig, torTools, uiTools COLOR_PROMPT = True # provides a colored interpretor prompt INFO_HOSTNAMES = False # hostname lookups in /info results @@ -300,7 +300,27 @@ class ControlInterpretor: for line in description.split("\n"): outputEntry.append((" " + line + "\n", OUTPUT_FORMAT)) else: - outputEntry.append(("No help information for '%s'..." % arg, ERROR_FORMAT)) + # check if this is a configuration option + manEntry = torConfig.getConfigDescription(arg) + + if manEntry: + # provides basic usage information in bold, followed an indented + # copy of the man page description (wrapped to eighty characters) + + helpTitle = "%s %s (category: %s)\n" % (manEntry.option, manEntry.argUsage, manEntry.category) + outputEntry.append((helpTitle, OUTPUT_FORMAT + (Attr.BOLD, ))) + + descLines = manEntry.description.split("\n") + + for line in descLines: + if not line: + outputEntry.append(("\n", OUTPUT_FORMAT)) + else: + while line: + drawPortion, line = uiTools.cropStr(line, 88, 4, 4, uiTools.Ending.HYPHEN, True) + outputEntry.append((" %s\n" % drawPortion.strip(), OUTPUT_FORMAT)) + else: + outputEntry.append(("No help information for '%s'..." % arg, ERROR_FORMAT)) else: # provides the GENERAL_HELP with everything bolded except descriptions for line in GENERAL_HELP.split("\n"):

1 0

[arm/master] Implementing /help for interpretor commands
by atagar＠torproject.org 14 Sep '11

14 Sep '11

commit d40a26f6bbd69fa63436983905ed261f164b5cb9 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Sep 14 09:19:53 2011 -0700 Implementing /help for interpretor commands Beginning to implement the '/help [OPTION]' interpretor command. This will provide usage information on interpretor commands, tor controller commands, and tor configuration options. At present just the general help and interpretor commands are implemented. --- src/util/torInterpretor.py | 103 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 100 insertions(+), 3 deletions(-) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index fbb33da..3908d6e 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -14,6 +14,9 @@ from util import connections, enum, hostnames, torTools COLOR_PROMPT = True # provides a colored interpretor prompt INFO_HOSTNAMES = False # hostname lookups in /info results +# initial location /write will save to when no path is specified +DEFAULT_WRITE_PATH = "/tmp/torInterpretor_output" + INIT_MSG = """Arm %s Control Interpretor Enter \"/help\" for usage information and \"/quit\" to stop. """ % version.VERSION @@ -45,6 +48,64 @@ RESET = CSI % "0" BACKLOG_LIMIT = 100 CONTENT_LIMIT = 20000 +GENERAL_HELP = """Interpretor commands include: + help - provides information for interpretor and tor commands/config options + write - saves backlog to a given location + info - general information for a relay + find - searches backlog for lines with the given regex + quit - shuts down the interpretor + +Tor commands include: + GETINFO - queries information from tor + GETCONF, SETCONF, RESETCONF - show or edit a configuration option + SIGNAL - issues control signal to the process (for resetting, stopping, etc) + SETEVENT - configures the events tor will notify us of + + USEFEATURE - enables custom behavior for the controller + SAVECONF - writes tor's current configuration to our torrc + LOADCONF - loads the given input like it was part of our torrc + MAPADDRESS - replaces requests for one address with another + POSTDESCRIPTOR - adds a relay descriptor to our cache + EXTENDCIRCUIT - create or extend a tor circuit + SETCIRCUITPURPOSE - configures the purpose associated with a circuit + CLOSECIRCUIT - closes the given circuit + ATTACHSTREAM - associates an application's stream with a tor circuit + REDIRECTSTREAM - sets a stream's destination + CLOSESTREAM - closes the given stream + RESOLVE - issues an asynchronous dns or rdns request over tor + TAKEOWNERSHIP - instructs tor to quit when this control connection is closed + PROTOCOLINFO - queries version and controller authentication information + QUIT - disconnect control connection + +For more information use '/help [OPTION]'.""" + +HELP_HELP = """Provides usage information for the given interpretor, tor command, or tor +configuration option. + +Example: + /help info # provides a description of the '/info' option + /help GETINFO # usage information for tor's GETINFO controller option + /help ExitPolicy # description of tor's ExitPolicy configuration option""" + +HELP_WRITE = """Writes the interpretor's backlog to the given path. If no location is +specified then this saves to the last path specified (initially '%s').""" % DEFAULT_WRITE_PATH + +HELP_INFO = """Provides general information for a relay that's currently in the consensus. +If no relay is specified then this provides information on ourselves.""" + +HELP_FIND = """Searches the backlog for lines matching a given regular expression pattern. +Results are deduplicated and the matching portions bolded.""" + +HELP_QUIT = """Terminates the interpretor.""" + +INTERPRETOR_HELP = { + "HELP": ("/help [OPTION]", HELP_HELP), + "WRITE": ("/write [PATH]", HELP_WRITE), + "INFO": ("/info [relay fingerprint, nickname, or IP address]", HELP_INFO), + "FIND": ("/find PATTERN", HELP_FIND), + "QUIT": ("/quit", HELP_QUIT) +} + class InterpretorClosed(Exception): """ Exception raised when the interpretor should be shut down. @@ -156,7 +217,7 @@ class TorControlCompleter: self.commands.append("MAPADDRESS ") self.commands.append("EXTENDCIRCUIT ") self.commands.append("SETCIRCUITPURPOSE ") - self.commands.append("SETROUTERPURPOSE ") + #self.commands.append("SETROUTERPURPOSE ") # deprecated option self.commands.append("ATTACHSTREAM ") self.commands.append("+POSTDESCRIPTOR ") # TODO: needs to support multiline options for this (ugg) self.commands.append("REDIRECTSTREAM ") @@ -197,7 +258,7 @@ class ControlInterpretor: def __init__(self): self.backlog = [] # prior requests the user has made self.contents = [] # (msg, format list) tuples for what's been displayed - self.writePath = "/tmp/torInterpretor_output" # last location we've saved to + self.writePath = DEFAULT_WRITE_PATH # last location we've saved to def getBacklog(self): """ @@ -220,6 +281,37 @@ class ControlInterpretor: return self.contents + [appendPrompt] else: return self.contents + def doHelp(self, arg, outputEntry): + """ + Performs the '/help' operation, giving usage information for the given + argument or a general summary if there wasn't one. + """ + + arg = arg.upper() + + if arg: + if arg in INTERPRETOR_HELP: + # Provides information for the interpretor argument. This bolds the + # usage information and indents the description after it. + usage, description = INTERPRETOR_HELP[arg] + + outputEntry.append((usage + "\n", OUTPUT_FORMAT + (Attr.BOLD, ))) + + for line in description.split("\n"): + outputEntry.append((" " + line + "\n", OUTPUT_FORMAT)) + else: + outputEntry.append(("No help information for '%s'..." % arg, ERROR_FORMAT)) + else: + # provides the GENERAL_HELP with everything bolded except descriptions + for line in GENERAL_HELP.split("\n"): + cmdStart = line.find(" - ") + + if cmdStart != -1: + outputEntry.append((line[:cmdStart], OUTPUT_FORMAT + (Attr.BOLD, ))) + outputEntry.append((line[cmdStart:] + "\n", OUTPUT_FORMAT)) + else: + outputEntry.append((line + "\n", OUTPUT_FORMAT + (Attr.BOLD, ))) + def doWrite(self, arg, outputEntry): """ Performs the '/write' operation, which attempts to save the backlog to a @@ -286,7 +378,11 @@ class ControlInterpretor: # determines the fingerprint, leaving it unset and adding an error message # if unsuccessful if not arg: - outputEntry.append(("No fingerprint or nickname to look up", ERROR_FORMAT)) + # uses our fingerprint if we're a relay, otherwise gives an error + fingerprint = conn.getInfo("fingerprint") + + if not fingerprint: + outputEntry.append(("We aren't a relay, no information to provide", ERROR_FORMAT)) elif len(arg) == 40 and re.match("^[0-9a-fA-F]+$", arg): # we got a fingerprint (fourty character hex string) fingerprint = arg @@ -438,6 +534,7 @@ class ControlInterpretor: inputEntry.append((input, INPUT_INTERPRETOR_FORMAT)) if cmd == "/quit": raise InterpretorClosed() + elif cmd == "/help": self.doHelp(arg, outputEntry) elif cmd == "/write": self.doWrite(arg, outputEntry) elif cmd == "/find": self.doFind(arg, outputEntry) elif cmd == "/info": self.doInfo(arg, outputEntry)

1 0