nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

solve the first half of bug 199: if we don't like the looks

Browse Source 
of an address, but it's the controller's job to handle it,
don't refuse it first.


svn:r5287
This commit is contained in:
Roger Dingledine 2005-10-19 02:07:11 +00:00
parent 1bd3f6cc9a
commit 4df1892db1
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/or/connection_edge.c
View File

@ -925,6 +925,7 @@ connection_ap_handshake_process_socks(connection_t *conn)
socks_request_t *socks; socks_request_t *socks;
int sockshere; int sockshere;
hostname_type_t addresstype; hostname_type_t addresstype;
int tor_should_handle_stream = !get_options()->LeaveStreamsUnattached;
tor_assert(conn); tor_assert(conn);
tor_assert(conn->type == CONN_TYPE_AP); tor_assert(conn->type == CONN_TYPE_AP);
@ -963,7 +964,8 @@ connection_ap_handshake_process_socks(connection_t *conn)
/* For address map controls, remap the address */ /* For address map controls, remap the address */
addressmap_rewrite(socks->address, sizeof(socks->address)); addressmap_rewrite(socks->address, sizeof(socks->address));
if (address_is_in_virtual_range(socks->address)) { if (tor_should_handle_stream &&
address_is_in_virtual_range(socks->address)) {
/* This address was probably handed out by client_dns_get_unmapped_address, /* This address was probably handed out by client_dns_get_unmapped_address,
* but the mapping was discarded for some reason. We *don't* want to send * but the mapping was discarded for some reason. We *don't* want to send
* the address through tor; that's likely to fail, and may leak * the address through tor; that's likely to fail, and may leak
@ -980,7 +982,7 @@ connection_ap_handshake_process_socks(connection_t *conn)
*/ */
addresstype = parse_extended_hostname(socks->address); addresstype = parse_extended_hostname(socks->address);
if (addresstype == BAD_HOSTNAME) { if (tor_should_handle_stream && addresstype == BAD_HOSTNAME) {
log_fn(LOG_WARN, "Invalid hostname %s; rejecting", socks->address); log_fn(LOG_WARN, "Invalid hostname %s; rejecting", socks->address);
connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL); connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL);
return -1; return -1;
@ -1008,7 +1010,7 @@ connection_ap_handshake_process_socks(connection_t *conn)
/* XXXX Should this use server->address instead? */ /* XXXX Should this use server->address instead? */
in.s_addr = htonl(r->addr); in.s_addr = htonl(r->addr);
strlcpy(socks->address, inet_ntoa(in), sizeof(socks->address)); strlcpy(socks->address, inet_ntoa(in), sizeof(socks->address));
} else { } else if (tor_should_handle_stream) {
log_fn(LOG_WARN, log_fn(LOG_WARN,
"Unrecognized server in exit address '%s.exit'. Refusing.", "Unrecognized server in exit address '%s.exit'. Refusing.",
safe_str(socks->address)); safe_str(socks->address));
@ -1021,7 +1023,8 @@ connection_ap_handshake_process_socks(connection_t *conn)
if (addresstype != ONION_HOSTNAME) { if (addresstype != ONION_HOSTNAME) {
/* not a hidden-service request (i.e. normal or .exit) */ /* not a hidden-service request (i.e. normal or .exit) */
if (address_is_invalid_destination(socks->address)) { if (tor_should_handle_stream &&
address_is_invalid_destination(socks->address)) {
log_fn(LOG_WARN,"Destination '%s' seems to be an invalid hostname. Failing.", log_fn(LOG_WARN,"Destination '%s' seems to be an invalid hostname. Failing.",
safe_str(socks->address)); safe_str(socks->address));
connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL); connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL);