tor-commits January 2020

tor-commits@lists.torproject.org

19 participants
1596 discussions

[tor/master] fix leak in GETCONF
by nickm＠torproject.org 24 Jan '20

24 Jan '20

commit f7a2b98674040f191e4a44d59610cc018fccb461 Author: Taylor Yu <catalyst(a)torproject.org> Date: Fri Jan 24 09:06:30 2020 -0600 fix leak in GETCONF Fix a memory leak introduced by refactoring of control reply formatting code. Fixes bug 33039; bugfix on 0.4.3.1-alpha. --- src/feature/control/control_cmd.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/feature/control/control_cmd.c b/src/feature/control/control_cmd.c index 5fceb404e..c2d23243e 100644 --- a/src/feature/control/control_cmd.c +++ b/src/feature/control/control_cmd.c @@ -323,10 +323,8 @@ handle_control_getconf(control_connection_t *conn, send_control_done(conn); } - SMARTLIST_FOREACH(answers, char *, cp, tor_free(cp)); - smartlist_free(answers); - smartlist_free(unrecognized); - + control_reply_free(answers); + control_reply_free(unrecognized); return 0; }

1 0

[tor/master] tests for ticket 33039
by nickm＠torproject.org 24 Jan '20

24 Jan '20

commit 76a8a734c939edab50c565d2ac514c65bd899f5f Author: Taylor Yu <catalyst(a)torproject.org> Date: Fri Jan 24 10:33:01 2020 -0600 tests for ticket 33039 --- src/test/test_controller.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/src/test/test_controller.c b/src/test/test_controller.c index fb027d1a1..a69ec17db 100644 --- a/src/test/test_controller.c +++ b/src/test/test_controller.c @@ -2027,6 +2027,91 @@ test_control_reply(void *arg) return; } +static void +test_control_getconf(void *arg) +{ + (void)arg; + control_connection_t conn; + char *args = NULL; + int r = -1; + + memset(&conn, 0, sizeof(conn)); + conn.current_cmd = tor_strdup("GETCONF"); + + MOCK(control_write_reply, mock_control_write_reply_list); + reply_strs = smartlist_new(); + + args = tor_strdup(""); + r = handle_control_command(&conn, (uint32_t)strlen(args), args); + tt_int_op(r, OP_EQ, 0); + tt_int_op(smartlist_len(reply_strs), OP_EQ, 1); + tt_str_op((char *)smartlist_get(reply_strs, 0), OP_EQ, "250 OK"); + SMARTLIST_FOREACH(reply_strs, char *, p, tor_free(p)); + smartlist_clear(reply_strs); + tor_free(args); + + args = tor_strdup("NoSuch"); + r = handle_control_command(&conn, (uint32_t)strlen(args), args); + tt_int_op(r, OP_EQ, 0); + tt_int_op(smartlist_len(reply_strs), OP_EQ, 1); + tt_str_op((char *)smartlist_get(reply_strs, 0), OP_EQ, + "552 Unrecognized configuration key \"NoSuch\""); + tor_free(args); + SMARTLIST_FOREACH(reply_strs, char *, p, tor_free(p)); + smartlist_clear(reply_strs); + + args = tor_strdup("NoSuch1 NoSuch2"); + r = handle_control_command(&conn, (uint32_t)strlen(args), args); + tt_int_op(r, OP_EQ, 0); + tt_int_op(smartlist_len(reply_strs), OP_EQ, 2); + tt_str_op((char *)smartlist_get(reply_strs, 0), OP_EQ, + "552-Unrecognized configuration key \"NoSuch1\""); + tt_str_op((char *)smartlist_get(reply_strs, 1), OP_EQ, + "552 Unrecognized configuration key \"NoSuch2\""); + tor_free(args); + SMARTLIST_FOREACH(reply_strs, char *, p, tor_free(p)); + smartlist_clear(reply_strs); + + args = tor_strdup("ControlPort NoSuch"); + r = handle_control_command(&conn, (uint32_t)strlen(args), args); + tt_int_op(r, OP_EQ, 0); + /* Valid keys ignored if there are any invalid ones */ + tt_int_op(smartlist_len(reply_strs), OP_EQ, 1); + tt_str_op((char *)smartlist_get(reply_strs, 0), OP_EQ, + "552 Unrecognized configuration key \"NoSuch\""); + tor_free(args); + SMARTLIST_FOREACH(reply_strs, char *, p, tor_free(p)); + smartlist_clear(reply_strs); + + args = tor_strdup("ClientOnly"); + r = handle_control_command(&conn, (uint32_t)strlen(args), args); + tt_int_op(r, OP_EQ, 0); + tt_int_op(smartlist_len(reply_strs), OP_EQ, 1); + /* According to config.c, this is an exception for the unit tests */ + tt_str_op((char *)smartlist_get(reply_strs, 0), OP_EQ, "250 ClientOnly=0"); + tor_free(args); + SMARTLIST_FOREACH(reply_strs, char *, p, tor_free(p)); + smartlist_clear(reply_strs); + + args = tor_strdup("BridgeRelay ClientOnly"); + r = handle_control_command(&conn, (uint32_t)strlen(args), args); + tt_int_op(r, OP_EQ, 0); + tt_int_op(smartlist_len(reply_strs), OP_EQ, 2); + /* Change if config.c changes BridgeRelay default (unlikely) */ + tt_str_op((char *)smartlist_get(reply_strs, 0), OP_EQ, "250-BridgeRelay=0"); + tt_str_op((char *)smartlist_get(reply_strs, 1), OP_EQ, "250 ClientOnly=0"); + tor_free(args); + SMARTLIST_FOREACH(reply_strs, char *, p, tor_free(p)); + smartlist_clear(reply_strs); + + done: + tor_free(conn.current_cmd); + tor_free(args); + UNMOCK(control_write_reply); + SMARTLIST_FOREACH(reply_strs, char *, p, tor_free(p)); + smartlist_free(reply_strs); +} + #ifndef COCCI #define PARSER_TEST(type) \ { "parse/" #type, test_controller_parse_cmd, 0, &passthrough_setup, \ @@ -2060,5 +2145,6 @@ struct testcase_t controller_tests[] = { { "current_time", test_current_time, 0, NULL, NULL }, { "getinfo_md_all", test_getinfo_md_all, 0, NULL, NULL }, { "control_reply", test_control_reply, 0, NULL, NULL }, + { "control_getconf", test_control_getconf, 0, NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/master] changes file for ticket 33039
by nickm＠torproject.org 24 Jan '20

