tor-commits June 2013

tor-commits@lists.torproject.org

19 participants
1571 discussions

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 01 Jun '13

01 Jun '13

commit 06e7f5b35789b77b5bc2e9949fd437918460700c Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 1 11:16:12 2013 +0000 Update translations for liveusb-creator --- si_LK/si_LK.po | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/si_LK/si_LK.po b/si_LK/si_LK.po index d84c6e8..30bab5c 100644 --- a/si_LK/si_LK.po +++ b/si_LK/si_LK.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# ganeshwaki <ganeshwaki(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-02-14 16:07+0100\n" -"PO-Revision-Date: 2012-10-03 17:40+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2013-06-01 11:14+0000\n" +"Last-Translator: ganeshwaki <ganeshwaki(a)gmail.com>\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/torproject/language/si_LK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -130,7 +131,7 @@ msgstr "" #: ../liveusb/gui.py:197 #, python-format msgid "Device is too small: it must be at least %s MiB." -msgstr "" +msgstr "උපකරණය ඉතා කුඩාය: එය අඩුම තරමේ %s MiB." #: ../liveusb/dialog.py:157 #, python-format @@ -148,7 +149,7 @@ msgstr "" #: ../liveusb/gui.py:84 #, python-format msgid "Downloading %s..." -msgstr "" +msgstr "භාගත වෙමින්%s..." #: ../liveusb/creator.py:1116 msgid "Drive is a loopback, skipping MBR reset" @@ -162,7 +163,7 @@ msgstr "" msgid "" "Error: Cannot set the label or obtain the UUID of your device. Unable to " "continue." -msgstr "" +msgstr "දෝෂය: ලේබලය සැකසීමට හෝ ඔබගේ උපකරණයේ UUID ලබාගැනීමට නොහැක. ඉදිරියට පවත්වා ගැනීමට නොහැක ." #: ../liveusb/creator.py:405 msgid "" @@ -195,12 +196,12 @@ msgstr "" #: ../liveusb/gui.py:601 msgid "Installation complete!" -msgstr "" +msgstr "ස්ථාපනය සම්පුර්ණය!" #: ../liveusb/gui.py:276 #, python-format msgid "Installation complete! (%s)" -msgstr "" +msgstr "ස්ථාපනය කිරීම සම්පුරණයි! (%s)" #: ../liveusb/gui.py:602 msgid "Installation was completed. Press OK to close this program." @@ -212,7 +213,7 @@ msgstr "" #: ../liveusb/gui.py:281 msgid "LiveUSB creation failed!" -msgstr "" +msgstr "LiveUSB තැනීම අසාර්ථකයි!" #: ../liveusb/creator.py:1332 msgid "" @@ -253,7 +254,7 @@ msgstr "" #: ../liveusb/gui.py:592 msgid "Persistent Storage" -msgstr "" +msgstr "නොනැසී පවතින සංචිතය " #: ../liveusb/dialog.py:161 msgid "Persistent Storage (0 MB)" @@ -380,7 +381,7 @@ msgstr "" #: ../liveusb/gui.py:414 msgid "Unable to find any USB drive" -msgstr "" +msgstr "USB ධාවකය සොයාගත නොහැක " #: ../liveusb/creator.py:1198 msgid "Unable to find any removable device" @@ -446,7 +447,7 @@ msgstr "" #: ../liveusb/gui.py:80 #, python-format msgid "Unknown release: %s" -msgstr "" +msgstr "නොදන්නා දිගහැරුම: %s" #: ../liveusb/creator.py:835 #, python-format @@ -517,7 +518,7 @@ msgid "" "Warning: This tool needs to be run as an Administrator. To do this, right " "click on the icon and open the Properties. Under the Compatibility tab, " "check the \"Run this program as an administrator\" box." -msgstr "" +msgstr "අවවාදය: This tool needs to be run as an Administrator. To do this, right click on the icon and open the Properties. Under the Compatibility tab, check the \"Run this program as an administrator\" box." #: ../liveusb/creator.py:151 #, python-format

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 01 Jun '13

