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

[tor/maint-0.2.7] Make memwipe() do nothing when passed a NULL pointer or zero size
by nickm＠torproject.org 19 Jan '16

19 Jan '16

commit db8156533133836b19bca51f7fabba4d161b6ba2 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Tue Jan 19 11:22:58 2016 +1100 Make memwipe() do nothing when passed a NULL pointer or zero size Check size argument to memwipe() for underflow. Closes bug #18089. Reported by "gk", patch by "teor". Bugfix on 0.2.3.25 and 0.2.4.6-alpha (#7352), commit 49dd5ef3 on 7 Nov 2012. --- changes/bug18089 | 6 ++++++ src/common/crypto.c | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/changes/bug18089 b/changes/bug18089 new file mode 100644 index 0000000..c1fb342 --- /dev/null +++ b/changes/bug18089 @@ -0,0 +1,6 @@ + o Minor fixes (security): + - Make memwipe() do nothing when passed a NULL pointer + or zero size. Check size argument to memwipe() for underflow. + Closes bug #18089. Reported by "gk", patch by "teor". + Bugfix on 0.2.3.25 and 0.2.4.6-alpha (#7352), + commit 49dd5ef3 on 7 Nov 2012. diff --git a/src/common/crypto.c b/src/common/crypto.c index 218c7be..4e0b383 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -3012,6 +3012,7 @@ base32_decode(char *dest, size_t destlen, const char *src, size_t srclen) /** * Destroy the sz bytes of data stored at mem, setting them to * the value byte. + * If mem is NULL or sz is zero, nothing happens. * * This function is preferable to memset, since many compilers will happily * optimize out memset() when they can convince themselves that the data being @@ -3029,6 +3030,13 @@ base32_decode(char *dest, size_t destlen, const char *src, size_t srclen) void memwipe(void *mem, uint8_t byte, size_t sz) { + if (mem == NULL || sz == 0) { + return; + } + + /* Data this large is likely to be an underflow. */ + tor_assert(sz < SIZE_T_CEILING); + /* Because whole-program-optimization exists, we may not be able to just * have this function call "memset". A smart compiler could inline it, then * eliminate dead memsets, and declare itself to be clever. */

1 0

[tor/maint-0.2.6] Make memwipe() do nothing when passed a NULL pointer or zero size
by nickm＠torproject.org 19 Jan '16

19 Jan '16

commit db8156533133836b19bca51f7fabba4d161b6ba2 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Tue Jan 19 11:22:58 2016 +1100 Make memwipe() do nothing when passed a NULL pointer or zero size Check size argument to memwipe() for underflow. Closes bug #18089. Reported by "gk", patch by "teor". Bugfix on 0.2.3.25 and 0.2.4.6-alpha (#7352), commit 49dd5ef3 on 7 Nov 2012. --- changes/bug18089 | 6 ++++++ src/common/crypto.c | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/changes/bug18089 b/changes/bug18089 new file mode 100644 index 0000000..c1fb342 --- /dev/null +++ b/changes/bug18089 @@ -0,0 +1,6 @@ + o Minor fixes (security): + - Make memwipe() do nothing when passed a NULL pointer + or zero size. Check size argument to memwipe() for underflow. + Closes bug #18089. Reported by "gk", patch by "teor". + Bugfix on 0.2.3.25 and 0.2.4.6-alpha (#7352), + commit 49dd5ef3 on 7 Nov 2012. diff --git a/src/common/crypto.c b/src/common/crypto.c index 218c7be..4e0b383 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -3012,6 +3012,7 @@ base32_decode(char *dest, size_t destlen, const char *src, size_t srclen) /** * Destroy the sz bytes of data stored at mem, setting them to * the value byte. + * If mem is NULL or sz is zero, nothing happens. * * This function is preferable to memset, since many compilers will happily * optimize out memset() when they can convince themselves that the data being @@ -3029,6 +3030,13 @@ base32_decode(char *dest, size_t destlen, const char *src, size_t srclen) void memwipe(void *mem, uint8_t byte, size_t sz) { + if (mem == NULL || sz == 0) { + return; + } + + /* Data this large is likely to be an underflow. */ + tor_assert(sz < SIZE_T_CEILING); + /* Because whole-program-optimization exists, we may not be able to just * have this function call "memset". A smart compiler could inline it, then * eliminate dead memsets, and declare itself to be clever. */

