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

[tor/master] test_options: remove def_opt member of test data.
by teor＠torproject.org 23 Oct '19

23 Oct '19

commit 3656fdae98ff964447a8a8a5cf3d44985e264c7f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 22 14:09:02 2019 -0400 test_options: remove def_opt member of test data. --- src/test/test_options.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/test/test_options.c b/src/test/test_options.c index b90e36c8c..cecb36966 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -386,7 +386,6 @@ fixed_get_uname(void) typedef struct { or_options_t *old_opt; or_options_t *opt; - or_options_t *def_opt; } options_test_data_t; static void free_options_test_data(options_test_data_t *td); @@ -400,11 +399,9 @@ get_options_test_data(const char *conf) options_test_data_t *result = tor_malloc(sizeof(options_test_data_t)); result->opt = options_new(); result->old_opt = options_new(); - result->def_opt = options_new(); options_init(result->opt); options_init(result->old_opt); - options_init(result->def_opt); rv = config_get_lines(conf, &cl, 1); tt_int_op(rv, OP_EQ, 0); @@ -419,12 +416,6 @@ get_options_test_data(const char *conf) result->opt->TokenBucketRefillInterval = 1; rv = config_get_lines("", &cl, 1); tt_int_op(rv, OP_EQ, 0); - rv = config_assign(get_options_mgr(), result->def_opt, cl, 0, &msg); - if (msg) { - /* Display the parse error message by comparing it with an empty string */ - tt_str_op(msg, OP_EQ, ""); - } - tt_int_op(rv, OP_EQ, 0); done: config_free_lines(cl); @@ -444,7 +435,6 @@ free_options_test_data(options_test_data_t *td) if (!td) return; or_options_free(td->old_opt); or_options_free(td->opt); - or_options_free(td->def_opt); tor_free(td); }

1 0

[tor/master] test_options: remove "dflt" part of setup_options().
by teor＠torproject.org 23 Oct '19

23 Oct '19

commit 86a1d670acd053d1cab3ac4ff74669bcecc5c1ac Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 22 14:07:32 2019 -0400 test_options: remove "dflt" part of setup_options(). It is no longer used anywhere. --- src/test/test_options.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/test/test_options.c b/src/test/test_options.c index f8ad2cbda..b90e36c8c 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -92,14 +92,11 @@ clear_log_messages(void) messages = NULL; } -#define setup_options(opt,dflt) \ +#define setup_options(opt) \ do { \ opt = options_new(); \ opt->command = CMD_RUN_TOR; \ options_init(opt); \ - \ - dflt = config_dup(get_options_mgr(), opt); \ - clear_log_messages(); \ } while (0) #define VALID_DIR_AUTH "DirAuthority dizum orport=443 v3ident=E8A9C45" \ @@ -181,12 +178,11 @@ test_options_validate_impl(const char *configuration, int phase) { or_options_t *opt=NULL; - or_options_t *dflt; config_line_t *cl=NULL; char *msg=NULL; int r; - setup_options(opt, dflt); + setup_options(opt); r = config_get_lines(configuration, &cl, 1); if (phase == PH_GETLINES) { @@ -223,7 +219,6 @@ test_options_validate_impl(const char *configuration, policies_free_all(); config_free_lines(cl); or_options_free(opt); - or_options_free(dflt); tor_free(msg); clear_log_messages(); } @@ -295,15 +290,13 @@ test_have_enough_mem_for_dircache(void *arg) { (void)arg; or_options_t *opt=NULL; - or_options_t *dflt=NULL; config_line_t *cl=NULL; char *msg=NULL; int r; const char *configuration = "ORPort 8080\nDirCache 1", *expect_errmsg; - setup_options(opt, dflt); + setup_options(opt); setup_log_callback(); - (void)dflt; r = config_get_lines(configuration, &cl, 1); tt_int_op(r, OP_EQ, 0); @@ -377,7 +370,6 @@ test_have_enough_mem_for_dircache(void *arg) done: if (msg) tor_free(msg); - or_options_free(dflt); or_options_free(opt); config_free_lines(cl); return;

1 0

[tor/master] config validation: make the "old_options" argument const.
by teor＠torproject.org 23 Oct '19

23 Oct '19

