- tor-commits - lists.torproject.org

r24455: {arm} Torrc validation requires 'GETINFO config-text' which was in (arm/trunk/src/util)
by Damian Johnson 27 Mar '11

27 Mar '11

Author: atagar Date: 2011-03-27 06:07:59 +0000 (Sun, 27 Mar 2011) New Revision: 24455 Modified: arm/trunk/src/util/torConfig.py arm/trunk/src/util/torTools.py Log: Torrc validation requires 'GETINFO config-text' which was introduced in Tor verison 0.2.2.7 (as per https://trac.torproject.org/projects/tor/ticket/2501) Skipping validation if we don't meet that requirement. Modified: arm/trunk/src/util/torConfig.py =================================================================== --- arm/trunk/src/util/torConfig.py 2011-03-27 02:58:34 UTC (rev 24454) +++ arm/trunk/src/util/torConfig.py 2011-03-27 06:07:59 UTC (rev 24455) @@ -628,13 +628,23 @@ self.valsLock.acquire() + # The torrc validation relies on 'GETINFO config-text' which was + # introduced in tor 0.2.2.7-alpha so if we're using an earlier version + # (or configured to skip torrc validation) then this is a no-op. For more + # information see: + # https://trac.torproject.org/projects/tor/ticket/2501 + if not self.isLoaded(): returnVal = None - elif not CONFIG["features.torrc.validate"]: returnVal = {} else: - if self.corrections == None: - self.corrections = validate(self.contents) + skipValidation = not CONFIG["features.torrc.validate"] + skipValidation |= not torTools.getConn().isVersion("0.2.2.7-alpha") - returnVal = list(self.corrections) + if skipValidation: returnVal = {} + else: + if self.corrections == None: + self.corrections = validate(self.contents) + + returnVal = list(self.corrections) self.valsLock.release() return returnVal Modified: arm/trunk/src/util/torTools.py =================================================================== --- arm/trunk/src/util/torTools.py 2011-03-27 02:58:34 UTC (rev 24454) +++ arm/trunk/src/util/torTools.py 2011-03-27 06:07:59 UTC (rev 24455) @@ -54,8 +54,8 @@ CACHE_ARGS = ("version", "config-file", "exit-policy/default", "fingerprint", "config/names", "info/names", "features/names", "events/names", "nsEntry", "descEntry", "address", "bwRate", "bwBurst", - "bwObserved", "bwMeasured", "flags", "pid", "pathPrefix", - "startTime", "authorities", "circuits") + "bwObserved", "bwMeasured", "flags", "parsedVersion", "pid", + "pathPrefix", "startTime", "authorities", "circuits") # Tor has a couple messages (in or/router.c) for when our ip address changes: # "Our IP Address has changed from <previous> to <current>; rebuilding @@ -217,6 +217,41 @@ log.log(CONFIG["log.unknownBsdJailId"], "Failed to figure out the FreeBSD jail id. Assuming 0.") return 0 +def parseVersion(versionStr): + """ + Parses the given version string into its expected components, for instance... + '0.2.2.13-alpha (git-feb8c1b5f67f2c6f)' + + would provide: + (0, 2, 2, 13, 'alpha') + + If the input isn't recognized then this returns None. + + Arguments: + versionStr - version string to be parsed + """ + + # crops off extra arguments, for instance: + # '0.2.2.13-alpha (git-feb8c1b5f67f2c6f)' -> '0.2.2.13-alpha' + versionStr = versionStr.split()[0] + + result = None + if versionStr.count(".") in (2, 3): + # parses the optional suffix ('alpha', 'release', etc) + if versionStr.count("-") == 1: + versionStr, versionSuffix = versionStr.split("-") + else: versionSuffix = "" + + # Parses the numeric portion of the version. This can have three or four + # entries depending on if an optional patch level was provided. + try: + versionComp = [int(entry) for entry in versionStr.split(".")] + if len(versionComp) == 3: versionComp += [0] + result = tuple(versionComp + [versionSuffix]) + except ValueError: pass + + return result + def getConn(): """ Singleton constructor for a Controller. Be aware that this starts as being @@ -702,6 +737,53 @@ return self._getRelayAttr("flags", default) + def isVersion(self, minVersionStr): + """ + Checks if we meet the given version. Recognized versions are of the form: + <major>.<minor>.<micro>[.<patch>][-<status_tag>] + + for instance, "0.2.2.13-alpha" or "0.2.1.5". This raises a ValueError if + the input isn't recognized, and returns False if unable to fetch our + instance's version. + + According to the spec the status_tag is purely informal, so it's ignored + in comparisons. + + Arguments: + minVersionStr - version to be compared against + """ + + minVersion = parseVersion(minVersionStr) + + if minVersion == None: + raise ValueError("unrecognized version: %s" % minVersionStr) + + self.connLock.acquire() + + result = False + if self.isAlive(): + myVersion = self._getRelayAttr("parsedVersion", None) + + if not myVersion: + result = False + elif myVersion[:4] == minVersion[:4]: + result = True # versions match + else: + # compares each of the numeric portions of the version + for i in range(4): + myVal, minVal = myVersion[i], minVersion[i] + + if myVal > minVal: + result = True + break + elif myVal < minVal: + result = False + break + + self.connLock.release() + + return result + def getMyPid(self): """ Provides the pid of the attached tor process (None if no controller exists @@ -1515,6 +1597,8 @@ if line.startswith("s "): result = line[2:].split() break + elif key == "parsedVersion": + result = parseVersion(self.getInfo("version", "")) elif key == "pid": result = getPid(int(self.getOption("ControlPort", 9051)), self.getOption("PidFile")) elif key == "pathPrefix":

1 0

r24454: {arm} Suggesting authentication and giving steps for it in the rea (arm/trunk)
by Damian Johnson 27 Mar '11

27 Mar '11

Author: atagar Date: 2011-03-27 02:58:34 +0000 (Sun, 27 Mar 2011) New Revision: 24454 Modified: arm/trunk/README Log: Suggesting authentication and giving steps for it in the readme (idea by Sebastian) Modified: arm/trunk/README =================================================================== --- arm/trunk/README 2011-03-27 01:51:48 UTC (rev 24453) +++ arm/trunk/README 2011-03-27 02:58:34 UTC (rev 24454) @@ -25,6 +25,22 @@ ... starting Tor with '--controlport <PORT>' ... or including 'ControlPort <PORT>' in your torrc +It's also highly suggested for the control port to require authentication. +This can be done either with a cookie or password: + * Cookie Authentication - Controllers authenticate to Tor by providing the + contents of the control_auth_cookie file. To set this up... + - add "CookieAuthentication 1" to your torrc + - either restart Tor or run "pkill -sighup tor" + - this method of authentication is automatically handled by arm, so you + can still start arm as you normally would + + * Password Authentication - Attaching to the control port requires a + password. To set this up... + - run "tor --hash-password <your password>" + - add "HashedControlPassword <hashed password>" to your torrc + - either restart Tor or run "pkill -sighup tor" + - when starting up arm will prompt you for this password + For full functionality this also needs: - To be ran with the same user as tor to avoid permission issues with connection resolution and reading the torrc.

1 0

r24453: {website} add org name by request. (website/trunk)
by Andrew Lewman 27 Mar '11

27 Mar '11

Author: phobos Date: 2011-03-27 01:51:48 +0000 (Sun, 27 Mar 2011) New Revision: 24453 Modified: website/trunk/update-mirrors.pl Log: add org name by request. Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2011-03-27 01:20:31 UTC (rev 24452) +++ website/trunk/update-mirrors.pl 2011-03-27 01:51:48 UTC (rev 24453) @@ -572,7 +572,7 @@ mirror029 => { adminContact => "", - orgName => "", + orgName => "NW Linux", isoCC => "US", subRegion => "WA", region => "US",

1 0

r24452: {check} Attempt to fix an issue where dns requests time out and apac (check/trunk/cgi-bin)
by Sebastian Hahn 27 Mar '11

27 Mar '11

Author: sebastian Date: 2011-03-27 01:20:31 +0000 (Sun, 27 Mar 2011) New Revision: 24452 Modified: check/trunk/cgi-bin/TorCheck.py Log: Attempt to fix an issue where dns requests time out and apache overloads Modified: check/trunk/cgi-bin/TorCheck.py =================================================================== --- check/trunk/cgi-bin/TorCheck.py 2011-03-26 21:52:09 UTC (rev 24451) +++ check/trunk/cgi-bin/TorCheck.py 2011-03-27 01:20:31 UTC (rev 24452) @@ -67,7 +67,10 @@ request = DNS.DnsRequest(name=ELQuestion,qtype='A') # Ask the question and load the data into our answer - answer=request.req() + try: + answer=request.req() + except DNSError: + return 2 # Parse the answer and decide if it's allowing exits # 127.0.0.2 is an exit and NXDOMAIN is not

1 0

r24451: {website} Reverting r24450 (there's a couple non-list addresses on the (website/trunk/about/en)
by Damian Johnson 26 Mar '11

26 Mar '11

Author: atagar Date: 2011-03-26 21:52:09 +0000 (Sat, 26 Mar 2011) New Revision: 24451 Modified: website/trunk/about/en/contact.wml Log: Reverting r24450 (there's a couple non-list addresses on the page). I'll wait for phobos to see how we want to proceed with this. Modified: website/trunk/about/en/contact.wml =================================================================== --- website/trunk/about/en/contact.wml 2011-03-26 20:47:39 UTC (rev 24450) +++ website/trunk/about/en/contact.wml 2011-03-26 21:52:09 UTC (rev 24451) @@ -16,7 +16,7 @@ First, if you have a problem or question about using Tor, go look at the <a href="<page docs/documentation>#Support">Support section</a> for how to proceed. The Tor developers spend most of their time developing Tor, and there are no people devoted to user support, so try to help yourself before <a href="<page docs/faq>#SupportMail">politely trying to find a volunteer</a>. If you really do need to reach us, here are some approaches. All - of these addresses are @lists.torproject.org. Please be patient and <a + of these addresses are @torproject.org. Please be patient and <a href="http://www.catb.org/~esr/faqs/smart-questions.html">helpful</a>, and please make sure to write your mail in English.

1 0

r24450: {website} Correcting for the @torproject.org -> @lists.torproject.org (website/trunk/about/en)
by Damian Johnson 26 Mar '11

26 Mar '11

Author: atagar Date: 2011-03-26 20:47:39 +0000 (Sat, 26 Mar 2011) New Revision: 24450 Modified: website/trunk/about/en/contact.wml Log: Correcting for the @torproject.org -> @lists.torproject.org migration. With the exception of tor-ops (which is noted in the man page and https://www.torproject.org/docs/tor-manual.html) this should be it - all remaining @torproject.org addresses appear to be for individuals or autoresponders. Modified: website/trunk/about/en/contact.wml =================================================================== --- website/trunk/about/en/contact.wml 2011-03-26 16:10:16 UTC (rev 24449) +++ website/trunk/about/en/contact.wml 2011-03-26 20:47:39 UTC (rev 24450) @@ -16,7 +16,7 @@ First, if you have a problem or question about using Tor, go look at the <a href="<page docs/documentation>#Support">Support section</a> for how to proceed. The Tor developers spend most of their time developing Tor, and there are no people devoted to user support, so try to help yourself before <a href="<page docs/faq>#SupportMail">politely trying to find a volunteer</a>. If you really do need to reach us, here are some approaches. All - of these addresses are @torproject.org. Please be patient and <a + of these addresses are @lists.torproject.org. Please be patient and <a href="http://www.catb.org/~esr/faqs/smart-questions.html">helpful</a>, and please make sure to write your mail in English.

1 0

r24449: {website} update the mirrors table. (website/trunk/include)
by Andrew Lewman 26 Mar '11

26 Mar '11

Author: phobos Date: 2011-03-26 16:10:16 +0000 (Sat, 26 Mar 2011) New Revision: 24449 Modified: website/trunk/include/mirrors-table.wmi Log: update the mirrors table. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2011-03-26 16:08:25 UTC (rev 24448) +++ website/trunk/include/mirrors-table.wmi 2011-03-26 16:10:16 UTC (rev 24449) @@ -18,23 +18,6 @@ <tr> - <td>NL</td> - - <td>Amorphis</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> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>US</td> <td>searchprivate</td> @@ -86,40 +69,6 @@ <tr> - <td>DK</td> - - <td>Zentrum der Gesundheit</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> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>EE</td> - - <td>CyberSIDE</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> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>DE</td> <td>chaos darmstadt</td> @@ -222,49 +171,66 @@ <tr> - <td>SE</td> + <td>DE</td> - <td>homosu</td> + <td>[[:bbs:]]</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.homosu.net/dist">http</a></td> - <td><a href="http://tor.homosu.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> +</tr> + +<tr> + + <td>NL</td> + + <td>Amorphis</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> - </td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>DE</td> + <td>DK</td> - <td>[[:bbs:]]</td> + <td>Zentrum der Gesundheit</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.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>INT</td> + <td>SE</td> - <td>CoralCDN</td> + <td>homosu</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><a href="http://tor.homosu.net/dist">http</a></td> + <td><a href="http://tor.homosu.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -273,6 +239,23 @@ <tr> + <td>EE</td> + + <td>CyberSIDE</td> + + <td>Out of 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> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>IN</td> <td>India Tor Fans</td> @@ -292,7 +275,7 @@ <td>IR</td> - <td>Access</td> + <td>Ninjas</td> <td>Out of date</td> @@ -375,6 +358,23 @@ <tr> + <td>IS</td> + + <td>tor</td> + + <td>Out of date</td> + + <td> - </td> + <td><a href="http://torproject.is/dist">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>NL</td> <td>BIT BV</td> @@ -477,6 +477,23 @@ <tr> + <td>INT</td> + + <td>CoralCDN</td> + + <td>Unknown</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> - </td> + <td> - </td> +</tr> + +<tr> + <td>DE</td> <td>Spline</td>

1 0

r24448: {website} and fix the rest of the org update. (website/trunk)
by Andrew Lewman 26 Mar '11

26 Mar '11

Author: phobos Date: 2011-03-26 16:08:25 +0000 (Sat, 26 Mar 2011) New Revision: 24448 Modified: website/trunk/update-mirrors.pl Log: and fix the rest of the org update. Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2011-03-26 16:06:11 UTC (rev 24447) +++ website/trunk/update-mirrors.pl 2011-03-26 16:08:25 UTC (rev 24448) @@ -457,7 +457,7 @@ }, mirror023 => { - adminContact => "sina at accessnow.org", + adminContact => "SiNA", orgName => "Ninjas", isoCC => "IR", subRegion => "",

1 0

r24447: {website} fix one org name. (website/trunk)
by Andrew Lewman 26 Mar '11

26 Mar '11

Author: phobos Date: 2011-03-26 16:06:11 +0000 (Sat, 26 Mar 2011) New Revision: 24447 Modified: website/trunk/update-mirrors.pl Log: fix one org name. Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2011-03-26 16:03:11 UTC (rev 24446) +++ website/trunk/update-mirrors.pl 2011-03-26 16:06:11 UTC (rev 24447) @@ -458,7 +458,7 @@ mirror023 => { adminContact => "sina at accessnow.org", - orgName => "Access", + orgName => "Ninjas", isoCC => "IR", subRegion => "", region => "IR",

1 0

r24446: {website} add cyberarmy and iceland mirrors. (website/trunk)
by Andrew Lewman 26 Mar '11

26 Mar '11

Author: phobos Date: 2011-03-26 16:03:11 +0000 (Sat, 26 Mar 2011) New Revision: 24446 Modified: website/trunk/update-mirrors.pl Log: add cyberarmy and iceland mirrors. Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2011-03-26 00:17:53 UTC (rev 24445) +++ website/trunk/update-mirrors.pl 2011-03-26 16:03:11 UTC (rev 24446) @@ -623,6 +623,42 @@ httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", + }, + mirror032 => { + adminContact => "", + orgName => "cyberarmy", + isoCC => "AT", + subRegion => "", + region => "AT", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "http://tor.cyberarmy.at", + httpsWebsiteMirror => "", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "http://tor.cyberarmy.at/dist", + httpsDistMirror => "", + rsyncDistMirror => "", + hiddenServiceMirror => "", + }, + mirror032 => { + adminContact => "", + orgName => "tor", + isoCC => "IS", + subRegion => "", + region => "IS", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "", + httpsWebsiteMirror => "", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "http://torproject.is/dist", + httpsDistMirror => "", + rsyncDistMirror => "", + hiddenServiceMirror => "", } );

1 0