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

[stem/master] Handling the server descriptor's platform line
by atagar＠torproject.org 26 Mar '12

26 Mar '12

commit ac81552c0b966b1a9bed97c812e5a574ffa6f3db Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Mar 17 18:53:16 2012 -0700 Handling the server descriptor's platform line --- stem/descriptor/server_descriptor.py | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 97829ac..8c1b845 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -10,6 +10,7 @@ etc). This information is provided from a few sources... import re +import stem.version from stem.descriptor.descriptor import Descriptor import stem.util.connection import stem.util.tor_tools @@ -65,12 +66,16 @@ class ServerDescriptorV2(Descriptor): average_bandwidth (int) - rate of traffic relay is willing to relay in bytes/s (*) burst_bandwidth (int) - rate of traffic relay is willing to burst to in bytes/s (*) observed_bandwidth (int) - estimated capacity of the relay based on usage in bytes/s (*) + platform (str) - operating system and tor version + tor_version (stem.version.Version) - version of tor + * required fields, others are left as None if undefined """ nickname = address = or_port = socks_port = dir_port = None average_bandwidth = burst_bandwidth = observed_bandwidth = None + platform = tor_version = None def __init__(self, contents): Descriptor.__init__(self, contents) @@ -152,4 +157,21 @@ class ServerDescriptorV2(Descriptor): average_bandwidth = int(router_comp[0]) burst_bandwidth = int(router_comp[1]) observed_bandwidth = int(router_comp[2]) + elif keyword == "platform": + # "platform" string + + self.platform = values[0] + + # This line can contain any arbitrary data, but tor seems to report its + # version followed by the os like the following... + # platform Tor 0.2.2.35 (git-73ff13ab3cc9570d) on Linux x86_64 + # + # There's no guerentee that we'll be able to pick out the version. + + platform_comp = platform.split() + + if platform_comp[0] == "Tor" and len(platform_comp) >= 2: + try: + tor_version = stem.version.Version(platform_comp[1]) + except ValueError: pass

1 0

[stem/master] Handling the server descriptor's uptime line
by atagar＠torproject.org 26 Mar '12

26 Mar '12

commit be8e245400161fe05a2899da9a003eefa8110989 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 18 15:21:22 2012 -0700 Handling the server descriptor's uptime line --- stem/descriptor/server_descriptor.py | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 4ba7acc..4ec4586 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -72,14 +72,15 @@ class ServerDescriptorV2(Descriptor): published (datetime.datetime) - time in GMT when the descriptor was generated (*) fingerprint (str) - fourty hex digits that make up the relay's fingerprint hibernating (bool) - flag to indicate if the relay was hibernating when published (*) + uptime (int) - relay's uptime when published in seconds * required fields, others are left as None if undefined """ nickname = address = or_port = socks_port = dir_port = None average_bandwidth = burst_bandwidth = observed_bandwidth = None - platform = tor_version = None - published = fingerprint = None + platform = tor_version = published = fingerprint = None + uptime = None hibernating = False def __init__(self, contents): @@ -216,4 +217,10 @@ class ServerDescriptorV2(Descriptor): raise TypeError("Hibernating line had an invalid value, must be zero or one: %s" % value) self.hibernating = value == "1" + elif keyword == "uptime": + if not value.isdigit(): + raise TypeError("Uptime line must have an integer value: %s" % value) + + self.uptime = int(value) +

1 0

[stem/master] Stripping off the 'opt ' keyline prefix
by atagar＠torproject.org 26 Mar '12

26 Mar '12

commit 47f21c97da50392d4d0be38d7292bca920d716df Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 18 14:39:13 2012 -0700 Stripping off the 'opt ' keyline prefix --- stem/descriptor/server_descriptor.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index d0f343c..2b92f5c 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -94,7 +94,13 @@ class ServerDescriptorV2(Descriptor): exit_policy_lines = [] for line in contents.split("\n"): - line_match = KEYWORD_LINE.match() + # Some lines have an 'opt ' for backward compatability. They should be + # ignored. This prefix is being removed in... + # https://trac.torproject.org/projects/tor/ticket/5419 + + line = line.lstrip("opt ") + + line_match = KEYWORD_LINE.match(line) if not line_match: raise ValueError("Line contains invalid characters: %s" % line)

1 0