commit 6bc2b41e54976abdafb464128890ae23584aeed7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 22 14:16:23 2019 -0400 config validation: make the "old_options" argument const. We can't do this with the "options" argument yet, since several places in the code change those right now. --- src/app/config/config.c | 9 +++++---- src/app/config/config.h | 2 +- src/app/config/statefile.c | 4 ++-- src/feature/dirauth/shared_random_state.c | 4 ++-- src/lib/confmgt/confparse.h | 2 +- src/test/test_confparse.c | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index b804da62f..55cc49448 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -843,7 +843,7 @@ static int parse_outbound_addresses(or_options_t *options, int validate_only, char **msg); static void config_maybe_load_geoip_files_(const or_options_t *options, const or_options_t *old_options); -static int options_validate_cb(void *old_options, void *options, +static int options_validate_cb(const void *old_options, void *options, char **msg); static void cleanup_protocol_warning_severity_level(void); static void set_protocol_warning_severity_level(int warning_severity); @@ -1227,7 +1227,8 @@ add_default_fallback_dir_servers,(void)) * user if we changed any dangerous ones. */ static int -validate_dir_servers(or_options_t *options, or_options_t *old_options) +validate_dir_servers(const or_options_t *options, + const or_options_t *old_options) { config_line_t *cl; @@ -3230,7 +3231,7 @@ compute_publishserverdescriptor(or_options_t *options) #define RECOMMENDED_MIN_CIRCUIT_BUILD_TIMEOUT (10) static int -options_validate_cb(void *old_options, void *options, char **msg) +options_validate_cb(const void *old_options, void *options, char **msg) { in_option_validation = 1; int rv = options_validate(old_options, options, msg); @@ -3430,7 +3431,7 @@ options_validate_single_onion(or_options_t *options, char **msg) * On error, tor_strdup an error explanation into *<b>msg</b>. */ STATIC int -options_validate(or_options_t *old_options, or_options_t *options, +options_validate(const or_options_t *old_options, or_options_t *options, char **msg) { config_line_t *cl; diff --git a/src/app/config/config.h b/src/app/config/config.h index 32ddc6765..dbba30e9c 100644 --- a/src/app/config/config.h +++ b/src/app/config/config.h @@ -277,7 +277,7 @@ STATIC void port_cfg_free_(port_cfg_t *port); STATIC void or_options_free_(or_options_t *options); STATIC int options_validate_single_onion(or_options_t *options, char **msg); -STATIC int options_validate(or_options_t *old_options, +STATIC int options_validate(const or_options_t *old_options, or_options_t *options, char **msg); STATIC int parse_transport_line(const or_options_t *options, diff --git a/src/app/config/statefile.c b/src/app/config/statefile.c index 3653deeee..5c2e37490 100644 --- a/src/app/config/statefile.c +++ b/src/app/config/statefile.c @@ -141,7 +141,7 @@ static const config_var_t state_vars_[] = { static int or_state_validate(or_state_t *state, char **msg); -static int or_state_validate_cb(void *old_options, +static int or_state_validate_cb(const void *old_options, void *options, char **msg); /** Magic value for or_state_t. */ @@ -268,7 +268,7 @@ validate_transports_in_state(or_state_t *state) } static int -or_state_validate_cb(void *old_state, void *state, char **msg) +or_state_validate_cb(const void *old_state, void *state, char **msg) { /* We don't use these; only options do. Still, we need to match that * signature. */ diff --git a/src/feature/dirauth/shared_random_state.c b/src/feature/dirauth/shared_random_state.c index beeb03448..94743fdb7 100644 --- a/src/feature/dirauth/shared_random_state.c +++ b/src/feature/dirauth/shared_random_state.c @@ -60,7 +60,7 @@ DUMMY_TYPECHECK_INSTANCE(sr_disk_state_t); #define SR_DISK_STATE_MAGIC 0x98AB1254 static int -disk_state_validate_cb(void *old_state, void *state, char **msg); +disk_state_validate_cb(const void *old_state, void *state, char **msg); /** Array of variables that are saved to disk as a persistent state. */ static const config_var_t state_vars[] = { @@ -344,7 +344,7 @@ disk_state_validate(const sr_disk_state_t *state) /** Validate the disk state (NOP for now). */ static int -disk_state_validate_cb(void *old_state, void *state, char **msg) +disk_state_validate_cb(const void *old_state, void *state, char **msg) { /* We don't use these; only options do. */ (void) old_state; diff --git a/src/lib/confmgt/confparse.h b/src/lib/confmgt/confparse.h index 628eb8927..8d7278cb0 100644 --- a/src/lib/confmgt/confparse.h +++ b/src/lib/confmgt/confparse.h @@ -68,7 +68,7 @@ typedef struct config_deprecation_t { * config_dump(); later in our refactoring, it will be cleaned up and used * more generally. */ -typedef int (*validate_fn_t)(void *oldval, +typedef int (*validate_fn_t)(const void *oldval, void *newval, char **msg_out); diff --git a/src/test/test_confparse.c b/src/test/test_confparse.c index cfdcd34c3..890c95d1c 100644 --- a/src/test/test_confparse.c +++ b/src/test/test_confparse.c @@ -103,7 +103,7 @@ static config_deprecation_t test_deprecation_notes[] = { }; static int -test_validate_cb(void *old_options, void *options, char **msg) +test_validate_cb(const void *old_options, void *options, char **msg) { (void)old_options; (void)msg;

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1449'
by teor＠torproject.org 23 Oct '19

