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

[bridgedb/develop] Merge branch 'fix/24460' into develop
by isis＠torproject.org 28 Nov '17

28 Nov '17

commit 16e7a2d5fad1658244c204bdfb54e5e385e4632f Merge: a316083 77776de Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Nov 28 19:44:42 2017 +0000 Merge branch 'fix/24460' into develop bridgedb/distributors/https/server.py | 6 ++++-- bridgedb/test/test_https_server.py | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-)

1 0

[nyx/master] Errors when saving torrc caused stacktrace
by atagar＠torproject.org 28 Nov '17

28 Nov '17

commit 5378d759ed53377fc48649e333073f032cedd974 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Nov 28 11:34:48 2017 -0800 Errors when saving torrc caused stacktrace Why was I catching an IOError here? Stem generally raises an OperationFailed, and possibly others when there's a malformed response. Caught thanks to Dbryrtfbcbhgf... https://trac.torproject.org/projects/tor/ticket/24409 Traceback (most recent call last): File "/usr/local/bin/nyx", line 11, in <module> sys.exit(main()) ... File "/usr/local/lib/python3.5/dist-packages/nyx/__init__.py", line 243, in draw_loop keybinding.handle(key) File "/usr/local/lib/python3.5/dist-packages/nyx/panel/__init__.py", line 84, in handle self._action() File "/usr/local/lib/python3.5/dist-packages/nyx/panel/config.py", line 219, in _show_write_dialog controller.save_conf() File "/usr/local/lib/python3.5/dist-packages/stem/control.py", line 3220, in save_conf raise stem.OperationFailed(response.code, response.message) stem.OperationFailed: Unable to write configuration to disk. --- nyx/panel/config.py | 2 +- web/changelog/index.html | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nyx/panel/config.py b/nyx/panel/config.py index 67ab218..0b2f1dc 100644 --- a/nyx/panel/config.py +++ b/nyx/panel/config.py @@ -218,7 +218,7 @@ class ConfigPanel(nyx.panel.Panel): try: controller.save_conf() show_message('Saved configuration to %s' % controller.get_info('config-file', '<unknown>'), HIGHLIGHT, max_wait = 2) - except IOError as exc: + except stem.ControllerError as exc: show_message('Unable to save configuration (%s)' % exc.strerror, HIGHLIGHT, max_wait = 2) self.redraw() diff --git a/web/changelog/index.html b/web/changelog/index.html index c47869b..f622f04 100644 --- a/web/changelog/index.html +++ b/web/changelog/index.html @@ -76,7 +76,8 @@ <li><span class="component">Configuration Editor</span> <ul> - <li>New tor configuration options crashed nyx when shown (<b><a href="https://trac.torproject.org/projects/tor/ticket/24401">ticket</a></b>) + <li>New tor configuration options crashed nyx when shown (<b><a href="https://trac.torproject.org/projects/tor/ticket/24401">ticket</a></b>)</li> + <li>Errors when saving the configuration could result in a stacktrace (<b><a href="https://trac.torproject.org/projects/tor/ticket/24409">ticket</a></b>)</li> </ul> </li> </ul>

1 0

[nyx/master] New tor config options crashed nyx when shown
by atagar＠torproject.org 28 Nov '17

28 Nov '17