[stem/master] Handling the server descriptor's onion-key and signing-key lines
by atagar＠torproject.org 26 Mar '12

26 Mar '12

commit 5e7d6fadb520817e21436ecfea6437fa7ae26ab1 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 18 15:56:26 2012 -0700 Handling the server descriptor's onion-key and signing-key lines --- stem/descriptor/server_descriptor.py | 54 ++++++++++++++++++++------------- 1 files changed, 33 insertions(+), 21 deletions(-) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 3d416dd..73c7f27 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -22,8 +22,8 @@ ENTRY_END = "router-signature" KEYWORD_CHAR = "[a-zA-Z0-9-]" WHITESPACE = "[ \t]" KEYWORD_LINE = re.compile("^(%s+)%s*(%s*)$" % (KEYWORD_CHAR, WHITESPACE, KEYWORD_CHAR)) -SIGNATURE_START = re.compile("^-----BEGIN (%s+) PUBLIC KEY-----$" % KEYWORD_CHAR) -SIGNATURE_END = "-----END %s PUBLIC KEY-----" +PUBLIC_KEY_START = re.compile("^-----BEGIN (%s+) PUBLIC KEY-----$" % KEYWORD_CHAR) +PUBLIC_KEY_END = "-----END %s PUBLIC KEY-----" # entries must have exactly one of the following REQUIRED_FIELDS = ( @@ -53,40 +53,40 @@ def parse_server_descriptors_v2(path, descriptor_file): pass -def _get_sig_block(remaining_contents): +def _get_key_block(remaining_contents): """ - Checks if given contents begins with a signature block and, if so, pops it + Checks if given contents begins with a public key block and, if so, pops it off and provides it back to the caller. Arguments: - remaining_contents (list) - lines to be checked for a signature block + remaining_contents (list) - lines to be checked for a public key block Returns: - String with the signature block, or None if it doesn't exist + String with the public key block, or None if it doesn't exist Raises: - ValueError if the contents starts with a signature block but it's malformed - (for instance, if it lacks an ending line) + ValueError if the contents starts with a key block but it's malformed (for + instance, if it lacks an ending line) """ if not remaining_contents: return None # nothing left - sig_match = SIGNATURE_START.match(remaining_contents[0]) + key_match = PUBLIC_KEY_START.match(remaining_contents[0]) - if sig_match: - sig_type = sig_match.groups()[0] - sig_lines = [] + if key_match: + key_type = key_match.groups()[0] + key_lines = [] while True: if not remaining_contents: - raise ValueError("Unterminated signature block") + raise ValueError("Unterminated public key block") line = remaining_contents.pop(0) - sig_lines.append(line) + key_lines.append(line) - if line == SIGNATURE_END $ sig_type: - return "\n".join(sig_lines) + if line == PUBLIC_KEY_END $ key_type: + return "\n".join(key_lines) else: return None @@ -110,6 +110,8 @@ class ServerDescriptorV2(Descriptor): fingerprint (str) - fourty hex digits that make up the relay's fingerprint hibernating (bool) - flag to indicate if the relay was hibernating when published (*) uptime (int) - relay's uptime when published in seconds + onion_key (str) - key used to encrypt EXTEND cells (*) + signing_key (str) - relay's long-term identity key (*) * required fields, others are left as None if undefined """ @@ -117,7 +119,7 @@ class ServerDescriptorV2(Descriptor): nickname = address = or_port = socks_port = dir_port = None average_bandwidth = burst_bandwidth = observed_bandwidth = None platform = tor_version = published = fingerprint = None - uptime = None + uptime = onion_key = signing_key = None hibernating = False unrecognized_entries = [] @@ -151,14 +153,14 @@ class ServerDescriptorV2(Descriptor): raise ValueError("Line contains invalid characters: %s" % line) keyword, value = line_match.groups() - sig_block = _get_sig_block(remaining_contents) + key_block = _get_key_block(remaining_contents) if keyword in ("accept", "reject"): exit_policy_lines.append("%s %s" % (keyword, value)) elif keyword in entries: - entries[keyword].append((value, sig_block)) + entries[keyword].append((value, key_block)) else: - entries[keyword] = [(value, sig_block)] + entries[keyword] = [(value, key_block)] # validates restrictions about the entries @@ -173,7 +175,7 @@ class ServerDescriptorV2(Descriptor): # parse all the entries into our attributes for keyword, values in entres.items(): - value, sig_block = values[0] # most just work with the first (and only) value + value, key_block = values[0] # most just work with the first (and only) value line = "%s %s" % (keyword, value) # original line if keyword == "router": @@ -264,6 +266,16 @@ class ServerDescriptorV2(Descriptor): raise TypeError("Uptime line must have an integer value: %s" % value) self.uptime = int(value) + elif keyword == "onion-key": + if not key_block: + raise TypeError("Onion key line must be followed by a public key: %s" % value) + + self.onion_key = key_block + elif keyword == "signing-key": + if not key_block: + raise TypeError("Signing key line must be followed by a public key: %s" % value) + + self.signing_key = key_block else: unrecognized_entries.append(line)

1 0

[stem/master] Handling the server descriptor's hibernating line
by atagar＠torproject.org 26 Mar '12

26 Mar '12

commit da5fcc6ba9b170fce548f08848ae2b0b268bf547 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 18 15:18:56 2012 -0700 Handling the server descriptor's hibernating line --- stem/descriptor/server_descriptor.py | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index cee2bcd..4ba7acc 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -71,6 +71,7 @@ class ServerDescriptorV2(Descriptor): tor_version (stem.version.Version) - version of tor published (datetime.datetime) - time in GMT when the descriptor was generated (*) fingerprint (str) - fourty hex digits that make up the relay's fingerprint + hibernating (bool) - flag to indicate if the relay was hibernating when published (*) * required fields, others are left as None if undefined """ @@ -79,6 +80,7 @@ class ServerDescriptorV2(Descriptor): average_bandwidth = burst_bandwidth = observed_bandwidth = None platform = tor_version = None published = fingerprint = None + hibernating = False def __init__(self, contents): Descriptor.__init__(self, contents) @@ -207,4 +209,11 @@ class ServerDescriptorV2(Descriptor): raise TypeError("Tor relay fingerprints consist of fourty hex digits: %s" % value) self.fingerprint = fingerprint + elif keyword == "hibernating": + # "hibernating" 0|1 (in practice only set if one) + + if not value in ("0", "1"): + raise TypeError("Hibernating line had an invalid value, must be zero or one: %s" % value) + + self.hibernating = value == "1"

