tor-commits June 2012

tor-commits@lists.torproject.org

17 participants
880 discussions

[stem/master] Making relay-signature field only apply to relay extra-info
by atagar＠torproject.org 10 Jun '12

10 Jun '12

commit 737018b7ee3da5b457689404376a7937de5a016f Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 10 13:33:21 2012 -0700 Making relay-signature field only apply to relay extra-info Parsing and handling the relay-signature field as only an attribute of extra-info descriptors for relays. --- stem/descriptor/__init__.py | 4 +- stem/descriptor/extrainfo_descriptor.py | 78 ++++++++++++++++++------ stem/descriptor/server_descriptor.py | 31 ++++------ test/integ/descriptor/extrainfo_descriptor.py | 2 +- test/unit/descriptor/extrainfo_descriptor.py | 34 +++++----- 5 files changed, 91 insertions(+), 58 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index e4f23e5..929396c 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -70,9 +70,9 @@ def parse_file(path, descriptor_file): desc = stem.descriptor.server_descriptor.RelayDescriptor(descriptor_file.read()) elif first_line == "@type bridge-server-descriptor 1.0": desc = stem.descriptor.server_descriptor.BridgeDescriptor(descriptor_file.read()) - elif first_line in ("@type bridge-extra-info 1.0"): - desc = stem.descriptor.extrainfo_descriptor.RelayExtraInfoDescriptor(descriptor_file.read()) elif first_line in ("@type extra-info 1.0"): + desc = stem.descriptor.extrainfo_descriptor.RelayExtraInfoDescriptor(descriptor_file.read()) + elif first_line in ("@type bridge-extra-info 1.0"): desc = stem.descriptor.extrainfo_descriptor.BridgeExtraInfoDescriptor(descriptor_file.read()) if desc: diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index 03c7a37..0515099 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -114,9 +114,6 @@ SINGLE_FIELDS = ( "exit-streams-opened", ) -FIRST_FIELD = "extra-info" -LAST_FIELD = "router-signature" - def parse_file(descriptor_file, validate = True): """ Iterates over the extra-info descriptors in a file. @@ -139,7 +136,7 @@ def parse_file(descriptor_file, validate = True): extrainfo_content += stem.descriptor._read_until_keyword(block_end_prefix, descriptor_file, True) if extrainfo_content: - yield ExtraInfoDescriptor("".join(extrainfo_content), validate) + yield RelayExtraInfoDescriptor("".join(extrainfo_content), validate) else: break # done parsing file def _parse_timestamp_and_interval(keyword, content): @@ -180,7 +177,6 @@ class ExtraInfoDescriptor(stem.descriptor.Descriptor): :var str fingerprint: **\*** identity key fingerprint :var datetime published: **\*** time in GMT when this descriptor was made :var str geoip_db_digest: sha1 of geoIP database file - :var str signature: **\*** signature for this extrainfo descriptor **Bi-directional connection usage:** @@ -289,7 +285,6 @@ class ExtraInfoDescriptor(stem.descriptor.Descriptor): self.fingerprint = None self.published = None self.geoip_db_digest = None - self.signature = None self.conn_bi_direct_end = None self.conn_bi_direct_interval = None @@ -364,18 +359,21 @@ class ExtraInfoDescriptor(stem.descriptor.Descriptor): stem.descriptor._get_descriptor_components(raw_contents, validate, ()) if validate: - for keyword in REQUIRED_FIELDS: + for keyword in self._required_fields(): if not keyword in entries: raise ValueError("Extra-info descriptor must have a '%s' entry" % keyword) - for keyword in REQUIRED_FIELDS + SINGLE_FIELDS: + for keyword in self._required_fields() + SINGLE_FIELDS: if keyword in entries and len(entries[keyword]) > 1: raise ValueError("The '%s' entry can only appear once in an extra-info descriptor" % keyword) - if not first_keyword == FIRST_FIELD: - raise ValueError("Extra-info descriptor must start with a '%s' entry" % FIRST_FIELD) - if not last_keyword == LAST_FIELD: - raise ValueError("Descriptor must end with a '%s' entry" % LAST_FIELD) + expected_first_keyword = self._first_keyword() + if expected_first_keyword and not first_keyword == expected_first_keyword: + raise ValueError("Extra-info descriptor must start with a '%s' entry" % expected_first_keyword) + + expected_last_keyword = self._last_keyword() + if expected_last_keyword and not last_keyword == expected_last_keyword: + raise ValueError("Descriptor must end with a '%s' entry" % expected_last_keyword) self._parse(entries, validate) @@ -395,10 +393,8 @@ class ExtraInfoDescriptor(stem.descriptor.Descriptor): for keyword, values in entries.items(): # most just work with the first (and only) value - value, block_contents = values[0] - + value, _ = values[0] line = "%s %s" % (keyword, value) # original line - if block_contents: line += "\n%s" % block_contents if keyword == "extra-info": # "extra-info" Nickname Fingerprint @@ -674,23 +670,65 @@ class ExtraInfoDescriptor(stem.descriptor.Descriptor): self.entry_ips = locale_usage elif keyword == "bridge-ips": self.bridge_ips = locale_usage - elif keyword == "router-signature": - if validate and not block_contents: - raise ValueError("Router signature line must be followed by a signature block: %s" % line) - - self.signature = block_contents else: self._unrecognized_lines.append(line) + + def _required_fields(self): + return REQUIRED_FIELDS + + def _first_keyword(self): + return "extra-info" + + def _last_keyword(self): + return "router-signature" class RelayExtraInfoDescriptor(ExtraInfoDescriptor): """ Relay extra-info descriptor, constructed from data such as that provided by "GETINFO extra-info/digest/*", cached descriptors, and metrics (`specification <https://gitweb.torproject.org/torspec.git/blob/HEAD:/dir-spec.txt>`_). + + :var str signature: **\*** signature for this extrainfo descriptor + + **\*** attribute is either required when we're parsed with validation or has a default value, others are left as None if undefined """ + + def __init__(self, raw_contents, validate = True): + self.signature = None + + ExtraInfoDescriptor.__init__(self, raw_contents, validate) + + def _parse(self, entries, validate): + entries = dict(entries) # shallow copy since we're destructive + + # handles fields only in server descriptors + for keyword, values in entries.items(): + value, block_contents = values[0] + + line = "%s %s" % (keyword, value) # original line + if block_contents: line += "\n%s" % block_contents + + if keyword == "router-signature": + if validate and not block_contents: + raise ValueError("Router signature line must be followed by a signature block: %s" % line) + + self.signature = block_contents + del entries["router-signature"] + + ExtraInfoDescriptor._parse(self, entries, validate) class BridgeExtraInfoDescriptor(ExtraInfoDescriptor): """ Bridge extra-info descriptor (`specification <https://metrics.torproject.org/formats.html#bridgedesc>`_) """ + + def _required_fields(self): + excluded_fields = ( + "router-signature", + ) + + filter(lambda e: not e in excluded_fields, REQUIRED_FIELDS) + + def _last_keyword(self): + return None diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 6f8079b..af31f03 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -542,10 +542,17 @@ class ServerDescriptor(stem.descriptor.Descriptor): # Constraints that the descriptor must meet to be valid. These can be None if # not applicable. - def _required_fields(self): return None - def _single_fields(self): return None - def _first_keyword(self): return None - def _last_keyword(self): return None + def _required_fields(self): + return REQUIRED_FIELDS + + def _single_fields(self): + return REQUIRED_FIELDS + SINGLE_FIELDS + + def _first_keyword(self): + return "router" + + def _last_keyword(self): + return "router-signature" class RelayDescriptor(ServerDescriptor): """ @@ -640,18 +647,6 @@ class RelayDescriptor(ServerDescriptor): del entries["router-signature"] ServerDescriptor._parse(self, entries, validate) - - def _required_fields(self): - return REQUIRED_FIELDS - - def _single_fields(self): - return REQUIRED_FIELDS + SINGLE_FIELDS - - def _first_keyword(self): - return "router" - - def _last_keyword(self): - return "router-signature" class BridgeDescriptor(ServerDescriptor): """ @@ -780,6 +775,6 @@ class BridgeDescriptor(ServerDescriptor): def _single_fields(self): return self._required_fields() + SINGLE_FIELDS - def _first_keyword(self): - return "router" + def _last_keyword(self): + return None diff --git a/test/integ/descriptor/extrainfo_descriptor.py b/test/integ/descriptor/extrainfo_descriptor.py index a753d27..2739985 100644 --- a/test/integ/descriptor/extrainfo_descriptor.py +++ b/test/integ/descriptor/extrainfo_descriptor.py @@ -29,7 +29,7 @@ k0d2aofcVbHr4fPQOSST0LXDrhFl5Fqo5um296zpJGvRUeO6S44U/EfJAGShtqWw 7LZqklu+gVvhMKREpchVqlAwXkWR44VENm24Hs+mT3M= -----END SIGNATURE-----""" - desc = stem.descriptor.extrainfo_descriptor.ExtraInfoDescriptor(descriptor_contents) + desc = stem.descriptor.extrainfo_descriptor.RelayExtraInfoDescriptor(descriptor_contents) self.assertEquals("NINJA", desc.nickname) self.assertEquals("B2289C3EAB83ECD6EB916A2F481A02E6B76A0A48", desc.fingerprint) self.assertEquals(datetime.datetime(2012, 5, 5, 17, 3, 50), desc.published) diff --git a/test/unit/descriptor/extrainfo_descriptor.py b/test/unit/descriptor/extrainfo_descriptor.py index 5d4c910..3bfff70 100644 --- a/test/unit/descriptor/extrainfo_descriptor.py +++ b/test/unit/descriptor/extrainfo_descriptor.py @@ -4,7 +4,7 @@ Unit tests for stem.descriptor.extrainfo_descriptor. import datetime import unittest -from stem.descriptor.extrainfo_descriptor import ExtraInfoDescriptor, DirResponses, DirStats +from stem.descriptor.extrainfo_descriptor import RelayExtraInfoDescriptor, DirResponses, DirStats CRYPTO_BLOB = """ K5FSywk7qvw/boA4DQcqkls6Ize5vcBYfhQ8JnOeRQC9+uDxbnpm3qaYN9jZ8myj @@ -58,7 +58,7 @@ class TestExtraInfoDescriptor(unittest.TestCase): """ desc_text = _make_descriptor() - desc = ExtraInfoDescriptor(desc_text) + desc = RelayExtraInfoDescriptor(desc_text) self.assertEquals("ninja", desc.nickname) self.assertEquals("B2289C3EAB83ECD6EB916A2F481A02E6B76A0A48", desc.fingerprint) @@ -70,7 +70,7 @@ class TestExtraInfoDescriptor(unittest.TestCase): """ desc_text = _make_descriptor({"pepperjack": "is oh so tasty!"}) - desc = ExtraInfoDescriptor(desc_text) + desc = RelayExtraInfoDescriptor(desc_text) self.assertEquals(["pepperjack is oh so tasty!"], desc.get_unrecognized_lines()) def test_proceeding_line(self): @@ -116,7 +116,7 @@ class TestExtraInfoDescriptor(unittest.TestCase): geoip_db_digest = "916A3CA8B7DF61473D5AE5B21711F35F301CE9E8" desc_text = _make_descriptor({"geoip-db-digest": geoip_db_digest}) - desc = ExtraInfoDescriptor(desc_text) + desc = RelayExtraInfoDescriptor(desc_text) self.assertEquals(geoip_db_digest, desc.geoip_db_digest) test_entries = ( @@ -143,7 +143,7 @@ class TestExtraInfoDescriptor(unittest.TestCase): for entry in ("0", "11", "25"): desc_text = _make_descriptor({"cell-circuits-per-decile": entry}) - desc = ExtraInfoDescriptor(desc_text) + desc = RelayExtraInfoDescriptor(desc_text) self.assertEquals(int(entry), desc.cell_circuits_per_decile) test_entries = ( @@ -169,7 +169,7 @@ class TestExtraInfoDescriptor(unittest.TestCase): test_value = "ok=0,unavailable=0,not-found=984,not-modified=0,something-new=7" desc_text = _make_descriptor({keyword: test_value}) - desc = ExtraInfoDescriptor(desc_text) + desc = RelayExtraInfoDescriptor(desc_text) self.assertEquals(0, getattr(desc, attr)[DirResponses.OK]) self.assertEquals(0, getattr(desc, attr)[DirResponses.UNAVAILABLE]) self.assertEquals(984, getattr(desc, attr)[DirResponses.NOT_FOUND]) @@ -200,7 +200,7 @@ class TestExtraInfoDescriptor(unittest.TestCase): test_value = "complete=2712,timeout=32,running=4,min=741,d1=14507,d2=22702,q1=28881,d3=38277,d4=73729,md=111455,d6=168231,d7=257218,q3=319833,d8=390507,d9=616301,something-new=11,max=29917857" desc_text = _make_descriptor({keyword: test_value}) - desc = ExtraInfoDescriptor(desc_text) + desc = RelayExtraInfoDescriptor(desc_text) self.assertEquals(2712, getattr(desc, attr)[DirStats.COMPLETE]) self.assertEquals(32, getattr(desc, attr)[DirStats.TIMEOUT]) self.assertEquals(4, getattr(desc, attr)[DirStats.RUNNING]) @@ -237,7 +237,7 @@ class TestExtraInfoDescriptor(unittest.TestCase): """ desc_text = _make_descriptor({"conn-bi-direct": "2012-05-03 12:07:50 (500 s) 277431,12089,0,2134"}) - desc = ExtraInfoDescriptor(desc_text) + desc = RelayExtraInfoDescriptor(desc_text) self.assertEquals(datetime.datetime(2012, 5, 3, 12, 7, 50), desc.conn_bi_direct_end) self.assertEquals(500, desc.conn_bi_direct_interval) self.assertEquals(277431, desc.conn_bi_direct_below) @@ -287,7 +287,7 @@ class TestExtraInfoDescriptor(unittest.TestCase): for test_value, expected_value in test_entries: desc_text = _make_descriptor({keyword: test_value}) - desc = ExtraInfoDescriptor(desc_text) + desc = RelayExtraInfoDescriptor(desc_text) self.assertEquals(expected_value, getattr(desc, attr)) test_entries = ( @@ -320,7 +320,7 @@ class TestExtraInfoDescriptor(unittest.TestCase): for test_value, expected_value in test_entries: desc_text = _make_descriptor({keyword: test_value}) - desc = ExtraInfoDescriptor(desc_text) + desc = RelayExtraInfoDescriptor(desc_text) self.assertEquals(expected_value, getattr(desc, attr)) test_entries = ( @@ -343,7 +343,7 @@ class TestExtraInfoDescriptor(unittest.TestCase): attr = keyword.replace('-', '_') desc_text = _make_descriptor({keyword: "2012-05-03 12:07:50"}) - desc = ExtraInfoDescriptor(desc_text) + desc = RelayExtraInfoDescriptor(desc_text) self.assertEquals(datetime.datetime(2012, 5, 3, 12, 7, 50), getattr(desc, attr)) test_entries = ( @@ -368,7 +368,7 @@ class TestExtraInfoDescriptor(unittest.TestCase): interval_attr = end_attr[:-4] + "_interval" desc_text = _make_descriptor({keyword: "2012-05-03 12:07:50 (500 s)"}) - desc = ExtraInfoDescriptor(desc_text) + desc = RelayExtraInfoDescriptor(desc_text) self.assertEquals(datetime.datetime(2012, 5, 3, 12, 7, 50), getattr(desc, end_attr)) self.assertEquals(500, getattr(desc, interval_attr)) @@ -408,7 +408,7 @@ class TestExtraInfoDescriptor(unittest.TestCase): for test_values, expected_values in test_entries: desc_text = _make_descriptor({keyword: "2012-05-03 12:07:50 (500 s)%s" % test_values}) - desc = ExtraInfoDescriptor(desc_text) + desc = RelayExtraInfoDescriptor(desc_text) self.assertEquals(datetime.datetime(2012, 5, 3, 12, 7, 50), getattr(desc, end_attr)) self.assertEquals(500, getattr(desc, interval_attr)) self.assertEquals(expected_values, getattr(desc, values_attr)) @@ -448,7 +448,7 @@ class TestExtraInfoDescriptor(unittest.TestCase): for test_value, expected_value in test_entries: desc_text = _make_descriptor({keyword: test_value}) - desc = ExtraInfoDescriptor(desc_text) + desc = RelayExtraInfoDescriptor(desc_text) self.assertEquals(expected_value, getattr(desc, attr)) test_entries = ( @@ -480,7 +480,7 @@ class TestExtraInfoDescriptor(unittest.TestCase): for test_value, expected_value in test_entries: desc_text = _make_descriptor({keyword: test_value}) - desc = ExtraInfoDescriptor(desc_text) + desc = RelayExtraInfoDescriptor(desc_text) self.assertEquals(expected_value, getattr(desc, attr)) test_entries = ( @@ -501,8 +501,8 @@ class TestExtraInfoDescriptor(unittest.TestCase): value when we're constructed without validation. """ - self.assertRaises(ValueError, ExtraInfoDescriptor, desc_text) - desc = ExtraInfoDescriptor(desc_text, validate = False) + self.assertRaises(ValueError, RelayExtraInfoDescriptor, desc_text) + desc = RelayExtraInfoDescriptor(desc_text, validate = False) if attr: # check that the invalid attribute matches the expected value when