1 0

[tor/master] Check ORPort and DirPort reachability before publishing a relay descriptor
by nickm＠torproject.org 19 Jan '16

19 Jan '16

commit 6094a886cf9be92d29077b428554a75c9971a2ca Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Mon Jan 18 14:00:29 2016 +1100 Check ORPort and DirPort reachability before publishing a relay descriptor Otherwise, relays publish a descriptor with DirPort 0 when the DirPort reachability test takes longer than the ORPort reachability test. Closes bug #18050. Reported by "starlight", patch by "teor". Bugfix on 0.1.0.1-rc, commit a1f1fa6ab on 27 Feb 2005. --- changes/bug18050 | 7 +++++++ src/or/main.c | 10 ++++++---- src/or/router.c | 13 +++++++++---- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/changes/bug18050 b/changes/bug18050 new file mode 100644 index 0000000..ce24a77 --- /dev/null +++ b/changes/bug18050 @@ -0,0 +1,7 @@ + o Minor fixes (relays): + - Check that both the ORPort and DirPort (if present) are reachable + before publishing a relay descriptor. Otherwise, relays publish a + descriptor with DirPort 0 when the DirPort reachability test takes + longer than the ORPort reachability test. + Closes bug #18050. Reported by "starlight", patch by "teor". + Bugfix on 0.1.0.1-rc, commit a1f1fa6ab on 27 Feb 2005. diff --git a/src/or/main.c b/src/or/main.c index df0cd1b..5198b51 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1718,8 +1718,9 @@ second_elapsed_callback(periodic_timer_t *timer, void *arg) if (me && !check_whether_orport_reachable()) { char *address = tor_dup_ip(me->addr); log_warn(LD_CONFIG,"Your server (%s:%d) has not managed to confirm that " - "its ORPort is reachable. Please check your firewalls, ports, " - "address, /etc/hosts file, etc.", + "its ORPort is reachable. Relays do not publish descriptors " + "until their ORPort and DirPort are reachable. Please check " + "your firewalls, ports, address, /etc/hosts file, etc.", address, me->or_port); control_event_server_status(LOG_WARN, "REACHABILITY_FAILED ORADDRESS=%s:%d", @@ -1731,8 +1732,9 @@ second_elapsed_callback(periodic_timer_t *timer, void *arg) char *address = tor_dup_ip(me->addr); log_warn(LD_CONFIG, "Your server (%s:%d) has not managed to confirm that its " - "DirPort is reachable. Please check your firewalls, ports, " - "address, /etc/hosts file, etc.", + "DirPort is reachable. Relays do not publish descriptors " + "until their ORPort and DirPort are reachable. Please check " + "your firewalls, ports, address, /etc/hosts file, etc.", address, me->dir_port); control_event_server_status(LOG_WARN, "REACHABILITY_FAILED DIRADDRESS=%s:%d", diff --git a/src/or/router.c b/src/or/router.c index 2ddaa89..53e0522 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1232,7 +1232,8 @@ router_orport_found_reachable(void) char *address = tor_dup_ip(me->addr); log_notice(LD_OR,"Self-testing indicates your ORPort is reachable from " "the outside. Excellent.%s", - get_options()->PublishServerDescriptor_ != NO_DIRINFO ? + get_options()->PublishServerDescriptor_ != NO_DIRINFO + && check_whether_dirport_reachable() ? " Publishing server descriptor." : ""); can_reach_or_port = 1; mark_my_descriptor_dirty("ORPort found reachable"); @@ -1256,7 +1257,10 @@ router_dirport_found_reachable(void) if (!can_reach_dir_port && me) { char *address = tor_dup_ip(me->addr); log_notice(LD_DIRSERV,"Self-testing indicates your DirPort is reachable " - "from the outside. Excellent."); + "from the outside. Excellent.%s", + get_options()->PublishServerDescriptor_ != NO_DIRINFO + && check_whether_orport_reachable() ? + " Publishing server descriptor." : ""); can_reach_dir_port = 1; if (decide_to_advertise_dirport(get_options(), me->dir_port)) { mark_my_descriptor_dirty("DirPort found reachable"); @@ -1459,7 +1463,8 @@ proxy_mode(const or_options_t *options) * and * - We have ORPort set * and - * - We believe we are reachable from the outside; or + * - We believe both our ORPort and DirPort (if present) are reachable from + * the outside; or * - We are an authoritative directory server. */ static int @@ -1478,7 +1483,7 @@ decide_if_publishable_server(void) if (!router_get_advertised_or_port(options)) return 0; - return check_whether_orport_reachable(); + return check_whether_orport_reachable() && check_whether_dirport_reachable(); } /** Initiate server descriptor upload as reasonable (if server is publishable,

