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

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 01 Aug '12

01 Aug '12

commit 63a24597336093b28ba4257a9b8224e169a038e7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 1 10:15:02 2012 +0000 Update translations for bridgedb --- zh_CN/bridgedb.po | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/zh_CN/bridgedb.po b/zh_CN/bridgedb.po index 9bce198..d6c7505 100644 --- a/zh_CN/bridgedb.po +++ b/zh_CN/bridgedb.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Christopher Meng <cickumqt(a)gmail.com>, 2012. # hanl <iamh4n(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-02-14 10:04+0000\n" -"Last-Translator: hanl <iamh4n(a)gmail.com>\n" +"PO-Revision-Date: 2012-08-01 10:08+0000\n" +"Last-Translator: Christopher Meng <cickumqt(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,20 +29,20 @@ msgid "" "in the main directory. Since there is no complete public list of them,\n" "even if your ISP is filtering connections to all the known Tor relays,\n" "they probably won't be able to block all the bridges." -msgstr "网桥中继服务器（Bridge relays），简称网桥（bridges)为未公开在主目录的中继服务器⏎\n因为完整的网桥地址是不公开的，即使您的ISP过滤所有的 Tor 的中继服务器他们估计无法封锁所有的网桥。" +msgstr "网桥中继服务器，简称网桥(bridges)，是指那些未公开在主目录的中继服务器⏎\n因为完整的网桥地址是不公开的，即使您的 ISP 过滤所有的 Tor 的中继服务器，估计也无法封锁所有的网桥。" #: lib/bridgedb/I18n.py:28 msgid "" "To use the above lines, go to Vidalia's Network settings page, and click\n" "\"My ISP blocks connections to the Tor network\". Then add each bridge\n" "address one at a time." -msgstr "使用下列地址，请打开 Vidalia 网络设置。选中“我的 ISP 阻挡了对 Tor 网络的连接\"。之后请依次添加服务器。" +msgstr "使用下列地址，请打开 Vidalia 网络设置，选中“我的 ISP 阻挡了对 Tor 网络的连接\"。之后请依次添加服务器。" #: lib/bridgedb/I18n.py:32 msgid "" "Configuring more than one bridge address will make your Tor connection\n" "more stable, in case some of the bridges become unreachable." -msgstr "如果桥接变得不稳定，配置两个桥接会使你的链接更稳定。" +msgstr "如果桥接变得不稳定，配置两个桥接会使您的链接更稳定。" #: lib/bridgedb/I18n.py:35 msgid "" @@ -54,7 +55,7 @@ msgstr "您也可以发送内容为“get bridges” 的邮件到 bridges@torpro #: lib/bridgedb/I18n.py:41 msgid "[This is an automated message; please do not reply.]" -msgstr "自动生成内容，请勿回复。" +msgstr "[这是一封自动生成的邮件，请勿回复]" #: lib/bridgedb/I18n.py:43 msgid "" @@ -62,7 +63,7 @@ msgid "" "https://bridges.torproject.org/. The answers you get from that page\n" "will change every few days, so check back periodically if you need more\n" "bridge addresses." -msgstr "您也可以访问 https://bridges.torproject.org 获取公开网桥服务器地址。网桥服务器地址会经常更新，请定期回访。" +msgstr "您也可以访问 https://bridges.torproject.org 以获取公开网桥服务器地址。网桥服务器地址会经常更新，请定期回访。" #: lib/bridgedb/I18n.py:48 msgid "(no bridges currently available)"

1 0

[metrics-tasks/master] Fix typo.
by karsten＠torproject.org 01 Aug '12

01 Aug '12

