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

reject odd-looking addresses at the client, rather than having

Browse source 
the server drop them because they're malformed.


svn:r3493
This commit is contained in:
Roger Dingledine 2005-02-01 12:19:44 +00:00
parent d9ec1a6fe9
commit b90983e44f
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/or/connection_edge.c
View file

@ -329,6 +329,17 @@ void connection_ap_attach_pending(void)
} }
} }
/** Return 1 if <b>address</b> has funny characters in it like
* colons. Return 0 if it's fine.
*/
static int
address_is_invalid_destination(const char *address) {
/* FFFF should flesh this out */
if (strchr(address,':'))
return 1;
return 0;
}
/** connection_edge_process_inbuf() found a conn in state /** connection_edge_process_inbuf() found a conn in state
* socks_wait. See if conn->inbuf has the right bytes to proceed with * socks_wait. See if conn->inbuf has the right bytes to proceed with
* the socks handshake. * the socks handshake.
@ -381,7 +392,7 @@ static int connection_ap_handshake_process_socks(connection_t *conn) {
/* .exit -- modify conn to specify the exit node. */ /* .exit -- modify conn to specify the exit node. */
char *s = strrchr(socks->address,'.'); char *s = strrchr(socks->address,'.');
if (!s || s[1] == '\0') { if (!s || s[1] == '\0') {
log_fn(LOG_WARN,"Malformed address '%s.exit'. Refusing.", socks->address); log_fn(LOG_WARN,"Malformed exit address '%s'. Refusing.", socks->address);
return -1; return -1;
} }
conn->chosen_exit_name = tor_strdup(s+1); conn->chosen_exit_name = tor_strdup(s+1);
@ -391,6 +402,11 @@ static int 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)) {
log_fn(LOG_WARN,"Destination '%s' seems to be an invalid hostname. Failing.", socks->address);
return -1;
}
if (socks->command == SOCKS_COMMAND_RESOLVE) { if (socks->command == SOCKS_COMMAND_RESOLVE) {
uint32_t answer = 0; uint32_t answer = 0;
struct in_addr in; struct in_addr in;