24 Jan '20

commit f10e6b723480eafa778c6f304a1fe42a3cf109b6 Author: Taylor Yu <catalyst(a)torproject.org> Date: Fri Jan 24 11:57:45 2020 -0600 changes file for ticket 33039 --- changes/ticket33039 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket33039 b/changes/ticket33039 new file mode 100644 index 000000000..29eeabf45 --- /dev/null +++ b/changes/ticket33039 @@ -0,0 +1,3 @@ + o Minor bugfixes (control port): + - Fix a memory leak introduced by refactoring of control reply + formatting code. Fixes bug 33039; bugfix on 0.4.3.1-alpha.

1 0

[translation/https_everywhere_completed] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed
by translation＠torproject.org 24 Jan '20

24 Jan '20

commit b3651de2e2f4f7af694b611dd780103752f500c7 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 24 18:16:03 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_co… --- da/https-everywhere.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/da/https-everywhere.dtd b/da/https-everywhere.dtd index e8814a8c51..c67597b066 100644 --- a/da/https-everywhere.dtd +++ b/da/https-everywhere.dtd @@ -29,6 +29,8 @@ <!ENTITY https-everywhere.options.userRulesListed ""> <!ENTITY https-everywhere.options.disabledUrlsListed ""> <!ENTITY https-everywhere.options.updateChannelsWarning ""> +<!ENTITY https-everywhere.options.addDisabledSite ""> +<!ENTITY https-everywhere.options.enterDisabledSite ""> <!ENTITY https-everywhere.options.addUpdateChannel ""> <!ENTITY https-everywhere.options.enterUpdateChannelName ""> <!ENTITY https-everywhere.options.delete "">