23 Oct '19

commit 34509e78c6280a103eb243865ce52a70f4a665d0 Merge: 71191fa3d 04addabb0 Author: teor <teor(a)torproject.org> Date: Wed Oct 23 22:59:16 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1449' changes/ticket32187 | 3 + src/app/config/config.c | 24 +- src/app/config/config.h | 5 +- src/app/config/statefile.c | 10 +- src/feature/dirauth/shared_random_state.c | 8 +- src/lib/confmgt/confparse.c | 2 +- src/lib/confmgt/confparse.h | 4 +- src/test/test_config.c | 8 +- src/test/test_confparse.c | 5 +- src/test/test_options.c | 542 +++++++++++++++--------------- 10 files changed, 286 insertions(+), 325 deletions(-)

1 0

[tor/master] Changes file for options_validate() API changes in #32187.
by teor＠torproject.org 23 Oct '19

23 Oct '19

commit 04addabb0426f2f564f4f0914568b2fa227a8f54 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 22 14:21:17 2019 -0400 Changes file for options_validate() API changes in #32187. --- changes/ticket32187 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket32187 b/changes/ticket32187 new file mode 100644 index 000000000..b5b4e16bf --- /dev/null +++ b/changes/ticket32187 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Remove some unused arguments from the options_validate() function, + to simplify our code and tests. Closes ticket 32187.

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 23 Oct '19

23 Oct '19

commit 24d227651f718c4f464e9dcd8765964cd48f18aa Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 23 12:52:50 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ca.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contents+ca.po b/contents+ca.po index 172c2a48c..2eff5b293 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -893,11 +893,11 @@ msgstr "El web visitat." #: lego/templates/secure-connections.html:44 msgid "user / pw" -msgstr "usuari / pass" +msgstr "usuari / contrasenya" #: lego/templates/secure-connections.html:47 msgid "Username and password used for authentication." -msgstr "Nom d'usuari i contrasenya usats per la autenticació." +msgstr "Nom d'usuari i contrasenya utilitzats per a l'autenticació." #: lego/templates/secure-connections.html:51 msgid "data" @@ -909,19 +909,19 @@ msgstr "Dades trameses." #: lego/templates/secure-connections.html:58 msgid "location" -msgstr "lloc" +msgstr "ubicació" #: lego/templates/secure-connections.html:61 msgid "" "Network location of the computer used to visit the website (the public IP " "address)." msgstr "" -"Localització del ordinador usat per la consulta del web (l'adreça pública " -"IP)." +"Ubicació en la xarxa de l'ordinador utilitzat per a visitar el lloc web " +"(l'adreça IP pública)." #: lego/templates/secure-connections.html:68 msgid "Whether or not Tor is being used." -msgstr "Si o no, Tor s'està utilitzant." +msgstr "Si s'està utilitzant el Tor o no." #: templates/contact.html:8 msgid "Chat with us on" @@ -1438,7 +1438,7 @@ msgstr "Tema" #: templates/reports.html:2 msgid "Founding Documents" -msgstr "Documents de finançament" +msgstr "Documents fundacionals" #: templates/reports.html:16 msgid "Reports" @@ -1539,7 +1539,7 @@ msgstr "Suggeriu comentaris" #: templates/macros/question.html:16 msgid "Permalink" -msgstr "Permalink" +msgstr "Enllaç permanent" #: templates/macros/reports.html:5 templates/macros/reports.html:19 msgid "View PDF"

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 23 Oct '19