1 0

[stem/master] Adding extra-info digest() method
by atagar＠torproject.org 10 Jun '12

10 Jun '12

commit 9654beb5acb7ad0e8e90bbdf7b9e186ccd946654 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 10 14:24:33 2012 -0700 Adding extra-info digest() method Adding digest() methods for extra-info descriptors. I'm also swapping the server descriptor counterparts to provide a hex encoded digest as per Karsten's suggestion. --- stem/descriptor/extrainfo_descriptor.py | 53 ++++++++++++++++++++++++- stem/descriptor/server_descriptor.py | 12 +---- test/integ/descriptor/extrainfo_descriptor.py | 6 +- test/integ/descriptor/server_descriptor.py | 2 +- 4 files changed, 59 insertions(+), 14 deletions(-) diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index 257b747..04f061a 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -45,10 +45,12 @@ Extra-info descriptors are available from a few sources... | |- RelayExtraInfoDescriptor - Extra-info descriptor for a relay. | +- BridgeExtraInfoDescriptor - Extra-info descriptor for a bridge. | + |- digest - calculates the digest value for our content +- get_unrecognized_lines - lines with unrecognized content """ import re +import hashlib import datetime import stem.descriptor @@ -673,6 +675,16 @@ class ExtraInfoDescriptor(stem.descriptor.Descriptor): else: self._unrecognized_lines.append(line) + def digest(self): + """ + Provides the hex encoded sha1 of our content. This value is part of the + server descriptor entry for this relay. + + :returns: str with the digest value for this server descriptor + """ + + raise NotImplementedError("Unsupported Operation: this should be implemented by the ExtraInfoDescriptor subclass") + def _required_fields(self): return REQUIRED_FIELDS @@ -695,9 +707,19 @@ class RelayExtraInfoDescriptor(ExtraInfoDescriptor): def __init__(self, raw_contents, validate = True): self.signature = None + self._digest = None ExtraInfoDescriptor.__init__(self, raw_contents, validate) + def digest(self): + if self._digest is None: + # our digest is calculated from everything except our signature + raw_content, ending = str(self), "\nrouter-signature\n" + raw_content = raw_content[:raw_content.find(ending) + len(ending)] + self._digest = hashlib.sha1(raw_content).hexdigest().upper() + + return self._digest + def _parse(self, entries, validate): entries = dict(entries) # shallow copy since we're destructive @@ -722,12 +744,41 @@ class BridgeExtraInfoDescriptor(ExtraInfoDescriptor): Bridge extra-info descriptor (`specification <https://metrics.torproject.org/formats.html#bridgedesc>`_) """ + def __init__(self, raw_contents, validate = True): + self._digest = None + + ExtraInfoDescriptor.__init__(self, raw_contents, validate) + + def digest(self): + return self._digest + + def _parse(self, entries, validate): + entries = dict(entries) # shallow copy since we're destructive + + # handles fields only in server descriptors + for keyword, values in entries.items(): + value, _ = values[0] + line = "%s %s" % (keyword, value) # original line + + if keyword == "router-digest": + if validate and not stem.util.tor_tools.is_hex_digits(value, 40): + raise ValueError("Router digest line had an invalid sha1 digest: %s" % line) + + self._digest = value + del entries["router-digest"] + + ExtraInfoDescriptor._parse(self, entries, validate) + def _required_fields(self): excluded_fields = ( "router-signature", ) - return filter(lambda e: not e in excluded_fields, REQUIRED_FIELDS) + included_fields = ( + "router-digest", + ) + + return included_fields + filter(lambda e: not e in excluded_fields, REQUIRED_FIELDS) def _last_keyword(self): return None diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index af31f03..ec49a55 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -254,12 +254,8 @@ class ServerDescriptor(stem.descriptor.Descriptor): def digest(self): """ - Provides the base64 encoded sha1 of our content. This value is part of the - server descriptor entry for this relay. - - Note that network status entries exclude the padding, so you'll need to add - a '=' to it so they'll match (`explanation - <https://en.wikipedia.org/wiki/Base64#Padding>`_). + Provides the hex encoded sha1 of our content. This value is part of the + network status entry for this relay. :returns: str with the digest value for this server descriptor """ @@ -613,9 +609,7 @@ class RelayDescriptor(ServerDescriptor): # our digest is calculated from everything except our signature raw_content, ending = str(self), "\nrouter-signature\n" raw_content = raw_content[:raw_content.find(ending) + len(ending)] - - digest_sha1 = hashlib.sha1(raw_content).digest() - self._digest = base64.b64encode(digest_sha1) + self._digest = hashlib.sha1(raw_content).hexdigest().upper() return self._digest diff --git a/test/integ/descriptor/extrainfo_descriptor.py b/test/integ/descriptor/extrainfo_descriptor.py index 68b857b..d7244a9 100644 --- a/test/integ/descriptor/extrainfo_descriptor.py +++ b/test/integ/descriptor/extrainfo_descriptor.py @@ -43,6 +43,7 @@ k0d2aofcVbHr4fPQOSST0LXDrhFl5Fqo5um296zpJGvRUeO6S44U/EfJAGShtqWw self.assertEquals(datetime.datetime(2012, 5, 5, 17, 2, 45), desc.dir_write_history_end) self.assertEquals(900, desc.dir_write_history_interval) self.assertEquals(expected_signature, desc.signature) + self.assertEquals("00A57A9AAB5EA113898E2DD02A755E31AFC27227", desc.digest()) self.assertEquals([], desc.get_unrecognized_lines()) # The read-history, write-history, dirreq-read-history, and @@ -109,9 +110,8 @@ k0d2aofcVbHr4fPQOSST0LXDrhFl5Fqo5um296zpJGvRUeO6S44U/EfJAGShtqWw self.assertEquals(900, desc.dir_read_history_interval) self.assertEquals(datetime.datetime(2012, 6, 8, 2, 10, 38), desc.dir_write_history_end) self.assertEquals(900, desc.dir_write_history_interval) - - # TODO: uncomment when we handle router-digest entries - #self.assertEquals([], desc.get_unrecognized_lines()) + self.assertEquals("00A2AECCEAD3FEE033CFE29893387143146728EC", desc.digest()) + self.assertEquals([], desc.get_unrecognized_lines()) read_values_start = [337920, 437248, 3995648, 48726016] self.assertEquals(read_values_start, desc.read_history_values[:4]) diff --git a/test/integ/descriptor/server_descriptor.py b/test/integ/descriptor/server_descriptor.py index 180e82c..449fb2f 100644 --- a/test/integ/descriptor/server_descriptor.py +++ b/test/integ/descriptor/server_descriptor.py @@ -83,7 +83,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= self.assertEquals(expected_signing_key, desc.signing_key) self.assertEquals(expected_signature, desc.signature) self.assertEquals([], desc.get_unrecognized_lines()) - self.assertEquals("LHsnvqsEtOJFnYnKbVzRzF+Vpok" + "=", desc.digest()) + self.assertEquals("2C7B27BEAB04B4E2459D89CA6D5CD1CC5F95A689", desc.digest()) def test_old_descriptor(self): """