1 0

[stem/master] Parsing descriptor signature blocks
by atagar＠torproject.org 26 Mar '12

26 Mar '12

commit 68bb0d6621ddb4806285ccaab298d2fa166050a6 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 18 15:49:33 2012 -0700 Parsing descriptor signature blocks --- stem/descriptor/server_descriptor.py | 57 +++++++++++++++++++++++++++++---- 1 files changed, 50 insertions(+), 7 deletions(-) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 4ec4586..3d416dd 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -22,8 +22,8 @@ ENTRY_END = "router-signature" KEYWORD_CHAR = "[a-zA-Z0-9-]" WHITESPACE = "[ \t]" KEYWORD_LINE = re.compile("^(%s+)%s*(%s*)$" % (KEYWORD_CHAR, WHITESPACE, KEYWORD_CHAR)) -SIGNATURE_START = re.compile("^-----BEGIN %s+ PUBLIC KEY-----$" % KEYWORD_CHAR) -SIGNATURE_END = re.compile("^-----END %s+ PUBLIC KEY-----$" % KEYWORD_CHAR) +SIGNATURE_START = re.compile("^-----BEGIN (%s+) PUBLIC KEY-----$" % KEYWORD_CHAR) +SIGNATURE_END = "-----END %s PUBLIC KEY-----" # entries must have exactly one of the following REQUIRED_FIELDS = ( @@ -53,6 +53,43 @@ def parse_server_descriptors_v2(path, descriptor_file): pass +def _get_sig_block(remaining_contents): + """ + Checks if given contents begins with a signature block and, if so, pops it + off and provides it back to the caller. + + Arguments: + remaining_contents (list) - lines to be checked for a signature block + + Returns: + String with the signature block, or None if it doesn't exist + + Raises: + ValueError if the contents starts with a signature block but it's malformed + (for instance, if it lacks an ending line) + """ + + if not remaining_contents: + return None # nothing left + + sig_match = SIGNATURE_START.match(remaining_contents[0]) + + if sig_match: + sig_type = sig_match.groups()[0] + sig_lines = [] + + while True: + if not remaining_contents: + raise ValueError("Unterminated signature block") + + line = remaining_contents.pop(0) + sig_lines.append(line) + + if line == SIGNATURE_END $ sig_type: + return "\n".join(sig_lines) + else: + return None + class ServerDescriptorV2(Descriptor): """ Version 2 server descriptor, as specified in... @@ -82,6 +119,7 @@ class ServerDescriptorV2(Descriptor): platform = tor_version = published = fingerprint = None uptime = None hibernating = False + unrecognized_entries = [] def __init__(self, contents): Descriptor.__init__(self, contents) @@ -97,7 +135,10 @@ class ServerDescriptorV2(Descriptor): entries = {} exit_policy_lines = [] - for line in contents.split("\n"): + remaining_contents = contents.split("\n") + while remaining_contents: + line = remaining_contents.pop(0) + # Some lines have an 'opt ' for backward compatability. They should be # ignored. This prefix is being removed in... # https://trac.torproject.org/projects/tor/ticket/5419 @@ -110,13 +151,14 @@ class ServerDescriptorV2(Descriptor): raise ValueError("Line contains invalid characters: %s" % line) keyword, value = line_match.groups() + sig_block = _get_sig_block(remaining_contents) if keyword in ("accept", "reject"): exit_policy_lines.append("%s %s" % (keyword, value)) elif keyword in entries: - entries[keyword].append(value) + entries[keyword].append((value, sig_block)) else: - entries[keyword] = [value] + entries[keyword] = [(value, sig_block)] # validates restrictions about the entries @@ -131,7 +173,7 @@ class ServerDescriptorV2(Descriptor): # parse all the entries into our attributes for keyword, values in entres.items(): - value = values[0] # most just work with the first (and only) value + value, sig_block = values[0] # most just work with the first (and only) value line = "%s %s" % (keyword, value) # original line if keyword == "router": @@ -222,5 +264,6 @@ class ServerDescriptorV2(Descriptor): raise TypeError("Uptime line must have an integer value: %s" % value) self.uptime = int(value) - + else: + unrecognized_entries.append(line)