23 Oct '19

commit d4d74f25a7e0914f3ebd6ad8ff311d1c6a222eea Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 23 12:22:35 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ca.po | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/contents+ca.po b/contents+ca.po index ecab9179f..172c2a48c 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -2,10 +2,10 @@ # Jaime Muñoz Martín <jmmartin_5(a)outlook.com>, 2019 # erinm, 2019 # Emma Peel, 2019 -# Ecron <ecron_89(a)hotmail.com>, 2019 # Benny Beat <bennybeat(a)gmail.com>, 2019 # Marc Ripoll <markripesp(a)gmail.com>, 2019 # jmontane, 2019 +# Ecron <ecron_89(a)hotmail.com>, 2019 # msgid "" msgstr "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-10-22 18:47+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: jmontane, 2019\n" +"Last-Translator: Ecron <ecron_89(a)hotmail.com>, 2019\n" "Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -833,42 +833,42 @@ msgid "" "The following visualization shows what information is visible to " "eavesdroppers with and without Tor Browser and HTTPS encryption:" msgstr "" -"La següent imatge mostra quina informació és visible a ulls del interceptors" -" de dades sense el navegador Tor i una encriptació sota HTTPS:" +"La imatge següent mostra quina informació poden veure els tafaners amb el " +"Navegador Tor i un xifratge HTTPS, i sense:" #: lego/templates/secure-connections.html:4 msgid "" "Click the “Tor” button to see what data is visible to observers when you're " "using Tor. The button will turn green to indicate that Tor is on." msgstr "" -"Faci clic en el icona \"Tor\" per saber quines dades són visibles als " -"observadors quan s'utilitzi Tor. El icona es tornarà de color verd per " -"indicar que Tor està en marxa." +"Feu clic en el botó «Tor» per a saber quines dades poden veure els " +"observadors quan utilitzeu el Tor. El botó es tornarà de color verd per a " +"indicar que el Tor està encés." #: lego/templates/secure-connections.html:5 msgid "" "Click the “HTTPS” button to see what data is visible to observers when " "you're using HTTPS. The button will turn green to indicate that HTTPS is on." msgstr "" -"Faci clic al botó \"HTTPS\" per saber quines dades són visibles als " -"observador quan s'utilitzi HTTPS. El botó es tornarà verd per indicar que " -"HTTPS està en marxa." +"Feu clic en el botó «HTTPS» per a saber quines dades poden veure els " +"observadors quan utilitzeu HTTPS. El botó es tornarà verd per a indicar que " +"l'HTTPS està encés." #: lego/templates/secure-connections.html:6 msgid "" "When both buttons are green, you see the data that is visible to observers " "when you are using both tools." msgstr "" -"Quan ambdós botons estan en verd, es pot veure quines dades són visibles als" -" observadors amb les dos eines." +"Quan ambdós botons estan en verd, es mostren quines dades poden veure els " +"observadors quan utilitzeu ambdues eines." #: lego/templates/secure-connections.html:7 msgid "" "When both buttons are grey, you see the data that is visible to observers " "when you don't use either tool." msgstr "" -"Quan ambdós botons estan en gris, es pot veure quines dades són visibles als" -" observadors sense la utilització de les dos eines." +"Quan ambdós botons estan en gris, es mostren quines dades poden veure els " +"observadors quan no utilitzeu cap de les eines." #: lego/templates/secure-connections.html:11 msgid "HTTPS"

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 23 Oct '19

23 Oct '19