commit 933cc48ea2bd8ce0e7e1c3f3ab9535a28e31d57a Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Nov 28 11:27:08 2017 -0800 New tor config options crashed nyx when shown Oops! When tor provided an option stem didn't yet have manual information for unexpected None values caused us to stacktrace... https://trac.torproject.org/projects/tor/ticket/24401 File "/usr/local/bin/nyx", line 11, in <module> sys.exit(main()) ... File "/usr/local/lib/python3.5/dist-packages/nyx/panel/config.py", line 315, in _draw _draw_line(subwindow, scroll_offset, DETAILS_HEIGHT + i, entry, entry == selected, value_width, description_width) File "/usr/local/lib/python3.5/dist-packages/nyx/panel/config.py", line 335, in _draw_line attr = [CONFIG['attr.config.category_color'].get(entry.category, WHITE)] File "/usr/local/lib/python3.5/dist-packages/nyx/panel/config.py", line 136, in category return getattr(manual(self.name), 'category') AttributeError: 'NoneType' object has no attribute 'category' In practice I expect this only comes up when pressing 'a' to show all config options. That said, none the less an icky bug. --- nyx/panel/config.py | 22 +++++++++++++++------- web/changelog/index.html | 6 ++++++ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/nyx/panel/config.py b/nyx/panel/config.py index c51c609..67ab218 100644 --- a/nyx/panel/config.py +++ b/nyx/panel/config.py @@ -133,19 +133,19 @@ class ConfigEntry(object): @property def category(self): - return getattr(manual(self.name), 'category') + return getattr(manual(self.name), 'category', '') @property def usage(self): - return getattr(manual(self.name), 'usage') + return getattr(manual(self.name), 'usage', '') @property def summary(self): - return getattr(manual(self.name), 'summary') + return getattr(manual(self.name), 'summary', '') @property def description(self): - return getattr(manual(self.name), 'description') + return getattr(manual(self.name), 'description', '') @property def position(self): @@ -348,12 +348,20 @@ def _draw_selection_details(subwindow, selected): Shows details of the currently selected option. """ - attr = ', '.join(('custom' if selected.is_set() else 'default', selected.value_type, 'usage: %s' % selected.usage)) + attr = ['custom' if selected.is_set() else 'default', selected.value_type] + + if selected.usage: + attr.append('usage: %s' % selected.usage) + selected_color = CONFIG['attr.config.category_color'].get(selected.category, WHITE) subwindow.box(0, 0, subwindow.width, DETAILS_HEIGHT) - subwindow.addstr(2, 1, '%s (%s Option)' % (selected.name, selected.category), selected_color, BOLD) - subwindow.addstr(2, 2, 'Value: %s (%s)' % (selected.value(), str_tools.crop(attr, max(0, subwindow.width - len(selected.value()) - 13))), selected_color, BOLD) + if selected.category: + subwindow.addstr(2, 1, '%s (%s Option)' % (selected.name, selected.category), selected_color, BOLD) + else: + subwindow.addstr(2, 1, selected.name, selected_color, BOLD) + + subwindow.addstr(2, 2, 'Value: %s (%s)' % (selected.value(), str_tools.crop(', '.join(attr), max(0, subwindow.width - len(selected.value()) - 13))), selected_color, BOLD) description = 'Description: %s' % selected.description diff --git a/web/changelog/index.html b/web/changelog/index.html index 54737d5..c47869b 100644 --- a/web/changelog/index.html +++ b/web/changelog/index.html @@ -73,6 +73,12 @@ <li>Geoip information unavailable for inbound connections</li> </ul> </li> + + <li><span class="component">Configuration Editor</span> + <ul> + <li>New tor configuration options crashed nyx when shown (<b><a href="https://trac.torproject.org/projects/tor/ticket/24401">ticket</a></b>) + </ul> + </li> </ul> <div id="version-2-0" class="section"></div>

1 0

[webwml/master] Move Roya to the past contributors page
by atagar＠torproject.org 28 Nov '17

28 Nov '17