commit a7f426ccda7ba3506c5720382a77c77b4f399e7a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Aug 1 11:46:52 2012 +0200 Fix typo. --- task-6329/tor-relays-stats.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/task-6329/tor-relays-stats.py b/task-6329/tor-relays-stats.py index 0aa35bf..1e4159e 100755 --- a/task-6329/tor-relays-stats.py +++ b/task-6329/tor-relays-stats.py @@ -188,7 +188,7 @@ if '__main__' == __name__: group.add_option("-g", "--guards-only", action="store_true", help="select only relays suitable for guard position") group.add_option("-x", "--fast-exits-only", action="store_true", - help="select only 100+ MBit/s exits allowing ports 80, 443, 554, and 1755") + help="select only 100+ Mbit/s exits allowing ports 80, 443, 554, and 1755") parser.add_option_group(group) group = OptionGroup(parser, "Grouping options") group.add_option("-A", "--by-as", action="store_true", default=False,

1 0

[metrics-tasks/master] Exit after downloading, or some people will hit the server for every run.
by karsten＠torproject.org 01 Aug '12

01 Aug '12

commit 0cb386b00b60bf38872e510bdb60de3708ddceb8 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Aug 1 10:53:38 2012 +0200 Exit after downloading, or some people will hit the server for every run. --- task-6329/tor-relays-stats.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/task-6329/tor-relays-stats.py b/task-6329/tor-relays-stats.py index 8479dc3..60fd8e5 100755 --- a/task-6329/tor-relays-stats.py +++ b/task-6329/tor-relays-stats.py @@ -201,6 +201,8 @@ if '__main__' == __name__: if options.download: download_details_file() + print "Downloaded details.json. Re-run without --download option." + exit() if not os.path.exists('details.json'): parser.error("Did not find details.json. Re-run with --download.")

1 0

[metrics-tasks/master] Define --top -1 as "all".
by karsten＠torproject.org 01 Aug '12

01 Aug '12

commit 1e59c32e83a86a9c9c79a36c0396d0d5bf34f59e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Aug 1 10:51:18 2012 +0200 Define --top -1 as "all". --- task-6329/tor-relays-stats.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/task-6329/tor-relays-stats.py b/task-6329/tor-relays-stats.py index b76c9ed..8479dc3 100755 --- a/task-6329/tor-relays-stats.py +++ b/task-6329/tor-relays-stats.py @@ -129,7 +129,7 @@ class RelayStats(object): def print_groups(self, sorted_groups, count=10, by_country=False, by_as_number=False, short=None): print " CW adv_bw P_guard P_middle P_exit Nickname Fingerprint Exit Guard CC AS_num AS_name"[:short] - + if count < 0: count = len(sorted_groups) for formatted_group, weight in sorted_groups[:count]: print formatted_group[:short] if len(sorted_groups) > count: @@ -191,7 +191,7 @@ if '__main__' == __name__: parser.add_option_group(group) group = OptionGroup(parser, "Display options") group.add_option("-t", "--top", type="int", default=10, metavar="NUM", - help="display only the top results (default: %default)") + help="display only the top results (default: %default; -1 for all)") group.add_option("-s", "--short", action="store_true", help="cut the length of the line output at 70 chars") parser.add_option_group(group)

1 0

[metrics-tasks/master] Add a --links option to display links to Atlas instead of fingerprints.
by karsten＠torproject.org 01 Aug '12

01 Aug '12

commit 57c477cfd0a2b5e8263b8fd60c58db51197ed963 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Aug 1 11:10:21 2012 +0200 Add a --links option to display links to Atlas instead of fingerprints. --- task-6329/tor-relays-stats.py | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/task-6329/tor-relays-stats.py b/task-6329/tor-relays-stats.py index 60fd8e5..0aa35bf 100755 --- a/task-6329/tor-relays-stats.py +++ b/task-6329/tor-relays-stats.py @@ -84,7 +84,7 @@ class RelayStats(object): grouped_relays[key].append(relay) return grouped_relays - def format_and_sort_groups(self, grouped_relays, by_country=False, by_as_number=False): + def format_and_sort_groups(self, grouped_relays, by_country=False, by_as_number=False, links=False): formatted_groups = {} for group in grouped_relays.values(): group_weights = (0, 0, 0, 0, 0) @@ -97,7 +97,7 @@ class RelayStats(object): relay.get('exit_probability', 0)) group_weights = tuple(sum(x) for x in zip(group_weights, weights)) nickname = relay['nickname'] - fingerprint = relay['fingerprint'] + fingerprint = relay['fingerprint'] if not links else "https://atlas.torproject.org/#details/%s" % relay['fingerprint'] exit = 'Exit' if 'Exit' in set(relay['flags']) else '' guard = 'Guard' if 'Guard' in set(relay['flags']) else '' country = relay.get('country', '') @@ -114,7 +114,11 @@ class RelayStats(object): as_name = "*" if by_as_number and not by_country: country = "*" - formatted_group = "%8.4f%% %8.4f%% %8.4f%% %8.4f%% %8.4f%% %-19s %-40s %-4s %-5s %-2s %-9s %s" % ( + if links: + format_string = "%8.4f%% %8.4f%% %8.4f%% %8.4f%% %8.4f%% %-19s %-78s %-4s %-5s %-2s %-9s %s" + else: + format_string = "%8.4f%% %8.4f%% %8.4f%% %8.4f%% %8.4f%% %-19s %-40s %-4s %-5s %-2s %-9s %s" + formatted_group = format_string % ( group_weights[0] * 100.0, group_weights[1] * 100.0, group_weights[2] * 100.0, @@ -127,8 +131,11 @@ class RelayStats(object): sorted_groups.reverse() return sorted_groups - def print_groups(self, sorted_groups, count=10, by_country=False, by_as_number=False, short=None): - print " CW adv_bw P_guard P_middle P_exit Nickname Fingerprint Exit Guard CC AS_num AS_name"[:short] + def print_groups(self, sorted_groups, count=10, by_country=False, by_as_number=False, short=False, links=False): + if links: + print " CW adv_bw P_guard P_middle P_exit Nickname Link Exit Guard CC AS_num AS_name"[:short] + else: + print " CW adv_bw P_guard P_middle P_exit Nickname Fingerprint Exit Guard CC AS_num AS_name"[:short] if count < 0: count = len(sorted_groups) for formatted_group, weight in sorted_groups[:count]: print formatted_group[:short] @@ -190,6 +197,8 @@ if '__main__' == __name__: help="group relays by country") parser.add_option_group(group) group = OptionGroup(parser, "Display options") + group.add_option("-l", "--links", action="store_true", + help="display links to the Atlas service instead of fingerprints") group.add_option("-t", "--top", type="int", default=10, metavar="NUM", help="display only the top results (default: %default; -1 for all)") group.add_option("-s", "--short", action="store_true", @@ -219,8 +228,10 @@ if '__main__' == __name__: by_as_number=options.by_as) sorted_groups = stats.format_and_sort_groups(grouped_relays, by_country=options.by_country, - by_as_number=options.by_as) + by_as_number=options.by_as, + links=options.links) stats.print_groups(sorted_groups, options.top, by_country=options.by_country, by_as_number=options.by_as, - short=70 if options.short else None) + short=70 if options.short else None, + links=options.links)

