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

[tor/maint-0.3.2] Add a changelog for the STACK fixes
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit 35d56a127d9af913f0f74ec359b182fa33f49c50 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 26 17:37:36 2017 -0500 Add a changelog for the STACK fixes --- changes/stack | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/changes/stack b/changes/stack new file mode 100644 index 000000000..ffdf536cb --- /dev/null +++ b/changes/stack @@ -0,0 +1,7 @@ + o Minor bugfixes (correctness): + - Fix several places in our codebase where a C compiler would be likely + to eliminate a check, based on assuming that undefined behavior had not + happened elsewhere in the code. These cases are usually a sign of + redundant checking, or dubious arithmetic. Found by Georg Koppen using + the "STACK" tool from Wang, Zeldovich, Kaashoek, and + Solar-Lezama. Fixes bug 24423; bugfix on various Tor versions.

1 0

[tor/maint-0.3.2] Move subtraction in rephist to try to avoid STACK warning
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit f539d89fd9d19e44596976a42c12d4fd41f1d0fc Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 26 17:34:49 2017 -0500 Move subtraction in rephist to try to avoid STACK warning (I do not know why this one is happening) --- src/or/rephist.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/or/rephist.c b/src/or/rephist.c index 51e800bc3..b63cdbfcd 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -1811,7 +1811,7 @@ static time_t last_prediction_add_time=0; int predicted_ports_prediction_time_remaining(time_t now) { - time_t idle_delta = now - last_prediction_add_time; + time_t idle_delta; /* Protect against overflow of return value. This can happen if the clock * jumps backwards in time. Update the last prediction time (aka last @@ -1821,6 +1821,8 @@ predicted_ports_prediction_time_remaining(time_t now) if (last_prediction_add_time > now) { last_prediction_add_time = now; idle_delta = 0; + } else { + idle_delta = now - last_prediction_add_time; } /* Protect against underflow of the return value. This can happen for very

1 0

[tor/maint-0.3.2] sched: Avoid integer overflow when computing tcp_space
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit 057139d3830bb94df8031bb6e8e385cef53352bc Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Dec 11 15:42:28 2017 -0500 sched: Avoid integer overflow when computing tcp_space In KIST, we could have a small congestion window value than the unacked packets leading to a integer overflow which leaves the tcp_space value to be humongous. This has no security implications but it results in KIST scheduler allowing to send cells on a potentially saturated connection. Found by #24423. Fixes #24590. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug24590 | 5 +++++ src/or/scheduler_kist.c | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/changes/bug24590 b/changes/bug24590 new file mode 100644 index 000000000..77e039f8d --- /dev/null +++ b/changes/bug24590 @@ -0,0 +1,5 @@ + o Minor bugfixes (scheduler, KIST): + - Avoid a possible integer overflow when computing the available space on + the TCP buffer of a channel. This has no security implications but can + make KIST not behave properly by allowing more cells on a already + saturated connection. Fixes bug 24590; bugfix on 0.3.2.1-alpha. diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c index 3d8f553ac..9acd89b37 100644 --- a/src/or/scheduler_kist.c +++ b/src/or/scheduler_kist.c @@ -264,10 +264,13 @@ update_socket_info_impl, (socket_table_ent_t *ent)) * ^ ((cwnd * mss) * factor) bytes */ - /* Assuming all these values from the kernel are uint32_t still, they will - * always fit into a int64_t tcp_space variable. */ - tcp_space = (ent->cwnd - ent->unacked) * (int64_t)ent->mss; - if (tcp_space < 0) { + /* These values from the kernel are uint32_t, they will always fit into a + * int64_t tcp_space variable but if the congestion window cwnd is smaller + * than the unacked packets, the remaining TCP space is set to 0 so we don't + * write more on this channel. */ + if (ent->cwnd >= ent->unacked) { + tcp_space = (ent->cwnd - ent->unacked) * (int64_t)(ent->mss); + } else { tcp_space = 0; }

1 0

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

11 Dec '17

commit 4fc402496eb21fc46edfe162c911da9679fd5d28 Merge: 68ec14dc1 057139d38 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:02:10 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24590 | 5 +++++ src/or/scheduler_kist.c | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-)

1 0

[tor/master] sched: Avoid integer overflow when computing tcp_space
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit 057139d3830bb94df8031bb6e8e385cef53352bc Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Dec 11 15:42:28 2017 -0500 sched: Avoid integer overflow when computing tcp_space In KIST, we could have a small congestion window value than the unacked packets leading to a integer overflow which leaves the tcp_space value to be humongous. This has no security implications but it results in KIST scheduler allowing to send cells on a potentially saturated connection. Found by #24423. Fixes #24590. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug24590 | 5 +++++ src/or/scheduler_kist.c | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/changes/bug24590 b/changes/bug24590 new file mode 100644 index 000000000..77e039f8d --- /dev/null +++ b/changes/bug24590 @@ -0,0 +1,5 @@ + o Minor bugfixes (scheduler, KIST): + - Avoid a possible integer overflow when computing the available space on + the TCP buffer of a channel. This has no security implications but can + make KIST not behave properly by allowing more cells on a already + saturated connection. Fixes bug 24590; bugfix on 0.3.2.1-alpha. diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c index 3d8f553ac..9acd89b37 100644 --- a/src/or/scheduler_kist.c +++ b/src/or/scheduler_kist.c @@ -264,10 +264,13 @@ update_socket_info_impl, (socket_table_ent_t *ent)) * ^ ((cwnd * mss) * factor) bytes */ - /* Assuming all these values from the kernel are uint32_t still, they will - * always fit into a int64_t tcp_space variable. */ - tcp_space = (ent->cwnd - ent->unacked) * (int64_t)ent->mss; - if (tcp_space < 0) { + /* These values from the kernel are uint32_t, they will always fit into a + * int64_t tcp_space variable but if the congestion window cwnd is smaller + * than the unacked packets, the remaining TCP space is set to 0 so we don't + * write more on this channel. */ + if (ent->cwnd >= ent->unacked) { + tcp_space = (ent->cwnd - ent->unacked) * (int64_t)(ent->mss); + } else { tcp_space = 0; }

1 0

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

11 Dec '17

commit 252db6ad26900235f8904fa6b8d510551b9176cf Merge: ea929e845 057139d38 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:02:10 2017 -0500 Merge branch 'maint-0.3.2' changes/bug24590 | 5 +++++ src/or/scheduler_kist.c | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-)