commit dc4e00ec62f0e5f43e7325c690930405fde0ab37 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Nov 28 10:08:33 2017 -0800 Move Roya to the past contributors page --- about/en/contributors.wml | 2 ++ about/en/corepeople.wml | 35 ++++++++++++++--------------------- images/people/roya.png | Bin 36754 -> 0 bytes 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/about/en/contributors.wml b/about/en/contributors.wml index d9f3b8a5..08d7c0a7 100644 --- a/about/en/contributors.wml +++ b/about/en/contributors.wml @@ -91,6 +91,8 @@ Builds</a>.</dd> <dd>Original developer for Vidalia, a cross-platform Tor Graphical User Interface included in the bundles.</dd> +<dt>Roya Ensafi</dt><dd>Detects and understands how to manipulate and circumvent Tor network censorship attempts.</dd> + <dt>Christian Fromme, Developer</dt> <dd>Helped with many Python projects, such as the get-tor email auto-responder, check.torproject.org, bridge db, diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index e850edf4..2c49fc36 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -670,22 +670,13 @@ <tr> <td> - <a id="roya"></a> - <div class="photo"><img src="$(IMGROOT)/people/roya.png" alt="roya" /></div> - <div class="name"><a href="#roya">Roya Ensafi</a></div> - <div class="description">Detects and understands how to manipulate and circumvent Tor network censorship attempts.</div> - </td> - - <td> <a id="sajolida"></a> <div class="photo"><img src="$(IMGROOT)/people/sajolida.png" alt="sajolida" /></div> <div class="icon"><a href="../keys/sajolida.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> <div class="name"><a href="#sajolida">sajolida</a></div> <div class="description">Technical writing, UX, and fundraising for Tails.</div> </td> - </tr> - <tr> <td> <a id="sebastian"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -693,7 +684,9 @@ <div class="name"><a href="#sebastian">Sebastian Hahn</a></div> <div class="description">Helps people around the world use and understand Tor better. Generally helps everything run smoothly. Runs one of the directory authorities.</div> </td> + </tr> + <tr> <td> <a id="serene"></a> <div class="photo"><img src="$(IMGROOT)/people/serene.png" alt="serene" /></div> @@ -702,9 +695,7 @@ <div class="name"><a href="#serene">Serene</a></div> <div class="description">Snowflake and Pluggable Transports developer.</div> </td> - </tr> - <tr> <td> <a id="ssteele"></a> <div class="photo"><img src="$(IMGROOT)/people/ssteele.png" alt="ssteele" /></div> @@ -714,7 +705,9 @@ <div class="field"><b>IRC:</b> ssteele</div> <div class="description">Executive Director of the Tor Project, Inc.</div> </td> + </tr> + <tr> <td> <a id="hiro"></a> <div class="photo"><img src="$(IMGROOT)/people/hiro.png" alt="hiro" /></div> @@ -724,9 +717,7 @@ <div class="field"><b>IRC:</b> hiro</div> <div class="description">Hiro builds and runs Tor Project's web applications and services.</div> </td> - </tr> - <tr> <td> <a id="inf0"></a> <div class="photo"><img src="$(IMGROOT)/people/inf0.png" alt="inf0" /></div> @@ -736,7 +727,9 @@ <div class="field"><b>IRC:</b> inf0</div> <div class="description">Directory authority operator, outreach and trains human rights activists. System's Engineer at Team Cymru and co-Founder of accessnow.org.</div> </td> + </tr> + <tr> <td> <a id="stephw"></a> <div class="photo"><img src="$(IMGROOT)/people/stephw.png" alt="stephw" /></div> @@ -746,9 +739,7 @@ <div class="field"><b>IRC:</b> stephw</div> <div class="description">Directs communications.</div> </td> - </tr> - <tr> <td> <a id="sjmurdoch"></a> <div class="photo"><img src="$(IMGROOT)/people/sjmurdoch.png" alt="sjmurdoch" /></div> @@ -758,7 +749,9 @@ <div class="field"><b>IRC:</b> sjmurdoch</div> <div class="description"><a href="http://www.cs.ucl.ac.uk/staff/s.murdoch/">Principal Research Fellow</a> at University College London and original creator of the <a href="https://www.torproject.org/projects/torbrowser.html.en">Tor Browser</a>.</div> </td> + </tr> + <tr> <td> <a id="sukhe"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -767,9 +760,7 @@ <div class="field"><b>IRC:</b> sukhe</div> <div class="description"><a href="https://trac.torproject.org/projects/tor/wiki/torbirdy">TorBirdy</a> and <a href="https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger">Tor Messenger</a> developer. Volunteer on the <a href="https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam">Community Team</a>.</div> </td> - </tr> - <tr> <td> <a id="catalyst"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -779,7 +770,9 @@ <div class="field"><b>IRC:</b> catalyst</div> <div class="description">Software archaeologist and keeper of C language arcana. Works with applied cryptography, protocol design, software security, and technical debt restructuring.</div> </td> + </tr> + <tr> <td> <a id="teor"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -788,9 +781,7 @@ <div class="field"><b>IRC:</b> teor</div> <div class="description">Onion services developer, and core member of Tor dev team. Researches Tor network measurement and onion service scalability.</div> </td> - </tr> - <tr> <td> <a id="tjr"></a> <div class="photo"><img src="$(IMGROOT)/people/tjr.png" alt="tjr" /></div> @@ -800,7 +791,9 @@ <div class="field"><b>IRC:</b> tjr</div> <div class="description">Maintains <a href="https://consensus-health.torproject.org/">Consensus Health </a>, runs one of the bandwidth authorities, and contributes to Tor Browser.</div> </td> + </tr> + <tr> <td> <a id="t0mmy"></a> <div class="photo"><img src="$(IMGROOT)/people/t0mmy.png" alt="t0mmy" /></div> @@ -810,9 +803,7 @@ <div class="field"><b>IRC:</b> t0mmy</div> <div class="description">Writes and edits grant proposals, one-pagers, blogposts, etc.</div> </td> - </tr> - <tr> <td> <a id="wseltzer"></a> <div class="photo"><img src="$(IMGROOT)/people/wseltzer.png" alt="wseltzer" /></div> @@ -822,7 +813,9 @@ <div class="field"><b>IRC:</b> wseltzer</div> <div class="description"><a href="https://wendy.seltzer.org/">Techie lawyer</a> and former Tor board member. She works on legal and policy support for private and secure communications.</div> </td> + </tr> + <tr> <td> <a id="yawning"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> diff --git a/images/people/roya.png b/images/people/roya.png deleted file mode 100644 index e19e23aa..00000000 Binary files a/images/people/roya.png and /dev/null differ