1 0

[metrics-tasks/master] Add a --fast-exits-only option for #6498.
by karsten＠torproject.org 01 Aug '12

01 Aug '12

commit 7c0b0f5cf3a6a74a9dc779be493f457fb40ff4d6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Aug 1 10:48:30 2012 +0200 Add a --fast-exits-only option for #6498. --- task-6329/tor-relays-stats.py | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/task-6329/tor-relays-stats.py b/task-6329/tor-relays-stats.py index 245a241..b76c9ed 100755 --- a/task-6329/tor-relays-stats.py +++ b/task-6329/tor-relays-stats.py @@ -23,7 +23,7 @@ class RelayStats(object): self._data = json.load(file('details.json')) return self._data - def get_relays(self, countries=[], as_sets=[], exits_only=False, guards_only=False, inactive=False): + def get_relays(self, countries=[], as_sets=[], exits_only=False, guards_only=False, inactive=False, fast_exits_only=False): relays = [] if countries: countries = [x.lower() for x in countries] @@ -40,6 +40,31 @@ class RelayStats(object): continue if guards_only and not relay.get('guard_probability', -1) > 0.0: continue + if fast_exits_only: + if relay.get('bandwidth_rate', -1) < 12500 * 1024: + continue + if relay.get('advertised_bandwidth', -1) < 5000 * 1024: + continue + relevant_ports = set([80, 443, 554, 1755]) + summary = relay.get('exit_policy_summary', {}) + if 'accept' in summary: + portlist = summary['accept'] + elif 'reject' in summary: + portlist = summary['reject'] + else: + continue + ports = [] + for p in portlist: + if '-' in p: + ports.extend(range(int(p.split('-')[0]), + int(p.split('-')[1]) + 1)) + else: + ports.append(int(p)) + policy_ports = set(ports) + if 'accept' in summary and not relevant_ports.issubset(policy_ports): + continue + if 'reject' in summary and not relevant_ports.isdisjoint(policy_ports): + continue relays.append(relay) return relays @@ -155,6 +180,8 @@ if '__main__' == __name__: help="select only relays suitable for exit position") group.add_option("-g", "--guards-only", action="store_true", help="select only relays suitable for guard position") + group.add_option("-x", "--fast-exits-only", action="store_true", + help="select only 100+ MBit/s exits allowing ports 80, 443, 554, and 1755") parser.add_option_group(group) group = OptionGroup(parser, "Grouping options") group.add_option("-A", "--by-as", action="store_true", default=False, @@ -183,7 +210,8 @@ if '__main__' == __name__: as_sets=options.ases, exits_only=options.exits_only, guards_only=options.guards_only, - inactive=options.inactive) + inactive=options.inactive, + fast_exits_only=options.fast_exits_only) grouped_relays = stats.group_relays(relays, by_country=options.by_country, by_as_number=options.by_as)

1 0

[onionoo/master] Remove an unused import and an unused code line.
by karsten＠torproject.org 01 Aug '12

01 Aug '12