1 0

[stem/master] Integ test with bridge extra-info content
by atagar＠torproject.org 10 Jun '12

10 Jun '12

commit 860cd87212d6caca7f23423940ed1807cf3f0f84 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 10 13:58:23 2012 -0700 Integ test with bridge extra-info content Adding a bridge extra-info descriptor from metrics. I'm currently being a bit lazy and only parsing some of the mapping fields. The rest should be covered by unit tests, so I'll only add the rest if this ends up bitting us. --- stem/descriptor/extrainfo_descriptor.py | 2 +- .../descriptor/data/extrainfo_bridge_descriptor | 22 ++++++ test/integ/descriptor/data/extrainfo_descriptor | 13 --- .../descriptor/data/extrainfo_relay_descriptor | 13 +++ test/integ/descriptor/extrainfo_descriptor.py | 78 +++++++++++++++++++- 5 files changed, 112 insertions(+), 16 deletions(-) diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index 0515099..257b747 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -727,7 +727,7 @@ class BridgeExtraInfoDescriptor(ExtraInfoDescriptor): "router-signature", ) - filter(lambda e: not e in excluded_fields, REQUIRED_FIELDS) + return filter(lambda e: not e in excluded_fields, REQUIRED_FIELDS) def _last_keyword(self): return None diff --git a/test/integ/descriptor/data/extrainfo_bridge_descriptor b/test/integ/descriptor/data/extrainfo_bridge_descriptor new file mode 100644 index 0000000..e78c354 --- /dev/null +++ b/test/integ/descriptor/data/extrainfo_bridge_descriptor @@ -0,0 +1,22 @@ +@type bridge-extra-info 1.0 +extra-info ec2bridgereaac65a3 1EC248422B57D9C0BD751892FE787585407479A4 +published 2012-06-08 02:21:27 +write-history 2012-06-08 02:10:38 (900 s) 343040,991232,5649408,49548288,24411136,486400,465920,975872,930816,758784,5650432,1844224,4387840,7417856,789504,623616,7376896,3940352,10039296,6054912,2051072,462848,4260864,5298176,500736,717824,714752,1370112,760832,576512,1521664,3986432,724992,615424,7079936,20995072,17465344,2592768,1014784,3082240,11468800,2770944,5660672,7646208,3385344,5404672,1158144,7741440,3275776,5239808,5291008,2197504,6070272,4919296,1180672,2245632,2362368,1641472,6153216,4660224,9184256,1488896,9736192,768000,65536,176128,2268160,3023872,704512,905216,866304,2375680,3688448,5181440,5433344,5259264,8285184,9391104,7015424,7180288,3436544,3713024,4473856,10705920,10529792,3154944,1815552,3443712,4566016,2668544,2688000,2391040,3181568,2749440,3214336,8974336 +read-history 2012-06-08 02:10:38 (900 s) 337920,437248,3995648,48726016,24125440,479232,477184,1010688,988160,772096,6388736,776192,3093504,7187456,787456,657408,7360512,3588096,9319424,5211136,2034688,474112,4222976,5154816,490496,1878016,610304,757760,667648,593920,1484800,3638272,1307648,672768,6614016,19262464,14863360,2612224,525312,1494016,11119616,3160064,1986560,5619712,3290112,5457920,1145856,7060480,3262464,5570560,5933056,2245632,4548608,3614720,829440,1765376,2379776,2531328,4306944,4244480,9225216,1054720,9806848,880640,66560,192512,2135040,3038208,830464,804864,941056,2386944,3660800,4835328,6406144,5152768,8714240,9145344,6902784,6781952,3648512,3876864,5474304,9958400,10851328,3322880,2239488,4790272,4343808,2404352,2615296,1551360,3295232,2869248,2924544,4941824 +dirreq-write-history 2012-06-08 02:10:38 (900 s) 5120,664576,2419712,578560,3072,5120,5120,3072,11264,5120,54272,1130496,1381376,202752,47104,0,6144,1064960,716800,835584,2048,0,3072,128000,4096,1024,222208,604160,129024,7168,118784,353280,0,0,761856,2236416,2574336,3072,526336,2037760,214016,726016,3592192,2205696,134144,1024,86016,656384,8192,9216,402432,14336,1617920,1436672,445440,481280,7168,1024,1959936,442368,14336,544768,4096,1024,0,4096,1052672,78848,0,223232,51200,5120,5120,1191936,1024,579584,2048,231424,68608,1305600,38912,4096,8192,1433600,5120,4096,330752,574464,382976,225280,940032,1185792,6144,1024,374784,4173824 +dirreq-read-history 2012-06-08 02:10:38 (900 s) 0,71680,99328,25600,0,0,0,0,0,0,3072,45056,74752,13312,2048,0,0,69632,18432,39936,0,0,0,8192,0,0,16384,25600,9216,0,7168,8192,0,0,96256,92160,138240,0,18432,128000,0,81920,149504,113664,8192,0,11264,46080,2048,0,25600,0,75776,77824,0,6144,19456,0,58368,14336,0,21504,0,0,0,0,25600,6144,0,0,5120,4096,0,54272,0,23552,0,0,4096,64512,2048,0,0,34816,0,0,6144,8192,10240,0,31744,48128,0,0,10240,236544 +geoip-db-digest A27BE984989AB31C50D0861C7106B17A7EEC3756 +dirreq-stats-end 2012-06-07 06:33:46 (86400 s) +dirreq-v3-ips +dirreq-v2-ips +dirreq-v3-reqs +dirreq-v2-reqs +dirreq-v3-resp ok=72,not-enough-sigs=0,unavailable=0,not-found=0,not-modified=0,busy=0 +dirreq-v2-resp ok=0,unavailable=0,not-found=0,not-modified=0,busy=0 +dirreq-v3-direct-dl complete=0,timeout=0,running=0 +dirreq-v2-direct-dl complete=0,timeout=0,running=0 +dirreq-v3-tunneled-dl complete=68,timeout=4,running=0,min=2626,d1=7795,d2=14369,q1=18695,d3=29117,d4=52562,md=70626,d6=102271,d7=164175,q3=181522,d8=271682,d9=563791,max=32136142 +dirreq-v2-tunneled-dl complete=0,timeout=0,running=0 +bridge-stats-end 2012-06-07 06:33:53 (86400 s) +bridge-ips cn=16,ir=16,sy=16,us=16,??=8,bn=8,br=8,by=8,cu=8,dk=8,dz=8,es=8,lb=8,ph=8,sd=8,tw=8 +router-digest 00A2AECCEAD3FEE033CFE29893387143146728EC diff --git a/test/integ/descriptor/data/extrainfo_descriptor b/test/integ/descriptor/data/extrainfo_descriptor deleted file mode 100644 index ecaabe0..0000000 --- a/test/integ/descriptor/data/extrainfo_descriptor +++ /dev/null @@ -1,13 +0,0 @@ -@type extra-info 1.0 -extra-info NINJA B2289C3EAB83ECD6EB916A2F481A02E6B76A0A48 -published 2012-05-05 17:03:50 -write-history 2012-05-05 17:02:45 (900 s) 1082368,19456,50176,272384,485376,1850368,1132544,1790976,2459648,4091904,6310912,13701120,3209216,3871744,7873536,5440512,7287808,10561536,9979904,11247616,11982848,7590912,10611712,20728832,38534144,6839296,3173376,16678912 -read-history 2012-05-05 17:02:45 (900 s) 3309568,9216,41984,27648,123904,2004992,364544,576512,1607680,3808256,4672512,12783616,2938880,2562048,7348224,3574784,6488064,10954752,9359360,4438016,6286336,6438912,4502528,10720256,38165504,1524736,2336768,8186880 -dirreq-write-history 2012-05-05 17:02:45 (900 s) 0,0,0,227328,349184,382976,738304,1171456,850944,657408,1675264,987136,702464,1335296,587776,1941504,893952,533504,695296,6828032,6326272,1287168,6310912,10085376,1048576,5372928,894976,8610816 -dirreq-read-history 2012-05-05 17:02:45 (900 s) 0,0,0,0,33792,27648,48128,46080,60416,51200,63488,64512,45056,27648,37888,48128,57344,34816,46080,50176,37888,51200,25600,33792,39936,32768,28672,30720 -router-signature ------BEGIN SIGNATURE----- -K5FSywk7qvw/boA4DQcqkls6Ize5vcBYfhQ8JnOeRQC9+uDxbnpm3qaYN9jZ8myj -k0d2aofcVbHr4fPQOSST0LXDrhFl5Fqo5um296zpJGvRUeO6S44U/EfJAGShtqWw -7LZqklu+gVvhMKREpchVqlAwXkWR44VENm24Hs+mT3M= ------END SIGNATURE----- diff --git a/test/integ/descriptor/data/extrainfo_relay_descriptor b/test/integ/descriptor/data/extrainfo_relay_descriptor new file mode 100644 index 0000000..ecaabe0 --- /dev/null +++ b/test/integ/descriptor/data/extrainfo_relay_descriptor @@ -0,0 +1,13 @@ +@type extra-info 1.0 +extra-info NINJA B2289C3EAB83ECD6EB916A2F481A02E6B76A0A48 +published 2012-05-05 17:03:50 +write-history 2012-05-05 17:02:45 (900 s) 1082368,19456,50176,272384,485376,1850368,1132544,1790976,2459648,4091904,6310912,13701120,3209216,3871744,7873536,5440512,7287808,10561536,9979904,11247616,11982848,7590912,10611712,20728832,38534144,6839296,3173376,16678912 +read-history 2012-05-05 17:02:45 (900 s) 3309568,9216,41984,27648,123904,2004992,364544,576512,1607680,3808256,4672512,12783616,2938880,2562048,7348224,3574784,6488064,10954752,9359360,4438016,6286336,6438912,4502528,10720256,38165504,1524736,2336768,8186880 +dirreq-write-history 2012-05-05 17:02:45 (900 s) 0,0,0,227328,349184,382976,738304,1171456,850944,657408,1675264,987136,702464,1335296,587776,1941504,893952,533504,695296,6828032,6326272,1287168,6310912,10085376,1048576,5372928,894976,8610816 +dirreq-read-history 2012-05-05 17:02:45 (900 s) 0,0,0,0,33792,27648,48128,46080,60416,51200,63488,64512,45056,27648,37888,48128,57344,34816,46080,50176,37888,51200,25600,33792,39936,32768,28672,30720 +router-signature +-----BEGIN SIGNATURE----- +K5FSywk7qvw/boA4DQcqkls6Ize5vcBYfhQ8JnOeRQC9+uDxbnpm3qaYN9jZ8myj +k0d2aofcVbHr4fPQOSST0LXDrhFl5Fqo5um296zpJGvRUeO6S44U/EfJAGShtqWw +7LZqklu+gVvhMKREpchVqlAwXkWR44VENm24Hs+mT3M= +-----END SIGNATURE----- diff --git a/test/integ/descriptor/extrainfo_descriptor.py b/test/integ/descriptor/extrainfo_descriptor.py index 2739985..68b857b 100644 --- a/test/integ/descriptor/extrainfo_descriptor.py +++ b/test/integ/descriptor/extrainfo_descriptor.py @@ -9,14 +9,15 @@ import unittest import stem.descriptor.extrainfo_descriptor import test.runner import test.integ.descriptor +from stem.descriptor.extrainfo_descriptor import DirResponses class TestExtraInfoDescriptor(unittest.TestCase): - def test_metrics_descriptor(self): + def test_metrics_relay_descriptor(self): """ Parses and checks our results against an extrainfo descriptor from metrics. """ - descriptor_path = test.integ.descriptor.get_resource("extrainfo_descriptor") + descriptor_path = test.integ.descriptor.get_resource("extrainfo_relay_descriptor") descriptor_file = open(descriptor_path) descriptor_file.readline() # strip header @@ -60,6 +61,79 @@ k0d2aofcVbHr4fPQOSST0LXDrhFl5Fqo5um296zpJGvRUeO6S44U/EfJAGShtqWw dir_write_values_start = [0, 0, 0, 227328, 349184, 382976, 738304] self.assertEquals(dir_write_values_start, desc.dir_write_history_values[:7]) + def test_metrics_bridge_descriptor(self): + """ + Parses and checks our results against an extrainfo bridge descriptor from + metrics. + """ + + descriptor_path = test.integ.descriptor.get_resource("extrainfo_bridge_descriptor") + + descriptor_file = open(descriptor_path) + descriptor_file.readline() # strip header + descriptor_contents = descriptor_file.read() + descriptor_file.close() + + expected_dir_v2_responses = { + DirResponses.OK: 0, + DirResponses.UNAVAILABLE: 0, + DirResponses.NOT_FOUND: 0, + DirResponses.NOT_MODIFIED: 0, + DirResponses.BUSY: 0, + } + + expected_dir_v3_responses = { + DirResponses.OK: 72, + DirResponses.NOT_ENOUGH_SIGS: 0, + DirResponses.UNAVAILABLE: 0, + DirResponses.NOT_FOUND: 0, + DirResponses.NOT_MODIFIED: 0, + DirResponses.BUSY: 0, + } + + expected_signature = """-----BEGIN SIGNATURE----- +K5FSywk7qvw/boA4DQcqkls6Ize5vcBYfhQ8JnOeRQC9+uDxbnpm3qaYN9jZ8myj +k0d2aofcVbHr4fPQOSST0LXDrhFl5Fqo5um296zpJGvRUeO6S44U/EfJAGShtqWw +7LZqklu+gVvhMKREpchVqlAwXkWR44VENm24Hs+mT3M= +-----END SIGNATURE-----""" + + desc = stem.descriptor.extrainfo_descriptor.BridgeExtraInfoDescriptor(descriptor_contents) + self.assertEquals("ec2bridgereaac65a3", desc.nickname) + self.assertEquals("1EC248422B57D9C0BD751892FE787585407479A4", desc.fingerprint) + self.assertEquals(datetime.datetime(2012, 6, 8, 2, 21, 27), desc.published) + self.assertEquals(datetime.datetime(2012, 6, 8, 2, 10, 38), desc.read_history_end) + self.assertEquals(900, desc.read_history_interval) + self.assertEquals(datetime.datetime(2012, 6, 8, 2, 10, 38), desc.write_history_end) + self.assertEquals(900, desc.write_history_interval) + self.assertEquals(datetime.datetime(2012, 6, 8, 2, 10, 38), desc.dir_read_history_end) + self.assertEquals(900, desc.dir_read_history_interval) + self.assertEquals(datetime.datetime(2012, 6, 8, 2, 10, 38), desc.dir_write_history_end) + self.assertEquals(900, desc.dir_write_history_interval) + + # TODO: uncomment when we handle router-digest entries + #self.assertEquals([], desc.get_unrecognized_lines()) + + read_values_start = [337920, 437248, 3995648, 48726016] + self.assertEquals(read_values_start, desc.read_history_values[:4]) + + write_values_start = [343040, 991232, 5649408, 49548288] + self.assertEquals(write_values_start, desc.write_history_values[:4]) + + dir_read_values_start = [0, 71680, 99328, 25600] + self.assertEquals(dir_read_values_start, desc.dir_read_history_values[:4]) + + dir_write_values_start = [5120, 664576, 2419712, 578560] + self.assertEquals(dir_write_values_start, desc.dir_write_history_values[:4]) + + self.assertEquals({}, desc.dir_v2_requests) + self.assertEquals({}, desc.dir_v3_requests) + + self.assertEquals(expected_dir_v2_responses, desc.dir_v2_responses) + self.assertEquals(expected_dir_v3_responses, desc.dir_v3_responses) + + self.assertEquals({}, desc.dir_v2_responses_unknown) + self.assertEquals({}, desc.dir_v2_responses_unknown) + def test_cached_descriptor(self): """ Parses the cached descriptor file in our data directory, checking that it

