- tor-commits - lists.torproject.org

[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 }} <p class="mid"> {{ 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

[translation/tails-perl5lib] Update translations for tails-perl5lib
by translation＠torproject.org 18 Jan '16

18 Jan '16

commit a56c73ad6079b17a7a1feb3f2cc52f4ef1abea54 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 18 15:46:02 2016 +0000 Update translations for tails-perl5lib --- cs.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cs.po b/cs.po index fb778ee..bb7c1aa 100644 --- a/cs.po +++ b/cs.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: 2016-01-11 15:40+0100\n" -"PO-Revision-Date: 2016-01-18 14:33+0000\n" +"PO-Revision-Date: 2016-01-18 15:40+0000\n" "Last-Translator: Jiří Vírava <appukonrad(a)gmail.com>\n" "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 18 Jan '16

18 Jan '16

commit 09532ce5ab21edf47799291f714cdad789f26678 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 18 15:45:45 2016 +0000 Update translations for tails-misc --- cs.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cs.po b/cs.po index 66dc7b4..02f0fbd 100644 --- a/cs.po +++ b/cs.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-04 11:56+0100\n" -"PO-Revision-Date: 2016-01-06 09:25+0000\n" +"POT-Creation-Date: 2016-01-11 21:00+0100\n" +"PO-Revision-Date: 2016-01-18 15:40+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 18 Jan '16

18 Jan '16

commit cd55bb40c9c5095bfba0a9b4b075341c9e3d3bd2 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 18 15:45:22 2016 +0000 Update translations for tails-persistence-setup --- cs/cs.po | 53 +++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/cs/cs.po b/cs/cs.po index a0d67a0..f493462 100644 --- a/cs/cs.po +++ b/cs/cs.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2015-12-14 21:35+0100\n" -"PO-Revision-Date: 2015-12-15 09:27+0000\n" +"POT-Creation-Date: 2015-12-16 17:55+0100\n" +"PO-Revision-Date: 2016-01-18 15:40+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n" "MIME-Version: 1.0\n" @@ -128,71 +128,71 @@ msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" msgstr "Symbolický odkaz do $ HOME nalezne každý soubor nebo adresář v `dotfiles\" adresáři" -#: ../lib/Tails/Persistence/Setup.pm:227 +#: ../lib/Tails/Persistence/Setup.pm:230 msgid "Setup Tails persistent volume" msgstr "Nastavení trvalého oddílu pro Tails" -#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:451 +#: ../lib/Tails/Persistence/Setup.pm:311 ../lib/Tails/Persistence/Setup.pm:458 msgid "Error" msgstr "Chyba" -#: ../lib/Tails/Persistence/Setup.pm:338 +#: ../lib/Tails/Persistence/Setup.pm:343 #, perl-format msgid "Device %s already has a persistent volume." msgstr "Zařízení %s už má trvalý oddíl." -#: ../lib/Tails/Persistence/Setup.pm:346 +#: ../lib/Tails/Persistence/Setup.pm:351 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "Zařízení %s nemá dostatek nealokovaného místa." -#: ../lib/Tails/Persistence/Setup.pm:354 ../lib/Tails/Persistence/Setup.pm:368 +#: ../lib/Tails/Persistence/Setup.pm:359 ../lib/Tails/Persistence/Setup.pm:373 #, perl-format msgid "Device %s has no persistent volume." msgstr "Zařízení %s nemá trvalý oddíl." -#: ../lib/Tails/Persistence/Setup.pm:360 +#: ../lib/Tails/Persistence/Setup.pm:365 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "Nelze smazat trvalý oddíl, zatímco je používán. Musíte restartovat Tails bez používání trvalého oddílu." -#: ../lib/Tails/Persistence/Setup.pm:379 +#: ../lib/Tails/Persistence/Setup.pm:384 msgid "Persistence volume is not unlocked." msgstr "Trvalý oddíl není odemčen." -#: ../lib/Tails/Persistence/Setup.pm:384 +#: ../lib/Tails/Persistence/Setup.pm:389 msgid "Persistence volume is not mounted." msgstr "Trvalý oddíl není připojen." -#: ../lib/Tails/Persistence/Setup.pm:389 +#: ../lib/Tails/Persistence/Setup.pm:394 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "Trvalý oddíl není čitelný. Problém s povolením nebo s vlastnictvím?" -#: ../lib/Tails/Persistence/Setup.pm:394 +#: ../lib/Tails/Persistence/Setup.pm:399 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "Trvalý oddíl nejde přepsat. Nebyl připojen pouze pro čtení?" -#: ../lib/Tails/Persistence/Setup.pm:403 +#: ../lib/Tails/Persistence/Setup.pm:408 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tails běží ze zařízení %s, které není USB / SDIO." -#: ../lib/Tails/Persistence/Setup.pm:409 +#: ../lib/Tails/Persistence/Setup.pm:414 #, perl-format msgid "Device %s is optical." msgstr "Zařízení %s je optické." -#: ../lib/Tails/Persistence/Setup.pm:416 +#: ../lib/Tails/Persistence/Setup.pm:421 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "Zařízení %s nebylo pomocí Tails instaleru vytvořeno." -#: ../lib/Tails/Persistence/Setup.pm:676 +#: ../lib/Tails/Persistence/Setup.pm:667 msgid "Persistence wizard - Finished" msgstr "Průvodce tvorby trvalého oddílu dokončil svou činnost." -#: ../lib/Tails/Persistence/Setup.pm:679 +#: ../lib/Tails/Persistence/Setup.pm:670 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" @@ -244,32 +244,33 @@ msgstr "Heslo nesmí být prázdné" msgid "Passphrases do not match" msgstr "Hesla se neshodují" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 #: ../lib/Tails/Persistence/Step/Configure.pm:129 +#: ../lib/Tails/Persistence/Step/Delete.pm:95 msgid "Failed" msgstr "Selhani" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:271 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 msgid "Mounting Tails persistence partition." msgstr "Připojování trvalého oddílu Tails." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 msgid "The Tails persistence partition will be mounted." msgstr "Trvalý oddíl Tails bude připojen." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:295 msgid "Correcting permissions of the persistent volume." msgstr "Opravuji oprávnění na stálém svazku." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:298 msgid "The permissions of the persistent volume will be corrected." msgstr "Oprávnění na stálém svazku budou opravena." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:308 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:320 msgid "Creating..." msgstr "Vytváření..." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:311 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:323 msgid "Creating the persistent volume..." msgstr "Vytváření trvalého oddílu." @@ -319,10 +320,10 @@ msgstr "Trvalý oddíl %s (%s), na <b>%s %s</b> zařízení bude smazán." msgid "Delete" msgstr "Smazat" -#: ../lib/Tails/Persistence/Step/Delete.pm:101 +#: ../lib/Tails/Persistence/Step/Delete.pm:111 msgid "Deleting..." msgstr "Mazání..." -#: ../lib/Tails/Persistence/Step/Delete.pm:104 +#: ../lib/Tails/Persistence/Step/Delete.pm:114 msgid "Deleting the persistent volume..." msgstr "Mazání trvalého oddílu..."

1 0

[translation/tails-perl5lib] Update translations for tails-perl5lib
by translation＠torproject.org 18 Jan '16

18 Jan '16

commit 7bf05768dd77ee56084553c2d79fae60c310af40 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 18 14:45:53 2016 +0000 Update translations for tails-perl5lib --- cs.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cs.po b/cs.po index 745227f..fb778ee 100644 --- a/cs.po +++ b/cs.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Jiří Vírava <appukonrad(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-01-11 15:40+0100\n" -"PO-Revision-Date: 2016-01-12 08:13+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-01-18 14:33+0000\n" +"Last-Translator: Jiří Vírava <appukonrad(a)gmail.com>\n" "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +20,7 @@ msgstr "" #: ../lib/Tails/RunningSystem.pm:159 msgid "Error" -msgstr "" +msgstr "Chyba" #: ../lib/Tails/RunningSystem.pm:161 msgid ""

1 0