commit d2863472be2f6f957d2acf7616153e278bf95951 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Aug 1 08:06:55 2012 +0200 Remove an unused import and an unused code line. --- src/org/torproject/onionoo/WeightsDataWriter.java | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/onionoo/WeightsDataWriter.java b/src/org/torproject/onionoo/WeightsDataWriter.java index c4a887b..b02e0c0 100644 --- a/src/org/torproject/onionoo/WeightsDataWriter.java +++ b/src/org/torproject/onionoo/WeightsDataWriter.java @@ -13,7 +13,6 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; -import java.util.Date; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -103,7 +102,6 @@ public class WeightsDataWriter { private void updateWeightsHistory(long validAfterMillis, long freshUntilMillis, SortedMap<String, double[]> pathSelectionWeights) { - int files = pathSelectionWeights.size(); List<HistoryUpdateWorker> historyUpdateWorkers = new ArrayList<HistoryUpdateWorker>(); for (int i = 0; i < HISTORY_UPDATER_WORKERS_NUM; i++) {

1 0

[onionoo/master] Add four fields to details documents for #6498.
by karsten＠torproject.org 01 Aug '12

01 Aug '12

commit 5dfeedd8d7a65e3159133acbfff42e249042c864 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Aug 1 10:09:55 2012 +0200 Add four fields to details documents for #6498. --- src/org/torproject/onionoo/CurrentNodes.java | 41 ++++++++++++++++----- src/org/torproject/onionoo/DetailDataWriter.java | 24 +++++++++++-- src/org/torproject/onionoo/Node.java | 13 ++++++- web/index.html | 24 +++++++++++++ 4 files changed, 88 insertions(+), 14 deletions(-) diff --git a/src/org/torproject/onionoo/CurrentNodes.java b/src/org/torproject/onionoo/CurrentNodes.java index 7ef1473..a34cbb7 100644 --- a/src/org/torproject/onionoo/CurrentNodes.java +++ b/src/org/torproject/onionoo/CurrentNodes.java @@ -104,16 +104,27 @@ public class CurrentNodes { hostName = parts[11].equals("null") ? null : parts[11]; lastRdnsLookup = Long.parseLong(parts[12]); } + String defaultPolicy = null, portList = null; + if (parts.length > 14) { + if (!parts[13].equals("null")) { + defaultPolicy = parts[13]; + } + if (!parts[14].equals("null")) { + portList = parts[14]; + } + } if (isRelay) { this.addRelay(nickname, fingerprint, address, orAddressesAndPorts, exitAddresses, publishedOrValidAfterMillis, orPort, dirPort, relayFlags, - consensusWeight, countryCode, hostName, lastRdnsLookup); + consensusWeight, countryCode, hostName, lastRdnsLookup, + defaultPolicy, portList); } else { this.addBridge(nickname, fingerprint, address, orAddressesAndPorts, exitAddresses, publishedOrValidAfterMillis, orPort, dirPort, relayFlags, - consensusWeight, countryCode, hostName, lastRdnsLookup); + consensusWeight, countryCode, hostName, lastRdnsLookup, + defaultPolicy, portList); } } br.close(); @@ -175,11 +186,16 @@ public class CurrentNodes { String hostName = entry.getHostName() != null ? entry.getHostName() : "null"; long lastRdnsLookup = entry.getLastRdnsLookup(); + String defaultPolicy = entry.getDefaultPolicy() != null + ? entry.getDefaultPolicy() : "null"; + String portList = entry.getPortList() != null + ? entry.getPortList() : "null"; bw.write("r " + nickname + " " + fingerprint + " " + addressesBuilder.toString() + " " + validAfter + " " + orPort + " " + dirPort + " " + relayFlags + " " + consensusWeight + " " + countryCode + " " + hostName + " " - + String.valueOf(lastRdnsLookup) + "\n"); + + String.valueOf(lastRdnsLookup) + " " + defaultPolicy + " " + + portList + "\n"); } for (Node entry : this.currentBridges.values()) { String nickname = entry.getNickname(); @@ -204,7 +220,8 @@ public class CurrentNodes { String relayFlags = sb.toString().substring(1); bw.write("b " + nickname + " " + fingerprint + " " + addressesBuilder.toString() + " " + published + " " + orPort - + " " + dirPort + " " + relayFlags + " -1 ?? null -1\n"); + + " " + dirPort + " " + relayFlags + " -1 ?? null -1 null " + + "null\n"); } bw.close(); } catch (IOException e) { @@ -268,9 +285,11 @@ public class CurrentNodes { int dirPort = entry.getDirPort(); SortedSet<String> relayFlags = entry.getFlags(); long consensusWeight = entry.getBandwidth(); + String defaultPolicy = entry.getDefaultPolicy(); + String portList = entry.getPortList(); this.addRelay(nickname, fingerprint, address, orAddressesAndPorts, null, validAfterMillis, orPort, dirPort, relayFlags, - consensusWeight, null, null, -1L); + consensusWeight, null, null, -1L, defaultPolicy, portList); } if (this.lastValidAfterMillis == validAfterMillis) { this.lastBandwidthWeights = consensus.getBandwidthWeights(); @@ -281,7 +300,8 @@ public class CurrentNodes { String address, SortedSet<String> orAddressesAndPorts, SortedSet<String> exitAddresses, long validAfterMillis, int orPort, int dirPort, SortedSet<String> relayFlags, long consensusWeight, - String countryCode, String hostName, long lastRdnsLookup) { + String countryCode, String hostName, long lastRdnsLookup, + String defaultPolicy, String portList) { if (validAfterMillis >= cutoff && (!this.currentRelays.containsKey(fingerprint) || this.currentRelays.get(fingerprint).getLastSeenMillis() < @@ -296,7 +316,7 @@ public class CurrentNodes { Node entry = new Node(nickname, fingerprint, address, orAddressesAndPorts, exitAddresses, validAfterMillis, orPort, dirPort, relayFlags, consensusWeight, countryCode, hostName, - lastRdnsLookup); + lastRdnsLookup, defaultPolicy, portList); this.currentRelays.put(fingerprint, entry); if (validAfterMillis > this.lastValidAfterMillis) { this.lastValidAfterMillis = validAfterMillis; @@ -394,7 +414,7 @@ public class CurrentNodes { SortedSet<String> relayFlags = entry.getFlags(); this.addBridge(nickname, fingerprint, address, orAddressesAndPorts, null, publishedMillis, orPort, dirPort, relayFlags, -1, "??", - null, -1L); + null, -1L, null, null); } } @@ -402,7 +422,8 @@ public class CurrentNodes { String address, SortedSet<String> orAddressesAndPorts, SortedSet<String> exitAddresses, long publishedMillis, int orPort, int dirPort, SortedSet<String> relayFlags, long consensusWeight, - String countryCode, String hostname, long lastRdnsLookup) { + String countryCode, String hostname, long lastRdnsLookup, + String defaultPolicy, String portList) { if (publishedMillis >= cutoff && (!this.currentBridges.containsKey(fingerprint) || this.currentBridges.get(fingerprint).getLastSeenMillis() < @@ -410,7 +431,7 @@ public class CurrentNodes { Node entry = new Node(nickname, fingerprint, address, orAddressesAndPorts, exitAddresses, publishedMillis, orPort, dirPort, relayFlags, consensusWeight, countryCode, hostname, - lastRdnsLookup); + lastRdnsLookup, defaultPolicy, portList); this.currentBridges.put(fingerprint, entry); if (publishedMillis > this.lastPublishedMillis) { this.lastPublishedMillis = publishedMillis; diff --git a/src/org/torproject/onionoo/DetailDataWriter.java b/src/org/torproject/onionoo/DetailDataWriter.java index 2961de9..43d1206 100644 --- a/src/org/torproject/onionoo/DetailDataWriter.java +++ b/src/org/torproject/onionoo/DetailDataWriter.java @@ -494,11 +494,16 @@ public class DetailDataWriter { String lastRestartedString = dateTimeFormat.format( descriptor.getPublishedMillis() - descriptor.getUptime() * 1000L); - int advertisedBandwidth = Math.min(descriptor.getBandwidthRate(), - Math.min(descriptor.getBandwidthBurst(), - descriptor.getBandwidthObserved())); + int bandwidthRate = descriptor.getBandwidthRate(); + int bandwidthBurst = descriptor.getBandwidthBurst(); + int observedBandwidth = descriptor.getBandwidthObserved(); + int advertisedBandwidth = Math.min(bandwidthRate, + Math.min(bandwidthBurst, observedBandwidth)); sb.append("\"desc_published\":\"" + publishedDateTime + "\",\n" + "\"last_restarted\":\"" + lastRestartedString + "\",\n" + + "\"bandwidth_rate\":" + bandwidthRate + ",\n" + + "\"bandwidth_burst\":" + bandwidthBurst + ",\n" + + "\"observed_bandwidth\":" + observedBandwidth + ",\n" + "\"advertised_bandwidth\":" + advertisedBandwidth + ",\n" + "\"exit_policy\":["); int written = 0; @@ -560,6 +565,8 @@ public class DetailDataWriter { double guardProbability = entry.getGuardProbability(); double middleProbability = entry.getMiddleProbability(); double exitProbability = entry.getExitProbability(); + String defaultPolicy = entry.getDefaultPolicy(); + String portList = entry.getPortList(); StringBuilder sb = new StringBuilder(); sb.append("{\"version\":1,\n" + "\"nickname\":\"" + nickname + "\",\n" @@ -638,6 +645,17 @@ public class DetailDataWriter { sb.append(String.format(",\n\"exit_probability\":%.9f", exitProbability)); } + if (defaultPolicy != null && (defaultPolicy.equals("accept") || + defaultPolicy.equals("reject")) && portList != null) { + sb.append(",\n\"exit_policy_summary\":{\"" + defaultPolicy + + "\":["); + int portsWritten = 0; + for (String portOrPortRange : portList.split(",")) { + sb.append((portsWritten++ > 0 ? "," : "") + + "\"" + portOrPortRange + "\""); + } + sb.append("]}"); + } /* Add exit addresses if at least one of them is distinct from the * onion-routing addresses. */ diff --git a/src/org/torproject/onionoo/Node.java b/src/org/torproject/onionoo/Node.java index 61a26ed..1bf984d 100644 --- a/src/org/torproject/onionoo/Node.java +++ b/src/org/torproject/onionoo/Node.java @@ -40,11 +40,14 @@ public class Node { private double guardProbability = -1.0; private double middleProbability = -1.0; private double exitProbability = -1.0; + private String defaultPolicy; + private String portList; public Node(String nickname, String fingerprint, String address, SortedSet<String> orAddressesAndPorts, SortedSet<String> exitAddresses, long lastSeenMillis, int orPort, int dirPort, SortedSet<String> relayFlags, long consensusWeight, - String countryCode, String hostName, long lastRdnsLookup) { + String countryCode, String hostName, long lastRdnsLookup, + String defaultPolicy, String portList) { this.nickname = nickname; this.fingerprint = fingerprint; try { @@ -75,6 +78,8 @@ public class Node { this.countryCode = countryCode; this.hostName = hostName; this.lastRdnsLookup = lastRdnsLookup; + this.defaultPolicy = defaultPolicy; + this.portList = portList; } public String getFingerprint() { return this.fingerprint; @@ -230,5 +235,11 @@ public class Node { public double getExitProbability() { return this.exitProbability; } + public String getDefaultPolicy() { + return this.defaultPolicy; + } + public String getPortList() { + return this.portList; + } } diff --git a/web/index.html b/web/index.html index e80a99e..a74feac 100755 --- a/web/index.html +++ b/web/index.html @@ -256,6 +256,22 @@ was successful yet.</li> <li>"last_restarted": UTC timestamp (YYYY-MM-DD hh:mm:ss) when the relay was last (re-)started. Optional field.</li> +<li>"bandwidth_rate": Average bandwidth +in bytes per second that this relay is willing to sustain over long +periods. +Required field. +Added field on August 1, 2012.</li> +<li>"bandwidth_burst": Bandwidth in bytes +per second that this relay is willing to sustain in very short intervals. +Required field. +Added field on August 1, 2012.</li> +<li>"observed_bandwidth": Bandwidth +estimate in bytes per second of the capacity this relay can handle. +The relay remembers the maximum bandwidth sustained output over any ten +second period in the past day, and another sustained input. +The "observed_bandwidth" value is the lesser of these two numbers. +Required field. +Added field on August 1, 2012.</li> <li>"advertised_bandwidth": Bandwidth in bytes per second that this relay is willing and capable to provide. Optional field. @@ -265,6 +281,14 @@ found.</li> Optional field. Missing if router descriptor containing this information cannot be found.</li> +<li>"exit_policy_summary": Summary +version of the relay's exit policy containing a dictionary with either an +"accept" or a "reject" element. +If there is an "accept" ("reject") element, the relay accepts (rejects) +all TCP ports or port ranges in the given list for most IP addresses and +rejects (accepts) all other ports. +Optional field. +Added field on August 1, 2012.</li> <li>"contact": Contact address of the relay operator. Omitted if empty or if descriptor containing this information cannot be found.</li>

1 0

r25736: {} add my presentation from today. (in projects/presentations: . images)
by Andrew Lewman 01 Aug '12

01 Aug '12

Author: phobos Date: 2012-08-01 01:25:30 +0000 (Wed, 01 Aug 2012) New Revision: 25736 Added: projects/presentations/2012-07-31-DHS-Tor-Overview.pdf projects/presentations/2012-07-31-DHS-Tor-Overview.tex projects/presentations/images/security-blocks-dec2011.png Log: add my presentation from today. Added: projects/presentations/2012-07-31-DHS-Tor-Overview.pdf =================================================================== (Binary files differ) Property changes on: projects/presentations/2012-07-31-DHS-Tor-Overview.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/presentations/2012-07-31-DHS-Tor-Overview.tex =================================================================== --- projects/presentations/2012-07-31-DHS-Tor-Overview.tex (rev 0) +++ projects/presentations/2012-07-31-DHS-Tor-Overview.tex 2012-08-01 01:25:30 UTC (rev 25736) @@ -0,0 +1,301 @@ +\documentclass{beamer} +\mode<presentation> +\usetheme{Boadilla} +\title{DHS Tor Overview} +\author{Andrew Lewman \\ andrew(a)torproject.org} +\date{July 31, 2012} +\begin{document} + +\begin{frame} +\maketitle +\begin{center} +\includegraphics[height=3cm]{./images/2009-tor-logo} +\end{center} +\end{frame} + +\begin{frame} +\frametitle{What are we talking about?} +\begin{itemize} +\item Crash course on anonymous communications +\item Quick overview of Tor +\item Quick overview of Tor Hidden Services +\item Future directions +\end{itemize} +\end{frame} + +\begin{frame} +\frametitle{The Tor Project, Inc.} +501(c)(3) non-profit organization dedicated to the research and development of technologies for online anonymity and privacy +\begin{center} +\includegraphics[height=5cm]{./images/2009-oval_sticker_new} +\end{center} +\end{frame} + +\begin{frame} +\frametitle{What is anonymity?} +\includegraphics[width=10cm]{./images/2llg3ts} +\end{frame} + +\begin{frame} +\frametitle{Anonymity isn't cryptography} +\begin{itemize} +\item Cryptography protects the contents in transit +\item You still know who is talking to whom, how often, and how much data is sent. +\end{itemize} +\begin{center} +\includegraphics[width=5cm]{./images/encryption-cc-by-sa} +\end{center} +\end{frame} + +\begin{frame} +\frametitle{Anonymity isn't steganography} +Attacker can tell Alice is talking to someone, how often, and how much data is sent. +\bigskip + +\begin{center} +\includegraphics[width=5cm]{./images/steganography-cc-by-sa} +\end{center} +\end{frame} + +\begin{frame} +\frametitle{Anonymity isn't just wishful thinking...} +\begin{itemize} +\item "You can't prove it was me!" +\pause \item "Promise you won't look" +\pause \item "Promise you won't remember" +\pause \item "Promise you won't tell" +\pause \item "I didn't write my name on it!" +\pause \item "Isn't the Internet already anonymous?" +\end{itemize} +\end{frame} + +\begin{frame} +\frametitle{..since "weak" isn't anonymity.} +\begin{itemize} +\item \textit{"You can't prove it was me!"} Proof is a very \textbf{strong} word. Statistical analysis allows suspicion to become certainty. +\pause \item \textit{"Promise you won't look/remember/tell"} Will other parties have the abilities and incentives to keep these promises? +\pause \item \textit{"I didn't write my name on it!"} Not what we're talking about. +\pause \item \textit{"Isn't the Internet already anonymous?"} Nope! +\end{itemize} +\end{frame} + +\begin{frame} +\frametitle{Anonymous communication} +\begin{itemize} +\item People have to hide in a crowd of other people ("anonymity loves company") +\item The goal of the system is to make all users look as similar as possible, to give a bigger crowd +\item Hide who is communicating with whom +\item Layered encryption and random delays hide correlation between input traffic and output traffic +\end{itemize} +\end{frame} + +\begin{frame} +\frametitle{Low versus High-latency anonymous communication systems} +\begin{itemize} +\item Tor is not the first system; ZKS, mixmaster, single-hop proxies, Crowds, Java Anon Proxy. +\item Low-latency systems are vulnerable to end-to-end correlation attacks. +\item High-latency systems are more resistant to end-to-end correlation attacks, but by definition, less interactive. +\end{itemize} +\end{frame} + +\begin{frame} +\frametitle{Low-latency systems are generally more attractive to today's user} +\begin{itemize} +\item Interactive apps: web, instant messaging, VOIP, ssh, X11, cifs/nfs, video streaming (millions of users) +\item Multi-hour delays: email, nntp, blog posting? (tens of thousands of users?) +\pause \item \begin{center}\begin{Large}And if anonymity loves company...\end{Large}\end{center} +\end{itemize} +\end{frame} + +\begin{frame} +\frametitle{What is Tor?} +\begin{itemize} +\item online anonymity software and network +\pause \item open source, freely available (3-clause BSD license) +\pause \item active research environment: \\ +Drexel, Univ of Waterloo, Georgia Tech, Princeton, Boston University, University College London, Univ of Minnesota, National Science Foundation, Naval Research Labs, Cambridge UK, Bamberg Germany, MIT... +\pause \item increasingly diverse toolset: \\ +Tor, Tor Browser Bundle, Tails LiveCD, Tor Weather, Tor auto-responder, Secure Updater, Orbot, Torora, Tor Check, Arm, Nymble, Tor Control, and so on. +\end{itemize} +\end{frame} + +\begin{frame} +\frametitle{Other Systems} +\begin{itemize} +\item VPN - Virtual Private Network, 1 to 1 connection, can redirect all traffic, generally encrypted +\pause \item Proxy - 1 to 1 connection, per application traffic redirection, sometimes encrypted +\pause \item I2P - Garlic routing, closed network, anonymity and reputation +\pause \item Freenet - closed network, anonymity, distributed file storage and sharing +\pause \item GNUnet - closed network, anonymity, distributed file storage and sharing +\end{itemize} +\end{frame} + +\begin{frame} +\frametitle{How is Tor different from other systems?} +\begin{overlayarea}{9cm}{6cm} +\only<1>{\includegraphics[height=7cm]{./images/single_hop_relay}} +\only<2>{\includegraphics[height=7cm]{./images/evil_single_hop_relay}} +\only<3>{\includegraphics[height=7cm]{./images/data_snooping_single_hop_relay}} +\end{overlayarea} +\end{frame} + +\begin{frame} +\frametitle{Who uses Tor?} +\parbox{8cm}{\sloppy \setbeamercolor{background}[\includegraphics[scale=0.35]{./images/anonymousman}} +\parbox{3cm}{\sloppy +\begin{flushleft} +\begin{itemize} +\begin{small} +\item Normal people +\item Law Enforcement +\item Human Rights Activists +\item Business Execs +\item Militaries +\item Abuse Victims +\end{small} +\end{itemize} +\end{flushleft} +} +\end{frame} + +\begin{frame} +\frametitle{Who uses Tor?} +\begin{itemize} +\item <1> \textit{Normal users} \\ linking sensitive information to their current identities, online advertising networks, search engines, censorship circumvention +\item <2> \textit{Law enforcement}\\ accidental disclosure to targets, family and friend concerns, separating work from home life +\item <3> \textit{Rights Activists}\\ Personal safety, family safety, narrowly-defined publicity, censorship circumvention +\item <4> \textit{Business Execs}\\ separating work from home life, competitor research, censorship circumvention +\item <5> \textit{Abuse Victims and Survivors}\\ complete separation of past abuse and current life, finding help and safety, need to help others anonymously +\item <6> \textit{Militaries}\\ intelligence gathering, separating work from home life, other activities +\end{itemize} +\end{frame} + +\begin{frame} +\frametitle{Doesn't Tor enable criminals to do bad things?} +\begin{quotation} +\noindent \includegraphics[width=1cm]{./images/opquo}\quad Criminals can already do bad things. Since they're willing to break laws, they already have lots of options available that provide better privacy than Tor provides. +\end{quotation} +\flushright +\small source: https://www.torproject.org/docs/faq-abuse.html.en\#WhatAboutCriminals +\end{frame} + +\begin{frame} +\frametitle{Breakdown of suspect traffic on the Internet} +\begin{center} +\begin{tabular}{|c|r|} +\hline +\textit{Category} & \textit{Percent}\\ +\hline Botnets & 79.59 \\ +\hline Malicious URLS & 14.32\\ +\hline Antivirus & 3.40\\ +\hline XSS & 1.21\\ +\hline Cookie Stealing & 1.07\\ +\hline Phishing & 0.20\\ +\hline Browser Exploits & 0.10\\ +\hline Adware \& Spyware & 0.07\\ +\hline WRI & 0.02\\ +\hline Anonymizers & 0.02\\ +\hline +\end{tabular} +\end{center} +\flushright +\tiny source: http://research.zscaler.com/2011/12/web-threats-trends-and-statistics.html +\end{frame} + +\begin{frame} +\frametitle{estimated 500k to 900k daily users} +\includegraphics[scale=0.4]{./images/huge-crowd} +\end{frame} + +\begin{frame} +\frametitle{Tor hides communication patterns by relaying data through volunteer servers} +\begin{center} +\begin{overlayarea}{9cm}{6cm} +\only<1>{\includegraphics[width=9cm]{./images/tor-network}} +\only<2>{\includegraphics[width=9cm]{./images/tor-safe-selection}} +\only<3>{\includegraphics[width=9cm]{./images/tor-safe-path}} +\only<4>{\includegraphics[width=9cm]{./images/tor-keys1}} +\end{overlayarea} +\flushright +\tiny Diagram: Robert Watson +\end{center} +\end{frame} + +\begin{frame} +\frametitle{Vidalia Network Map} +\includegraphics[scale=0.4]{./images/vidalia-network-map} +\end{frame} + +\begin{frame} +\frametitle{Metrics} +\begin{itemize} +\item Measuring metrics anonymously +\item NSF grant to find out +\item Archive of hourly consensus, ExoneraTor, VisiTor +\item Metrics portal: \\ \url{https://metrics.torproject.org/} +\end{itemize} +\end{frame} + +\begin{frame} +\frametitle{Tor hidden services allow privacy enhanced hosting of services} +\includegraphics[scale=0.5]{./images/hidden-federalist} +\end{frame} + +\begin{frame} +\frametitle{dot onion you say?} +\includegraphics[scale=0.6]{./images/hidden-federalist-zoom} +\end{frame} + +\begin{frame} +\frametitle{Hidden Services, in graphics} +\begin{overlayarea}{9cm}{6cm} +\only<1>{\includegraphics[scale=0.5]{../../website/trunk/images/THS-1}} +\only<2>{\includegraphics[scale=0.5]{../../website/trunk/images/THS-2}} +\only<3>{\includegraphics[scale=0.5]{../../website/trunk/images/THS-3}} +\only<4>{\includegraphics[scale=0.5]{../../website/trunk/images/THS-4}} +\only<5>{\includegraphics[scale=0.5]{../../website/trunk/images/THS-5}} +\only<6>{\includegraphics[scale=0.5]{../../website/trunk/images/THS-6}} +\end{overlayarea} +\end{frame} + +\begin{frame} +\frametitle{Operating Systems leak info like a sieve} +\parbox{5cm}{\sloppy \setbeamercolor{background}[\includegraphics[height=7cm]{./images/cropped-hijack-sign-south-africa}} +\parbox{5cm}{\begin{itemize} +\item Applications, network stacks, plugins, oh my.... +\pause some call this "sharing" +\pause \item Did you know Microsoft Word and OpenOffice Writer are browsers? +\pause \item \url{www.decloak.net} is a fine test +\end{itemize} +} +\end{frame} + +\begin{frame} +\frametitle{Mobile Operating Systems} +\begin{itemize} +\item Entirely new set of challenges for something designed to know where you are at all times. +\item Orbot: Tor on Android. \url{https://guardianproject.info/apps/} +\item Tor on iphone, maemo/meego, symbian, etc +\item Tor on Windows Mobile, \url{http://www.gsmk.de} as an example. +\item Guardian Project, \url{https://guardianproject.info/} +\end{itemize} +\end{frame} + +\begin{frame} +\frametitle{Thanks!} +\includegraphics[scale=0.6]{./images/thankyou_img} +\flushright +Visit \url{https://www.torproject.org/} for more information, links, and ideas. +\end{frame} + +\begin{frame} +\frametitle{Credits \& Thanks} +\begin{itemize} +\item who uses tor? \url{http://www.flickr.com/photos/mattw/2336507468/siz}, Matt Westervelt, CC-BY-SA. +\item danger!, \url{http://flickr.com/photos/hmvh/58185411/sizes/o/}, hmvh, CC-BY-SA. +\item 500k, \url{http://www.flickr.com/photos/lukaskracic/334850378/sizes/l/}, Luka Skracic, used with permission. +\item zscaler research, http://research.zscaler.com/2011/12/web-threats-trends-and-statistics.html +\end{itemize} +\end{frame} + +\end{document} Property changes on: projects/presentations/2012-07-31-DHS-Tor-Overview.tex ___________________________________________________________________ Added: svn:mime-type + text/x-tex Added: projects/presentations/images/security-blocks-dec2011.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/security-blocks-dec2011.png ___________________________________________________________________ Added: svn:mime-type + image/png

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by mikeperry＠torproject.org 01 Aug '12

01 Aug '12

commit 266dd0d28bbfe6ddc1281f031132825583638168 Merge: 0087524 fb8c3ea Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Jul 31 18:01:09 2012 -0700 Merge branch 'maint-2.2' into maint-2.3 build-scripts/config/prefs.js | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)

1 0