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

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 30 Aug '19

30 Aug '19

commit 1013af50b6ea0c2695d4b4ab1c15172caf6026ea Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 30 20:48:47 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- nl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl.po b/nl.po index 06ca325a2..f90e5d70f 100644 --- a/nl.po +++ b/nl.po @@ -19,7 +19,7 @@ # LittleNacho <louisboy(a)msn.com>, 2013 # 53a60eabbf5124a226a7678001f9a57b, 2015 # Nathan Follens, 2015 -# Full name, 2019 +# Meteor OID, 2019 # Midgard, 2014 # T. Des Maison <ton.siedsma(a)bof.nl>, 2014 # Thinkwell, 2018

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 30 Aug '19

30 Aug '19

commit 8aabfb8128a8125a00d0a36d41518379258e0b38 Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Jun 11 16:29:27 2019 +0200 squash! TB4: Tor Browser's Firefox preference overrides. Bug 28896: Enable extensions in private browsing by default --- browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index fd0b691d1831..0d84455051e5 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -279,6 +279,8 @@ pref("extensions.legacy.exceptions", "{972ce4c6-7e08-4474-a285-3208198ce6fd},tor pref("extensions.webextensions.restrictedDomains", ""); // Bug 31396: Disable indexedDB WebExtension storage backend. pref("extensions.webextensions.ExtensionStorageIDB.enabled", false); +// Bug 28896: Make sure our bundled WebExtensions are running in Private Browsing Mode +pref("extensions.allowPrivateBrowsingByDefault", true); // Toolbar layout pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"torbutton-button\",\"security-level-button\",\"downloads-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"PanelUI-contents\":[\"home-button\",\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"]},\"seen\":[\"developer-button\",\"https-everywhere-eff_eff_org-browser-action\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\"],\"currentVersion\":14,\"newElementCount \":1}");

1 0

[translation/policies-code_of_conducttxtpot_completed] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot_completed
by translation＠torproject.org 30 Aug '19

30 Aug '19

commit 0db437ccf75dc23f89f020f29effdf0661de0237 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 30 20:17:38 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_co… --- code_of_conduct+es.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code_of_conduct+es.po b/code_of_conduct+es.po index 220c06047..6ed887ed7 100644 --- a/code_of_conduct+es.po +++ b/code_of_conduct+es.po @@ -7,6 +7,7 @@ # Translators: # Alfredo Duro <AlfredoDuroexplota(a)protonmail.com>, 2019 # Emma Peel, 2019 +# 26 nothing <nothinguser(a)protonmail.com>, 2019 # #, fuzzy msgid "" @@ -14,7 +15,7 @@ msgstr "" "Project-Id-Version: Code of conduct of the Tor Project\n" "POT-Creation-Date: 2019-08-02 12:00+0000\n" "PO-Revision-Date: 2019-08-27 18:54+0000\n" -"Last-Translator: Emma Peel, 2019\n" +"Last-Translator: 26 nothing <nothinguser(a)protonmail.com>, 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"

1 0

[translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
by translation＠torproject.org 30 Aug '19

30 Aug '19

commit 184404322163062b3ed60dfcff74439db7396bf6 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 30 20:17:30 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_co… --- code_of_conduct+es.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code_of_conduct+es.po b/code_of_conduct+es.po index 220c06047..890287a66 100644 --- a/code_of_conduct+es.po +++ b/code_of_conduct+es.po @@ -7,6 +7,7 @@ # Translators: # Alfredo Duro <AlfredoDuroexplota(a)protonmail.com>, 2019 # Emma Peel, 2019 +# 26 nothing <nothinguser(a)protonmail.com>, 2019 # #, fuzzy msgid "" @@ -14,7 +15,7 @@ msgstr "" "Project-Id-Version: Code of conduct of the Tor Project\n" "POT-Creation-Date: 2019-08-02 12:00+0000\n" "PO-Revision-Date: 2019-08-27 18:54+0000\n" -"Last-Translator: Emma Peel, 2019\n" +"Last-Translator: 26 nothing <nothinguser(a)protonmail.com>, 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" @@ -175,6 +176,9 @@ msgid "" " questions or concerns. Public key:\n" " https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil#Contact\n" msgstr "" +"Y qué hacer: Email rápido : tor-community-council(a)lists.torproject.org con \n" +" preguntas o preocupaciones. Public key:\n" +" https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil#Contact\n" #. type: Plain text #: ../code_of_conduct.txt:53

1 0

[gettor/master] Continue with ansible recipes
by hiro＠torproject.org 30 Aug '19

30 Aug '19

commit 754da82ddd16f83386cc2ba84acb88dc8239961a Author: hiro <hiro(a)torproject.org> Date: Fri Aug 30 18:46:09 2019 +0200 Continue with ansible recipes --- ansible.cfg | 5 ----- playbooks/all.yml | 3 +++ roles/gettor/tasks/db.yml | 13 +++++++++++++ roles/gettor/tasks/main.yml | 1 + roles/gettor/tasks/source.yml | 23 +++++++++++++++++++++++ roles/gettor/meta/main.yml => site.yml | 0 6 files changed, 40 insertions(+), 5 deletions(-) diff --git a/ansible.cfg b/ansible.cfg index c55ed59..23b801f 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -1,16 +1,11 @@ [defaults] roles_path = ./roles -library = /usr/share/ansible:./library -inventory = inventories/current,inventories/current/secrets # google for errors more easily module_lang=en_US.UTF-8 display_failed_stderr = true -pipelining = True -validate_certs=False - # I want no cows here nocows = 1 diff --git a/playbooks/all.yml b/playbooks/all.yml new file mode 100644 index 0000000..9ba7505 --- /dev/null +++ b/playbooks/all.yml @@ -0,0 +1,3 @@ +--- +gettor_repo: https://git.torproject.org/gettor.git +gettor_path: /home/gettor/gettor diff --git a/roles/gettor/tasks/db.yml b/roles/gettor/tasks/db.yml index e69de29..9a16a51 100644 --- a/roles/gettor/tasks/db.yml +++ b/roles/gettor/tasks/db.yml @@ -0,0 +1,13 @@ +--- + +- name: export stats + command: > + {{ gettor_path }}/scripts/export_stats + +- name: create database + command: > + {{ gettor_path }}/scripts/create_db -n -c -o + +- name: add links + command: > + {{ gettor_path }}/scripts/add_links_to_db -f gettor.db diff --git a/roles/gettor/tasks/main.yml b/roles/gettor/tasks/main.yml new file mode 100644 index 0000000..6aaa7dc --- /dev/null +++ b/roles/gettor/tasks/main.yml @@ -0,0 +1 @@ +- import_tasks: db.yml diff --git a/roles/gettor/tasks/source.yml b/roles/gettor/tasks/source.yml new file mode 100644 index 0000000..33b7978 --- /dev/null +++ b/roles/gettor/tasks/source.yml @@ -0,0 +1,23 @@ +--- +- name: check if repository exists + stat: + path: "{{ gettor_path }}/.git/config" + register: stat_result + +- name: checkout some stuff + command: git checkout -- db/schema.rb locale + args: + chdir: "{{ gettor_path }}" + when: stat_result.stat.exists + +- name: update gettor source + git: + repo: "{{ gettor_repo }}" + dest: "{{ gettor_path }}" + umask: '022' + diff: false + when: not ansible_check_mode + notify: + - restart gitlab-mailroom + - restart gitlab-sidekiq + - reload gitlab-unicorn diff --git a/roles/gettor/meta/main.yml b/site.yml similarity index 100% rename from roles/gettor/meta/main.yml rename to site.yml

1 0

[tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/1114' into maint-0.3.5
by teor＠torproject.org 30 Aug '19

30 Aug '19

commit 4662cbec7bd33fee973e467615ab30933138c279 Merge: 190386f1c 4ab1d1c0c Author: teor <teor(a)torproject.org> Date: Fri Aug 30 23:20:59 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1114' into maint-0.3.5 changes/bug30894 | 4 ++++ src/app/config/confparse.c | 1 + 2 files changed, 5 insertions(+)

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by teor＠torproject.org 30 Aug '19

30 Aug '19

commit a95613ac807f8a0c3bea7c67fe66c736ca1c7c20 Merge: 7a53e3552 1132dc9f7 Author: teor <teor(a)torproject.org> Date: Fri Aug 30 23:25:19 2019 +1000 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug30894 | 4 ++++ changes/bug31003 | 4 ++++ changes/ticket30871 | 6 +++++ src/app/config/confparse.c | 1 + src/feature/client/entrynodes.c | 4 ++++ src/feature/nodelist/routerlist.c | 12 +++++----- src/test/test_circuitbuild.c | 47 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 72 insertions(+), 6 deletions(-)

1 0

[tor/release-0.4.0] guard: Ignore marked for close circuit when changing state to open
by teor＠torproject.org 30 Aug '19

30 Aug '19

commit e3f3478032921a8b6af07a655fd2ea520d3ff463 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jun 18 13:32:45 2019 -0400 guard: Ignore marked for close circuit when changing state to open When we consider all circuits in "waiting for guard" state to be promoted to an "open" state, we were considering all circuits, even the one marked for close. This ultiamtely triggers a "circuit_has_opened()" called on the circuit that is marked for close which then leads to possible undesirable behaviors within a subsystem. For instance, the HS subsystem would be unable to find the authentication key of the introduction point circuit leading to a BUG() warning and a duplicate mark for close on the circuit. This commit also adds a unit test to make sure we never select marked for close circuits when upgrading its guard state from waiting for guard to open. Fixes #30871 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket30871 | 6 ++++++ src/feature/client/entrynodes.c | 4 ++++ src/test/test_circuitbuild.c | 47 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+) diff --git a/changes/ticket30871 b/changes/ticket30871 new file mode 100644 index 000000000..81c076bb0 --- /dev/null +++ b/changes/ticket30871 @@ -0,0 +1,6 @@ + o Major bugfixes (circuit build, guard): + - When considering upgrading circuits from "waiting for guard" to "open", + always ignore the ones that are mark for close. Else, we can end up in + the situation where a subsystem is notified of that circuit opening but + still marked for close leading to undesirable behavior. Fixes bug 30871; + bugfix on 0.3.0.1-alpha. diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c index e543289ce..d191f5836 100644 --- a/src/feature/client/entrynodes.c +++ b/src/feature/client/entrynodes.c @@ -2611,6 +2611,10 @@ entry_guards_upgrade_waiting_circuits(guard_selection_t *gs, entry_guard_t *guard = entry_guard_handle_get(state->guard); if (!guard || guard->in_selection != gs) continue; + if (TO_CIRCUIT(circ)->marked_for_close) { + /* Don't consider any marked for close circuits. */ + continue; + } smartlist_add(all_circuits, circ); } SMARTLIST_FOREACH_END(circ); diff --git a/src/test/test_circuitbuild.c b/src/test/test_circuitbuild.c index 275f1eced..538f20781 100644 --- a/src/test/test_circuitbuild.c +++ b/src/test/test_circuitbuild.c @@ -4,6 +4,8 @@ /* See LICENSE for licensing information */ #define CIRCUITBUILD_PRIVATE +#define CIRCUITLIST_PRIVATE +#define ENTRYNODES_PRIVATE #include "core/or/or.h" #include "test/test.h" @@ -13,7 +15,11 @@ #include "core/or/circuitbuild.h" #include "core/or/circuitlist.h" +#include "core/or/cpath_build_state_st.h" #include "core/or/extend_info_st.h" +#include "core/or/origin_circuit_st.h" + +#include "feature/client/entrynodes.h" /* Dummy nodes smartlist for testing */ static smartlist_t dummy_nodes; @@ -126,10 +132,51 @@ test_new_route_len_unhandled_exit(void *arg) UNMOCK(count_acceptable_nodes); } +static void +test_upgrade_from_guard_wait(void *arg) +{ + circuit_t *circ = NULL; + origin_circuit_t *orig_circ = NULL; + entry_guard_t *guard = NULL; + smartlist_t *list = NULL; + + (void) arg; + + circ = dummy_origin_circuit_new(0); + orig_circ = TO_ORIGIN_CIRCUIT(circ); + tt_assert(orig_circ); + + orig_circ->build_state = tor_malloc_zero(sizeof(cpath_build_state_t)); + + circuit_set_state(circ, CIRCUIT_STATE_GUARD_WAIT); + + /* Put it in guard wait state. */ + guard = tor_malloc_zero(sizeof(*guard)); + guard->in_selection = get_guard_selection_info(); + + orig_circ->guard_state = + circuit_guard_state_new(guard, GUARD_CIRC_STATE_WAITING_FOR_BETTER_GUARD, + NULL); + + /* Mark the circuit for close. */ + circuit_mark_for_close(circ, END_CIRC_REASON_TORPROTOCOL); + tt_int_op(circ->marked_for_close, OP_NE, 0); + + /* We shouldn't pick the mark for close circuit. */ + list = circuit_find_circuits_to_upgrade_from_guard_wait(); + tt_assert(!list); + + done: + circuit_free(circ); + entry_guard_free_(guard); +} + struct testcase_t circuitbuild_tests[] = { { "noexit", test_new_route_len_noexit, 0, NULL, NULL }, { "safe_exit", test_new_route_len_safe_exit, 0, NULL, NULL }, { "unsafe_exit", test_new_route_len_unsafe_exit, 0, NULL, NULL }, { "unhandled_exit", test_new_route_len_unhandled_exit, 0, NULL, NULL }, + { "upgrade_from_guard_wait", test_upgrade_from_guard_wait, TT_FORK, + NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/release-0.4.0] Set 'routerlist' global to NULL before freeing it.
by teor＠torproject.org 30 Aug '19

30 Aug '19

commit a9379d6750d025d8bfe54a79c26e89eb45393f3a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 19 09:49:52 2019 -0400 Set 'routerlist' global to NULL before freeing it. There is other code that uses this value, and some of it is apparently reachable from inside router_dir_info_changed(), which routerlist_free() apparently calls. (ouch!) This is a minimal fix to try to resolve the issue without causing other problems. Fixes bug 31003. I'm calling this a bugfix on 0.1.2.2-alpha, where the call to router_dir_info_changed() was added to routerlist_free(). --- changes/bug31003 | 4 ++++ src/feature/nodelist/routerlist.c | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/changes/bug31003 b/changes/bug31003 new file mode 100644 index 000000000..6c7516338 --- /dev/null +++ b/changes/bug31003 @@ -0,0 +1,4 @@ + o Minor bugfixes (crash on exit): + - Avoid a set of possible code paths that could use try to use freed memory + in routerlist_free() while Tor was exiting. Fixes bug 31003; bugfix on + 0.1.2.2-alpha. diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c index 4a99427cd..61af09742 100644 --- a/src/feature/nodelist/routerlist.c +++ b/src/feature/nodelist/routerlist.c @@ -954,20 +954,18 @@ routerlist_free_(routerlist_t *rl) smartlist_free(rl->routers); smartlist_free(rl->old_routers); if (rl->desc_store.mmap) { - int res = tor_munmap_file(routerlist->desc_store.mmap); + int res = tor_munmap_file(rl->desc_store.mmap); if (res != 0) { log_warn(LD_FS, "Failed to munmap routerlist->desc_store.mmap"); } } if (rl->extrainfo_store.mmap) { - int res = tor_munmap_file(routerlist->extrainfo_store.mmap); + int res = tor_munmap_file(rl->extrainfo_store.mmap); if (res != 0) { log_warn(LD_FS, "Failed to munmap routerlist->extrainfo_store.mmap"); } } tor_free(rl); - - router_dir_info_changed(); } /** Log information about how much memory is being used for routerlist, @@ -1426,8 +1424,10 @@ routerlist_reparse_old(routerlist_t *rl, signed_descriptor_t *sd) void routerlist_free_all(void) { - routerlist_free(routerlist); - routerlist = NULL; + routerlist_t *rl = routerlist; + routerlist = NULL; // Prevent internals of routerlist_free() from using + // routerlist. + routerlist_free(rl); dirlist_free_all(); if (warned_nicknames) { SMARTLIST_FOREACH(warned_nicknames, char *, cp, tor_free(cp));

1 0

[tor/release-0.4.0] Fix memleak when failing to parse a CSV_INTERVAL.
by teor＠torproject.org 30 Aug '19

30 Aug '19

commit 4ab1d1c0c44a887417b04fc75b1b11bf246f2bb5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 15 16:47:16 2019 -0400 Fix memleak when failing to parse a CSV_INTERVAL. Fixes bug 30894; bugfix on 0.3.4.1-alpha --- changes/bug30894 | 4 ++++ src/app/config/confparse.c | 1 + 2 files changed, 5 insertions(+) diff --git a/changes/bug30894 b/changes/bug30894 new file mode 100644 index 000000000..64c14c4e6 --- /dev/null +++ b/changes/bug30894 @@ -0,0 +1,4 @@ + o Minor bugfixes (memory leaks): + - Fix a trivial memory leak when parsing an invalid value + from a download schedule in the configuration. Fixes bug + 30894; bugfix on 0.3.4.1-alpha. diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c index 8681f648d..729e7a447 100644 --- a/src/app/config/confparse.c +++ b/src/app/config/confparse.c @@ -225,6 +225,7 @@ config_assign_value(const config_format_t *fmt, void *options, tor_asprintf(msg, "Interval '%s %s' is malformed or out of bounds.", c->key, c->value); + tor_free(tmp); return -1; } *(int *)lvalue = i;

1 0