June 2019 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'ticket30687_042_01'
by asn＠torproject.org 11 Jun '19

11 Jun '19

commit 646f7a9a94db1837f0c4a1c2ab7bc0b10736a82d Merge: b83dba7cb 7cf9d54e6 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jun 11 14:02:33 2019 +0300 Merge branch 'ticket30687_042_01' changes/ticket30687 | 3 + src/lib/evloop/token_bucket.c | 52 +++++++++++++++ src/lib/evloop/token_bucket.h | 29 ++++++++ src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_token_bucket.c | 152 ++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 239 insertions(+)

1 0

[tor/master] Fix a logic error in deciding whether to accept SessionGroup=
by asn＠torproject.org 11 Jun '19

11 Jun '19

commit 70b85358afd0a8d4291489f9e9f5654ab2d53371 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 31 08:26:10 2019 -0400 Fix a logic error in deciding whether to accept SessionGroup= Fixes bug 22619; bugfix on 0.2.7.2-alpha --- changes/bug22619 | 3 +++ src/app/config/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug22619 b/changes/bug22619 new file mode 100644 index 000000000..9c71996f5 --- /dev/null +++ b/changes/bug22619 @@ -0,0 +1,3 @@ + o Minor bugfixes (circuit isolation): + - Fix a logic error that prevented the SessionGroup sub-option from + being accepted. Fixes bug 22619; bugfix on 0.2.7.2-alpha. diff --git a/src/app/config/config.c b/src/app/config/config.c index 2a504d306..352559759 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -7080,7 +7080,7 @@ parse_port_config(smartlist_t *out, if (!strcasecmpstart(elt, "SessionGroup=")) { int group = (int)tor_parse_long(elt+strlen("SessionGroup="), 10, 0, INT_MAX, &ok, NULL); - if (!ok || !allow_no_stream_options) { + if (!ok || allow_no_stream_options) { log_warn(LD_CONFIG, "Invalid %sPort option '%s'", portname, escaped(elt)); goto err;

1 0

[tor/master] Fix some tests for CL_PORT_NO_STREAM_OPTIONS
by asn＠torproject.org 11 Jun '19

11 Jun '19

commit 3c3158f1826826d9b4e8841bc67855cca0fc883b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 31 09:03:16 2019 -0400 Fix some tests for CL_PORT_NO_STREAM_OPTIONS The comment in the tests was correct: this option _was_ inverted wrt SessionGroup=. --- src/test/test_config.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/test/test_config.c b/src/test/test_config.c index c342d8cca..0de6b1291 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -4568,16 +4568,14 @@ test_config_parse_port_config__ports__ports_given(void *data) "127.0.0.44", 0, CL_PORT_NO_STREAM_OPTIONS); tt_int_op(ret, OP_EQ, -1); - // TODO: this seems wrong. Shouldn't it be the other way around? - // Potential bug. - // Test failure for a SessionGroup argument with valid value but with stream - // options allowed + // Test failure for a SessionGroup argument with valid value but with no + // stream options allowed config_free_lines(config_port_invalid); config_port_invalid = NULL; SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_invalid = mock_config_line("DNSPort", "42 SessionGroup=123"); ret = parse_port_config(slout, config_port_invalid, "DNS", 0, - "127.0.0.44", 0, 0); + "127.0.0.44", 0, CL_PORT_NO_STREAM_OPTIONS); tt_int_op(ret, OP_EQ, -1); // Test failure for more than one SessionGroup argument @@ -4587,7 +4585,7 @@ test_config_parse_port_config__ports__ports_given(void *data) config_port_invalid = mock_config_line("DNSPort", "42 SessionGroup=123 " "SessionGroup=321"); ret = parse_port_config(slout, config_port_invalid, "DNS", 0, - "127.0.0.44", 0, CL_PORT_NO_STREAM_OPTIONS); + "127.0.0.44", 0, 0); tt_int_op(ret, OP_EQ, -1); // Test success with a sessiongroup options @@ -4596,7 +4594,7 @@ test_config_parse_port_config__ports__ports_given(void *data) smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 SessionGroup=1111122"); ret = parse_port_config(slout, config_port_valid, "DNS", 0, - "127.0.0.44", 0, CL_PORT_NO_STREAM_OPTIONS); + "127.0.0.44", 0, 0); tt_int_op(ret, OP_EQ, 0); tt_int_op(smartlist_len(slout), OP_EQ, 1); port_cfg = (port_cfg_t *)smartlist_get(slout, 0);

1 0

[tor/master] Merge branch 'tor-github/pr/1065' into maint-0.4.1
by asn＠torproject.org 11 Jun '19

11 Jun '19

commit eab9dc06af32ceb3826d068cf5bc55db68ad6c61 Merge: 2779ce1f6 3c3158f18 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jun 11 13:48:10 2019 +0300 Merge branch 'tor-github/pr/1065' into maint-0.4.1 changes/bug22619 | 3 +++ src/app/config/config.c | 2 +- src/test/test_config.c | 12 +++++------- 3 files changed, 9 insertions(+), 8 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.1'
by asn＠torproject.org 11 Jun '19

11 Jun '19

commit b83dba7cb0dbd96c2be09edab47e6c16491c0a14 Merge: ece5133e0 eab9dc06a Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jun 11 13:48:16 2019 +0300 Merge branch 'maint-0.4.1' changes/bug22619 | 3 +++ src/app/config/config.c | 2 +- src/test/test_config.c | 12 +++++------- 3 files changed, 9 insertions(+), 8 deletions(-)

1 0

[tor/release-0.4.1] Fix some tests for CL_PORT_NO_STREAM_OPTIONS
by asn＠torproject.org 11 Jun '19

11 Jun '19

commit 3c3158f1826826d9b4e8841bc67855cca0fc883b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 31 09:03:16 2019 -0400 Fix some tests for CL_PORT_NO_STREAM_OPTIONS The comment in the tests was correct: this option _was_ inverted wrt SessionGroup=. --- src/test/test_config.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/test/test_config.c b/src/test/test_config.c index c342d8cca..0de6b1291 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -4568,16 +4568,14 @@ test_config_parse_port_config__ports__ports_given(void *data) "127.0.0.44", 0, CL_PORT_NO_STREAM_OPTIONS); tt_int_op(ret, OP_EQ, -1); - // TODO: this seems wrong. Shouldn't it be the other way around? - // Potential bug. - // Test failure for a SessionGroup argument with valid value but with stream - // options allowed + // Test failure for a SessionGroup argument with valid value but with no + // stream options allowed config_free_lines(config_port_invalid); config_port_invalid = NULL; SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_invalid = mock_config_line("DNSPort", "42 SessionGroup=123"); ret = parse_port_config(slout, config_port_invalid, "DNS", 0, - "127.0.0.44", 0, 0); + "127.0.0.44", 0, CL_PORT_NO_STREAM_OPTIONS); tt_int_op(ret, OP_EQ, -1); // Test failure for more than one SessionGroup argument @@ -4587,7 +4585,7 @@ test_config_parse_port_config__ports__ports_given(void *data) config_port_invalid = mock_config_line("DNSPort", "42 SessionGroup=123 " "SessionGroup=321"); ret = parse_port_config(slout, config_port_invalid, "DNS", 0, - "127.0.0.44", 0, CL_PORT_NO_STREAM_OPTIONS); + "127.0.0.44", 0, 0); tt_int_op(ret, OP_EQ, -1); // Test success with a sessiongroup options @@ -4596,7 +4594,7 @@ test_config_parse_port_config__ports__ports_given(void *data) smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 SessionGroup=1111122"); ret = parse_port_config(slout, config_port_valid, "DNS", 0, - "127.0.0.44", 0, CL_PORT_NO_STREAM_OPTIONS); + "127.0.0.44", 0, 0); tt_int_op(ret, OP_EQ, 0); tt_int_op(smartlist_len(slout), OP_EQ, 1); port_cfg = (port_cfg_t *)smartlist_get(slout, 0);

1 0

[tor/release-0.4.1] Fix a logic error in deciding whether to accept SessionGroup=
by asn＠torproject.org 11 Jun '19

11 Jun '19

commit 70b85358afd0a8d4291489f9e9f5654ab2d53371 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 31 08:26:10 2019 -0400 Fix a logic error in deciding whether to accept SessionGroup= Fixes bug 22619; bugfix on 0.2.7.2-alpha --- changes/bug22619 | 3 +++ src/app/config/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug22619 b/changes/bug22619 new file mode 100644 index 000000000..9c71996f5 --- /dev/null +++ b/changes/bug22619 @@ -0,0 +1,3 @@ + o Minor bugfixes (circuit isolation): + - Fix a logic error that prevented the SessionGroup sub-option from + being accepted. Fixes bug 22619; bugfix on 0.2.7.2-alpha. diff --git a/src/app/config/config.c b/src/app/config/config.c index 2a504d306..352559759 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -7080,7 +7080,7 @@ parse_port_config(smartlist_t *out, if (!strcasecmpstart(elt, "SessionGroup=")) { int group = (int)tor_parse_long(elt+strlen("SessionGroup="), 10, 0, INT_MAX, &ok, NULL); - if (!ok || !allow_no_stream_options) { + if (!ok || allow_no_stream_options) { log_warn(LD_CONFIG, "Invalid %sPort option '%s'", portname, escaped(elt)); goto err;

1 0

[tor/release-0.4.1] Merge branch 'tor-github/pr/1065' into maint-0.4.1
by asn＠torproject.org 11 Jun '19

11 Jun '19

commit eab9dc06af32ceb3826d068cf5bc55db68ad6c61 Merge: 2779ce1f6 3c3158f18 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jun 11 13:48:10 2019 +0300 Merge branch 'tor-github/pr/1065' into maint-0.4.1 changes/bug22619 | 3 +++ src/app/config/config.c | 2 +- src/test/test_config.c | 12 +++++------- 3 files changed, 9 insertions(+), 8 deletions(-)

1 0

[tor/maint-0.4.1] Fix a logic error in deciding whether to accept SessionGroup=
by asn＠torproject.org 11 Jun '19

11 Jun '19

commit 70b85358afd0a8d4291489f9e9f5654ab2d53371 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 31 08:26:10 2019 -0400 Fix a logic error in deciding whether to accept SessionGroup= Fixes bug 22619; bugfix on 0.2.7.2-alpha --- changes/bug22619 | 3 +++ src/app/config/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug22619 b/changes/bug22619 new file mode 100644 index 000000000..9c71996f5 --- /dev/null +++ b/changes/bug22619 @@ -0,0 +1,3 @@ + o Minor bugfixes (circuit isolation): + - Fix a logic error that prevented the SessionGroup sub-option from + being accepted. Fixes bug 22619; bugfix on 0.2.7.2-alpha. diff --git a/src/app/config/config.c b/src/app/config/config.c index 2a504d306..352559759 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -7080,7 +7080,7 @@ parse_port_config(smartlist_t *out, if (!strcasecmpstart(elt, "SessionGroup=")) { int group = (int)tor_parse_long(elt+strlen("SessionGroup="), 10, 0, INT_MAX, &ok, NULL); - if (!ok || !allow_no_stream_options) { + if (!ok || allow_no_stream_options) { log_warn(LD_CONFIG, "Invalid %sPort option '%s'", portname, escaped(elt)); goto err;

1 0

[tor/maint-0.4.1] Fix some tests for CL_PORT_NO_STREAM_OPTIONS
by asn＠torproject.org 11 Jun '19

11 Jun '19

commit 3c3158f1826826d9b4e8841bc67855cca0fc883b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 31 09:03:16 2019 -0400 Fix some tests for CL_PORT_NO_STREAM_OPTIONS The comment in the tests was correct: this option _was_ inverted wrt SessionGroup=. --- src/test/test_config.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/test/test_config.c b/src/test/test_config.c index c342d8cca..0de6b1291 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -4568,16 +4568,14 @@ test_config_parse_port_config__ports__ports_given(void *data) "127.0.0.44", 0, CL_PORT_NO_STREAM_OPTIONS); tt_int_op(ret, OP_EQ, -1); - // TODO: this seems wrong. Shouldn't it be the other way around? - // Potential bug. - // Test failure for a SessionGroup argument with valid value but with stream - // options allowed + // Test failure for a SessionGroup argument with valid value but with no + // stream options allowed config_free_lines(config_port_invalid); config_port_invalid = NULL; SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_invalid = mock_config_line("DNSPort", "42 SessionGroup=123"); ret = parse_port_config(slout, config_port_invalid, "DNS", 0, - "127.0.0.44", 0, 0); + "127.0.0.44", 0, CL_PORT_NO_STREAM_OPTIONS); tt_int_op(ret, OP_EQ, -1); // Test failure for more than one SessionGroup argument @@ -4587,7 +4585,7 @@ test_config_parse_port_config__ports__ports_given(void *data) config_port_invalid = mock_config_line("DNSPort", "42 SessionGroup=123 " "SessionGroup=321"); ret = parse_port_config(slout, config_port_invalid, "DNS", 0, - "127.0.0.44", 0, CL_PORT_NO_STREAM_OPTIONS); + "127.0.0.44", 0, 0); tt_int_op(ret, OP_EQ, -1); // Test success with a sessiongroup options @@ -4596,7 +4594,7 @@ test_config_parse_port_config__ports__ports_given(void *data) smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "42 SessionGroup=1111122"); ret = parse_port_config(slout, config_port_valid, "DNS", 0, - "127.0.0.44", 0, CL_PORT_NO_STREAM_OPTIONS); + "127.0.0.44", 0, 0); tt_int_op(ret, OP_EQ, 0); tt_int_op(smartlist_len(slout), OP_EQ, 1); port_cfg = (port_cfg_t *)smartlist_get(slout, 0);

1 0