mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 22:58:50 +01:00
Code Issues Projects Releases Wiki Activity

Even when we can't answer an AUTH_CHALLENGE, send NETINFO.

Browse source 
Fixes bug 4368; fix on 0.2.3.6-alpha; bug found by "frosty".
This commit is contained in:
Nick Mathewson 2011-11-03 12:40:02 -04:00
parent 88c4b425bd
commit 325a659cb1
2 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changes/bug4368 Normal file
View file

@ -0,0 +1,4 @@
o Minor bugfixes:
- If a relay receives an AUTH_CHALLENGE it can't answer, it should
still send a NETINFO cell to allow the connection to become open.
Fixes bug 4368; fix on 0.2.3.6-alpha; bug found by "frosty".

25
src/or/command.c
View file

@ -1100,7 +1100,14 @@ command_process_auth_challenge_cell(var_cell_t *cell, or_connection_t *conn)
conn->handshake_state->received_auth_challenge = 1;
if (use_type >= 0 && public_server_mode(get_options())) {
if (! public_server_mode(get_options())) {
/* If we're not a public server then we don't want to authenticate on a
connection we originated, and we already sent a NETINFO cell when we
got the CERTS cell. We have nothing more to do. */
return;
}
if (use_type >= 0) {
log_info(LD_OR, "Got an AUTH_CHALLENGE cell from %s:%d: Sending "
"authentication",
safe_str(conn->_base.address), conn->_base.port);
@ -1110,16 +1117,18 @@ command_process_auth_challenge_cell(var_cell_t *cell, or_connection_t *conn)
connection_mark_for_close(TO_CONN(conn));
return;
}
if (connection_or_send_netinfo(conn) < 0) {
log_warn(LD_OR, "Couldn't send netinfo cell");
connection_mark_for_close(TO_CONN(conn));
return;
}
} else {
log_info(LD_OR, "Got an AUTH_CHALLENGE cell from %s:%d: Not "
"authenticating",
log_info(LD_OR, "Got an AUTH_CHALLENGE cell from %s:%d, but we don't "
"know any of its authentication types. Not authenticating.",
safe_str(conn->_base.address), conn->_base.port);
}
if (connection_or_send_netinfo(conn) < 0) {
log_warn(LD_OR, "Couldn't send netinfo cell");
connection_mark_for_close(TO_CONN(conn));
return;
}
#undef ERR
}