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@torproject.org>
This commit is contained in:
David Goulet 2017-11-01 12:15:15 -04:00 committed by Nick Mathewson
parent cb42c62c9e
commit 0386280487
2 changed files with 9 additions and 1 deletions

5
changes/bug24025 Normal file
View File

@ -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.

View File

@ -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) {