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

Merge remote-tracking branch 'tor-github/pr/1529'

Browse Source
This commit is contained in:
Nick Mathewson 2020-01-17 08:49:56 -05:00
commit 5086b16055
3 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug32315 Normal file
View File

@ -0,0 +1,4 @@
o Major bugfixes (networking):
- Correctly handle IPv6 addresses in SOCKS5 RESOLVE_PTR requests,
and accept strings as well as binary addresses. Fixes bug 32315;
bugfix on Tor 0.3.5.1-alpha.

6
src/core/proto/proto_socks.c
View File

@ -620,6 +620,7 @@ process_socks5_client_request(socks_request_t *req,
int safe_socks) int safe_socks)
{ {
socks_result_t res = SOCKS_RESULT_DONE; socks_result_t res = SOCKS_RESULT_DONE;
tor_addr_t tmpaddr;
if (req->command != SOCKS_COMMAND_CONNECT && if (req->command != SOCKS_COMMAND_CONNECT &&
req->command != SOCKS_COMMAND_RESOLVE && req->command != SOCKS_COMMAND_RESOLVE &&
@ -630,11 +631,10 @@ process_socks5_client_request(socks_request_t *req,
} }
if (req->command == SOCKS_COMMAND_RESOLVE_PTR && if (req->command == SOCKS_COMMAND_RESOLVE_PTR &&
!string_is_valid_ipv4_address(req->address) && tor_addr_parse(&tmpaddr, req->address) < 0) {
!string_is_valid_ipv6_address(req->address)) {
socks_request_set_socks5_error(req, SOCKS5_ADDRESS_TYPE_NOT_SUPPORTED); socks_request_set_socks5_error(req, SOCKS5_ADDRESS_TYPE_NOT_SUPPORTED);
log_warn(LD_APP, "socks5 received RESOLVE_PTR command with " log_warn(LD_APP, "socks5 received RESOLVE_PTR command with "
"hostname type. Rejecting."); "a malformed address. Rejecting.");
res = SOCKS_RESULT_INVALID; res = SOCKS_RESULT_INVALID;
goto end; goto end;

37
src/test/test_socks.c
View File

@ -399,6 +399,43 @@ test_socks_5_supported_commands(void *ptr)
tt_int_op(0,OP_EQ, buf_datalen(buf)); tt_int_op(0,OP_EQ, buf_datalen(buf));
socks_request_clear(socks);
/* SOCKS 5 Send RESOLVE_PTR [F1] for an IPv6 address */
ADD_DATA(buf, "\x05\x01\x00");
ADD_DATA(buf, "\x05\xF1\x00\x04"
"\x20\x01\x0d\xb8\x85\xa3\x00\x00\x00\x00\x8a\x2e\x03\x70\x73\x34"
"\x12\x34");
tt_int_op(fetch_from_buf_socks(buf, socks, get_options()->TestSocks,
get_options()->SafeSocks),
OP_EQ, 1);
tt_int_op(5,OP_EQ, socks->socks_version);
tt_int_op(2,OP_EQ, socks->replylen);
tt_int_op(5,OP_EQ, socks->reply[0]);
tt_int_op(0,OP_EQ, socks->reply[1]);
tt_str_op("[2001:db8:85a3::8a2e:370:7334]",OP_EQ, socks->address);
tt_int_op(0,OP_EQ, buf_datalen(buf));
socks_request_clear(socks);
/* SOCKS 5 Send RESOLVE_PTR [F1] for a an IPv6 address written as a
* string with brackets */
ADD_DATA(buf, "\x05\x01\x00");
ADD_DATA(buf, "\x05\xF1\x00\x03\x1e");
ADD_DATA(buf, "[2001:db8:85a3::8a2e:370:7334]");
ADD_DATA(buf, "\x12\x34");
tt_int_op(fetch_from_buf_socks(buf, socks, get_options()->TestSocks,
get_options()->SafeSocks),
OP_EQ, 1);
tt_int_op(5,OP_EQ, socks->socks_version);
tt_int_op(2,OP_EQ, socks->replylen);
tt_int_op(5,OP_EQ, socks->reply[0]);
tt_int_op(0,OP_EQ, socks->reply[1]);
tt_str_op("[2001:db8:85a3::8a2e:370:7334]",OP_EQ, socks->address);
tt_int_op(0,OP_EQ, buf_datalen(buf));
done: done:
; ;
} }