1 0

[tor/master] Merge remote-tracking branch 'teor/bug18050' into maint-0.2.7
by nickm＠torproject.org 19 Jan '16

19 Jan '16

commit 83dfcfbc4a295ca52325f47291d109cd0a16ac8f Merge: b34c5c6 6094a88 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 18 19:51:57 2016 -0500 Merge remote-tracking branch 'teor/bug18050' into maint-0.2.7 changes/bug18050 | 7 +++++++ src/or/main.c | 10 ++++++---- src/or/router.c | 13 +++++++++---- 3 files changed, 22 insertions(+), 8 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.7'
by nickm＠torproject.org 19 Jan '16

19 Jan '16

commit 0ace22ef6dcb918c74cdfadd90a21afe622f2921 Merge: da4dbb2 83dfcfb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 18 19:52:34 2016 -0500 Merge remote-tracking branch 'origin/maint-0.2.7' changes/bug18050 | 7 +++++++ src/or/main.c | 10 ++++++---- src/or/router.c | 13 +++++++++---- 3 files changed, 22 insertions(+), 8 deletions(-)

1 0

[tor/maint-0.2.7] Merge remote-tracking branch 'teor/bug18050' into maint-0.2.7
by nickm＠torproject.org 19 Jan '16

19 Jan '16

commit 83dfcfbc4a295ca52325f47291d109cd0a16ac8f Merge: b34c5c6 6094a88 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 18 19:51:57 2016 -0500 Merge remote-tracking branch 'teor/bug18050' into maint-0.2.7 changes/bug18050 | 7 +++++++ src/or/main.c | 10 ++++++---- src/or/router.c | 13 +++++++++---- 3 files changed, 22 insertions(+), 8 deletions(-)

1 0

[tor/maint-0.2.7] Check ORPort and DirPort reachability before publishing a relay descriptor
by nickm＠torproject.org 19 Jan '16

19 Jan '16