1 0

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

28 Nov '17

commit fa5d33ec0fbf070886835c7d5a265574dc89167c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 28 16:20:21 2017 +0000 Update translations for tails-greeter-2 --- es_MX/es_MX.po | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/es_MX/es_MX.po b/es_MX/es_MX.po index 868826efd..f9ff9daa4 100644 --- a/es_MX/es_MX.po +++ b/es_MX/es_MX.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-15 21:21+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Sanxcher Motala <motala.sanxcher(a)yandex.com>, 2017\n" +"Last-Translator: Shiba Inu <moderninu(a)gmail.com>, 2017\n" "Language-Team: Spanish (Mexico) (https://www.transifex.com/otf/teams/1519/es_MX/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -94,13 +94,15 @@ msgstr "No falsificar direcciones MAC" #: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532 msgid "Cannot unlock encrypted storage with this passphrase." -msgstr "" +msgstr "No se puede descifrar el almacenamiento cifrardo con esta contraseña." #: ../data/greeter.ui.h:18 msgid "" "You will configure the Tor bridge and local proxy later on after connecting " "to a network." msgstr "" +"Tu configuraras el puente Tor y el proxy local después de conectarse a una " +"red." #: ../data/greeter.ui.h:19 msgid "Welcome to Tails!" @@ -129,23 +131,23 @@ msgstr "Guardar Configuración de Lenguaje y Region" #: ../data/greeter.ui.h:25 msgid "_Language" -msgstr "" +msgstr "_Lenguaje" #: ../data/greeter.ui.h:26 msgid "_Keyboard Layout" -msgstr "" +msgstr "_Distribución de Teclado" #: ../data/greeter.ui.h:27 msgid "_Formats" -msgstr "" +msgstr "_Formatos" #: ../data/greeter.ui.h:28 msgid "_Time Zone" -msgstr "" +msgstr "_Zona Horaria" #: ../data/greeter.ui.h:29 msgid "Encrypted _Persistent Storage" -msgstr "" +msgstr "Almacenamiento _Cifrado Persistente" #: ../data/greeter.ui.h:30 msgid "Show Passphrase" @@ -171,22 +173,24 @@ msgstr "Cerrar Almacenamiento Persistente" #: ../data/greeter.ui.h:35 msgid "Your persistent storage is unlocked. Restart Tails to lock it again." msgstr "" +"Tu almacenamiento persistente esta abierto. Reinicia Tails para cerrarlo de " +"nuevo." #: ../data/greeter.ui.h:36 msgid "_Additional Settings" -msgstr "" +msgstr "_Configuración Adicional " #: ../data/greeter.ui.h:37 msgid "Save Additional Settings" -msgstr "" +msgstr "Guardar Configuración Adicional" #: ../data/greeter.ui.h:38 msgid "Add an additional setting" -msgstr "" +msgstr "Añadir una configuración adicional" #: ../data/greeter.ui.h:39 msgid "Network Configuration" -msgstr "" +msgstr "Configuración de Red" #: ../data/greeter.ui.h:40 msgid "" @@ -194,14 +198,18 @@ msgid "" "configure a Tor bridge or a local proxy. To work completely offline, you can" " disable all networking." msgstr "" +"Si su conexión al internet esta censurada, filtrada u usada atravéz de un " +"proxy, es possible que usted pueda configurar un puente Tor u un proxy " +"local. Para trabajar completamente fuera de línea, puede desactivar por " +"completo todas las redes." #: ../data/greeter.ui.h:41 msgid "Connect directly to the Tor network (default)" -msgstr "" +msgstr "Conectase directamente a la red Tor automáticamente (predeterminado)" #: ../data/greeter.ui.h:42 msgid "Configure a Tor bridge or local proxy" -msgstr "" +msgstr "Configurar un puente Tor u un proxy local" #: ../data/greeter.ui.h:43 msgid "Disable all networking"

1 0

[metrics-web/master] Document four version-related Onionoo changes.
by karsten＠torproject.org 28 Nov '17

28 Nov '17

commit 813e06853812cc35213c444d1794f80430932338 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Nov 18 21:27:32 2017 +0100 Document four version-related Onionoo changes. This update covers four Onionoo changes that are all related to versions and recommended versions: #22488, #23962, #21827, and #23544. --- website/src/main/resources/web/WEB-INF/onionoo.jsp | 74 +++++++++++++++++++++- 1 file changed, 72 insertions(+), 2 deletions(-) diff --git a/website/src/main/resources/web/WEB-INF/onionoo.jsp b/website/src/main/resources/web/WEB-INF/onionoo.jsp index 3e73fa7..8f9bfad 100644 --- a/website/src/main/resources/web/WEB-INF/onionoo.jsp +++ b/website/src/main/resources/web/WEB-INF/onionoo.jsp @@ -284,6 +284,13 @@ Added a new "host_name" parameter to filter by host name and a new "unreachable_or_addresses" field with declared but unreachable OR addresses on November 17, 2017. <a href="#versions_4_3" class="anchor">#</a></li> +<li><a id="versions_4_4"></a><strong>4.4</strong>: +Extended the "version" parameter to bridges, added a +"recommended_version" parameter for relays and bridges, added a +"version" field to relay and bridge details documents, and added a +"recommended_version" field to bridge details documents on November +28, 2017. +<a href="#versions_4_4" class="anchor">#</a></li> <li><a id="versions_5_0"></a><strong>5.0</strong> (scheduled, but not deployed yet!): Remove $ from fingerprints in "effective_family", "alleged_family", and "indirect_family" fields, to @@ -563,12 +570,13 @@ a family. <li> <a id="parameters_version"></a> -<b>version</b> +<b>version <span class="label label-primary">updated</span></b> <a href="#parameters_version" class="anchor">#</a> <p> -Return only relays running a Tor version that starts with the +Return only relays or bridges running a Tor version that starts with the parameter value <i>without</i> leading <code>"Tor"</code>. Searches are case-insensitive. +<span class="blue">Extended to bridges on November 28, 2017.</span> </p> </li> @@ -587,6 +595,21 @@ Filtering by host name is case-insensitive. </p> </li> +<li> +<a id="parameters_recommended_version"></a> +<b>recommended_version <span class="label label-primary">new</span></b> +<a href="#parameters_recommended_version" class="anchor">#</a> +<p> +Return only relays and bridges running a Tor software version that is +recommended (parameter value <strong>true</strong>) or not recommended by +the directory authorities (parameter value <strong>false</strong>). +Relays and bridges are not contained in either result, if the version they +are running is not known. +Parameter values are case-insensitive. +<span class="blue">Added on November 28, 2017.</span> +</p> +</li> + </ul> <p> @@ -1431,6 +1454,22 @@ found. </li> <li> +<a id="details_relay_version"></a> +<b>version <span class="label label-primary">new</span></b> +<code class="typeof">string</code> +<span class="required-false">optional</span> +<a href="#details_relay_version" class="anchor">#</a> +<p> +Tor software version <i>without</i> leading <code>"Tor"</code> as reported +by the directory authorities in the "v" line of the consensus. +Omitted if either the directory authorities or the relay did not report +which version the relay runs or if the relay runs an alternative Tor +implementation. +<span class="blue">Added on November 28, 2017.</span> +</p> +</li> + +<li> <a id="details_relay_recommended_version"></a> <b>recommended_version</b> <code class="typeof">boolean</code> @@ -1763,6 +1802,37 @@ information cannot be found. </li> <li> +<a id="details_bridge_version"></a> +<b>version <span class="label label-primary">new</span></b> +<code class="typeof">string</code> +<span class="required-false">optional</span> +<a href="#details_bridge_version" class="anchor">#</a> +<p> +Tor software version <i>without</i> leading <code>"Tor"</code> as reported +by the bridge in the "platform" line of its server descriptor. +Omitted if not provided by the bridge, if the descriptor containing this +information cannot be found, or if the bridge runs an alternative Tor +implementation. +<span class="blue">Added on November 28, 2017.</span> +</p> +</li> + +<li> +<a id="details_bridge_recommended_version"></a> +<b>recommended_version <span class="label label-primary">new</span></b> +<code class="typeof">boolean</code> +<span class="required-false">optional</span> +<a href="#details_bridge_recommended_version" class="anchor">#</a> +<p> +Boolean field saying whether the Tor software version of this bridge is +recommended by the directory authorities or not. +Omitted if either the directory authorities did not recommend versions, or +the bridge did not report which version it runs. +<span class="blue">Added on November 28, 2017.</span> +</p> +</li> + +<li> <a id="details_bridge_transports"></a> <b>transports</b> <code class="typeof">array of strings</code>

1 0

[onionoo/master] Bump version to 4.4-1.8.0-dev.
by karsten＠torproject.org 28 Nov '17

28 Nov '17

commit 33a6500ef5db925b10b7b09b92bb8d64f69e35ac Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Nov 28 16:17:41 2017 +0100 Bump version to 4.4-1.8.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 76a4bf2..01760c8 100644 --- a/build.xml +++ b/build.xml @@ -10,7 +10,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="4.4"/> <property name="release.version" - value="${onionoo.protocol.version}-1.8.0"/> + value="${onionoo.protocol.version}-1.8.0-dev"/> <property name="metricslibversion" value="2.1.1"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[onionoo/release] Prepare for 4.4-1.8.0 release.
by karsten＠torproject.org 28 Nov '17

28 Nov '17

commit 25021a871499dca8f7b78766fb2d07a0dab73ca8 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Nov 28 14:00:24 2017 +0100 Prepare for 4.4-1.8.0 release. --- CHANGELOG.md | 2 +- build.xml | 4 ++-- src/main/java/org/torproject/onionoo/server/ResponseBuilder.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8acdc0b..067d5bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 4.4-1.8.0 - 2017-??-?? +# Changes in version 4.4-1.8.0 - 2017-11-28 * Medium changes - Add a "version" field to relay details documents with the Tor diff --git a/build.xml b/build.xml index 45e09dc..76a4bf2 100644 --- a/build.xml +++ b/build.xml @@ -8,9 +8,9 @@ <property name="javadoc-title" value="Onionoo API Documentation"/> <property name="implementation-title" value="Onionoo" /> - <property name="onionoo.protocol.version" value="4.3"/> + <property name="onionoo.protocol.version" value="4.4"/> <property name="release.version" - value="${onionoo.protocol.version}-1.7.1-dev"/> + value="${onionoo.protocol.version}-1.8.0"/> <property name="metricslibversion" value="2.1.1"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile" diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index a83234b..160b681 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -123,7 +123,7 @@ public class ResponseBuilder { return this.charsWritten; } - private static final String PROTOCOL_VERSION = "4.3"; + private static final String PROTOCOL_VERSION = "4.4"; private static final String NEXT_MAJOR_VERSION_SCHEDULED = "2017-12-17";

1 0

[onionoo/release] Bump version to 4.3-1.7.1-dev.
by karsten＠torproject.org 28 Nov '17

28 Nov '17

commit e118782c5066c8ac79829c11078c73fc8ddd8b61 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Nov 17 16:21:14 2017 +0100 Bump version to 4.3-1.7.1-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 4e865c9..45e09dc 100644 --- a/build.xml +++ b/build.xml @@ -10,7 +10,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="4.3"/> <property name="release.version" - value="${onionoo.protocol.version}-1.7.1"/> + value="${onionoo.protocol.version}-1.7.1-dev"/> <property name="metricslibversion" value="2.1.1"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[onionoo/release] Add "version" field to details documents.
by karsten＠torproject.org 28 Nov '17

28 Nov '17

commit bd5b45a79cc71410c66b776c44d52f7f2e84a117 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Nov 18 17:32:27 2017 +0100 Add "version" field to details documents. Add a "version" field to relay details documents with the Tor software version listed in the consensus and similarly to bridge details documents with the Tor software version found in the server descriptor. Implements #22488. --- CHANGELOG.md | 9 +++++++++ .../org/torproject/onionoo/docs/DetailsDocument.java | 10 ++++++++++ .../org/torproject/onionoo/docs/DetailsStatus.java | 10 ++++++++++ .../java/org/torproject/onionoo/docs/NodeStatus.java | 3 +-- .../torproject/onionoo/server/ResponseBuilder.java | 2 ++ .../onionoo/updater/NodeDetailsStatusUpdater.java | 19 ++++++++++++++++++- .../onionoo/writer/DetailsDocumentWriter.java | 2 ++ 7 files changed, 52 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eef02a8..3adcdd4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# Changes in version 4.4-1.8.0 - 2017-??-?? + + * Medium changes + - Add a "version" field to relay details documents with the Tor + software version listed in the consensus and similarly to bridge + details documents with the Tor software version found in the + server descriptor. + + # Changes in version 4.3-1.7.1 - 2017-11-17 * Minor changes diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java index bde3cae..911a978 100644 --- a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java +++ b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java @@ -346,6 +346,16 @@ public class DetailsDocument extends Document { return unescapeJson(this.platform); } + private String version; + + public void setVersion(String version) { + this.version = version; + } + + public String getVersion() { + return this.version; + } + private SortedSet<String> alleged_family; public void setAllegedFamily(SortedSet<String> allegedFamily) { diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java index 77ff75f..9ed8658 100644 --- a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java @@ -540,5 +540,15 @@ public class DetailsStatus extends Document { public List<String> getAdvertisedOrAddresses() { return this.advertised_or_addresses; } + + private String version; + + public void setVersion(String version) { + this.version = version; + } + + public String getVersion() { + return this.version; + } } diff --git a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java index 3271ccc..7a8510e 100644 --- a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java @@ -324,8 +324,7 @@ public class NodeStatus extends Document { private String version; public void setVersion(String version) { - this.version = null == version ? null - : version.substring(version.lastIndexOf(" ") + 1); + this.version = version; } public String getVersion() { diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index 58b66ce..a83234b 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -342,6 +342,8 @@ public class ResponseBuilder { } else if (field.equals("unreachable_or_addresses")) { dd.setUnreachableOrAddresses( detailsDocument.getUnreachableOrAddresses()); + } else if (field.equals("version")) { + dd.setVersion(detailsDocument.getVersion()); } } /* Don't escape HTML characters, like < and >, contained in diff --git a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java index fa3f3af..7792764 100644 --- a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java @@ -291,7 +291,12 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, nodeStatus.setRecommendedVersion((recommendedVersions == null || entry.getVersion() == null) ? null : recommendedVersions.contains(entry.getVersion())); - nodeStatus.setVersion(entry.getVersion()); + String version = null; + if (null != entry.getVersion() + && entry.getVersion().startsWith("Tor ")) { + version = entry.getVersion().split(" ")[1]; + } + nodeStatus.setVersion(version); } if (entry.getUnmeasured()) { if (!this.lastSeenUnmeasured.containsKey(fingerprint) @@ -784,6 +789,17 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, nodeStatus.setContact(detailsStatus.getContact()); + /* Extract tor software version for bridges from their "platform" line. + * (We already know this for relays from "v" lines in the consensus.) */ + if (!nodeStatus.isRelay()) { + String version = null; + if (null != detailsStatus.getPlatform() + && detailsStatus.getPlatform().startsWith("Tor ")) { + version = detailsStatus.getPlatform().split(" ")[1]; + } + nodeStatus.setVersion(version); + } + Map<String, Long> exitAddresses = new HashMap<>(); if (detailsStatus.getExitAddresses() != null) { for (Map.Entry<String, Long> e : @@ -890,6 +906,7 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, nodeStatus.getRecommendedVersion()); detailsStatus.setLastChangedOrAddressOrPort( nodeStatus.getLastChangedOrAddressOrPort()); + detailsStatus.setVersion(nodeStatus.getVersion()); this.documentStore.store(detailsStatus, fingerprint); this.documentStore.store(nodeStatus, fingerprint); diff --git a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java index 9538cba..5eaa950 100644 --- a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java +++ b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java @@ -165,6 +165,7 @@ public class DetailsDocumentWriter implements DocumentWriter { if (!unreachableOrAddresses.isEmpty()) { detailsDocument.setUnreachableOrAddresses(unreachableOrAddresses); } + detailsDocument.setVersion(detailsStatus.getVersion()); this.documentStore.store(detailsDocument, fingerprint); } @@ -193,6 +194,7 @@ public class DetailsDocumentWriter implements DocumentWriter { detailsStatus.getAdvertisedBandwidth()); detailsDocument.setPlatform(detailsStatus.getPlatform()); detailsDocument.setTransports(detailsStatus.getTransports()); + detailsDocument.setVersion(detailsStatus.getVersion()); this.documentStore.store(detailsDocument, fingerprint); }

1 0