01 Jun '13

commit adf225870589f5eef219ad708c506d2aa13ba305 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 1 11:15:25 2013 +0000 Update translations for vidalia_alpha --- si_LK/vidalia_si_LK.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/si_LK/vidalia_si_LK.po b/si_LK/vidalia_si_LK.po index 66009ba..d1ebe28 100644 --- a/si_LK/vidalia_si_LK.po +++ b/si_LK/vidalia_si_LK.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2013-05-30 23:40+0000\n" +"PO-Revision-Date: 2013-06-01 11:12+0000\n" "Last-Translator: Randika.Pathirage <randika.pathirage(a)gmail.com>\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/torproject/language/si_LK/)\n" "MIME-Version: 1.0\n" @@ -494,7 +494,7 @@ msgid "" "Tor is already running, but Vidalia can't connect to it.\n" "\n" "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor." -msgstr "" +msgstr "Tor කාලීනව විචල්‍ය වෙමින් පවතී, නමුත් විදාලියා එයට සබැදීමට නොහැක.\n\nමෙය සිදුවීමට හැක්කේ වෙනයම් දෙයක් (එනම් වෙනත් සක්‍රිය විදාලියා සැකසුමක්, හෝ අක්‍රිය විදාලියා සැකසුමක්) Tor දියත් කලේ නම්." msgctxt "ControlPasswordInputDialog" msgid "" @@ -572,7 +572,7 @@ msgstr "බෙල්ජියම" msgctxt "CountryInfo" msgid "Belize" -msgstr "" +msgstr "බේලීස්" msgctxt "CountryInfo" msgid "Bhutan"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 01 Jun '13

01 Jun '13

commit eed278fe3ca70322d4c9b2c38ec8a69e898bfb60 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 1 11:15:17 2013 +0000 Update translations for vidalia --- si_LK/vidalia_si_LK.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/si_LK/vidalia_si_LK.po b/si_LK/vidalia_si_LK.po index 34be847..f981f1a 100644 --- a/si_LK/vidalia_si_LK.po +++ b/si_LK/vidalia_si_LK.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2013-05-30 23:40+0000\n" +"PO-Revision-Date: 2013-06-01 11:00+0000\n" "Last-Translator: ganeshwaki <ganeshwaki(a)gmail.com>\n" "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/torproject/language/si_LK/)\n" "MIME-Version: 1.0\n" @@ -540,7 +540,7 @@ msgstr "බෙල්ජියම" msgctxt "CountryInfo" msgid "Belize" -msgstr "" +msgstr "බේලීස්" msgctxt "CountryInfo" msgid "Bhutan"

1 0

[arm/master] Dropping getMyDescriptor()
by atagar＠torproject.org 01 Jun '13

01 Jun '13

