commit 17f9c80e678472aaf711365e8423becb4067f56b Author: Iain R. Learmonth irl@fsfe.org Date: Fri Jul 6 13:13:01 2018 +0100
Restrict scary warning to obsolete relays
This restricts the scary warning informing relay operators to upgrade as soon as possible to only outdated relays according to the Onionoo version_status field.
Fixes: #25199 --- src/main/resources/web/js/rs/models/relay.js | 2 +- src/main/resources/web/templates/rs/details/router.html | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/web/js/rs/models/relay.js b/src/main/resources/web/js/rs/models/relay.js index cfb6dec..d01f748 100644 --- a/src/main/resources/web/js/rs/models/relay.js +++ b/src/main/resources/web/js/rs/models/relay.js @@ -60,7 +60,7 @@ define([ var model = this; _.each(flags, function(flag) { if (flag == "Not Recommended") { - output.push([flag,"notrecommended", "This relay is running a Tor version that is not recommended by the directory authorities and may contain known issues."]); + output.push([flag,"notrecommended", "This relay is running a Tor version that is not recommended by the directory authorities and may contain known issues. This includes both obsolete and experimental versions."]); } if (flag == "Unmeasured") { output.push([flag,"unmeasured", "This relay has not been measured by at least 3 bandwidth authorities and so its consensus weight is currently capped. This is expected for new relays."]); diff --git a/src/main/resources/web/templates/rs/details/router.html b/src/main/resources/web/templates/rs/details/router.html index ef0508c..c5ff77f 100644 --- a/src/main/resources/web/templates/rs/details/router.html +++ b/src/main/resources/web/templates/rs/details/router.html @@ -10,13 +10,11 @@ <% if (relay.get('new_relay') === true) {%> <div class="alert alert-info">This relay appears to be less than 2 weeks old. <a href="https://blog.torproject.org/lifecycle-new-relay">This blog post</a> explains the lifecycle of a new relay, and why it will not be immediately fully used to capacity.</div> <% } %> -<% if (relay.get('recommended_version') === false && relay.get('version_consistent') == true) { %> -<div class="alert alert-danger">This relay is running a version of Tor that is not recommended. -It is most likely too old and may be missing important security fixes. If -this is the case, and this is your relay, you should update it as soon as -possible. Development versions (versions that are too new) will also trigger -this warning message (see bug <a -href="https://bugs.torproject.org/24256%22%3E#24256</a>).</div> +<% if (relay.get('version_status') === 'obsolete' + && relay.get('version_consistent') == true) { %> +<div class="alert alert-danger">This relay is running a version of Tor that is +too old and may be missing important security fixes. If this is your relay, you +should update it as soon as possible.</div> <% } %> <div class="row"> <div class="col-md-6">