January 2021 - tor-commits - lists.torproject.org

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by dgoulet＠torproject.org 28 Jan '21

28 Jan '21

commit c0c13e1e98f40fe0bb316c09719bb0c603d38443 Merge: 2039aca623 545fee6e4f Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:42:32 2021 -0500 Merge branch 'maint-0.4.5' into release-0.4.5

1 0

[tor/release-0.4.5] Merge branch 'tor-gitlab/mr/239' into maint-0.3.5
by dgoulet＠torproject.org 28 Jan '21

28 Jan '21

commit 290007e3c48624060620b0340c1b4874487aab09 Merge: 02bd135cb1 c4fe66e342 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:42:26 2021 -0500 Merge branch 'tor-gitlab/mr/239' into maint-0.3.5 changes/bug40190 | 4 ++++ src/core/proto/proto_socks.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
by dgoulet＠torproject.org 28 Jan '21

28 Jan '21

commit 545fee6e4f6dc2785b425e08e76507a0b777b069 Merge: 50ac9f9229 be81ecba3a Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:42:32 2021 -0500 Merge branch 'maint-0.4.4' into maint-0.4.5

1 0

[tor/maint-0.3.5] Merge branch 'tor-gitlab/mr/239' into maint-0.3.5
by dgoulet＠torproject.org 28 Jan '21

28 Jan '21

commit 290007e3c48624060620b0340c1b4874487aab09 Merge: 02bd135cb1 c4fe66e342 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:42:26 2021 -0500 Merge branch 'tor-gitlab/mr/239' into maint-0.3.5 changes/bug40190 | 4 ++++ src/core/proto/proto_socks.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.3] Merge branch 'tor-gitlab/mr/239' into maint-0.3.5
by dgoulet＠torproject.org 28 Jan '21

28 Jan '21

commit 290007e3c48624060620b0340c1b4874487aab09 Merge: 02bd135cb1 c4fe66e342 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:42:26 2021 -0500 Merge branch 'tor-gitlab/mr/239' into maint-0.3.5 changes/bug40190 | 4 ++++ src/core/proto/proto_socks.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.5] Socks5: handle truncated client requests correctly
by dgoulet＠torproject.org 28 Jan '21

28 Jan '21