commit 0d6146c69621314658d2f7ff53076270ade03d7d Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 31 09:03:23 2013 -0700 Dropping getMyDescriptor() Our helper function for getting our own descriptor data was only used in one spot. Now that we're using stem to fetch it this helper function isn't actually simplifying things so dropping it. --- src/util/torTools.py | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index b2f09e4..b23a3cc 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -348,16 +348,6 @@ class Controller: return self._getRelayAttr("nsEntry", default) - def getMyDescriptor(self, default = None): - """ - Provides the descriptor entry for this relay if available. - - Arguments: - default - result if the query fails - """ - - return self._getRelayAttr("descEntry", default) - def getMyBandwidthRate(self, default = None): """ Provides the effective relaying bandwidth rate of this relay. Currently @@ -1006,7 +996,6 @@ class Controller: desc_fingerprints = [fingerprint for (fingerprint, nickname) in event.relays] if not myFingerprint or myFingerprint in desc_fingerprints: - self._cachedParam["descEntry"] = None self._cachedParam["bwObserved"] = None # If we're tracking ip address -> fingerprint mappings then update with @@ -1185,14 +1174,11 @@ class Controller: currentVal, result = self._cachedParam.get(key), None if currentVal == None and (self.isAlive() or key == "pathPrefix"): # still unset - fetch value - if key in ("nsEntry", "descEntry"): + if key == "nsEntry": myFingerprint = self.getInfo("fingerprint", None) if myFingerprint: - if key == "nsEntry": - result = self.controller.get_network_status(myFingerprint) - else: - result = self.controller.get_server_descriptor(myFingerprint) + result = self.controller.get_network_status(myFingerprint) elif key == "bwRate": # effective relayed bandwidth is the minimum of BandwidthRate, # MaxAdvertisedBandwidth, and RelayBandwidthRate (if set) @@ -1216,10 +1202,13 @@ class Controller: result = effectiveBurst elif key == "bwObserved": - myDescriptor = self.getMyDescriptor() + myFingerprint = self.getInfo("fingerprint", None) + + if myFingerprint: + myDescriptor = self.controller.get_server_descriptor(myFingerprint) - if myDescriptor: - result = myDescriptor.observed_bandwidth + if myDescriptor: + result = myDescriptor.observed_bandwidth elif key == "bwMeasured": # TODO: Currently there's no client side indication of what type of # measurement was used. Include this in results if it's ever available.

1 0

[arm/master] Dropping getMyNetworkStatus()
by atagar＠torproject.org 01 Jun '13

01 Jun '13

commit 55b59e4017ec023ab5a77c9cdf0c3e4f3166a65a Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 31 17:04:35 2013 -0700 Dropping getMyNetworkStatus() This helper function doesn't do much now that we're using stem. Dropping it. --- src/util/torTools.py | 52 ++++++++++++++++---------------------------------- 1 file changed, 16 insertions(+), 36 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index b23a3cc..e56a5c2 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -331,23 +331,6 @@ class Controller: return self._getRelayAttr("hsPorts", default) - def getMyNetworkStatus(self, default = None): - """ - Provides the network status entry for this relay if available. This is - occasionally expanded so results may vary depending on tor's version. For - 0.2.2.13 they contained entries like the following: - - r caerSidi p1aag7VwarGxqctS7/fS0y5FU+s 9On1TRGCEpljszPpJR1hKqlzaY8 2010-05-26 09:26:06 76.104.132.98 9001 0 - s Fast HSDir Named Running Stable Valid - w Bandwidth=25300 - p reject 1-65535 - - Arguments: - default - result if the query fails - """ - - return self._getRelayAttr("nsEntry", default) - def getMyBandwidthRate(self, default = None): """ Provides the effective relaying bandwidth rate of this relay. Currently @@ -960,19 +943,16 @@ class Controller: if myFingerprint: for desc in event.desc: if desc.fingerprint == myFingerprint: - self._cachedParam["nsEntry"] = None self._cachedParam["flags"] = None self._cachedParam["bwMeasured"] = None return else: - self._cachedParam["nsEntry"] = None self._cachedParam["flags"] = None self._cachedParam["bwMeasured"] = None def new_consensus_event(self, event): self.connLock.acquire() - self._cachedParam["nsEntry"] = None self._cachedParam["flags"] = None self._cachedParam["bwMeasured"] = None @@ -1174,12 +1154,7 @@ class Controller: currentVal, result = self._cachedParam.get(key), None if currentVal == None and (self.isAlive() or key == "pathPrefix"): # still unset - fetch value - if key == "nsEntry": - myFingerprint = self.getInfo("fingerprint", None) - - if myFingerprint: - result = self.controller.get_network_status(myFingerprint) - elif key == "bwRate": + if key == "bwRate": # effective relayed bandwidth is the minimum of BandwidthRate, # MaxAdvertisedBandwidth, and RelayBandwidthRate (if set) effectiveRate = int(self.getOption("BandwidthRate", None)) @@ -1213,20 +1188,25 @@ class Controller: # TODO: Currently there's no client side indication of what type of # measurement was used. Include this in results if it's ever available. - # TODO: I don't believe the following ever worked. The - # getMyNetworkStatus() method provides a v2 router status entry but 'w' - # lines are part of v3 responses. Oh well, double check this while - # rewriting this module. + # TODO: Tor is documented as providing v2 router status entries but + # actually looks to be v3. This needs to be sorted out between stem + # and tor. - myStatusEntry = self.getMyNetworkStatus() + myFingerprint = self.getInfo("fingerprint", None) + + if myFingerprint: + myStatusEntry = self.controller.get_network_status(myFingerprint) - if myStatusEntry and hasattr(myStatusEntry, 'bandwidth'): - result = myStatusEntry.bandwidth + if myStatusEntry and hasattr(myStatusEntry, 'bandwidth'): + result = myStatusEntry.bandwidth elif key == "flags": - myStatusEntry = self.getMyNetworkStatus() + myFingerprint = self.getInfo("fingerprint", None) + + if myFingerprint: + myStatusEntry = self.controller.get_network_status(myFingerprint) - if myStatusEntry: - result = myStatusEntry.flags + if myStatusEntry: + result = myStatusEntry.flags elif key == "user": result = self.controller.get_user(None) elif key == "fdLimit":