1 0

[translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
by translation＠torproject.org 24 Jan '20

24 Jan '20

commit bbc5bb5f2ee5c158f18704698e5f2099c27f0389 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 24 18:15:57 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- da/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da/https-everywhere.dtd b/da/https-everywhere.dtd index 64da904217..4e7b06868e 100644 --- a/da/https-everywhere.dtd +++ b/da/https-everywhere.dtd @@ -29,8 +29,8 @@ <!ENTITY https-everywhere.options.userRulesListed "Brugerregler for HTTPS Everywhere"> <!ENTITY https-everywhere.options.disabledUrlsListed "HTTPS Everywhere-steder deaktiveret"> <!ENTITY https-everywhere.options.updateChannelsWarning "Advarsel: Tilføjelse af opdateringskanaler kan gøre at angribere kan kidnappe din browser. Rediger kun sektionen hvis du ved hvad du gør!"> -<!ENTITY https-everywhere.options.addDisabledSite "Add Disabled Site"> -<!ENTITY https-everywhere.options.enterDisabledSite "Enter disabled site"> +<!ENTITY https-everywhere.options.addDisabledSite "Tilføj deaktiveret sted"> +<!ENTITY https-everywhere.options.enterDisabledSite "Indtast deaktiveret sted"> <!ENTITY https-everywhere.options.addUpdateChannel "Tilføj opdateringskanal"> <!ENTITY https-everywhere.options.enterUpdateChannelName "Indtast navn på opdateringskanal"> <!ENTITY https-everywhere.options.delete "Delete">

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 24 Jan '20

24 Jan '20

commit 708e65a5c285cb02adc7c4b72bb9da2ec07f7977 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 24 17:23:34 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ja.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+ja.po b/contents+ja.po index 8e64d8d1dd..521ff2929a 100644 --- a/contents+ja.po +++ b/contents+ja.po @@ -5,9 +5,9 @@ # Emma Peel, 2019 # ue zaeco, 2019 # Tokumei Nanashi, 2019 -# h345u37g3 h345u37g3, 2019 # 987 pluto <pluto987(a)protonmail.com>, 2019 # Agent Exe <sw.172.135.9.xxx.l62118102(a)gmail.com>, 2020 +# h345u37g3 h345u37g3, 2020 # msgid "" msgstr "" @@ -15,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-01-20 16:43+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Agent Exe <sw.172.135.9.xxx.l62118102(a)gmail.com>, 2020\n" +"Last-Translator: h345u37g3 h345u37g3, 2020\n" "Language-Team: Japanese (https://www.transifex.com/otf/teams/1519/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -527,7 +527,7 @@ msgstr "" #: https//support.torproject.org/about/distribute-tor/ #: (content/about/distribute-tor/contents+en.lrquestion.description) msgid "Yes." -msgstr "" +msgstr "はい" #: https//support.torproject.org/about/distribute-tor/ #: (content/about/distribute-tor/contents+en.lrquestion.description)

1 0

[translation/https_everywhere_completed] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed
by translation＠torproject.org 24 Jan '20

24 Jan '20

commit 7cc5429cd6c9dd175e69dc7e3428f52d8411c322 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 24 16:46:09 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_co… --- es/https-everywhere.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd index 2712153c04..05e0926ace 100644 --- a/es/https-everywhere.dtd +++ b/es/https-everywhere.dtd @@ -29,6 +29,8 @@ <!ENTITY https-everywhere.options.userRulesListed "Reglas del Usuario para HTTPS Everywhere"> <!ENTITY https-everywhere.options.disabledUrlsListed "Sitios deshabilitados por HTTPS Everywhere"> <!ENTITY https-everywhere.options.updateChannelsWarning "Cuidado: Agregar canales de actualización puede originar que los atacantes secuestren tu navegador. ¡Edita esta sección sólo si sabes lo que estás haciendo!"> +<!ENTITY https-everywhere.options.addDisabledSite ""> +<!ENTITY https-everywhere.options.enterDisabledSite ""> <!ENTITY https-everywhere.options.addUpdateChannel "Añadir Actualizar Canales"> <!ENTITY https-everywhere.options.enterUpdateChannelName "Introduce el nombre del canal de actualización"> <!ENTITY https-everywhere.options.delete "Borrar">

1 0

[translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
by translation＠torproject.org 24 Jan '20

24 Jan '20

commit 83e08cf897175aec5693a3beacbf9c1f2b38f491 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 24 16:46:02 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- es/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd index cc37cc919d..820ad61f41 100644 --- a/es/https-everywhere.dtd +++ b/es/https-everywhere.dtd @@ -29,8 +29,8 @@ <!ENTITY https-everywhere.options.userRulesListed "Reglas del Usuario para HTTPS Everywhere"> <!ENTITY https-everywhere.options.disabledUrlsListed "Sitios deshabilitados por HTTPS Everywhere"> <!ENTITY https-everywhere.options.updateChannelsWarning "Cuidado: Agregar canales de actualización puede originar que los atacantes secuestren tu navegador. ¡Edita esta sección sólo si sabes lo que estás haciendo!"> -<!ENTITY https-everywhere.options.addDisabledSite "Add Disabled Site"> -<!ENTITY https-everywhere.options.enterDisabledSite "Enter disabled site"> +<!ENTITY https-everywhere.options.addDisabledSite "Añadir lugares inhabilitados"> +<!ENTITY https-everywhere.options.enterDisabledSite "Introducir el sitio inhabilitado"> <!ENTITY https-everywhere.options.addUpdateChannel "Añadir Actualizar Canales"> <!ENTITY https-everywhere.options.enterUpdateChannelName "Introduce el nombre del canal de actualización"> <!ENTITY https-everywhere.options.delete "Borrar">

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 24 Jan '20

24 Jan '20

commit 9d34b33072a35a490d729ad82f8fd673b7af80a5 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 24 15:54:13 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+fa.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contents+fa.po b/contents+fa.po index 7f373505a8..77aebc7405 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -5737,6 +5737,8 @@ msgid "" "You're right, for the most part a byte into your Tor relay means a byte out," " and vice versa. But there are a few exceptions:" msgstr "" +"حق با شماست، برای یک بایت که وارد بازپخش Tor شما شود یک بایت خارج می شود. " +"اما چندین استثنا وجود دارد:" #: https//support.torproject.org/operators/relay-write-more-bytes/ #: (content/operators/relay-write-more-bytes/contents+en.lrquestion.description)

1 0

[translation/whisperback] https://gitweb.torproject.org/translation.git/commit/?h=whisperback
by translation＠torproject.org 24 Jan '20

24 Jan '20

commit 9d7f900430415df9375de15a3c7fe1b1c93e06ee Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 24 15:53:56 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=whisperback --- ia/ia.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ia/ia.po b/ia/ia.po index 873597f07a..9272587b20 100644 --- a/ia/ia.po +++ b/ia/ia.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-29 12:08+0200\n" -"PO-Revision-Date: 2019-12-04 13:33+0000\n" -"Last-Translator: SoftInterlingua <>\n" +"PO-Revision-Date: 2020-01-24 15:35+0000\n" +"Last-Translator: erinm\n" "Language-Team: Interlingua (http://www.transifex.com/otf/torproject/language/ia/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -179,7 +179,7 @@ msgstr "" #: ../data/whisperback.ui.h:22 msgid "Summary" -msgstr "" +msgstr "Summario:" #: ../data/whisperback.ui.h:23 msgid "Bug description"

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2020