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

Sending 'Not allowed' error message before closing the connection.

Browse Source
This commit is contained in:
rl1987 2014-10-21 20:50:32 +03:00 committed by Nick Mathewson
parent fc9591da72
commit 51e2473618
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/or/buffers.c
View File

@ -2053,9 +2053,11 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req,
string_is_valid_ipv6_address(req->address)) { string_is_valid_ipv6_address(req->address)) {
log_unsafe_socks_warning(5,req->address,req->port,safe_socks); log_unsafe_socks_warning(5,req->address,req->port,safe_socks);
if (safe_socks) if (safe_socks) {
socks_request_set_socks5_error(req, SOCKS5_NOT_ALLOWED);
return -1; return -1;
} }
}
if (!string_is_valid_hostname(req->address)) { if (!string_is_valid_hostname(req->address)) {
log_warn(LD_PROTOCOL, log_warn(LD_PROTOCOL,

14
src/test/test_socks.c
View File

@ -238,6 +238,13 @@ test_socks_5_supported_commands(void *ptr)
ADD_DATA(buf, "\x01\x02"); ADD_DATA(buf, "\x01\x02");
tt_assert(fetch_from_buf_socks(buf,socks,get_options()->TestSocks,1) tt_assert(fetch_from_buf_socks(buf,socks,get_options()->TestSocks,1)
== -1); == -1);
tt_int_op(5,==,socks->socks_version);
tt_int_op(10,==,socks->replylen);
tt_int_op(5,==,socks->reply[0]);
tt_int_op(SOCKS5_NOT_ALLOWED,==,socks->reply[1]);
tt_int_op(1,==,socks->reply[3]);
socks_request_clear(socks); socks_request_clear(socks);
/* SOCKS 5 should reject RESOLVE [F0] reject for IPv6 address /* SOCKS 5 should reject RESOLVE [F0] reject for IPv6 address
@ -249,6 +256,13 @@ test_socks_5_supported_commands(void *ptr)
ADD_DATA(buf, "\x01\x02"); ADD_DATA(buf, "\x01\x02");
tt_assert(fetch_from_buf_socks(buf,socks,get_options()->TestSocks,1) tt_assert(fetch_from_buf_socks(buf,socks,get_options()->TestSocks,1)
== -1); == -1);
tt_int_op(5,==,socks->socks_version);
tt_int_op(10,==,socks->replylen);
tt_int_op(5,==,socks->reply[0]);
tt_int_op(SOCKS5_NOT_ALLOWED,==,socks->reply[1]);
tt_int_op(1,==,socks->reply[3]);
socks_request_clear(socks); socks_request_clear(socks);
/* SOCKS 5 Send RESOLVE_PTR [F1] for IP address 2.2.2.5 */ /* SOCKS 5 Send RESOLVE_PTR [F1] for IP address 2.2.2.5 */