nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make the "2 unknown, 7 missing key..." messages easier to understand

Browse Source 
This patch should fix the cases we care about for bugs 1290 and 1145.

     "30-56-99 are correct. Limited 4 and 8 are missing".
This commit is contained in:
Nick Mathewson 2010-08-19 11:13:35 -04:00
parent 1f81474b2e
commit 6f9f1f3324
2 changed files with 44 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/prettier-signature-log Normal file
View File

@ -0,0 +1,5 @@
o Minor features
- Make the formerly ugly "2 unknown, 7 missing key, 0 good, 0 bad,
2 no signature, 4 required" messages easier to read, and make sure
they get logged at the same severity as the messages explaining
which keys are which.

48
src/or/networkstatus.c
View File

@ -542,31 +542,61 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus,
if (warn >= 0) { if (warn >= 0) {
SMARTLIST_FOREACH(unrecognized, networkstatus_voter_info_t *, voter, SMARTLIST_FOREACH(unrecognized, networkstatus_voter_info_t *, voter,
{ {
log_info(LD_DIR, "Consensus includes unrecognized authority '%s' " log(severity, LD_DIR, "Consensus includes unrecognized authority "
"at %s:%d (contact %s; identity %s)", "'%s' at %s:%d (contact %s; identity %s)",
voter->nickname, voter->address, (int)voter->dir_port, voter->nickname, voter->address, (int)voter->dir_port,
voter->contact?voter->contact:"n/a", voter->contact?voter->contact:"n/a",
hex_str(voter->identity_digest, DIGEST_LEN)); hex_str(voter->identity_digest, DIGEST_LEN));
}); });
SMARTLIST_FOREACH(need_certs_from, networkstatus_voter_info_t *, voter, SMARTLIST_FOREACH(need_certs_from, networkstatus_voter_info_t *, voter,
{ {
log_info(LD_DIR, "Looks like we need to download a new certificate " log(severity, LD_DIR, "Looks like we need to download a new "
"from authority '%s' at %s:%d (contact %s; identity %s)", "certificate from authority '%s' at %s:%d (contact %s; "
"identity %s)",
voter->nickname, voter->address, (int)voter->dir_port, voter->nickname, voter->address, (int)voter->dir_port,
voter->contact?voter->contact:"n/a", voter->contact?voter->contact:"n/a",
hex_str(voter->identity_digest, DIGEST_LEN)); hex_str(voter->identity_digest, DIGEST_LEN));
}); });
SMARTLIST_FOREACH(missing_authorities, trusted_dir_server_t *, ds, SMARTLIST_FOREACH(missing_authorities, trusted_dir_server_t *, ds,
{ {
log_info(LD_DIR, "Consensus does not include configured " log(severity, LD_DIR, "Consensus does not include configured "
"authority '%s' at %s:%d (identity %s)", "authority '%s' at %s:%d (identity %s)",
ds->nickname, ds->address, (int)ds->dir_port, ds->nickname, ds->address, (int)ds->dir_port,
hex_str(ds->v3_identity_digest, DIGEST_LEN)); hex_str(ds->v3_identity_digest, DIGEST_LEN));
}); });
log(severity, LD_DIR, {
"%d unknown, %d missing key, %d good, %d bad, %d no signature, " smartlist_t *sl = smartlist_create();
"%d required", n_unknown, n_missing_key, n_good, n_bad, char *cp;
n_no_signature, n_required); tor_asprintf(&cp, "A consensus needs %d good signatures from recognized "
"authorities for us to accept it. This one has %d.",
n_required, n_good);
smartlist_add(sl,cp);
if (n_no_signature) {
tor_asprintf(&cp, "%d of the authorities we know didn't sign it.",
n_no_signature);
smartlist_add(sl,cp);
}
if (n_unknown) {
tor_asprintf(&cp, "It has %d signatures from authorities we don't "
"recognize.", n_unknown);
smartlist_add(sl,cp);
}
if (n_bad) {
tor_asprintf(&cp, "%d of the signatures on it didn't verify "
"correctly.", n_bad);
smartlist_add(sl,cp);
}
if (n_missing_key) {
tor_asprintf(&cp, "We were unable to check %d of the signatures, "
"because we were missing the keys.", n_missing_key);
smartlist_add(sl,cp);
}
cp = smartlist_join_strings(sl, " ", 0, NULL);
log(severity, LD_DIR, "%s", cp);
tor_free(cp);
SMARTLIST_FOREACH(sl, char *, c, tor_free(c));
smartlist_free(sl);
}
} }
smartlist_free(unrecognized); smartlist_free(unrecognized);