mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-11 05:33:47 +01:00
Fix for 152: reject malformed .onion addresses rather then passing them on
svn:r4329
This commit is contained in:
parent
2118e5798a
commit
621ab95e59
@ -911,6 +911,12 @@ static int connection_ap_handshake_process_socks(connection_t *conn) {
|
||||
*/
|
||||
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) {
|
||||
/* foo.exit -- modify conn->chosen_exit_node to specify the exit
|
||||
* node, and conn->address to hold only the address portion.*/
|
||||
@ -1712,6 +1718,6 @@ parse_extended_hostname(char *address) {
|
||||
failed:
|
||||
/* otherwise, return to previous state and return 0 */
|
||||
*s = '.';
|
||||
return NORMAL_HOSTNAME;
|
||||
return BAD_HOSTNAME;
|
||||
}
|
||||
|
||||
|
@ -1377,7 +1377,7 @@ int socks_policy_permits_address(uint32_t addr);
|
||||
|
||||
void set_exit_redirects(smartlist_t *lst);
|
||||
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 parse_extended_hostname(char *address);
|
||||
|
||||
|
@ -1384,6 +1384,7 @@ test_rend_fns(void)
|
||||
char address1[] = "fooaddress.onion";
|
||||
char address2[] = "aaaaaaaaaaaaaaaa.onion";
|
||||
char address3[] = "fooaddress.exit";
|
||||
char address4[] = "tor.eff.org";
|
||||
rend_service_descriptor_t *d1, *d2;
|
||||
char *encoded;
|
||||
size_t len;
|
||||
@ -1412,9 +1413,10 @@ test_rend_fns(void)
|
||||
test_streq(d2->intro_points[1], "crow");
|
||||
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(EXIT_HOSTNAME, parse_extended_hostname(address3));
|
||||
test_eq(NORMAL_HOSTNAME, parse_extended_hostname(address4));
|
||||
|
||||
rend_service_descriptor_free(d1);
|
||||
rend_service_descriptor_free(d2);
|
||||
|
Loading…
Reference in New Issue
Block a user