nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.5'

Browse Source
This commit is contained in:
George Kadianakis 2021-01-22 00:21:21 +02:00
commit 74cfe3611f
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug40238 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (logging):
- Reject obsolete router/extrainfo descs earlier and more quietly.
Fixes bug 40238; bugfix on 0.4.5.1-alpha.

11
src/feature/dirparse/routerparse.c
View File

@ -456,6 +456,12 @@ router_parse_entry_from_string(const char *s, const char *end,
}
}
if (!tor_memstr(s, end-s, "\nproto ")) {
log_debug(LD_DIR, "Found an obsolete router descriptor. "
"Rejecting quietly.");
goto err;
}
if (router_get_router_hash(s, end - s, digest) < 0) {
log_warn(LD_DIR, "Couldn't compute router hash.");
goto err;
@ -991,6 +997,11 @@ extrainfo_parse_entry_from_string(const char *s, const char *end,
while (end > s+2 && *(end-1) == '\n' && *(end-2) == '\n')
--end;
if (!tor_memstr(s, end-s, "\nidentity-ed25519")) {
log_debug(LD_DIR, "Found an obsolete extrainfo. Rejecting quietly.");
goto err;
}
if (router_get_extrainfo_hash(s, end-s, digest) < 0) {
log_warn(LD_DIR, "Couldn't compute router hash.");
goto err;