1 0

[arm/master] Using stem's function for getting tor's user
by atagar＠torproject.org 01 Jun '13

01 Jun '13

commit 4556f896532aeb41a516431457ceeb18d9d700a8 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 31 08:43:07 2013 -0700 Using stem's function for getting tor's user Dropping our code for getting the user tor is running as in favor of stem's method. --- src/util/torTools.py | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index 410afd3..353ad25 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -1239,28 +1239,7 @@ class Controller: result = line[2:].split() break elif key == "user": - # provides the empty string if the query fails - queriedUser = self.getInfo("process/user", None) - - if queriedUser != None and queriedUser != "": - result = queriedUser - else: - myPid = self.controller.get_pid(None) - - if myPid: - # if proc contents are available then fetch the pid from there and - # convert it to the username - if proc.is_available(): - try: - myUid = proc.get_uid(myPid) - if myUid and myUid.isdigit(): - result = pwd.getpwuid(int(myUid)).pw_name - except: pass - - # fall back to querying via ps - if not result: - psResults = system.call("ps -o user %s" % myPid) - if psResults and len(psResults) >= 2: result = psResults[1].strip() + result = self.controller.get_user(None) elif key == "fdLimit": # provides -1 if the query fails queriedLimit = self.getInfo("process/descriptor-limit", None)

1 0

[arm/master] Cleaning up getHiddenServicePorts()
by atagar＠torproject.org 01 Jun '13

01 Jun '13

commit 652364c02a601ec8d0fb6965532dbcbae2928493 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 31 17:32:14 2013 -0700 Cleaning up getHiddenServicePorts() In my continuing effort to eliminate the _getRelayAttr() helper moving the getHiddenServicePorts() portion to its method. This also cleans it up a bit and fixes a use case where arm would crash with a stacktrace (if the HiddenServicePort target is just an address). --- src/util/torTools.py | 58 ++++++++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index e56a5c2..97c1808 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -329,7 +329,38 @@ class Controller: default - value provided back if unable to query the hidden service ports """ - return self._getRelayAttr("hsPorts", default) + result = [] + hs_options = self.controller.get_conf_map("HiddenServiceOptions", {}) + + for entry in hs_options.get("HiddenServicePort", []): + # HiddenServicePort entries are of the form... + # + # VIRTPORT [TARGET] + # + # ... with the TARGET being an address, port, or address:port. If the + # target port isn't defined then uses the VIRTPORT. + + hs_port = None + + if ' ' in entry: + virtport, target = entry.split(' ', 1) + + if ':' in target: + hs_port = target.split(':', 1)[1] # target is an address:port + elif target.isdigit(): + hs_port = target # target is a port + else: + hs_port = virtport # target is an address + else: + hs_port = entry # just has the virtual port + + if hs_port.isdigit(): + result.append(hsPort) + + if result: + return result + else: + return default def getMyBandwidthRate(self, default = None): """ @@ -1329,31 +1360,6 @@ class Controller: path.append("0" * 40) result.append((int(lineComp[0]), lineComp[1], lineComp[3][8:], tuple(path))) - elif key == "hsPorts": - result = [] - hsOptions = self.controller.get_conf_map("HiddenServiceOptions", None) - - if hsOptions and "HiddenServicePort" in hsOptions: - for hsEntry in hsOptions["HiddenServicePort"]: - # hidden service port entries are of the form: - # VIRTPORT [TARGET] - # with the TARGET being an IP, port, or IP:Port. If the target port - # isn't defined then uses the VIRTPORT. - - hsPort = None - - if " " in hsEntry: - # parses the target, checking if it's a port or IP:Port combination - hsTarget = hsEntry.split()[1] - - if ":" in hsTarget: - hsPort = hsTarget.split(":")[1] # target is the IP:Port - elif hsTarget.isdigit(): - hsPort = hsTarget # target is just the port - else: hsPort = hsEntry # just has the virtual port - - if hsPort.isdigit(): - result.append(hsPort) # cache value if result != None: self._cachedParam[key] = result