commit 6094a886cf9be92d29077b428554a75c9971a2ca Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Mon Jan 18 14:00:29 2016 +1100 Check ORPort and DirPort reachability before publishing a relay descriptor Otherwise, relays publish a descriptor with DirPort 0 when the DirPort reachability test takes longer than the ORPort reachability test. Closes bug #18050. Reported by "starlight", patch by "teor". Bugfix on 0.1.0.1-rc, commit a1f1fa6ab on 27 Feb 2005. --- changes/bug18050 | 7 +++++++ src/or/main.c | 10 ++++++---- src/or/router.c | 13 +++++++++---- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/changes/bug18050 b/changes/bug18050 new file mode 100644 index 0000000..ce24a77 --- /dev/null +++ b/changes/bug18050 @@ -0,0 +1,7 @@ + o Minor fixes (relays): + - Check that both the ORPort and DirPort (if present) are reachable + before publishing a relay descriptor. Otherwise, relays publish a + descriptor with DirPort 0 when the DirPort reachability test takes + longer than the ORPort reachability test. + Closes bug #18050. Reported by "starlight", patch by "teor". + Bugfix on 0.1.0.1-rc, commit a1f1fa6ab on 27 Feb 2005. diff --git a/src/or/main.c b/src/or/main.c index df0cd1b..5198b51 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1718,8 +1718,9 @@ second_elapsed_callback(periodic_timer_t *timer, void *arg) if (me && !check_whether_orport_reachable()) { char *address = tor_dup_ip(me->addr); log_warn(LD_CONFIG,"Your server (%s:%d) has not managed to confirm that " - "its ORPort is reachable. Please check your firewalls, ports, " - "address, /etc/hosts file, etc.", + "its ORPort is reachable. Relays do not publish descriptors " + "until their ORPort and DirPort are reachable. Please check " + "your firewalls, ports, address, /etc/hosts file, etc.", address, me->or_port); control_event_server_status(LOG_WARN, "REACHABILITY_FAILED ORADDRESS=%s:%d", @@ -1731,8 +1732,9 @@ second_elapsed_callback(periodic_timer_t *timer, void *arg) char *address = tor_dup_ip(me->addr); log_warn(LD_CONFIG, "Your server (%s:%d) has not managed to confirm that its " - "DirPort is reachable. Please check your firewalls, ports, " - "address, /etc/hosts file, etc.", + "DirPort is reachable. Relays do not publish descriptors " + "until their ORPort and DirPort are reachable. Please check " + "your firewalls, ports, address, /etc/hosts file, etc.", address, me->dir_port); control_event_server_status(LOG_WARN, "REACHABILITY_FAILED DIRADDRESS=%s:%d", diff --git a/src/or/router.c b/src/or/router.c index 2ddaa89..53e0522 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1232,7 +1232,8 @@ router_orport_found_reachable(void) char *address = tor_dup_ip(me->addr); log_notice(LD_OR,"Self-testing indicates your ORPort is reachable from " "the outside. Excellent.%s", - get_options()->PublishServerDescriptor_ != NO_DIRINFO ? + get_options()->PublishServerDescriptor_ != NO_DIRINFO + && check_whether_dirport_reachable() ? " Publishing server descriptor." : ""); can_reach_or_port = 1; mark_my_descriptor_dirty("ORPort found reachable"); @@ -1256,7 +1257,10 @@ router_dirport_found_reachable(void) if (!can_reach_dir_port && me) { char *address = tor_dup_ip(me->addr); log_notice(LD_DIRSERV,"Self-testing indicates your DirPort is reachable " - "from the outside. Excellent."); + "from the outside. Excellent.%s", + get_options()->PublishServerDescriptor_ != NO_DIRINFO + && check_whether_orport_reachable() ? + " Publishing server descriptor." : ""); can_reach_dir_port = 1; if (decide_to_advertise_dirport(get_options(), me->dir_port)) { mark_my_descriptor_dirty("DirPort found reachable"); @@ -1459,7 +1463,8 @@ proxy_mode(const or_options_t *options) * and * - We have ORPort set * and - * - We believe we are reachable from the outside; or + * - We believe both our ORPort and DirPort (if present) are reachable from + * the outside; or * - We are an authoritative directory server. */ static int @@ -1478,7 +1483,7 @@ decide_if_publishable_server(void) if (!router_get_advertised_or_port(options)) return 0; - return check_whether_orport_reachable(); + return check_whether_orport_reachable() && check_whether_dirport_reachable(); } /** Initiate server descriptor upload as reasonable (if server is publishable,

1 0

[check/master] Link to Atlas' search page for the connecting IP address
by arlo＠torproject.org 18 Jan '16

18 Jan '16

commit 62cb4cbf5924a2ca4c6ed842a9d4f8b477b1ef4d Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon Jan 18 13:07:54 2016 -0800 Link to Atlas' search page for the connecting IP address * Instead of the details page of the fingerprint check thinks it knows, for the case where multiple nodes are being hosted at the same IP. * Trac 10499 --- public/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/index.html b/public/index.html index eb1195e..056884d 100644 --- a/public/index.html +++ b/public/index.html @@ -102,7 +102,7 @@ {{ end }} {{ if .IsTor }} - {{ GetText .Lang "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> for further information about using Tor safely. You are now free to browse the Internet anonymously." | UnEscaped }} {{ GetText .Lang "For more information about this exit relay, see:" }} <a href="https://atlas.torproject.org/#details/{{ .Fingerprint }}">Atlas</a>. + {{ GetText .Lang "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> for further information about using Tor safely. You are now free to browse the Internet anonymously." | UnEscaped }} {{ GetText .Lang "For more information about this exit relay, see:" }} <a href="https://atlas.torproject.org/#search/{{ .IP }}">Atlas</a>. {{ else }} {{ GetText .Lang "If you are attempting to use a Tor client, please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for configuring your Tor client</a>." | UnEscaped }} {{ end }}