commit 5ae829f41a522c2bebe80bf261fc60b7d19647bb Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 23 11:52:40 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+es.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+es.po b/contents+es.po index 132595487..e97bcefd0 100644 --- a/contents+es.po +++ b/contents+es.po @@ -6,8 +6,8 @@ # sim, 2019 # David Figuera <dfb(a)fastmail.com>, 2019 # erinm, 2019 -# Emma Peel, 2019 # eulalio barbero espinosa <eulaliob(a)gmail.com>, 2019 +# Emma Peel, 2019 # msgid "" msgstr "" @@ -15,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-10-22 18:47+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: eulalio barbero espinosa <eulaliob(a)gmail.com>, 2019\n" +"Last-Translator: Emma Peel, 2019\n" "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -59,7 +59,7 @@ msgstr "El rastreo, la vigilancia y la censura están muy extendidos en línea." #: https//www.torproject.org/ (content/contents+en.lrpage.body) msgid "Take back the internet with Tor. Donate now." -msgstr "" +msgstr "Recupera Internet con Tor. Dona ahora." #: https//www.torproject.org/ (content/contents+en.lrpage.body) msgid "Give today, and Mozilla will match your donation."

1 0

[onionperf/master] Initial Debian packaging
by irl＠torproject.org 23 Oct '19

23 Oct '19

commit e7679ad0baa2b82828f0510be23c9bdb1451af8b Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Mon May 27 10:25:13 2019 +0100 Initial Debian packaging --- debian/changelog | 5 +++++ debian/compat | 1 + debian/control | 40 ++++++++++++++++++++++++++++++++++++++++ debian/install | 1 + debian/rules | 15 +++++++++++++++ debian/source/format | 1 + 6 files changed, 63 insertions(+) diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..7671854 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +onionperf (2019052301) stretch-backports; urgency=medium + + * Initial release. + + -- Iain R. Learmonth <irl(a)debian.org> Thu, 23 May 2019 12:42:20 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..b4de394 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +11 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..c8ffa68 --- /dev/null +++ b/debian/control @@ -0,0 +1,40 @@ +Source: onionperf +Maintainer: Tor Metrics <metrics-team(a)lists.torproject.org> +Section: net +Priority: optional +Build-Depends: debhelper (>= 11), + dh-python, + cmake, + make, + build-essential, + gcc, + libigraph0-dev, + libglib2.0-dev, + python, + python-ipaddress, + python-lxml, + python-matplotlib, + python-netifaces, + python-networkx, + python-nose, + python-numpy, + python-scipy, + python-stem (>=1.7) +Standards-Version: 4.1.3 + +Package: onionperf +Architecture: any +Depends: ${python:Depends}, + ${shlibs:Depends}, + ${misc:Depends}, + python-ipaddress, + python-lxml, + python-matplotlib, + python-netifaces, + python-networkx, + python-nose, + python-numpy, + python-scipy, + python-stem (>=1.7) +Description: Tor Performance Measurement Tool + Tor Performance Measurement Tool diff --git a/debian/install b/debian/install new file mode 100644 index 0000000..6d40677 --- /dev/null +++ b/debian/install @@ -0,0 +1 @@ +tgen/build/tgen usr/bin diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..64d85ba --- /dev/null +++ b/debian/rules @@ -0,0 +1,15 @@ +#!/usr/bin/make -f + +%: + dh $@ --with python2 --buildsystem=pybuild + +override_dh_auto_test: + ./run_tests.sh + +override_dh_auto_build: + ( cd tgen; \ + mkdir build; \ + cd build; \ + cmake ..; \ + make ) + dh_auto_build diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native)

1 0

[metrics-cloud/master] onionperf: Use buster-backports for stem
by irl＠torproject.org 23 Oct '19

23 Oct '19

commit d77fcedf66a5784c4022443ddab1de8a7b931ae8 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Wed Oct 23 11:02:49 2019 +0100 onionperf: Use buster-backports for stem --- ansible/roles/onionperf/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/onionperf/tasks/main.yml b/ansible/roles/onionperf/tasks/main.yml index 6129f49..cec6bdb 100644 --- a/ansible/roles/onionperf/tasks/main.yml +++ b/ansible/roles/onionperf/tasks/main.yml @@ -9,7 +9,7 @@ apt: pkg: python-stem state: latest - default_release: stretch-backports + default_release: buster-backports become: true notify: restart onionperf - name: install onionperf dependencies

1 0