1 0

[arm/master] Don't try to parse our own descriptors
by atagar＠torproject.org 01 Jun '13

01 Jun '13

commit bc7d95d1e35e331df61349e2210bbd3b853df81a Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 31 09:00:03 2013 -0700 Don't try to parse our own descriptors Now that we're using stem there's little reason to manually parse our own descriptor data. --- src/util/torTools.py | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index 353ad25..b2f09e4 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -1189,9 +1189,10 @@ class Controller: myFingerprint = self.getInfo("fingerprint", None) if myFingerprint: - queryType = "ns" if key == "nsEntry" else "desc" - queryResult = self.getInfo("%s/id/%s" % (queryType, myFingerprint), None) - if queryResult: result = queryResult.split("\n") + if key == "nsEntry": + result = self.controller.get_network_status(myFingerprint) + else: + result = self.controller.get_server_descriptor(myFingerprint) elif key == "bwRate": # effective relayed bandwidth is the minimum of BandwidthRate, # MaxAdvertisedBandwidth, and RelayBandwidthRate (if set) @@ -1215,29 +1216,28 @@ class Controller: result = effectiveBurst elif key == "bwObserved": - for line in self.getMyDescriptor([]): - if line.startswith("bandwidth"): - # line should look something like: - # bandwidth 40960 102400 47284 - comp = line.split() - - if len(comp) == 4 and comp[-1].isdigit(): - result = int(comp[-1]) - break + myDescriptor = self.getMyDescriptor() + + if myDescriptor: + result = myDescriptor.observed_bandwidth elif key == "bwMeasured": # TODO: Currently there's no client side indication of what type of # measurement was used. Include this in results if it's ever available. - for line in self.getMyNetworkStatus([]): - if line.startswith("w Bandwidth="): - bwValue = line[12:] - if bwValue.isdigit(): result = int(bwValue) - break + # TODO: I don't believe the following ever worked. The + # getMyNetworkStatus() method provides a v2 router status entry but 'w' + # lines are part of v3 responses. Oh well, double check this while + # rewriting this module. + + myStatusEntry = self.getMyNetworkStatus() + + if myStatusEntry and hasattr(myStatusEntry, 'bandwidth'): + result = myStatusEntry.bandwidth elif key == "flags": - for line in self.getMyNetworkStatus([]): - if line.startswith("s "): - result = line[2:].split() - break + myStatusEntry = self.getMyNetworkStatus() + + if myStatusEntry: + result = myStatusEntry.flags elif key == "user": result = self.controller.get_user(None) elif key == "fdLimit":

1 0

[arm/master] Cleaning up getCircuits()
by atagar＠torproject.org 01 Jun '13

01 Jun '13