1 0

[atlas/master] Add contact information and link to bug reporting in footer
by art＠torproject.org 10 Jun '12

10 Jun '12

commit 7c5e9eca8c4d55c323f4225f2902582b821e1dc7 Author: Arturo Filastò <art(a)baculo.org> Date: Sun Jun 10 20:37:35 2012 +0200 Add contact information and link to bug reporting in footer Fixes #6122 (branches are my friends...) --- index.html | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/index.html b/index.html index 5d5b044..c30a662 100644 --- a/index.html +++ b/index.html @@ -62,7 +62,11 @@ </div> <hr/> <footer> - The Tor Project - 2012 + The Tor Project - 2012<br/> + <a href="https://gitweb.torproject.org/atlas.git">Source code</a> + + <a href="https://trac.torproject.org/projects/tor/newticket?component=Atlas">Report a bug</a> + - <a href="mailto:art@torproject.org">Contact</a> </footer> </div>

1 0

[atlas/master] Remove broken changes
by art＠torproject.org 10 Jun '12

10 Jun '12

commit 7c3d7adb3b87adc6fe5a04a94348ee4c9bcb387b Merge: 7c5e9ec 33dbb90 Author: Arturo Filastò <art(a)baculo.org> Date: Sun Jun 10 20:40:45 2012 +0200 Remove broken changes index.html | 9 ++++----- js/router.js | 3 +-- js/views/details/main.js | 5 +++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --cc index.html index c30a662,6d583f1..ffd4be1 --- a/index.html +++ b/index.html @@@ -62,11 -62,10 +62,10 @@@ </div> <hr/> <footer> - The Tor Project - 2012<br/> - <a href="https://gitweb.torproject.org/atlas.git">Source code</a> - - <a href="https://trac.torproject.org/projects/tor/newticket?component=Atlas">Report a bug</a> - - <a href="mailto:art@torproject.org">Contact</a> - The Tor Project - 2012<br/> ++ The Tor Project - 2012<br/> + <a href="https://gitweb.torproject.org/atlas.git">Source code</a> - + <a href="https://trac.torproject.org/projects/tor/newticket?component=Atlas">Report a bug</a> + - <a href="mailto:art@torproject.org">Contact</a> </footer> </div>  diff --cc js/router.js index 3dd9ba8,ad58917..3fd4a8b --- a/js/router.js +++ b/js/router.js @@@ -6,15 -6,17 +6,14 @@@ define( 'views/details/main', 'views/search/main', 'views/search/do', -- 'views/about/main', - 'views/details/graph' -], function($, _, Backbone, mainDetailsView, mainSearchView, - doSearchView, aboutView, showGraphView){ ++ 'views/about/main' +], function($, _, Backbone, mainDetailsView, mainSearchView, doSearchView, aboutView){ var AppRouter = Backbone.Router.extend({ routes: { // Define the routes for the actions in Tor Status 'details/:fingerprint': 'mainDetails', 'search/:query': 'doSearch', 'about': 'showAbout', - - 'graph/:fingerprint': 'showGraph', // Default '*actions': 'defaultAction' },

1 0

[atlas/master] Add contact information and link to bug reporting in footer
by art＠torproject.org 10 Jun '12

10 Jun '12

commit 33dbb90e26926a7c08f7cd85c8d5197eb27d6b03 Author: Arturo Filastò <art(a)baculo.org> Date: Sun Jun 10 20:30:59 2012 +0200 Add contact information and link to bug reporting in footer Fixes #6122 --- index.html | 5 ++++- js/main.js | 3 ++- js/router.js | 22 ++++++++++++++++++++-- js/views/details/main.js | 6 ++++-- 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/index.html b/index.html index 5d5b044..6d583f1 100644 --- a/index.html +++ b/index.html @@ -62,7 +62,10 @@ </div> <hr/> <footer> - The Tor Project - 2012 + The Tor Project - 2012<br/> + <a href="https://gitweb.torproject.org/atlas.git">Source code</a> - + <a href="https://trac.torproject.org/projects/tor/newticket?component=Atlas">Report a bug</a> + - <a href="mailto:art@torproject.org">Contact</a> </footer> </div>  diff --git a/js/main.js b/js/main.js index 0a37d0d..31e1aea 100644 --- a/js/main.js +++ b/js/main.js @@ -16,7 +16,8 @@ require.config({ collapse: 'libs/bootstrap/bootstrap-collapse', flot: 'libs/flot/jquery.flot', canvas2img: 'libs/flot/canvas2image', - templates: '../templates' + templates: '../templates', + d3: 'libs/d3/d3.v2.js' } }); diff --git a/js/router.js b/js/router.js index 3dd9ba8..ad58917 100644 --- a/js/router.js +++ b/js/router.js @@ -7,14 +7,16 @@ define([ 'views/search/main', 'views/search/do', 'views/about/main', -], function($, _, Backbone, mainDetailsView, mainSearchView, doSearchView, aboutView){ + 'views/details/graph' +], function($, _, Backbone, mainDetailsView, mainSearchView, + doSearchView, aboutView, showGraphView){ var AppRouter = Backbone.Router.extend({ routes: { // Define the routes for the actions in Tor Status 'details/:fingerprint': 'mainDetails', 'search/:query': 'doSearch', 'about': 'showAbout', - + 'graph/:fingerprint': 'showGraph', // Default '*actions': 'defaultAction' }, @@ -38,6 +40,22 @@ define([ }); }, + // Display the bandwidth graph + showGraph: function(fingerprint){ + console.log("starting it.."); + $("#home").removeClass("active"); + $("#about").removeClass("active"); + + $("#loading").show(); + $("#content").hide(); + showGraphView.graph.fingerprint = fingerprint; + $("#content").show(); + showGraphView.render(); + $("#loading").hide(); + + }, + + // Perform a search on Tor Status doSearch: function(query){ $("#home").removeClass("active"); diff --git a/js/views/details/main.js b/js/views/details/main.js index 8c6b9b4..142a713 100644 --- a/js/views/details/main.js +++ b/js/views/details/main.js @@ -47,9 +47,10 @@ define([ graphs = ['days', 'week', 'month', 'months', 'year', 'years']; _.each(graphs, function(g) { + var plot_data = [{data: graph.get(g).write, label: 'write'}, + {data: graph.get(g).read, label: 'read'}]; $.plot($("#"+g), - [{data: graph.get(g).write, label: 'write'}, - {data: graph.get(g).read, label: 'read'}], { + plot_data, { series: { lines: {show: true}, points: {show: true}, @@ -57,6 +58,7 @@ define([ grid: { hoverable: true, clickable: true }, xaxis: {mode: 'time', tickLength: 5}, }); + console.log(plot_data); $("#"+g).resize();

1 0

[translation/orbot_completed] Update translations for orbot_completed
by translation＠torproject.org 10 Jun '12

10 Jun '12

commit 110433986ed3217486f81482c9c56f40da899750 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 10 16:45:07 2012 +0000 Update translations for orbot_completed --- values-it/strings.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/values-it/strings.xml b/values-it/strings.xml index be9dcb2..0932cde 100644 --- a/values-it/strings.xml +++ b/values-it/strings.xml @@ -61,13 +61,13 @@ <string name="wizard_permissions_stock">Permessi Orbot</string> <string name="wizard_premissions_msg_root">Eccellente! Abbiamo rilevato la presenza dei permessi di root attivati per Orbot. Useremo questi poteri con saggezza.</string> <string name="wizard_permissions_msg_stock">Anche se non è richiesto, Orbot può diventare uno strumento ancora più potente se il dispositivo ha accesso come root. Utilizza il pulsante qui sotto per concedere i superpoteri a Orbot!</string> - <string name="wizard_permissions_no_root">Se non hai i permessi root o non hai idea di cosa siano, tanto per essere sicuro di utilizzare le applicazioni fatte per lavorare con Orbot.</string> + <string name="wizard_permissions_no_root">Se non hai i permessi root o non hai idea di cosa siano, assicurati solamente di utilizzare applicazioni fatte per lavorare con Orbot.</string> <string name="wizard_permissions_consent">Ho capito e desidero continuare senza il root</string> <string name="wizard_permission_enable_root">Concedi permessi root a Orbot</string> <string name="wizard_configure">Configura Torification</string> <string name="wizard_configure_msg">Orbot dà la possibilità di instradare tutto il traffico delle applicazioni tramite Tor o scegliere le applicazioni singolarmente.</string> <string name="wizard_configure_all">Usa Tor come proxy per tutte le applicazioni.</string> - <string name="wizard_configure_select_apps">Seleziona singole app per Tor</string> + <string name="wizard_configure_select_apps">Seleziona singole App per Tor</string> <string name="wizard_tips_tricks">App abilitate per Orbot</string> <string name="wizard_tips_msg">Ti invitiamo a scaricare & usare app che possono connettersi direttamente a Orbot. Fai click sui pulsanti qui sotto per installare.</string> <string name="wizard_tips_otrchat">Gibberbot - Client sicuro di instant messaging per Android</string> @@ -98,7 +98,7 @@ <string name="wizard_tips_title">Orbot-App abilitate</string> <string name="wizard_tips_gibberbot">Gibberbot: un applicazione per chat sicura con crittografia Off-the-Record</string> <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> - <string name="wizard_tips_orweb">ORWEB (Solo Android 1.x) - Browser progettato per la privacy e Orbot</string> + <string name="wizard_tips_orweb">Orweb - Browser progettato per la privacy e Orbot</string> <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 10 Jun '12

10 Jun '12

commit 632c3e9d721182e715b532e7bc6a100e9d19502f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 10 16:45:05 2012 +0000 Update translations for orbot --- values-it/strings.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/values-it/strings.xml b/values-it/strings.xml index be9dcb2..0932cde 100644 --- a/values-it/strings.xml +++ b/values-it/strings.xml @@ -61,13 +61,13 @@ <string name="wizard_permissions_stock">Permessi Orbot</string> <string name="wizard_premissions_msg_root">Eccellente! Abbiamo rilevato la presenza dei permessi di root attivati per Orbot. Useremo questi poteri con saggezza.</string> <string name="wizard_permissions_msg_stock">Anche se non è richiesto, Orbot può diventare uno strumento ancora più potente se il dispositivo ha accesso come root. Utilizza il pulsante qui sotto per concedere i superpoteri a Orbot!</string> - <string name="wizard_permissions_no_root">Se non hai i permessi root o non hai idea di cosa siano, tanto per essere sicuro di utilizzare le applicazioni fatte per lavorare con Orbot.</string> + <string name="wizard_permissions_no_root">Se non hai i permessi root o non hai idea di cosa siano, assicurati solamente di utilizzare applicazioni fatte per lavorare con Orbot.</string> <string name="wizard_permissions_consent">Ho capito e desidero continuare senza il root</string> <string name="wizard_permission_enable_root">Concedi permessi root a Orbot</string> <string name="wizard_configure">Configura Torification</string> <string name="wizard_configure_msg">Orbot dà la possibilità di instradare tutto il traffico delle applicazioni tramite Tor o scegliere le applicazioni singolarmente.</string> <string name="wizard_configure_all">Usa Tor come proxy per tutte le applicazioni.</string> - <string name="wizard_configure_select_apps">Seleziona singole app per Tor</string> + <string name="wizard_configure_select_apps">Seleziona singole App per Tor</string> <string name="wizard_tips_tricks">App abilitate per Orbot</string> <string name="wizard_tips_msg">Ti invitiamo a scaricare & usare app che possono connettersi direttamente a Orbot. Fai click sui pulsanti qui sotto per installare.</string> <string name="wizard_tips_otrchat">Gibberbot - Client sicuro di instant messaging per Android</string> @@ -98,7 +98,7 @@ <string name="wizard_tips_title">Orbot-App abilitate</string> <string name="wizard_tips_gibberbot">Gibberbot: un applicazione per chat sicura con crittografia Off-the-Record</string> <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> - <string name="wizard_tips_orweb">ORWEB (Solo Android 1.x) - Browser progettato per la privacy e Orbot</string> + <string name="wizard_tips_orweb">Orweb - Browser progettato per la privacy e Orbot</string> <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 10 Jun '12

10 Jun '12

commit f79d0c4ffbfca71bd0593f6f0b3394dbbf2ff245 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 10 16:15:14 2012 +0000 Update translations for vidalia_completed --- it/vidalia_it.po | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/it/vidalia_it.po b/it/vidalia_it.po index fdc69b3..29f3790 100644 --- a/it/vidalia_it.po +++ b/it/vidalia_it.po @@ -11,7 +11,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: 2012-06-10 15:44+0000\n" +"PO-Revision-Date: 2012-06-10 16:01+0000\n" "Last-Translator: Alessandro <luccaronia(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/language/it/)\n" "MIME-Version: 1.0\n" @@ -2628,7 +2628,7 @@ msgstr "Seleziona per cifrare le richieste di directory e, facoltativamente, usa msgctxt "NetworkPage" msgid "My ISP blocks connections to the Tor network" -msgstr "Il mio ISP blocca le connessioni alla rete Tor" +msgstr "Il mio fornitore di servizi Internet (ISP) blocca le connessioni alla rete Tor" msgctxt "NetworkPage" msgid "Bridge Settings" @@ -2662,7 +2662,7 @@ msgctxt "NetworkPage" msgid "" "No new bridges are currently available. You can either wait a while and try " "again, or try another method of finding new bridges." -msgstr "Non ci sono nuovi bridge disponibili. Puoi aspettare un po' e riprovare, oppure cerca un altro modo per trovare dei bridge" +msgstr "Non ci sono nuovi bridge disponibili. Puoi aspettare un po' e riprovare, oppure cercare un altro modo per trovare dei bridge." msgctxt "NetworkPage" msgid "Click Help to see other methods of finding new bridges." @@ -2770,7 +2770,7 @@ msgstr "Sommario" msgctxt "RouterInfoDialog" msgid "Name:" -msgstr "Nickname:" +msgstr "Nome:" msgctxt "RouterInfoDialog" msgid "Status:" @@ -2858,7 +2858,7 @@ msgctxt "ServerPage" msgid "" "Please upgrade your Tor software or configure Tor to act as a normal Tor " "relay." -msgstr "Aggiorna il tuo software Tor o configura Tor per fare da normale relay Tor" +msgstr "Aggiorna il tuo software Tor o configura Tor per fare da normale relay" msgctxt "ServerPage" msgid "Your bridge relay is not running." @@ -2866,7 +2866,7 @@ msgstr "Il tuo bridge relay non è attivo." msgctxt "ServerPage" msgid "You must specify at least a relay nickname and port." -msgstr "Devi specificare un nickname del relay ed una porta" +msgstr "Devi specificare un nickname del relay ed una porta." msgctxt "ServerPage" msgid "Run as a client only" @@ -3106,7 +3106,7 @@ msgstr "Aiuta gli utenti sotto censura a raggiungere la rete Tor" msgctxt "ServerPage" msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>" -msgstr "<a href=\"bridges.finding\">Come trovo un bridge?</a>" +msgstr "<a href=\"#bridgeUsage\">Chi ha usato il mio bridge?</a>" msgctxt "ServerPage" msgid "<a href=\"#bridgeHelp\">What's this?</a>" @@ -3581,7 +3581,7 @@ msgstr "Successo" msgctxt "UPNPControl" msgid "No UPnP-enabled devices found" -msgstr "Nessuna periferica UpnP trovata" +msgstr "Nessun dispositivo UPnP trovato" msgctxt "UPNPControl" msgid "No valid UPnP-enabled Internet gateway devices found" @@ -3641,7 +3641,7 @@ msgctxt "UpdateProcess" msgid "" "Vidalia was unable to check for available software updates because Tor's " "update process exited unexpectedly." -msgstr "Vidalia non è riuscito a controllare gli aggiornamenti software perché il processo di aggiornamento di Tor si è interrotto inaspettatamente." +msgstr "Vidalia non è riuscito a controllare gli aggiornamenti software perché il processo di aggiornamento di Tor si è interrotto inaspettatamente." msgctxt "UpdateProgressDialog" msgid "Checking for available updates..." @@ -3701,7 +3701,7 @@ msgstr "Pacchetto" msgctxt "UpdatesAvailableDialog" msgid "Version" -msgstr "versione" +msgstr "Versione" msgctxt "VMessageBox" msgid "OK" @@ -3816,7 +3816,7 @@ msgid "" "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n" "\n" "Would you like to continue starting Vidalia?" -msgstr "Sembra che un altro processo di Vidalia stia già girando. Se davvero non c'è un altro processo Vidalia in funzione, puoi decidere di continuare lo stesso.\n\nVuoi continuare ed avviare Vidalia?" +msgstr "Sembra che un altro processo di Vidalia sia già in esecuzione. Se davvero non c'è un altro processo Vidalia in funzione, puoi decidere di continuare lo stesso.\n\nVuoi continuare ed avviare Vidalia?" msgctxt "stringutil.h" msgid "%1 secs"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 10 Jun '12

10 Jun '12

commit 222840921e962c59be07310891bc389f8a8a1ee8 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 10 16:15:12 2012 +0000 Update translations for vidalia --- it/vidalia_it.po | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/it/vidalia_it.po b/it/vidalia_it.po index fdc69b3..29f3790 100644 --- a/it/vidalia_it.po +++ b/it/vidalia_it.po @@ -11,7 +11,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: 2012-06-10 15:44+0000\n" +"PO-Revision-Date: 2012-06-10 16:01+0000\n" "Last-Translator: Alessandro <luccaronia(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/language/it/)\n" "MIME-Version: 1.0\n" @@ -2628,7 +2628,7 @@ msgstr "Seleziona per cifrare le richieste di directory e, facoltativamente, usa msgctxt "NetworkPage" msgid "My ISP blocks connections to the Tor network" -msgstr "Il mio ISP blocca le connessioni alla rete Tor" +msgstr "Il mio fornitore di servizi Internet (ISP) blocca le connessioni alla rete Tor" msgctxt "NetworkPage" msgid "Bridge Settings" @@ -2662,7 +2662,7 @@ msgctxt "NetworkPage" msgid "" "No new bridges are currently available. You can either wait a while and try " "again, or try another method of finding new bridges." -msgstr "Non ci sono nuovi bridge disponibili. Puoi aspettare un po' e riprovare, oppure cerca un altro modo per trovare dei bridge" +msgstr "Non ci sono nuovi bridge disponibili. Puoi aspettare un po' e riprovare, oppure cercare un altro modo per trovare dei bridge." msgctxt "NetworkPage" msgid "Click Help to see other methods of finding new bridges." @@ -2770,7 +2770,7 @@ msgstr "Sommario" msgctxt "RouterInfoDialog" msgid "Name:" -msgstr "Nickname:" +msgstr "Nome:" msgctxt "RouterInfoDialog" msgid "Status:" @@ -2858,7 +2858,7 @@ msgctxt "ServerPage" msgid "" "Please upgrade your Tor software or configure Tor to act as a normal Tor " "relay." -msgstr "Aggiorna il tuo software Tor o configura Tor per fare da normale relay Tor" +msgstr "Aggiorna il tuo software Tor o configura Tor per fare da normale relay" msgctxt "ServerPage" msgid "Your bridge relay is not running." @@ -2866,7 +2866,7 @@ msgstr "Il tuo bridge relay non è attivo." msgctxt "ServerPage" msgid "You must specify at least a relay nickname and port." -msgstr "Devi specificare un nickname del relay ed una porta" +msgstr "Devi specificare un nickname del relay ed una porta." msgctxt "ServerPage" msgid "Run as a client only" @@ -3106,7 +3106,7 @@ msgstr "Aiuta gli utenti sotto censura a raggiungere la rete Tor" msgctxt "ServerPage" msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>" -msgstr "<a href=\"bridges.finding\">Come trovo un bridge?</a>" +msgstr "<a href=\"#bridgeUsage\">Chi ha usato il mio bridge?</a>" msgctxt "ServerPage" msgid "<a href=\"#bridgeHelp\">What's this?</a>" @@ -3581,7 +3581,7 @@ msgstr "Successo" msgctxt "UPNPControl" msgid "No UPnP-enabled devices found" -msgstr "Nessuna periferica UpnP trovata" +msgstr "Nessun dispositivo UPnP trovato" msgctxt "UPNPControl" msgid "No valid UPnP-enabled Internet gateway devices found" @@ -3641,7 +3641,7 @@ msgctxt "UpdateProcess" msgid "" "Vidalia was unable to check for available software updates because Tor's " "update process exited unexpectedly." -msgstr "Vidalia non è riuscito a controllare gli aggiornamenti software perché il processo di aggiornamento di Tor si è interrotto inaspettatamente." +msgstr "Vidalia non è riuscito a controllare gli aggiornamenti software perché il processo di aggiornamento di Tor si è interrotto inaspettatamente." msgctxt "UpdateProgressDialog" msgid "Checking for available updates..." @@ -3701,7 +3701,7 @@ msgstr "Pacchetto" msgctxt "UpdatesAvailableDialog" msgid "Version" -msgstr "versione" +msgstr "Versione" msgctxt "VMessageBox" msgid "OK" @@ -3816,7 +3816,7 @@ msgid "" "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n" "\n" "Would you like to continue starting Vidalia?" -msgstr "Sembra che un altro processo di Vidalia stia già girando. Se davvero non c'è un altro processo Vidalia in funzione, puoi decidere di continuare lo stesso.\n\nVuoi continuare ed avviare Vidalia?" +msgstr "Sembra che un altro processo di Vidalia sia già in esecuzione. Se davvero non c'è un altro processo Vidalia in funzione, puoi decidere di continuare lo stesso.\n\nVuoi continuare ed avviare Vidalia?" msgctxt "stringutil.h" msgid "%1 secs"

1 0

← Newer
1
...
59
60
61
62
63
64
65
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2012