1 0

[stem/master] Karsten already had a ticket for opt removal
by atagar＠torproject.org 26 Mar '12

26 Mar '12

commit f6221839e8b012fa5848feb5b68eb3f390889ba2 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 19 08:38:40 2012 -0700 Karsten already had a ticket for opt removal --- stem/descriptor/server_descriptor.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 9512fa3..df10423 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -146,7 +146,7 @@ class ServerDescriptorV2(Descriptor): # Some lines have an 'opt ' for backward compatability. They should be # ignored. This prefix is being removed in... - # https://trac.torproject.org/projects/tor/ticket/5419 + # https://trac.torproject.org/projects/tor/ticket/5124 line = line.lstrip("opt ")

1 0

[stem/master] Generalizing PGP style block parsing
by atagar＠torproject.org 26 Mar '12

26 Mar '12

commit 54c3e6b7c6ea41ff29230c4e6a476f6f7fbac19a Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 19 08:35:12 2012 -0700 Generalizing PGP style block parsing Descriptors include blocks for both "RSA PUBLIC KEY" and "SIGNATURE" so generalizing that parser (the spec around how to handle these blocks is wrong and I'll fix that later). I'm also including the block type since callers will want that to be prepared for encryption migrations. --- stem/descriptor/server_descriptor.py | 59 +++++++++++++++++++--------------- 1 files changed, 33 insertions(+), 26 deletions(-) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 73c7f27..9512fa3 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -19,11 +19,11 @@ from stem.descriptor.descriptor import Descriptor ENTRY_START = "router" ENTRY_END = "router-signature" -KEYWORD_CHAR = "[a-zA-Z0-9-]" -WHITESPACE = "[ \t]" -KEYWORD_LINE = re.compile("^(%s+)%s*(%s*)$" % (KEYWORD_CHAR, WHITESPACE, KEYWORD_CHAR)) -PUBLIC_KEY_START = re.compile("^-----BEGIN (%s+) PUBLIC KEY-----$" % KEYWORD_CHAR) -PUBLIC_KEY_END = "-----END %s PUBLIC KEY-----" +KEYWORD_CHAR = "a-zA-Z0-9-" +WHITESPACE = " \t" +KEYWORD_LINE = re.compile("^([%s]+)[%s]*([%s]*)$" % (KEYWORD_CHAR, WHITESPACE, KEYWORD_CHAR)) +PGP_BLOCK_START = re.compile("^-----BEGIN ([%s%s]+)-----$" % (KEYWORD_CHAR, WHITESPACE)) +PGP_BLOCK_END = "-----END %s-----" # entries must have exactly one of the following REQUIRED_FIELDS = ( @@ -53,16 +53,17 @@ def parse_server_descriptors_v2(path, descriptor_file): pass -def _get_key_block(remaining_contents): +def _get_psudo_pgp_block(remaining_contents): """ - Checks if given contents begins with a public key block and, if so, pops it - off and provides it back to the caller. + Checks if given contents begins with a pseudo-Open-PGP-style block and, if + so, pops it off and provides it back to the caller. Arguments: remaining_contents (list) - lines to be checked for a public key block Returns: - String with the public key block, or None if it doesn't exist + (str, str) tuple with the block type and the armor wrapped contents, this + returns (None, None) instead if it doesn't exist Raises: ValueError if the contents starts with a key block but it's malformed (for @@ -70,25 +71,25 @@ def _get_key_block(remaining_contents): """ if not remaining_contents: - return None # nothing left + return (None, None) # nothing left - key_match = PUBLIC_KEY_START.match(remaining_contents[0]) + block_match = PGP_BLOCK_START.match(remaining_contents[0]) - if key_match: - key_type = key_match.groups()[0] - key_lines = [] + if block_match: + block_type = block_match.groups()[0] + block_lines = [] while True: if not remaining_contents: raise ValueError("Unterminated public key block") line = remaining_contents.pop(0) - key_lines.append(line) + block_lines.append(line) - if line == PUBLIC_KEY_END $ key_type: - return "\n".join(key_lines) + if line == PGP_BLOCK_END $ block_type: + return block_type, "\n".join(block_lines) else: - return None + return (None, None) class ServerDescriptorV2(Descriptor): """ @@ -111,7 +112,9 @@ class ServerDescriptorV2(Descriptor): hibernating (bool) - flag to indicate if the relay was hibernating when published (*) uptime (int) - relay's uptime when published in seconds onion_key (str) - key used to encrypt EXTEND cells (*) + onion_key_type (str) - block type of the onion_key, probably "RSA PUBLIC KEY" (*) signing_key (str) - relay's long-term identity key (*) + signing_key_type (str) - block type of the signing_key, probably "RSA PUBLIC KEY" (*) * required fields, others are left as None if undefined """ @@ -153,14 +156,14 @@ class ServerDescriptorV2(Descriptor): raise ValueError("Line contains invalid characters: %s" % line) keyword, value = line_match.groups() - key_block = _get_key_block(remaining_contents) + block_type, block_contents = _get_psudo_pgp_block(remaining_contents) if keyword in ("accept", "reject"): exit_policy_lines.append("%s %s" % (keyword, value)) elif keyword in entries: - entries[keyword].append((value, key_block)) + entries[keyword].append((value, block_type, block_contents)) else: - entries[keyword] = [(value, key_block)] + entries[keyword] = [(value, block_type, block_contents)] # validates restrictions about the entries @@ -175,7 +178,9 @@ class ServerDescriptorV2(Descriptor): # parse all the entries into our attributes for keyword, values in entres.items(): - value, key_block = values[0] # most just work with the first (and only) value + # most just work with the first (and only) value + value, block_type, block_contents = values[0] + line = "%s %s" % (keyword, value) # original line if keyword == "router": @@ -267,15 +272,17 @@ class ServerDescriptorV2(Descriptor): self.uptime = int(value) elif keyword == "onion-key": - if not key_block: + if not block_type or not block_contents: raise TypeError("Onion key line must be followed by a public key: %s" % value) - self.onion_key = key_block + self.onion_key_type = block_type + self.onion_key = block_contents elif keyword == "signing-key": - if not key_block: + if not block_type or not block_contents: raise TypeError("Signing key line must be followed by a public key: %s" % value) - self.signing_key = key_block + self.signing_key_type = block_type + self.signing_key = block_contents else: unrecognized_entries.append(line)

1 0

[stem/master] Handling the server descriptor's fingerprint line
by atagar＠torproject.org 26 Mar '12

26 Mar '12

commit 4ae18ed246b8f9f762df154ea493adb5cfbf1e80 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 18 15:08:57 2012 -0700 Handling the server descriptor's fingerprint line --- stem/descriptor/server_descriptor.py | 34 ++++++++++++++++++++++++++-------- stem/util/tor_tools.py | 15 +++++++++++---- test/unit/util/tor_tools.py | 4 ++-- 3 files changed, 39 insertions(+), 14 deletions(-) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 2b92f5c..cee2bcd 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -70,6 +70,7 @@ class ServerDescriptorV2(Descriptor): platform (str) - operating system and tor version tor_version (stem.version.Version) - version of tor published (datetime.datetime) - time in GMT when the descriptor was generated (*) + fingerprint (str) - fourty hex digits that make up the relay's fingerprint * required fields, others are left as None if undefined """ @@ -77,7 +78,7 @@ class ServerDescriptorV2(Descriptor): nickname = address = or_port = socks_port = dir_port = None average_bandwidth = burst_bandwidth = observed_bandwidth = None platform = tor_version = None - published = None + published = fingerprint = None def __init__(self, contents): Descriptor.__init__(self, contents) @@ -127,12 +128,15 @@ class ServerDescriptorV2(Descriptor): # parse all the entries into our attributes for keyword, values in entres.items(): + value = values[0] # most just work with the first (and only) value + line = "%s %s" % (keyword, value) # original line + if keyword == "router": # "router" nickname address ORPort SocksPort DirPort - router_comp = values[0].split() + router_comp = value.split() if len(router_comp) != 5: - raise ValueError("Router line must have five values: router %s" % values[0] + raise ValueError("Router line must have five values: %s" % line elif not stem.util.tor_tools.is_valid_nickname(router_comp[0]): raise TypeError("Router line entry isn't a valid nickname: %s" % router_comp[0]) elif not stem.util.connection.is_valid_ip_address(router_comp[1]): @@ -151,10 +155,10 @@ class ServerDescriptorV2(Descriptor): self.dir_port = router_comp[4] elif keyword == "bandwidth": # "bandwidth" bandwidth-avg bandwidth-burst bandwidth-observed - bandwidth_comp = values[0].split() + bandwidth_comp = value.split() if len(bandwidth_comp) != 3: - raise ValueError("Bandwidth line must have three values: bandwidth %s" % values[0] + raise ValueError("Bandwidth line must have three values: %s" % line elif not bandwidth_comp[0].isdigit()): raise TypeError("Bandwidth line's average rate isn't numeric: %s" % bandwidth_comp[0]) elif not bandwidth_comp[1].isdigit()): @@ -168,7 +172,7 @@ class ServerDescriptorV2(Descriptor): elif keyword == "platform": # "platform" string - self.platform = values[0] + self.platform = value # This line can contain any arbitrary data, but tor seems to report its # version followed by the os like the following... @@ -186,7 +190,21 @@ class ServerDescriptorV2(Descriptor): # "published" YYYY-MM-DD HH:MM:SS try: - self.published = datetime.datetime.strptime(values[0], "%Y-%m-%d %H:%M:%S") + self.published = datetime.datetime.strptime(value, "%Y-%m-%d %H:%M:%S") except ValueError: - raise TypeError("Published line's time wasn't parseable: %s" % values[0]) + raise TypeError("Published line's time wasn't parseable: %s" % line) + elif keyword == "fingerprint": + # This is fourty hex digits split into space separated groups of four. + # Checking that we match this pattern. + + fingerprint = value.replace(" ", "") + + for grouping in value.split(" "): + if len(grouping) != 4: + raise TypeError("Fingerprint line should have groupings of four hex digits: %s" % value) + + if not stem.util.tor_tools.is_valid_fingerprint(fingerprint): + raise TypeError("Tor relay fingerprints consist of fourty hex digits: %s" % value) + + self.fingerprint = fingerprint diff --git a/stem/util/tor_tools.py b/stem/util/tor_tools.py index 5e468c3..3c0e88a 100644 --- a/stem/util/tor_tools.py +++ b/stem/util/tor_tools.py @@ -13,20 +13,27 @@ import re # case insensitive. Tor doesn't define this in the spec so flipping a coin # and going with case insensitive. -FINGERPRINT_PATTERN = re.compile("^\$[0-9a-fA-F]{40}$") +FINGERPRINT_PATTERN = re.compile("^[0-9a-fA-F]{40}$") NICKNAME_PATTERN = re.compile("^[a-zA-Z0-9]{1,19}$") -def is_valid_fingerprint(entry): +def is_valid_fingerprint(entry, check_prefix = False): """ - Checks if a string is a properly formatted relay fingerprint. + Checks if a string is a properly formatted relay fingerprint. This checks for + a '$' prefix if check_prefix is true, otherwise this only validates the hex + digits. Arguments: - entry (str) - string to be checked + entry (str) - string to be checked + check_prefix (bool) - checks for a '$' prefix Returns: True if the string could be a relay fingerprint, False otherwise. """ + if check_prefix: + if not entry or entry[0] != "$": return False + entry = entry[1:] + return bool(FINGERPRINT_PATTERN.match(entry)) def is_valid_nickname(entry): diff --git a/test/unit/util/tor_tools.py b/test/unit/util/tor_tools.py index 5dd1abb..2ff3058 100644 --- a/test/unit/util/tor_tools.py +++ b/test/unit/util/tor_tools.py @@ -25,10 +25,10 @@ class TestTorTools(unittest.TestCase): ) for fingerprint in valid_fingerprints: - self.assertTrue(stem.util.tor_tools.is_valid_fingerprint(fingerprint)) + self.assertTrue(stem.util.tor_tools.is_valid_fingerprint(fingerprint, True)) for fingerprint in invalid_fingerprints: - self.assertFalse(stem.util.tor_tools.is_valid_fingerprint(fingerprint)) + self.assertFalse(stem.util.tor_tools.is_valid_fingerprint(fingerprint, True)) def test_is_valid_nickname(self): """

1 0

[stem/master] Handling the server descriptor's router-signature line
by atagar＠torproject.org 26 Mar '12

26 Mar '12

commit 043f739405ec6012725ce4d86361fc01cb1a0c17 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 19 08:55:47 2012 -0700 Handling the server descriptor's router-signature line --- stem/descriptor/server_descriptor.py | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index df10423..8ed9afa 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -26,11 +26,13 @@ PGP_BLOCK_START = re.compile("^-----BEGIN ([%s%s]+)-----$" % (KEYWORD_CHAR, WHIT PGP_BLOCK_END = "-----END %s-----" # entries must have exactly one of the following +# TODO: spec doesn't list 'router-signature', but that's a spec bug I should fix REQUIRED_FIELDS = ( "published", "onion-key", "signing-key", "bandwidth", + "router-signature", ) # optional entries that can appear at most once @@ -115,6 +117,8 @@ class ServerDescriptorV2(Descriptor): onion_key_type (str) - block type of the onion_key, probably "RSA PUBLIC KEY" (*) signing_key (str) - relay's long-term identity key (*) signing_key_type (str) - block type of the signing_key, probably "RSA PUBLIC KEY" (*) + router_sig (str) - signature for this descriptor (*) + router_sig_type (str) - block type of the router_sig, probably "SIGNATURE" (*) * required fields, others are left as None if undefined """ @@ -182,6 +186,7 @@ class ServerDescriptorV2(Descriptor): value, block_type, block_contents = values[0] line = "%s %s" % (keyword, value) # original line + if block_contents: line += "\n%s" % block_contents if keyword == "router": # "router" nickname address ORPort SocksPort DirPort @@ -273,16 +278,22 @@ class ServerDescriptorV2(Descriptor): self.uptime = int(value) elif keyword == "onion-key": if not block_type or not block_contents: - raise TypeError("Onion key line must be followed by a public key: %s" % value) - + raise TypeError("Onion key line must be followed by a public key: %s" % line) + self.onion_key_type = block_type self.onion_key = block_contents elif keyword == "signing-key": if not block_type or not block_contents: - raise TypeError("Signing key line must be followed by a public key: %s" % value) - + raise TypeError("Signing key line must be followed by a public key: %s" % line) + self.signing_key_type = block_type self.signing_key = block_contents + elif keyword == "router-signature": + if not block_type or not block_contents: + raise TypeError("Router signature line must be followed by a signature block: %s" % line) + + self.router_sig_type = block_type + self.router_sig = block_contents else: unrecognized_entries.append(line)

1 0