January 2017 - tor-commits - lists.torproject.org

[tor/master] Do not clear is_bad_exit on sybil.
by nickm＠torproject.org 31 Jan '17

31 Jan '17

commit a47c133c869db74024c9ab50801cd6b7553409e4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 31 14:12:14 2017 -0500 Do not clear is_bad_exit on sybil. But do clear is_v2_dir. Fixes bug 21108 -- bugfix on d95e7c7d67134b9b964d49cf8c2bdbf805a in 0.2.0.13-alpha. --- changes/bug21108_029 | 6 ++++++ src/or/dirserv.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/bug21108_029 b/changes/bug21108_029 new file mode … [View More]

1 0

[tor/master] be explicit in clear_status_flags_on_sybil that we leave BadExit alone
by nickm＠torproject.org 31 Jan '17

31 Jan '17

commit 6ff7850f2617a0e565c2fd13deb5aaebf39e974a Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Jan 31 15:06:15 2017 -0500 be explicit in clear_status_flags_on_sybil that we leave BadExit alone --- src/or/dirserv.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index cbed646..1b614b9 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2233,6 +2233,10 @@ dirserv_set_routerstatus_testing(routerstatus_t *rs) /** … [View More]

1 0

[tor/master] Merge branch 'bug21108_029'
by nickm＠torproject.org 31 Jan '17

31 Jan '17

commit a5aec6ac3726d0202be7caa64acf1f02d2eac653 Merge: 09a00a2 6ff7850 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 31 18:51:26 2017 -0500 Merge branch 'bug21108_029' changes/bug21108_029 | 6 ++++++ src/or/dirserv.c | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --cc src/or/dirserv.c index 71dcbb6,1b614b9..59d0c88 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@@ -2230,8 -2231,12 +2230,12 @@@ dirserv_set_routerstatus_testing(router } … [View More]

1 0

[atlas/master] Don't display country flag if country is not defined.
by irl＠torproject.org 31 Jan '17

31 Jan '17

commit 8bd498be6013ef8042c4bc0e0c8a145fadf0f165 Author: Raphael Bergmann <raphael(a)cc-ltd.net> Date: Tue Jan 31 16:42:05 2017 +0100 Don't display country flag if country is not defined. --- templates/details/router.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/details/router.html b/templates/details/router.html index 80beb03..de68424 100644 --- a/templates/details/router.html +++ b/templates/details/router.html @@ -84,7 +84,7 @@ </dd&… [View More]

1 0

[atlas/master] Replaced popover with tooltips function
by irl＠torproject.org 31 Jan '17

31 Jan '17

commit 7a0ee0c7e69b10c33d671395f17c9cf8664bd2f9 Author: Raphael Bergmann <raphael(a)cc-ltd.net> Date: Mon Jan 30 17:41:41 2017 +0100 Replaced popover with tooltips function --- js/main.js | 1 - js/views/about/main.js | 3 +-- js/views/details/main.js | 5 ++--- templates/details/bridge.html | 24 +++++++++++----------- templates/details/router.html | 46 +++++++++++++++++++++---------------------- 5 files changed, 38 insertions(+), 41 deletions(-)… [View More] diff --git a/js/main.js b/js/main.js index 1217c6e..bd91484 100644 --- a/js/main.js +++ b/js/main.js @@ -12,7 +12,6 @@ require.config({ datatablest: 'libs/datatables/dataTables.TorStatus', tooltip: 'libs/bootstrap/bootstrap-tooltip', typeahead: 'libs/bootstrap/bootstrap-typeahead', - popover: 'libs/bootstrap/bootstrap-popover', collapse: 'libs/bootstrap/bootstrap-collapse', d3js: 'libs/d3js/d3.v3.min', jssha: 'libs/jssha/sha1', diff --git a/js/views/about/main.js b/js/views/about/main.js index 87d27e2..2aae5da 100644 --- a/js/views/about/main.js +++ b/js/views/about/main.js @@ -5,7 +5,6 @@ define([ 'underscore', 'backbone', 'text!templates/about.html', - 'popover', 'collapse', 'tooltip' ], function($, _, Backbone, aboutTemplate){ @@ -20,7 +19,7 @@ define([ this.el.html(compiledTemplate); //$("#loading").hide(); //$(".flag .tooltip").hide(); - //$(".tip").popover(); + //$(".tip").tooltip(); $(".flag").hover(function(){ $(this).children(".tooltip").show(); diff --git a/js/views/details/main.js b/js/views/details/main.js index d9a25b1..4becdf9 100644 --- a/js/views/details/main.js +++ b/js/views/details/main.js @@ -10,7 +10,6 @@ define([ 'text!templates/details/bridge.html', 'text!templates/details/error.html', 'tooltip', - 'popover', 'd3js', 'collapse', 'helpers' @@ -241,9 +240,9 @@ define([ } $("#loading").hide(); - $(".flag .tooltip").hide(); - $(".tip").popover(); $(".flags").tooltip(); + $(".flag .tooltip").hide(); + $(".tip").tooltip(); $(".flag").hover(function(){ $(this).children(".tooltip").show(); diff --git a/templates/details/bridge.html b/templates/details/bridge.html index d10fa8e..963858f 100644 --- a/templates/details/bridge.html +++ b/templates/details/bridge.html @@ -14,14 +14,14 @@ <div class="span4"> <h3>Configuration</h3> <dl> - <dt>Nickname</dt> + <dt>Nickname</dt> <dd><%= _.escape(relay.get('nickname')) %></dd> - <dt>OR Addresses</dt> + <dt>OR Addresses</dt> <dd><%= relay.get('or_addresses') %></dd> <dt> - Advertised Bandwidth + Advertised Bandwidth </dt> <dd><%= relay.get('bandwidth_hr') %></dd> </dl> @@ -35,14 +35,14 @@ <% } else { %> <h3>Last Known Properties</h3> <dl> - <dt>Last Seen</dt> + <dt>Last Seen</dt> <dd><%= relay.get('last_seen') %></dd> <% } %> - <dt>Hashed Fingerprint</dt> + <dt>Hashed Fingerprint</dt> <dd><tt><%= relay.get('fingerprint').replace(/(.{20})/g,"$1") %></tt></dd> - <dt>Flags</dt> + <dt>Flags</dt> <dd><% _.each(relay.get('flags'), function(flag) { %> <%= flag[2] %>"> <img class="inline" alt="" src="img/flags/<%= flag[1] %>.png"/> @@ -51,13 +51,13 @@ <% }); %> </dd> - <dt>Last Restarted</dt> + <dt>Last Restarted</dt> <dd><%= relay.get('last_restarted') %></dd> - <dt>Platform</dt> + <dt>Platform</dt> <dd><%= _.escape(relay.get('platform')) %></dd> - <dt>Transport protocols</dt> + <dt>Transport protocols</dt> <dd><%= relay.get('transports') %></dd> </dl> @@ -67,14 +67,14 @@ <dl> <% if (relay.get('running') === false) { %> - <dt>Downtime</dt> + <dt>Downtime</dt> <dd><%= relay.get('downtime') %></dd> <% } else {%> - <dt>Uptime</dt> + <dt>Uptime</dt> <dd><%= relay.get('uptime_hrfull') %></dd> <% } %> - <dt>Running</dt> + <dt>Running</dt> <dd><%= relay.get('running') %></dd> </dl> diff --git a/templates/details/router.html b/templates/details/router.html index c343b8b..80beb03 100644 --- a/templates/details/router.html +++ b/templates/details/router.html @@ -14,23 +14,23 @@ <div class="span4"> <h3>Configuration</h3> <dl> - <dt>Nickname</dt> + <dt>Nickname</dt> <dd><%= _.escape(relay.get('nickname')) %></dd> - <dt>OR Addresses</dt> + <dt>OR Addresses</dt> <dd><%= relay.get('or_addresses') %></dd> - <dt>Contact</dt> + <dt>Contact</dt> <dd><%= _.escape(relay.get('contact')) %></dd> - <dt>Dir Address</dt> + <dt>Dir Address</dt> <dd><%= relay.get('dir_address') %></dd> <dt> - Advertised Bandwidth + Advertised Bandwidth </dt> - <dd> Bandwidth burst: <%= relay.get('bandwidthb') %> Observed bandwidth: <%= relay.get('obandwidth') %>" data-original-title="Bandwidth values"><%= relay.get('bandwidth_hr') %></dd> - <dt>IPv4 Exit Policy Summary</dt> + <dd> Bandwidth burst: <%= relay.get('bandwidthb') %> Observed bandwidth: <%= relay.get('obandwidth') %>" data-original-title="Bandwidth values"><%= relay.get('bandwidth_hr') %></dd> + <dt>IPv4 Exit Policy Summary</dt> <dd> <% if ('accept' in relay.get('exit_policy_summary')) { %> <pre class="pre-scrollable">accept<% _.each(relay.get('exit_policy_summary')['accept'], @@ -39,7 +39,7 @@ <pre class="pre-scrollable">reject<% _.each(relay.get('exit_policy_summary')['reject'], function(ports) { %> <%= $.trim(ports) %><% });} %></pre> </dd> - <dt>IPv6 Exit Policy Summary</dt> + <dt>IPv6 Exit Policy Summary</dt> <dd> <% if (relay.get('exit_policy_v6_summary') && ('accept' in relay.get('exit_policy_v6_summary'))) { %> <pre class="pre-scrollable">accept<% _.each(relay.get('exit_policy_v6_summary')['accept'], @@ -51,7 +51,7 @@ <pre class="pre-scrollable">None defined.</pre> <% } %> </dd> - <dt>Exit Policy</dt> + <dt>Exit Policy</dt> <dd> <pre class="pre-scrollable"><% _.each(relay.get('exit_policy'), function(line) { %> <%= $.trim(line) %><% }); %></pre> @@ -67,14 +67,14 @@ <% } else { %> <h3>Last Known Properties</h3> <dl> - <dt>Last Seen</dt> + <dt>Last Seen</dt> <dd><%= relay.get('last_seen') %></dd> <% } %> - <dt>Fingerprint</dt> + <dt>Fingerprint</dt> <dd><pre><%= relay.get('fingerprint') %></pre></dd> - <dt>Flags</dt> + <dt>Flags</dt> <dd><% _.each(relay.get('flags'), function(flag) { %> <%= flag[2] %>"> <img class="inline" alt="" src="img/flags/<%= flag[1] %>.png"/> @@ -83,31 +83,31 @@ <% }); %> </dd> - <dt>Country</dt> + <dt>Country</dt> <dd><img class="inline country" title="<%= relay.get('countryname') %>" alt="" src="img/cc/<%= relay.get('country') %>.png"/> <%= relay.get('countryname') %></dd> - <dt>AS Number</dt> + <dt>AS Number</dt> <dd><%= _.escape(relay.get('as_no')) %></dd> - <dt>AS Name</dt> + <dt>AS Name</dt> <dd><%= _.escape(relay.get('as_name')) %></dd> - <dt>Last Restarted</dt> + <dt>Last Restarted</dt> <dd><%= relay.get('last_restarted') %></dd> - <dt>Family Members</dt> + <dt>Family Members</dt> <dd><pre><% if (relay.get('effective_family') !== null) { %><% _.each(relay.get('effective_family'), function(member) { %><% var valid = member.match(RegExp("^\$[A-F0-9]{40}$")); %> <% if (valid) { %><a href="#details/<%= member.replace('$', '') %>" title="Effective family member"><% } %><%= member %><% if (valid) { %></a><% }}); %><% } %> <% if (relay.get('alleged_family') !== null) { %><% _.each(relay.get('alleged_family'), function(member) { %><% var valid = member.match(RegExp("^\$[A-F0-9]{40}$")); %> <% if (valid) { %><a href="#details/<%= member.replace('$', '') %>" title="Alleged family member" class="alleged"><% } %><%= member %><% if (valid) { %></a><% }}); %><% } %></pre></dd> - <dt>Descriptor Published</dt> + <dt>Descriptor Published</dt> <dd><%= relay.get('desc_published') %></dd> - <dt>Platform</dt> + <dt>Platform</dt> <dd><%= _.escape(relay.get('platform')) %></dd> - <dt><span class="tip" data-content="Weight assigned to this relay by the directory authorities that clients use in their path selection algorithm. The unit is arbitrary; currently it's kilobytes per second, but that might change in the future." data-original-title="Consensus Weight">Consensus Weight</dt> + <dt><span class="tip" title="Weight assigned to this relay by the directory authorities that clients use in their path selection algorithm. The unit is arbitrary; currently it's kilobytes per second, but that might change in the future." data-original-title="Consensus Weight">Consensus Weight</dt> <dd><%= relay.get('consensus_weight') %></dd> </dl> @@ -117,14 +117,14 @@ <dl> <% if (relay.get('running') === false) { %> - <dt>Downtime</dt> + <dt>Downtime</dt> <dd><%= relay.get('downtime') %></dd> <% } else {%> - <dt>Uptime</dt> + <dt>Uptime</dt> <dd><%= relay.get('uptime_hrfull') %></dd> <% } %> - <dt>Running</dt> + <dt>Running</dt> <dd><%= relay.get('running') %></dd> </dl> [View Less]

1 0

[atlas/master] Fixed tooltips not working after filtering the search results table
by irl＠torproject.org 31 Jan '17

31 Jan '17

commit fce72d504ee16c74efb48abe578dc248d0a027e3 Author: Raphael Bergmann <raphael(a)cc-ltd.net> Date: Mon Jan 30 17:43:52 2017 +0100 Fixed tooltips not working after filtering the search results table --- js/views/search/do.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/js/views/search/do.js b/js/views/search/do.js index 13fe93c..4226dd8 100644 --- a/js/views/search/do.js +++ b/js/views/search/do.js @@ -157,12 +157,14 @@ define([ // Save … [View More]

1 0

[atlas/master] Separated effective and alleged family members more clearly
by irl＠torproject.org 31 Jan '17

31 Jan '17

commit 98ebb84d3971099970ce43f0700fd3cb9a56142a Author: Raphael Bergmann <raphael(a)cc-ltd.net> Date: Tue Jan 31 14:22:18 2017 +0100 Separated effective and alleged family members more clearly --- templates/details/router.html | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/templates/details/router.html b/templates/details/router.html index de68424..d3f80ed 100644 --- a/templates/details/router.html +++ b/templates/details/router.html @@ -96,10 +… [View More]

1 0

[atlas/master] Explain relay flags in detail view using tooltips
by irl＠torproject.org 31 Jan '17

31 Jan '17

commit 8b0d64ab54c7dc88e1d1135d0edd76363451d00b Author: Raphael Bergmann <raphael(a)cc-ltd.net> Date: Thu Jan 19 18:34:20 2017 +0100 Explain relay flags in detail view using tooltips --- css/style.css | 14 ++++++++++++++ js/models/relay.js | 29 +++++++++++++++++------------ js/views/details/main.js | 1 + templates/details/bridge.html | 4 +++- templates/details/router.html | 6 ++++-- templates/search/do.html | 2 +- 6 files changed, 40 … [View More]insertions(+), 16 deletions(-) diff --git a/css/style.css b/css/style.css index 71a63b9..3c67c24 100644 --- a/css/style.css +++ b/css/style.css @@ -52,3 +52,17 @@ a.alleged { color: #FE9F30; } + + +span.flags { + display:inline-block; + margin: 0 10px 5px 0; +} +span.flags img { + position:relative; + top:2px; +} + +.tooltip * { + text-align:left; +} diff --git a/js/models/relay.js b/js/models/relay.js index c8604db..e374ae4 100644 --- a/js/models/relay.js +++ b/js/models/relay.js @@ -14,41 +14,46 @@ define([ var model = this; _.each(flags, function(flag) { if (flag == "Authority") { - output.push([flag,"award_stroke_"+size[2]]); + output.push([flag,"award_stroke_"+size[2], "This relay is a directory authority."]); } if (flag == "BadExit") { model.set({badexit: true}); - output.push([flag, "denied_"+size[0]]); + output.push([flag, "denied_"+size[0], "This relay is believed to be useless as an exit node (because its ISP censors it, because it is behind a restrictive proxy, or for some similar reason)."]); } if (flag == "Fast") { - output.push([flag,"bolt_"+size[0]]); + output.push([flag,"bolt_"+size[0], "This relay is suitable for high-bandwidth circuits."]); } if (flag == "Guard") { - output.push([flag,"share_"+size[0]]); + output.push([flag,"share_"+size[0], "This relay is suitable for use as an entry guard."]); } if (flag == "HSDir") { - output.push([flag,"book_alt_"+size[0]]); + output.push([flag,"book_alt_"+size[0], "This relay is considered a v2 hidden service directory."]); } if (flag == "Named") { - output.push([flag,"info_"+size[2]]); + output.push([flag,"info_"+size[2], "This relay's identity-nickname mapping is canonical, and this authority binds names."]); } + /* added for future use, but we need an icon... + if (flag == "NoEdConsensus") { + output.push([flag,"xxx_"+size[2], "An Ed25519 key in the relay's descriptor or microdesriptor does not reflect authority consensus."]); + } + */ if (flag == "Running") { - output.push([flag,"fork_"+size[1]]); + output.push([flag,"fork_"+size[1], "This relay is currently usable."]); } if (flag == "Stable") { - output.push([flag,"cd_"+size[0]]); + output.push([flag,"cd_"+size[0], "This relay is suitable for long-lived circuits."]); } if (flag == "V2Dir") { - output.push([flag,"book_"+size[1]]); + output.push([flag,"book_"+size[1], "This relay implements the v2 directory protocol or higher."]); } if (flag == "Valid") { - output.push([flag,"check_alt_"+size[0]]); + output.push([flag,"check_alt_"+size[0], "This relay has been 'validated'."]); } if (flag == "Unnamed") { - output.push([flag,"question_mark_"+size[2]]); + output.push([flag,"question_mark_"+size[2], "Another relay has bound the name used by this relay, and this authority binds names."]); } if (flag == "Exit") { - output.push([flag,"cloud_download_"+size[0]]); + output.push([flag,"cloud_download_"+size[0], "This relay is more useful for building general-purpose exit circuits than for relay circuits."]); } }); return output; diff --git a/js/views/details/main.js b/js/views/details/main.js index 97846be..d9a25b1 100644 --- a/js/views/details/main.js +++ b/js/views/details/main.js @@ -243,6 +243,7 @@ define([ $("#loading").hide(); $(".flag .tooltip").hide(); $(".tip").popover(); + $(".flags").tooltip(); $(".flag").hover(function(){ $(this).children(".tooltip").show(); diff --git a/templates/details/bridge.html b/templates/details/bridge.html index 99ffdd3..d10fa8e 100644 --- a/templates/details/bridge.html +++ b/templates/details/bridge.html @@ -44,8 +44,10 @@ <dt>Flags</dt> <dd><% _.each(relay.get('flags'), function(flag) { %> - <img class="inline" alt="" src="img/flags/<%= flag[1] %>.png"> + <%= flag[2] %>"> + <img class="inline" alt="" src="img/flags/<%= flag[1] %>.png"/> <%= flag[0] %> + <% }); %> </dd> diff --git a/templates/details/router.html b/templates/details/router.html index f87001f..c343b8b 100644 --- a/templates/details/router.html +++ b/templates/details/router.html @@ -76,8 +76,10 @@ <dt>Flags</dt> <dd><% _.each(relay.get('flags'), function(flag) { %> - <img class="inline" alt="" src="img/flags/<%= flag[1] %>.png"> - <%= flag[0] %> + <%= flag[2] %>"> + <img class="inline" alt="" src="img/flags/<%= flag[1] %>.png"/> + <%= flag[0] %> + <% }); %> </dd> diff --git a/templates/search/do.html b/templates/search/do.html index ebb2508..2e2a71b 100644 --- a/templates/search/do.html +++ b/templates/search/do.html @@ -93,7 +93,7 @@ <td><%= relay.get('or_address') %></td> <td> <% _.each(relay.get('flags'), function(flag) { %> - <img class="inline flags" rel="tooltip" src="img/flags/<%= flag[1] %>.png" alt="<%= flag[0] %>" title="<%= flag[0] %>"/> + <img class="inline flags" rel="tooltip" src="img/flags/<%= flag[1] %>.png" alt="<%= flag[0] %>" title="<%= flag[0] %> <%= flag[2] %>"/> <% }); %> </td> <td><%= relay.get('or_port') %></td> [View Less]

1 0

[atlas/master] Use pre for fingerprint on bridge page too (Fixes: #21350)
by irl＠torproject.org 31 Jan '17

31 Jan '17

commit 61dfcd6bc354e6c91a71e1bae38119c54fc6678e Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Tue Jan 31 22:50:03 2017 +0000 Use pre for fingerprint on bridge page too (Fixes: #21350) Comment from cypherpunks: "My patch only addressed the issue on the router page. I forgot about the bridge page." Don't feel too bad cypherpunks, so did I. --- templates/details/bridge.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/details/… [View More]

1 0

[atlas/master] Removes deprecated attributes from search results table (Fixes: #21292)
by irl＠torproject.org 31 Jan '17

31 Jan '17

commit e5a3f7042972889bcaffc4bc81255c38136386e1 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Mon Jan 30 02:15:15 2017 +0000 Removes deprecated attributes from search results table (Fixes: #21292) --- templates/search/do.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/search/do.html b/templates/search/do.html index 2e2a71b..c534f7a 100644 --- a/templates/search/do.html +++ b/templates/search/do.html @@ -51,7 +51,7 @@ <% } %> <… [View More]

1 0