commit a6bc27614bac3755732ff8599f2b278140076e34 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 31 17:51:25 2013 -0700 Cleaning up getCircuits() Stem provides us a nice get_circuits() method so we don't need to keep manually parsing our circuits. So much nicer... --- src/util/torTools.py | 82 ++++++++++++++++++-------------------------------- 1 file changed, 29 insertions(+), 53 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index 97c1808..e4c6b5c 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -319,7 +319,35 @@ class Controller: default - value provided back if unable to query the circuit-status """ - return self._getRelayAttr("circuits", default) + # TODO: We're losing caching around this. We should check to see the call + # volume of this and probably add it to stem. + + results = [] + + for entry in self.controller.get_circuits(): + fingerprints = [] + + for fp, nickname in entry.path: + if not fp: + fp = self.getNicknameFingerprint(nickname) + + # It shouldn't be possible for this lookup to fail, but we + # need to fill something (callers won't expect our own client + # paths to have unknown relays). If this turns out to be wrong + # then log a warning. + + if not fp: + log.warn("Unable to determine the fingerprint for a relay in our own circuit: %s" % nickname) + fp = "0" * 40 + + fingerprints.append(fp) + + results.append((int(entry.id), entry.status, entry.purpose, fingerprints)) + + if results: + return results + else: + return default def getHiddenServicePorts(self, default = []): """ @@ -1045,8 +1073,6 @@ class Controller: self.connLock.acquire() self._fingerprintsAttachedCache = None self.connLock.release() - - self._cachedParam["circuits"] = None def _getFingerprintMappings(self, descriptors = None): """ @@ -1310,56 +1336,6 @@ class Controller: locationComp = entry.split()[-2] # address:port component result.append(tuple(locationComp.split(":", 1))) else: result = list(DIR_SERVERS) - elif key == "circuits": - # Parses our circuit-status results, for instance - # 91 BUILT $E4AE6E2FE320FBBD31924E8577F3289D4BE0B4AD=Qwerty PURPOSE=GENERAL - # would belong to a single hop circuit, most likely fetching the - # consensus via a directory mirror. - # - # The path is made up of "$<fingerprint>[=<nickname]" entries for new - # versions of Tor, but in versions prior to 0.2.2.1-alpha this was - # just "$<fingerprint>" OR <nickname>. The dolar sign can't be used in - # nicknames so this can be used to differentiate. - - circStatusResults = self.getInfo("circuit-status", None) - - if circStatusResults == "": - result = [] # we don't have any circuits - elif circStatusResults != None: - result = [] - - for line in circStatusResults.split("\n"): - # appends a tuple with the (status, purpose, path) - lineComp = line.split(" ") - if len(lineComp) < 3: continue - - # The third parameter is *optionally* the path. This is a pita to - # parse out because we need to identify it verses the key=value - # entries that might follow. To do this checking if... - # - it lacks a '=' then it can't be a key=value entry - # - if it has a '=' but starts with a '$' then this should be a - # $fingerprint=nickname entity - - if lineComp[2].count("=") == 1 and lineComp[2][0] != "$": - continue - - path = [] - for hopEntry in lineComp[2].split(","): - if hopEntry[0] == "$": path.append(hopEntry[1:41]) - else: - relayFingerprint = self.getNicknameFingerprint(hopEntry) - - # It shouldn't be possible for this lookup to fail, but we - # need to fill something (callers won't expect our own client - # paths to have unknown relays). If this turns out to be wrong - # then log a warning. - - if relayFingerprint: path.append(relayFingerprint) - else: - log.warn("Unable to determine the fingerprint for a relay in our own circuit: %s" % hopEntry) - path.append("0" * 40) - - result.append((int(lineComp[0]), lineComp[1], lineComp[3][8:], tuple(path))) # cache value if result != None: self._cachedParam[key] = result

1 0

[arm/master] Narrowing scope of _getRelayAttr()
by atagar＠torproject.org 01 Jun '13

01 Jun '13

