|
@@ -971,6 +971,7 @@ handle_control_authenticate(control_connection_t *conn, uint32_t len,
|
|
|
"551 Invalid hexadecimal encoding. Maybe you tried a plain text "
|
|
|
"password? If so, the standard requires that you put it in "
|
|
|
"double quotes.\r\n", conn);
|
|
|
+ connection_mark_for_close(TO_CONN(conn));
|
|
|
tor_free(password);
|
|
|
return 0;
|
|
|
}
|
|
@@ -981,6 +982,7 @@ handle_control_authenticate(control_connection_t *conn, uint32_t len,
|
|
|
if (!get_escaped_string(body, len, &password, &password_len)) {
|
|
|
connection_write_str_to_buf("551 Invalid quoted string. You need "
|
|
|
"to put the password in double quotes.\r\n", conn);
|
|
|
+ connection_mark_for_close(TO_CONN(conn));
|
|
|
return 0;
|
|
|
}
|
|
|
used_quoted_string = 1;
|
|
@@ -1032,6 +1034,7 @@ handle_control_authenticate(control_connection_t *conn, uint32_t len,
|
|
|
errstr = "Unknown reason.";
|
|
|
connection_printf_to_buf(conn, "515 Authentication failed: %s\r\n",
|
|
|
errstr);
|
|
|
+ connection_mark_for_close(TO_CONN(conn));
|
|
|
return 0;
|
|
|
ok:
|
|
|
log_info(LD_CONTROL, "Authenticated control connection (%d)", conn->_base.s);
|
|
@@ -2439,6 +2442,7 @@ connection_control_process_inbuf(control_connection_t *conn)
|
|
|
if (conn->_base.state == CONTROL_CONN_STATE_NEEDAUTH &&
|
|
|
strcasecmp(conn->incoming_cmd, "AUTHENTICATE")) {
|
|
|
connection_write_str_to_buf("514 Authentication required.\r\n", conn);
|
|
|
+ connection_mark_for_close(TO_CONN(conn));
|
|
|
conn->incoming_cmd_cur_len = 0;
|
|
|
goto again;
|
|
|
}
|