1 0

[tor/release-0.3.2] sched: Avoid integer overflow when computing tcp_space
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit 057139d3830bb94df8031bb6e8e385cef53352bc Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Dec 11 15:42:28 2017 -0500 sched: Avoid integer overflow when computing tcp_space In KIST, we could have a small congestion window value than the unacked packets leading to a integer overflow which leaves the tcp_space value to be humongous. This has no security implications but it results in KIST scheduler allowing to send cells on a potentially saturated connection. Found by #24423. Fixes #24590. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug24590 | 5 +++++ src/or/scheduler_kist.c | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/changes/bug24590 b/changes/bug24590 new file mode 100644 index 000000000..77e039f8d --- /dev/null +++ b/changes/bug24590 @@ -0,0 +1,5 @@ + o Minor bugfixes (scheduler, KIST): + - Avoid a possible integer overflow when computing the available space on + the TCP buffer of a channel. This has no security implications but can + make KIST not behave properly by allowing more cells on a already + saturated connection. Fixes bug 24590; bugfix on 0.3.2.1-alpha. diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c index 3d8f553ac..9acd89b37 100644 --- a/src/or/scheduler_kist.c +++ b/src/or/scheduler_kist.c @@ -264,10 +264,13 @@ update_socket_info_impl, (socket_table_ent_t *ent)) * ^ ((cwnd * mss) * factor) bytes */ - /* Assuming all these values from the kernel are uint32_t still, they will - * always fit into a int64_t tcp_space variable. */ - tcp_space = (ent->cwnd - ent->unacked) * (int64_t)ent->mss; - if (tcp_space < 0) { + /* These values from the kernel are uint32_t, they will always fit into a + * int64_t tcp_space variable but if the congestion window cwnd is smaller + * than the unacked packets, the remaining TCP space is set to 0 so we don't + * write more on this channel. */ + if (ent->cwnd >= ent->unacked) { + tcp_space = (ent->cwnd - ent->unacked) * (int64_t)(ent->mss); + } else { tcp_space = 0; }

1 0

[stem/master] Add stem.util.term to tutorials
by atagar＠torproject.org 11 Dec '17

11 Dec '17

