[tor-commits] [tor/maint-0.3.2] nodelist: Downgrade warning to protocol warning

[nickm at torproject.org]

commit 0386280487fce78b73e060234f515b850af9c589
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed Nov 1 12:15:15 2017 -0400

    nodelist: Downgrade warning to protocol warning
    
    The node_get_ed25519_id() warning can actually be triggered by a relay flagged
    with NoEdConsensus so instead of triggering a warning on all relays of the
    network, downgrade it to protocol warning.
    
    Fixes #24025
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 changes/bug24025  | 5 +++++
 src/or/nodelist.c | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/changes/bug24025 b/changes/bug24025
new file mode 100644
index 000000000..1d7841af5
--- /dev/null
+++ b/changes/bug24025
@@ -0,0 +1,5 @@
+  o Minor bugfixes (logging, relay):
+    - Downgrade a warning to a protocol warning in the case the ed25519 key is
+      not consistent between the descriptor and micro descriptor of a relay.
+      This can happen for instance if the relay has been flagged
+      NoEdConsensus. Fixes bug 24025; bugfix on 0.3.2.1-alpha.
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index f5a2cddf4..f2e979be8 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -924,7 +924,10 @@ node_get_ed25519_id(const node_t *node)
     if (ed25519_pubkey_eq(ri_pk, md_pk)) {
       return ri_pk;
     } else {
-      log_warn(LD_GENERAL, "Inconsistent ed25519 identities in the nodelist");
+      /* This can happen if the relay gets flagged NoEdConsensus which will be
+       * triggered on all relays of the network. Thus a protocol warning. */
+      log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
+             "Inconsistent ed25519 identities in the nodelist");
       return NULL;
     }
   } else if (ri_pk) {