November 2017 - tor-commits - lists.torproject.org

[tor/maint-0.3.2] Fix unit tests for 24050.
by nickm＠torproject.org 29 Nov '17

29 Nov '17

commit eb1976202e289d44633127d9dd2d6f96df832def Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 29 12:05:36 2017 -0500 Fix unit tests for 24050. --- src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_config.c b/src/test/test_config.c index 89f9b3e2a..88a0da981 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -4118,7 +4118,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(port_cfg->entry_cfg.dns_request, OP_EQ, 1); tt_int_op(port_cfg->entry_cfg.ipv4_traffic, OP_EQ, 1); tt_int_op(port_cfg->entry_cfg.onion_traffic, OP_EQ, 1); - tt_int_op(port_cfg->entry_cfg.cache_ipv4_answers, OP_EQ, 1); + tt_int_op(port_cfg->entry_cfg.cache_ipv4_answers, OP_EQ, 0); tt_int_op(port_cfg->entry_cfg.prefer_ipv6_virtaddr, OP_EQ, 1); #endif @@ -4454,7 +4454,7 @@ test_config_parse_port_config__ports__ports_given(void *data) 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); - tt_int_op(port_cfg->entry_cfg.cache_ipv4_answers, OP_EQ, 1); + tt_int_op(port_cfg->entry_cfg.cache_ipv4_answers, OP_EQ, 0); tt_int_op(port_cfg->entry_cfg.cache_ipv6_answers, OP_EQ, 1); // Test success with no cache ipv4 DNS

1 0

[tor/maint-0.3.2] Merge branch 'bug24050_029_squashed' into maint-0.3.2
by nickm＠torproject.org 29 Nov '17

29 Nov '17

commit 9b44bb49b41631abc7933b3009821782f20db3c2 Merge: ef5461044 a94c48610 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 29 12:02:07 2017 -0500 Merge branch 'bug24050_029_squashed' into maint-0.3.2 changes/bug24050 | 5 +++++ src/or/config.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --cc src/or/config.c index a33812a4c,c48070b58..d8f71a019 --- a/src/or/config.c +++ b/src/or/config.c @@@ -6421,10 -6164,8 +6421,9 @@@ port_cfg_new(size_t namelen tor_assert(namelen <= SIZE_T_CEILING - sizeof(port_cfg_t) - 1); port_cfg_t *cfg = tor_malloc_zero(sizeof(port_cfg_t) + namelen + 1); cfg->entry_cfg.ipv4_traffic = 1; + cfg->entry_cfg.ipv6_traffic = 1; cfg->entry_cfg.dns_request = 1; cfg->entry_cfg.onion_traffic = 1; - cfg->entry_cfg.cache_ipv4_answers = 1; cfg->entry_cfg.prefer_ipv6_virtaddr = 1; return cfg; } @@@ -6738,9 -6516,9 +6737,9 @@@ parse_port_config(smartlist_t *out /* This must be kept in sync with port_cfg_new's defaults */ int no_listen = 0, no_advertise = 0, all_addrs = 0, bind_ipv4_only = 0, bind_ipv6_only = 0, - ipv4_traffic = 1, ipv6_traffic = 0, prefer_ipv6 = 0, dns_request = 1, + ipv4_traffic = 1, ipv6_traffic = 1, prefer_ipv6 = 0, dns_request = 1, onion_traffic = 1, - cache_ipv4 = 1, use_cached_ipv4 = 0, + cache_ipv4 = 0, use_cached_ipv4 = 0, cache_ipv6 = 0, use_cached_ipv6 = 0, prefer_ipv6_automap = 1, world_writable = 0, group_writable = 0, relax_dirmode_check = 0,

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 29 Nov '17

29 Nov '17

commit 6a9c3d6e3a719ed4e72327320a2f0d1d86e11f9c Merge: b23086060 9b44bb49b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 29 12:02:44 2017 -0500 Merge branch 'maint-0.3.2' changes/bug24050 | 5 +++++ src/or/config.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.2] Merge branch 'bug24050_029_squashed' into maint-0.3.2
by nickm＠torproject.org 29 Nov '17

29 Nov '17