commit a774bdbf151b24b9d87188d27d3733bdf5b66383 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Dec 11 12:58:45 2017 -0800 Add stem.util.term to tutorials Long ago I made a utilities tutorial with the plan for it to have a myriad of tools, but year later it still just has our connection module. Long overdue we add something. :P --- docs/_static/example/words_with.py | 40 +++++++++++++++++++++++++++++++++++++ docs/_static/words_with.png | Bin 0 -> 46697 bytes docs/api.rst | 1 + docs/tutorials/east_of_the_sun.rst | 24 +++++++++++++++++++++- 4 files changed, 64 insertions(+), 1 deletion(-) diff --git a/docs/_static/example/words_with.py b/docs/_static/example/words_with.py new file mode 100644 index 00000000..b7956cb2 --- /dev/null +++ b/docs/_static/example/words_with.py @@ -0,0 +1,40 @@ +import itertools +import re + +from stem.util import term +from stem.util.term import Attr, Color + + +def get_words_with(target, attr): + """ + Provides words with the given substring highlighted within it. + + :param str target: substring to match against + :param tuple attr: terminal formatting to highlight the match with + + :returns: **iterable** with words containing that substring + """ + + matches = [] + word_matcher = re.compile('(.*)(%s)(.*)' % target, re.I) + + with open('/etc/dictionaries-common/words') as dictionary_file: + for word in dictionary_file: + match = word_matcher.match(word) + + if match: + yield ''.join(( + match.group(1), + term.format(match.group(2), *attr), + match.group(3), + )) + + +if __name__ == '__main__': + target = raw_input("What substring would you like to look for? We'll get words containing it: ") + attr = (Attr.BOLD, Color.YELLOW) + + print("Words with '%s' include...\n" % term.format(target, *attr)) + + for words in itertools.izip_longest(*(get_words_with(target, attr),) * 4): + print('%-30s%-30s%-30s%-30s' % tuple([w if w else '' for w in words])) diff --git a/docs/_static/words_with.png b/docs/_static/words_with.png new file mode 100644 index 00000000..6e0b0b48 Binary files /dev/null and b/docs/_static/words_with.png differ diff --git a/docs/api.rst b/docs/api.rst index 9fd56c65..307184dc 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -49,6 +49,7 @@ Utilities * `stem.util.conf <api/util/conf.html>`_ - Configuration file handling. * `stem.util.connection <api/util/connection.html>`_ - Connection and IP related utilities. * `stem.util.enum <api/util/enum.html>`_ - Enumeration class. +* `stem.util.proc <api/util/proc.html>`_ - Resource and connection usage via proc contents. * `stem.util.str_tools <api/util/str_tools.html>`_ - String utilities. * `stem.util.system <api/util/system.html>`_ - Tools related to the local system. * `stem.util.term <api/util/term.html>`_ - Tools for interacting with the terminal. diff --git a/docs/tutorials/east_of_the_sun.rst b/docs/tutorials/east_of_the_sun.rst index d74c347f..845cbf4a 100644 --- a/docs/tutorials/east_of_the_sun.rst +++ b/docs/tutorials/east_of_the_sun.rst @@ -3,8 +3,31 @@ East of the Sun & West of the Moon The following is an overview of some of the utilities Stem provides. +* :ref:`terminal-styling` * :ref:`connection-resolution` +.. _terminal-styling: + +Terminal Styling +---------------- + +Know what's better than text? Pretty text! + +OSX, Linux, BSD... really, everything except Windows supports terminal +formatting through `ANSI escape sequences +<https://en.wikipedia.org/wiki/ANSI_escape_code#CSI_codes>`_. Doing this +yourself is easy, but we also provide a module to make it `even easier +<../api/util/term.html>`_. + +| + +.. image:: /_static/words_with.png + +| + +.. literalinclude:: /_static/example/words_with.py + :language: python + .. _connection-resolution: Connection Resolution @@ -46,4 +69,3 @@ simple script that dumps Tor's present connections. 192.168.0.1:59014 => 38.229.79.2:443 192.168.0.1:58822 => 68.169.35.102:443 -

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 11 Dec '17

11 Dec '17

commit 5b7607446b56660f4524b59dd8ef861548303f2d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 11 18:20:17 2017 +0000 Update translations for tails-greeter-2 --- az/az.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/az/az.po b/az/az.po index 348b6c5da..25b4e1b25 100644 --- a/az/az.po +++ b/az/az.po @@ -259,7 +259,7 @@ msgstr "" #: ../tailsgreeter/gui.py:616 msgid "Back" -msgstr "" +msgstr "Geri" #: ../tailsgreeter/gui.py:730 msgid "Shutdown"

1 0

[translation/tails-perl5lib] Update translations for tails-perl5lib
by translation＠torproject.org 11 Dec '17

11 Dec '17

commit 82f0f215a6ac9a98dc6d488e70e3498b7cd2d3a9 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 11 17:48:01 2017 +0000 Update translations for tails-perl5lib --- az.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/az.po b/az.po index cb5a64b8a..93b1db7e3 100644 --- a/az.po +++ b/az.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-05-20 10:59+0200\n" -"PO-Revision-Date: 2017-09-19 22:59+0000\n" +"PO-Revision-Date: 2017-12-11 17:28+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Azerbaijani (http://www.transifex.com/otf/torproject/language/az/)\n" "MIME-Version: 1.0\n"

1 0