1 0

[stem/master] Remove config values when Config.set() is provided with a None value
by atagar＠torproject.org 18 Jan '16

18 Jan '16

commit 1248546bcdd6c1d9e6aa0e79dd1c29d89c8d6060 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 17 15:05:56 2016 -0800 Remove config values when Config.set() is provided with a None value Ran into a situation where I wanted to unset a config value. Intuitive way of doing this is to provide None to our set() method. --- docs/change_log.rst | 1 + stem/util/conf.py | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 0640aef..1420ddf 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -74,6 +74,7 @@ The following are only available within Stem's `git repository * Added :func:`~stem.util.__init__.datetime_to_unix` * Basic IPv6 support in :func:`~stem.util.connection.get_connections` * The 'ss' connection resolver didn't work on Gentoo (:trac:`18079`) + * Allow :func:`stem.util.conf.Config.set` to remove values when provided with a **None** value * **Interpreter** diff --git a/stem/util/conf.py b/stem/util/conf.py index 8e6597f..18226d8 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -620,6 +620,9 @@ class Config(object): Appends the given key/value configuration mapping, behaving the same as if we'd loaded this from a configuration file. + .. versionchanged:: 1.5.0 + Allow removal of values by overwriting with a **None** value. + :param str key: key for the configuration mapping :param str,list value: value we're setting the mapping to :param bool overwrite: replaces the previous value if **True**, otherwise @@ -629,7 +632,12 @@ class Config(object): with self._contents_lock: unicode_type = str if stem.prereq.is_python_3() else unicode - if isinstance(value, bytes) or isinstance(value, unicode_type): + if value is None: + if overwrite and key in self._contents: + del self._contents[key] + else: + pass # no value so this is a no-op + elif isinstance(value, (bytes, unicode_type)): if not overwrite and key in self._contents: self._contents[key].append(value) else:

1 0

[stem/master] Use size attribute on TarInfo rather than ExFileObject
by atagar＠torproject.org 18 Jan '16

18 Jan '16

commit 29e98ac500e810f20696ed569553741d8ccd0c25 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 18 08:17:51 2016 -0800 Use size attribute on TarInfo rather than ExFileObject Bah. With python 2.7 and 3.2 this worked but Karsten points out that with python 3.5 it chokes with... measure_average_advertised_bandwidth('../res/server-descriptors-2015-11.tar') File "metrics.py", line 9, in measure_average_advertised_bandwidth for desc in parse_file(path): File "/Users/karsten/Desktop/performance-comparison/stem/stem/descriptor/__init__.py", line 171, in parse_file for desc in handler(descriptor_file, descriptor_type, validate, document_handler, **kwargs): File "/Users/karsten/Desktop/performance-comparison/stem/stem/descriptor/__init__.py", line 246, in _parse_file_for_tar_path for desc in parse_file(tar_file, *args, **kwargs): File "/Users/karsten/Desktop/performance-comparison/stem/stem/descriptor/__init__.py", line 171, in parse_file for desc in handler(descriptor_file, descriptor_type, validate, document_handler, **kwargs): File "/Users/karsten/Desktop/performance-comparison/stem/stem/descriptor/__init__.py", line 259, in _parse_file_for_tarfile if entry.size == 0: AttributeError: 'ExFileObject' object has no attribute 'size' Docs definitely say the TarInfo has a size attribute so using that instead... https://docs.python.org/3.5/library/tarfile.html#tarinfo-objects --- stem/descriptor/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 6b18d65..dc7c1df 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -256,7 +256,7 @@ def _parse_file_for_tarfile(descriptor_file, *args, **kwargs): if tar_entry.isfile(): entry = descriptor_file.extractfile(tar_entry) - if entry.size == 0: + if tar_entry.size == 0: continue try:

1 0