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

Fix for 152: reject malformed .onion addresses rather then passing them on

Browse Source 
svn:r4329
This commit is contained in:
Nick Mathewson 2005-06-07 18:01:46 +00:00
parent 2118e5798a
commit 621ab95e59
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/or/connection_edge.c
View File

@ -911,6 +911,12 @@ static int connection_ap_handshake_process_socks(connection_t *conn) {
*/ */
addresstype = parse_extended_hostname(socks->address); addresstype = parse_extended_hostname(socks->address);
if (addresstype == BAD_HOSTNAME) {
log_fn(LOG_WARN, "Invalid hostname %s; rejecting", socks->address);
connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL);
return -1;
}
if (addresstype == EXIT_HOSTNAME) { if (addresstype == EXIT_HOSTNAME) {
/* foo.exit -- modify conn->chosen_exit_node to specify the exit /* foo.exit -- modify conn->chosen_exit_node to specify the exit
* node, and conn->address to hold only the address portion.*/ * node, and conn->address to hold only the address portion.*/
@ -1712,6 +1718,6 @@ parse_extended_hostname(char *address) {
failed: failed:
/* otherwise, return to previous state and return 0 */ /* otherwise, return to previous state and return 0 */
*s = '.'; *s = '.';
return NORMAL_HOSTNAME; return BAD_HOSTNAME;
} }

2
src/or/or.h
View File

@ -1377,7 +1377,7 @@ int socks_policy_permits_address(uint32_t addr);
void set_exit_redirects(smartlist_t *lst); void set_exit_redirects(smartlist_t *lst);
typedef enum hostname_type_t { typedef enum hostname_type_t {
NORMAL_HOSTNAME, ONION_HOSTNAME, EXIT_HOSTNAME NORMAL_HOSTNAME, ONION_HOSTNAME, EXIT_HOSTNAME, BAD_HOSTNAME
} hostname_type_t; } hostname_type_t;
hostname_type_t parse_extended_hostname(char *address); hostname_type_t parse_extended_hostname(char *address);

4
src/or/test.c
View File

@ -1384,6 +1384,7 @@ test_rend_fns(void)
char address1[] = "fooaddress.onion"; char address1[] = "fooaddress.onion";
char address2[] = "aaaaaaaaaaaaaaaa.onion"; char address2[] = "aaaaaaaaaaaaaaaa.onion";
char address3[] = "fooaddress.exit"; char address3[] = "fooaddress.exit";
char address4[] = "tor.eff.org";
rend_service_descriptor_t *d1, *d2; rend_service_descriptor_t *d1, *d2;
char *encoded; char *encoded;
size_t len; size_t len;
@ -1412,9 +1413,10 @@ test_rend_fns(void)
test_streq(d2->intro_points[1], "crow"); test_streq(d2->intro_points[1], "crow");
test_streq(d2->intro_points[2], "joel"); test_streq(d2->intro_points[2], "joel");
test_eq(NORMAL_HOSTNAME, parse_extended_hostname(address1)); test_eq(BAD_HOSTNAME, parse_extended_hostname(address1));
test_eq(ONION_HOSTNAME, parse_extended_hostname(address2)); test_eq(ONION_HOSTNAME, parse_extended_hostname(address2));
test_eq(EXIT_HOSTNAME, parse_extended_hostname(address3)); test_eq(EXIT_HOSTNAME, parse_extended_hostname(address3));
test_eq(NORMAL_HOSTNAME, parse_extended_hostname(address4));
rend_service_descriptor_free(d1); rend_service_descriptor_free(d1);
rend_service_descriptor_free(d2); rend_service_descriptor_free(d2);