nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-03 17:13:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

dirparse: reject votes with invalid recommended/required protocols

Browse Source
This commit is contained in:
cypherpunks 2020-02-08 21:11:44 +00:00
parent ad1b378e87
commit 8d89aa5eea
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/feature/dirparse/ns_parse.c
View File

@ -1168,16 +1168,25 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out,
}
}
// Reject the vote if any of the protocols lines are malformed.
if ((tok = find_opt_by_keyword(tokens, K_RECOMMENDED_CLIENT_PROTOCOLS))) {
if (protover_contains_long_protocol_names(tok->args[0]))
goto err;
ns->recommended_client_protocols = tor_strdup(tok->args[0]);
}
if ((tok = find_opt_by_keyword(tokens, K_RECOMMENDED_RELAY_PROTOCOLS))) {
if (protover_contains_long_protocol_names(tok->args[0]))
goto err;
ns->recommended_relay_protocols = tor_strdup(tok->args[0]);
}
if ((tok = find_opt_by_keyword(tokens, K_REQUIRED_CLIENT_PROTOCOLS))) {
if (protover_contains_long_protocol_names(tok->args[0]))
goto err;
ns->required_client_protocols = tor_strdup(tok->args[0]);
}
if ((tok = find_opt_by_keyword(tokens, K_REQUIRED_RELAY_PROTOCOLS))) {
if (protover_contains_long_protocol_names(tok->args[0]))
goto err;
ns->required_relay_protocols = tor_strdup(tok->args[0]);
}