commit 9b44bb49b41631abc7933b3009821782f20db3c2 Merge: ef5461044 a94c48610 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 29 12:02:07 2017 -0500 Merge branch 'bug24050_029_squashed' into maint-0.3.2 changes/bug24050 | 5 +++++ src/or/config.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --cc src/or/config.c index a33812a4c,c48070b58..d8f71a019 --- a/src/or/config.c +++ b/src/or/config.c @@@ -6421,10 -6164,8 +6421,9 @@@ port_cfg_new(size_t namelen tor_assert(namelen <= SIZE_T_CEILING - sizeof(port_cfg_t) - 1); port_cfg_t *cfg = tor_malloc_zero(sizeof(port_cfg_t) + namelen + 1); cfg->entry_cfg.ipv4_traffic = 1; + cfg->entry_cfg.ipv6_traffic = 1; cfg->entry_cfg.dns_request = 1; cfg->entry_cfg.onion_traffic = 1; - cfg->entry_cfg.cache_ipv4_answers = 1; cfg->entry_cfg.prefer_ipv6_virtaddr = 1; return cfg; } @@@ -6738,9 -6516,9 +6737,9 @@@ parse_port_config(smartlist_t *out /* This must be kept in sync with port_cfg_new's defaults */ int no_listen = 0, no_advertise = 0, all_addrs = 0, bind_ipv4_only = 0, bind_ipv6_only = 0, - ipv4_traffic = 1, ipv6_traffic = 0, prefer_ipv6 = 0, dns_request = 1, + ipv4_traffic = 1, ipv6_traffic = 1, prefer_ipv6 = 0, dns_request = 1, onion_traffic = 1, - cache_ipv4 = 1, use_cached_ipv4 = 0, + cache_ipv4 = 0, use_cached_ipv4 = 0, cache_ipv6 = 0, use_cached_ipv6 = 0, prefer_ipv6_automap = 1, world_writable = 0, group_writable = 0, relax_dirmode_check = 0,

1 0

[tor/maint-0.3.2] Merge branch 'bug24050_029_squashed' into maint-0.3.2
by nickm＠torproject.org 29 Nov '17

29 Nov '17

commit f0007f2b8d3fe981fc627eee0facfe828142a1fa Merge: 9b44bb49b eb1976202 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 29 12:05:49 2017 -0500 Merge branch 'bug24050_029_squashed' into maint-0.3.2 src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --cc src/test/test_config.c index 1c0dab39c,88a0da981..e7380c1d1 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@@ -4003,9 -4118,9 +4003,9 @@@ test_config_parse_port_config__ports__p tt_int_op(port_cfg->entry_cfg.dns_request, OP_EQ, 1); tt_int_op(port_cfg->entry_cfg.ipv4_traffic, OP_EQ, 1); tt_int_op(port_cfg->entry_cfg.onion_traffic, OP_EQ, 1); - tt_int_op(port_cfg->entry_cfg.cache_ipv4_answers, OP_EQ, 1); + tt_int_op(port_cfg->entry_cfg.cache_ipv4_answers, OP_EQ, 0); tt_int_op(port_cfg->entry_cfg.prefer_ipv6_virtaddr, OP_EQ, 1); -#endif +#endif /* defined(_WIN32) */ // Test failure if we have no ipv4 and no ipv6 and no onion (DNS only) config_free_lines(config_port_invalid); config_port_invalid = NULL;

1 0

[tor/master] Make the cache_ipv4_answers default become 0 again, for real.
by nickm＠torproject.org 29 Nov '17

29 Nov '17

commit a94c4861027015b4ca4c6a9512fc36512196fea4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 9 16:41:57 2017 -0500 Make the cache_ipv4_answers default become 0 again, for real. Fortunately, use_cached_ipv4_answers was already 0, so we wouldn't actually use this info, but it's best not to have it. Fixes bug 24050; bugfix on 0.2.6.3-alpha --- changes/bug24050 | 5 +++++ src/or/config.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug24050 b/changes/bug24050 new file mode 100644 index 000000000..d184a77ac --- /dev/null +++ b/changes/bug24050 @@ -0,0 +1,5 @@ + o Minor bugfixes (client): + - By default, do not enable storage of client-side DNS values. + These values were unused by default previously, but they should + not have been cached at all. Fixes bug 24050; bugfix on + 0.2.6.3-alpha. diff --git a/src/or/config.c b/src/or/config.c index 1aeff462e..c48070b58 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6166,7 +6166,6 @@ port_cfg_new(size_t namelen) cfg->entry_cfg.ipv4_traffic = 1; cfg->entry_cfg.dns_request = 1; cfg->entry_cfg.onion_traffic = 1; - cfg->entry_cfg.cache_ipv4_answers = 1; cfg->entry_cfg.prefer_ipv6_virtaddr = 1; return cfg; } @@ -6519,7 +6518,7 @@ parse_port_config(smartlist_t *out, bind_ipv4_only = 0, bind_ipv6_only = 0, ipv4_traffic = 1, ipv6_traffic = 0, prefer_ipv6 = 0, dns_request = 1, onion_traffic = 1, - cache_ipv4 = 1, use_cached_ipv4 = 0, + cache_ipv4 = 0, use_cached_ipv4 = 0, cache_ipv6 = 0, use_cached_ipv6 = 0, prefer_ipv6_automap = 1, world_writable = 0, group_writable = 0, relax_dirmode_check = 0,

1 0

[tor/master] Merge branch 'bug24050_029_squashed' into maint-0.3.2
by nickm＠torproject.org 29 Nov '17

29 Nov '17

commit f0007f2b8d3fe981fc627eee0facfe828142a1fa Merge: 9b44bb49b eb1976202 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 29 12:05:49 2017 -0500 Merge branch 'bug24050_029_squashed' into maint-0.3.2 src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --cc src/test/test_config.c index 1c0dab39c,88a0da981..e7380c1d1 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@@ -4003,9 -4118,9 +4003,9 @@@ test_config_parse_port_config__ports__p tt_int_op(port_cfg->entry_cfg.dns_request, OP_EQ, 1); tt_int_op(port_cfg->entry_cfg.ipv4_traffic, OP_EQ, 1); tt_int_op(port_cfg->entry_cfg.onion_traffic, OP_EQ, 1); - tt_int_op(port_cfg->entry_cfg.cache_ipv4_answers, OP_EQ, 1); + tt_int_op(port_cfg->entry_cfg.cache_ipv4_answers, OP_EQ, 0); tt_int_op(port_cfg->entry_cfg.prefer_ipv6_virtaddr, OP_EQ, 1); -#endif +#endif /* defined(_WIN32) */ // Test failure if we have no ipv4 and no ipv6 and no onion (DNS only) config_free_lines(config_port_invalid); config_port_invalid = NULL;

1 0

[tor/release-0.3.2] Make the cache_ipv4_answers default become 0 again, for real.
by nickm＠torproject.org 29 Nov '17

29 Nov '17

commit a94c4861027015b4ca4c6a9512fc36512196fea4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 9 16:41:57 2017 -0500 Make the cache_ipv4_answers default become 0 again, for real. Fortunately, use_cached_ipv4_answers was already 0, so we wouldn't actually use this info, but it's best not to have it. Fixes bug 24050; bugfix on 0.2.6.3-alpha --- changes/bug24050 | 5 +++++ src/or/config.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug24050 b/changes/bug24050 new file mode 100644 index 000000000..d184a77ac --- /dev/null +++ b/changes/bug24050 @@ -0,0 +1,5 @@ + o Minor bugfixes (client): + - By default, do not enable storage of client-side DNS values. + These values were unused by default previously, but they should + not have been cached at all. Fixes bug 24050; bugfix on + 0.2.6.3-alpha. diff --git a/src/or/config.c b/src/or/config.c index 1aeff462e..c48070b58 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6166,7 +6166,6 @@ port_cfg_new(size_t namelen) cfg->entry_cfg.ipv4_traffic = 1; cfg->entry_cfg.dns_request = 1; cfg->entry_cfg.onion_traffic = 1; - cfg->entry_cfg.cache_ipv4_answers = 1; cfg->entry_cfg.prefer_ipv6_virtaddr = 1; return cfg; } @@ -6519,7 +6518,7 @@ parse_port_config(smartlist_t *out, bind_ipv4_only = 0, bind_ipv6_only = 0, ipv4_traffic = 1, ipv6_traffic = 0, prefer_ipv6 = 0, dns_request = 1, onion_traffic = 1, - cache_ipv4 = 1, use_cached_ipv4 = 0, + cache_ipv4 = 0, use_cached_ipv4 = 0, cache_ipv6 = 0, use_cached_ipv6 = 0, prefer_ipv6_automap = 1, world_writable = 0, group_writable = 0, relax_dirmode_check = 0,

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 29 Nov '17

29 Nov '17

commit 9a9d32fabc0899b50d1b06c37892b9eb556ee2cb Merge: fa7261254 9b44bb49b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 29 12:02:44 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24050 | 5 +++++ src/or/config.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'bug24050_029_squashed' into maint-0.3.2
by nickm＠torproject.org 29 Nov '17

29 Nov '17

commit 9b44bb49b41631abc7933b3009821782f20db3c2 Merge: ef5461044 a94c48610 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 29 12:02:07 2017 -0500 Merge branch 'bug24050_029_squashed' into maint-0.3.2 changes/bug24050 | 5 +++++ src/or/config.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --cc src/or/config.c index a33812a4c,c48070b58..d8f71a019 --- a/src/or/config.c +++ b/src/or/config.c @@@ -6421,10 -6164,8 +6421,9 @@@ port_cfg_new(size_t namelen tor_assert(namelen <= SIZE_T_CEILING - sizeof(port_cfg_t) - 1); port_cfg_t *cfg = tor_malloc_zero(sizeof(port_cfg_t) + namelen + 1); cfg->entry_cfg.ipv4_traffic = 1; + cfg->entry_cfg.ipv6_traffic = 1; cfg->entry_cfg.dns_request = 1; cfg->entry_cfg.onion_traffic = 1; - cfg->entry_cfg.cache_ipv4_answers = 1; cfg->entry_cfg.prefer_ipv6_virtaddr = 1; return cfg; } @@@ -6738,9 -6516,9 +6737,9 @@@ parse_port_config(smartlist_t *out /* This must be kept in sync with port_cfg_new's defaults */ int no_listen = 0, no_advertise = 0, all_addrs = 0, bind_ipv4_only = 0, bind_ipv6_only = 0, - ipv4_traffic = 1, ipv6_traffic = 0, prefer_ipv6 = 0, dns_request = 1, + ipv4_traffic = 1, ipv6_traffic = 1, prefer_ipv6 = 0, dns_request = 1, onion_traffic = 1, - cache_ipv4 = 1, use_cached_ipv4 = 0, + cache_ipv4 = 0, use_cached_ipv4 = 0, cache_ipv6 = 0, use_cached_ipv6 = 0, prefer_ipv6_automap = 1, world_writable = 0, group_writable = 0, relax_dirmode_check = 0,

1 0