vote: TROVE-2018-005 Make DirAuths omit misbehaving routers from their vote.

This commit is contained in:
Isis Lovecruft 2018-05-07 23:59:06 +00:00 committed by Nick Mathewson
parent 701c2b69f5
commit 3283619acf
3 changed files with 19 additions and 0 deletions

View File

@ -4358,6 +4358,12 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key,
microdescriptors = smartlist_new();
SMARTLIST_FOREACH_BEGIN(routers, routerinfo_t *, ri) {
/* If it has a protover list and contains a protocol name greater than
* MAX_PROTOCOL_NAME_LENGTH, skip it. */
if (ri->protocol_list &&
protover_contains_long_protocol_names(ri->protocol_list)) {
continue;
}
if (ri->cache_info.published_on >= cutoff) {
routerstatus_t *rs;
vote_routerstatus_t *vrs;

View File

@ -276,6 +276,18 @@ parse_protocol_list(const char *s)
return NULL;
}
/**
* Return true if the unparsed protover in <b>s</b> would contain a protocol
* name longer than MAX_PROTOCOL_NAME_LENGTH, and false otherwise.
*/
bool
protover_contains_long_protocol_names(const char *s)
{
if (!parse_protocol_list(s))
return true;
return false;
}
/**
* Given a protocol type and version number, return true iff we know
* how to speak that protocol.

View File

@ -42,6 +42,7 @@ typedef enum protocol_type_t {
PRT_CONS,
} protocol_type_t;
bool protover_contains_long_protocol_names(const char *s);
int protover_all_supported(const char *s, char **missing);
int protover_is_supported_here(protocol_type_t pr, uint32_t ver);
const char *protover_get_supported_protocols(void);