commit bf057c32f0ae5bc3c0e7884a95e00e1a055b0f4d Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 31 18:03:59 2013 -0700 Narrowing scope of _getRelayAttr() Moving several attributes from _getRelayAttr() up to their relevant methods. This has two disadvantages: we lose caching and it's no longer under our connection lock. However, this gets us closer to purging this controller wrapper (stem should handle any caching and locking on our behalf). --- src/util/torTools.py | 80 +++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 43 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index e4c6b5c..49506c5 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -449,7 +449,15 @@ class Controller: default - result if the query fails or this relay isn't a part of the consensus yet """ - return self._getRelayAttr("flags", default) + myFingerprint = self.getInfo("fingerprint", None) + + if myFingerprint: + myStatusEntry = self.controller.get_network_status(myFingerprint) + + if myStatusEntry: + return myStatusEntry.flags + + return default def getVersion(self): """ @@ -486,7 +494,7 @@ class Controller: provides None. """ - return self._getRelayAttr("user", None) + return self.controller.get_user(None) def getMyFileDescriptorUsage(self): """ @@ -534,7 +542,29 @@ class Controller: use (unfortunately, this might be out of date). """ - return self._getRelayAttr("authorities", []) + # There's two configuration options that can overwrite the default + # authorities: DirServer and AlternateDirAuthority. + + # TODO: Both options accept a set of flags to more precisely set what they + # overwrite. Ideally this would account for these flags to more accurately + # identify authority connections from relays. + + dirServerCfg = self.getOption("DirServer", [], True) + altDirAuthCfg = self.getOption("AlternateDirAuthority", [], True) + altAuthoritiesCfg = dirServerCfg + altDirAuthCfg + + if altAuthoritiesCfg: + result = [] + + # entries are of the form: + # [nickname] [flags] address:port fingerprint + for entry in altAuthoritiesCfg: + locationComp = entry.split()[-2] # address:port component + result.append(tuple(locationComp.split(":", 1))) + + return result + else: + return list(DIR_SERVERS) def getPathPrefix(self): """ @@ -551,7 +581,10 @@ class Controller: can't be determined then this provides None. """ - return self._getRelayAttr("startTime", None) + try: + return system.get_start_time(self.controller.get_pid()) + except: + return None def isExitingAllowed(self, ipAddress, port): """ @@ -1002,17 +1035,14 @@ class Controller: if myFingerprint: for desc in event.desc: if desc.fingerprint == myFingerprint: - self._cachedParam["flags"] = None self._cachedParam["bwMeasured"] = None return else: - self._cachedParam["flags"] = None self._cachedParam["bwMeasured"] = None def new_consensus_event(self, event): self.connLock.acquire() - self._cachedParam["flags"] = None self._cachedParam["bwMeasured"] = None # reconstructs consensus based mappings @@ -1256,16 +1286,6 @@ class Controller: if myStatusEntry and hasattr(myStatusEntry, 'bandwidth'): result = myStatusEntry.bandwidth - elif key == "flags": - myFingerprint = self.getInfo("fingerprint", None) - - if myFingerprint: - myStatusEntry = self.controller.get_network_status(myFingerprint) - - if myStatusEntry: - result = myStatusEntry.flags - elif key == "user": - result = self.controller.get_user(None) elif key == "fdLimit": # provides -1 if the query fails queriedLimit = self.getInfo("process/descriptor-limit", None) @@ -1310,32 +1330,6 @@ class Controller: self._pathPrefixLogging = False # prevents logging if fetched again result = prefixPath - elif key == "startTime": - try: - result = system.get_start_time(self.controller.get_pid()) - except: - pass - elif key == "authorities": - # There's two configuration options that can overwrite the default - # authorities: DirServer and AlternateDirAuthority. - - # TODO: Both options accept a set of flags to more precisely set what they - # overwrite. Ideally this would account for these flags to more accurately - # identify authority connections from relays. - - dirServerCfg = self.getOption("DirServer", [], True) - altDirAuthCfg = self.getOption("AlternateDirAuthority", [], True) - altAuthoritiesCfg = dirServerCfg + altDirAuthCfg - - if altAuthoritiesCfg: - result = [] - - # entries are of the form: - # [nickname] [flags] address:port fingerprint - for entry in altAuthoritiesCfg: - locationComp = entry.split()[-2] # address:port component - result.append(tuple(locationComp.split(":", 1))) - else: result = list(DIR_SERVERS) # cache value if result != None: self._cachedParam[key] = result

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2013