commit c4fe66e342292b45f29e9fd242b66a0ca27a7758 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 14 10:14:03 2020 -0500 Socks5: handle truncated client requests correctly Previously, our code would send back an error if the socks5 request parser said anything but DONE. But there are other non-error cases, like TRUNCATED: we shouldn't send back errors for them. This patch lowers the responsibility for setting the error message into the parsing code, since the actual type of the error message will depend on what problem was encountered. Fixes bug 40190; bugfix on 0.3.5.1-alpha. --- changes/bug40190 | 4 ++++ src/core/proto/proto_socks.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/changes/bug40190 b/changes/bug40190 new file mode 100644 index 0000000000..0f3d6941dc --- /dev/null +++ b/changes/bug40190 @@ -0,0 +1,4 @@ + o Minor bugfixes (SOCKS5): + - Handle partial socks5 messages correctly. Previously, our code would + send an incorrect error message if it got a socks5 request that wasn't + complete. Fixes bug 40190; bugfix on 0.3.5.1-alpha. diff --git a/src/core/proto/proto_socks.c b/src/core/proto/proto_socks.c index c7bf13b9f4..5a7d7ac9be 100644 --- a/src/core/proto/proto_socks.c +++ b/src/core/proto/proto_socks.c @@ -545,6 +545,7 @@ parse_socks5_client_request(const uint8_t *raw_data, socks_request_t *req, if (parsed == -1) { log_warn(LD_APP, "socks5: parsing failed - invalid client request"); res = SOCKS_RESULT_INVALID; + socks_request_set_socks5_error(req, SOCKS5_GENERAL_ERROR); goto end; } else if (parsed == -2) { res = SOCKS_RESULT_TRUNCATED; @@ -556,6 +557,7 @@ parse_socks5_client_request(const uint8_t *raw_data, socks_request_t *req, if (socks5_client_request_get_version(trunnel_req) != 5) { res = SOCKS_RESULT_INVALID; + socks_request_set_socks5_error(req, SOCKS5_GENERAL_ERROR); goto end; } @@ -590,6 +592,7 @@ parse_socks5_client_request(const uint8_t *raw_data, socks_request_t *req, tor_addr_to_str(req->address, &destaddr, sizeof(req->address), 1); } break; default: { + socks_request_set_socks5_error(req, SOCKS5_ADDRESS_TYPE_NOT_SUPPORTED); res = -1; } break; } @@ -770,8 +773,10 @@ handle_socks_message(const uint8_t *raw_data, size_t datalen, } else { res = parse_socks5_client_request(raw_data, req, datalen, drain_out); - if (res != SOCKS_RESULT_DONE) { + if (BUG(res == SOCKS_RESULT_INVALID && req->replylen == 0)) { socks_request_set_socks5_error(req, SOCKS5_GENERAL_ERROR); + } + if (res != SOCKS_RESULT_DONE) { goto end; }

1 0

[tor/maint-0.4.3] Socks5: handle truncated client requests correctly
by dgoulet＠torproject.org 28 Jan '21

28 Jan '21

commit c4fe66e342292b45f29e9fd242b66a0ca27a7758 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 14 10:14:03 2020 -0500 Socks5: handle truncated client requests correctly Previously, our code would send back an error if the socks5 request parser said anything but DONE. But there are other non-error cases, like TRUNCATED: we shouldn't send back errors for them. This patch lowers the responsibility for setting the error message into the parsing code, since the actual type of the error message will depend on what problem was encountered. Fixes bug 40190; bugfix on 0.3.5.1-alpha. --- changes/bug40190 | 4 ++++ src/core/proto/proto_socks.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/changes/bug40190 b/changes/bug40190 new file mode 100644 index 0000000000..0f3d6941dc --- /dev/null +++ b/changes/bug40190 @@ -0,0 +1,4 @@ + o Minor bugfixes (SOCKS5): + - Handle partial socks5 messages correctly. Previously, our code would + send an incorrect error message if it got a socks5 request that wasn't + complete. Fixes bug 40190; bugfix on 0.3.5.1-alpha. diff --git a/src/core/proto/proto_socks.c b/src/core/proto/proto_socks.c index c7bf13b9f4..5a7d7ac9be 100644 --- a/src/core/proto/proto_socks.c +++ b/src/core/proto/proto_socks.c @@ -545,6 +545,7 @@ parse_socks5_client_request(const uint8_t *raw_data, socks_request_t *req, if (parsed == -1) { log_warn(LD_APP, "socks5: parsing failed - invalid client request"); res = SOCKS_RESULT_INVALID; + socks_request_set_socks5_error(req, SOCKS5_GENERAL_ERROR); goto end; } else if (parsed == -2) { res = SOCKS_RESULT_TRUNCATED; @@ -556,6 +557,7 @@ parse_socks5_client_request(const uint8_t *raw_data, socks_request_t *req, if (socks5_client_request_get_version(trunnel_req) != 5) { res = SOCKS_RESULT_INVALID; + socks_request_set_socks5_error(req, SOCKS5_GENERAL_ERROR); goto end; } @@ -590,6 +592,7 @@ parse_socks5_client_request(const uint8_t *raw_data, socks_request_t *req, tor_addr_to_str(req->address, &destaddr, sizeof(req->address), 1); } break; default: { + socks_request_set_socks5_error(req, SOCKS5_ADDRESS_TYPE_NOT_SUPPORTED); res = -1; } break; } @@ -770,8 +773,10 @@ handle_socks_message(const uint8_t *raw_data, size_t datalen, } else { res = parse_socks5_client_request(raw_data, req, datalen, drain_out); - if (res != SOCKS_RESULT_DONE) { + if (BUG(res == SOCKS_RESULT_INVALID && req->replylen == 0)) { socks_request_set_socks5_error(req, SOCKS5_GENERAL_ERROR); + } + if (res != SOCKS_RESULT_DONE) { goto end; }

1 0

[tor/maint-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.3
by dgoulet＠torproject.org 28 Jan '21

28 Jan '21

commit f058db1f3d6fee5bc6506ece88cfd100eb86729d Merge: f3da5f88d7 290007e3c4 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:42:31 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 changes/bug40190 | 4 ++++ src/core/proto/proto_socks.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.4] Merge branch 'tor-gitlab/mr/239' into maint-0.3.5
by dgoulet＠torproject.org 28 Jan '21

28 Jan '21

commit 290007e3c48624060620b0340c1b4874487aab09 Merge: 02bd135cb1 c4fe66e342 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:42:26 2021 -0500 Merge branch 'tor-gitlab/mr/239' into maint-0.3.5 changes/bug40190 | 4 ++++ src/core/proto/proto_socks.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3
by dgoulet＠torproject.org 28 Jan '21

28 Jan '21

commit f058db1f3d6fee5bc6506ece88cfd100eb86729d Merge: f3da5f88d7 290007e3c4 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:42:31 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 changes/bug40190 | 4 ++++ src/core/proto/proto_socks.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-)

1 0