March 2015 - tor-commits - lists.torproject.org

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 05 Mar '15

05 Mar '15

commit 72672e0584f68ad375eac3a743b4983a6b45e2a7 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 5 18:15:24 2015 +0000 Update translations for tails-persistence-setup_completed --- sv/sv.po | 55 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 23 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index 9a90ffd..cb080ae 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -3,18 +3,19 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Filip Nyquist <fillerix(a)fillerix.se>, 2015 # Michael Cavén, 2014 # phst <transifex(a)sturman.se>, 2014 -# leveebreaks <when.the.levee.breaks.89(a)gmail.com>, 2014 +# leveebreaks, 2014 # WinterFairy <winterfairy(a)riseup.net>, 2013 # WinterFairy <winterfairy(a)riseup.net>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-10-08 21:13+0200\n" -"PO-Revision-Date: 2014-10-11 21:30+0000\n" -"Last-Translator: leveebreaks <when.the.levee.breaks.89(a)gmail.com>\n" +"POT-Creation-Date: 2015-02-23 13:07+0100\n" +"PO-Revision-Date: 2015-03-05 17:51+0000\n" +"Last-Translator: Filip Nyquist <fillerix(a)fillerix.se>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -95,26 +96,34 @@ msgid "Printers configuration" msgstr "Konfiguration av skrivare" #: ../lib/Tails/Persistence/Configuration/Presets.pm:138 +msgid "Bitcoin client" +msgstr "Bitcoin Klienten" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +msgid "Electrum's bitcoin wallet and configuration" +msgstr "Electrum's bitcoin plånbok och konfiguration" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 msgid "APT Packages" msgstr "APT-paket" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 msgid "Packages downloaded by APT" msgstr "Paket hämtade av APT" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:158 msgid "APT Lists" msgstr "APT listor" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:160 msgid "Lists downloaded by APT" msgstr "Listor hämtade av APT" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:158 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:168 msgid "Dotfiles" msgstr "Punktfiler" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:160 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:170 msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" msgstr "Länka in i $HOME varje fil och katalog som finns i `dotfiles' katalogen" @@ -123,67 +132,67 @@ msgstr "Länka in i $HOME varje fil och katalog som finns i `dotfiles' katalogen msgid "Setup Tails persistent volume" msgstr "Konfigurera bestående lagring för Tails" -#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:452 +#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:451 msgid "Error" msgstr "Fel" -#: ../lib/Tails/Persistence/Setup.pm:339 +#: ../lib/Tails/Persistence/Setup.pm:338 #, perl-format msgid "Device %s already has a persistent volume." msgstr "Enhet %s innehåller redan en partition med bestående lagring." -#: ../lib/Tails/Persistence/Setup.pm:347 +#: ../lib/Tails/Persistence/Setup.pm:346 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "Enhet %s saknar tillräckligt med opartitionerat utrymme." -#: ../lib/Tails/Persistence/Setup.pm:355 ../lib/Tails/Persistence/Setup.pm:369 +#: ../lib/Tails/Persistence/Setup.pm:354 ../lib/Tails/Persistence/Setup.pm:368 #, perl-format msgid "Device %s has no persistent volume." msgstr "Enhet %s innehåller ingen partition för bestående lagring." -#: ../lib/Tails/Persistence/Setup.pm:361 +#: ../lib/Tails/Persistence/Setup.pm:360 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "Partitionen med bestående lagring kan inte tas bort när den används. Starta om Tails utan bestående lagring." -#: ../lib/Tails/Persistence/Setup.pm:380 +#: ../lib/Tails/Persistence/Setup.pm:379 msgid "Persistence volume is not unlocked." msgstr "Partitionen med bestående lagring är inte upplåst." -#: ../lib/Tails/Persistence/Setup.pm:385 +#: ../lib/Tails/Persistence/Setup.pm:384 msgid "Persistence volume is not mounted." msgstr "Partitionen med bestående lagring är inte monterad." -#: ../lib/Tails/Persistence/Setup.pm:390 +#: ../lib/Tails/Persistence/Setup.pm:389 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "Kunde inte läsa ifrån den bestående lagringen. Saknas nödvändiga rättigheter?" -#: ../lib/Tails/Persistence/Setup.pm:395 +#: ../lib/Tails/Persistence/Setup.pm:394 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "Skrivåtkomst till den bestående lagringen saknas. Kanske den är skrivskyddad?" -#: ../lib/Tails/Persistence/Setup.pm:404 +#: ../lib/Tails/Persistence/Setup.pm:403 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tails körs från icke-USB / icke-SDIO enheten %s." -#: ../lib/Tails/Persistence/Setup.pm:410 +#: ../lib/Tails/Persistence/Setup.pm:409 #, perl-format msgid "Device %s is optical." msgstr "Enheten %s är optisk." -#: ../lib/Tails/Persistence/Setup.pm:417 +#: ../lib/Tails/Persistence/Setup.pm:416 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "Din enhet %s är inte skapad av Tails installerare." -#: ../lib/Tails/Persistence/Setup.pm:677 +#: ../lib/Tails/Persistence/Setup.pm:676 msgid "Persistence wizard - Finished" msgstr "Guiden avslutad" -#: ../lib/Tails/Persistence/Setup.pm:680 +#: ../lib/Tails/Persistence/Setup.pm:679 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 05 Mar '15

05 Mar '15

commit 3a2a655dc91044a4a56cb72ecf64733b86d6b3e2 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 5 18:15:20 2015 +0000 Update translations for tails-persistence-setup --- sv/sv.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index 60f56d0..cb080ae 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Filip Nyquist <fillerix(a)fillerix.se>, 2015 # Michael Cavén, 2014 # phst <transifex(a)sturman.se>, 2014 # leveebreaks, 2014 @@ -13,8 +14,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2015-02-23 13:07+0100\n" -"PO-Revision-Date: 2015-02-24 10:24+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-03-05 17:51+0000\n" +"Last-Translator: Filip Nyquist <fillerix(a)fillerix.se>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -96,11 +97,11 @@ msgstr "Konfiguration av skrivare" #: ../lib/Tails/Persistence/Configuration/Presets.pm:138 msgid "Bitcoin client" -msgstr "" +msgstr "Bitcoin Klienten" #: ../lib/Tails/Persistence/Configuration/Presets.pm:140 msgid "Electrum's bitcoin wallet and configuration" -msgstr "" +msgstr "Electrum's bitcoin plånbok och konfiguration" #: ../lib/Tails/Persistence/Configuration/Presets.pm:148 msgid "APT Packages"

1 0

[user-manual/master] Fix locale discovery in configure
by lunar＠torproject.org 05 Mar '15

05 Mar '15

commit 05d366bd7840a0ecfa8368786a286b0ff72a0261 Author: Lunar <lunar(a)torproject.org> Date: Thu Mar 5 18:46:30 2015 +0100 Fix locale discovery in configure --- configure.ac | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac index 714740d..b0edfae 100644 --- a/configure.ac +++ b/configure.ac @@ -17,6 +17,8 @@ TOR_BROWSER_VERSION=$(eval $(GIT_DIR=${tor_browser_bundle_dir}/.git $GET_TB_VERS if test "x$TOR_BROWSER_VERSION" = "x"; then AC_MSG_ERROR([Couldn't determine Tor Browser version.]) fi + +VERSIONS_PATH="${tor_browser_bundle_dir}/gitian/versions" TOR_BROWSER_BUNDLE_LOCALES=$(. "$VERSIONS_PATH"; echo "$BUNDLE_LOCALES") AC_SUBST(TOR_BROWSER_VERSION)

1 0

[stem/master] Support for consensus' new package attribute
by atagar＠torproject.org 05 Mar '15

05 Mar '15

commit 51750b88553158d581bd1860a4c140d8f1336f9e Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Mar 5 09:33:39 2015 -0800 Support for consensus' new package attribute Support for the newly added pacakge field... https://gitweb.torproject.org/torspec.git/commit/?id=ab6453476066fd1bf5c8cb… These don't appear to be in the actual consensus yet, but likely will soon. I still have some questions about this field but this parsing apprach should work for now. https://trac.torproject.org/projects/tor/ticket/15157 --- docs/change_log.rst | 3 +- stem/descriptor/hidden_service_descriptor.py | 2 + stem/descriptor/microdescriptor.py | 3 ++ stem/descriptor/networkstatus.py | 55 ++++++++++++++++++++- test/mocking.py | 1 + test/unit/descriptor/networkstatus/document_v3.py | 42 ++++++++++++++++ 6 files changed, 104 insertions(+), 2 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index c181fea..cdd7311 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -60,6 +60,7 @@ conversion (:trac:`14075`). * Lazy-loading descriptors, improving performance by 25-70% depending on what type it is (:trac:`14011`) * Added `support for hidden service descriptors <api/descriptor/hidden_service_descriptor.html>`_ (:trac:`15004`) * The :class:`~stem.descriptor.networkstatus.DirectoryAuthority` 'fingerprint' attribute was actually its 'v3ident' + * Added consensus' new package attribute (:spec:`ab64534`) * Updating Faravahar's address (:trac:`14487`) * **Utilities** @@ -155,7 +156,7 @@ among numerous other improvements and fixes. Released on **June 1st, 2014**. * **Descriptors** * Added tarfile support to :func:`~stem.descriptor.__init__.parse_file` (:trac:`10977`) - * Added microdescriptor's new identity and identity_type attributes (:spec:`22cda72`) + * Added microdescriptor's new identifier and identifier_type attributes (:spec:`22cda72`) * **Utilities** diff --git a/stem/descriptor/hidden_service_descriptor.py b/stem/descriptor/hidden_service_descriptor.py index 73f5edf..1292189 100644 --- a/stem/descriptor/hidden_service_descriptor.py +++ b/stem/descriptor/hidden_service_descriptor.py @@ -14,6 +14,8 @@ the HSDir flag. :: HiddenServiceDescriptor - Tor hidden service descriptor. + +.. versionadded:: 1.4.0 """ # TODO: Add a description for how to retrieve them when tor supports that diff --git a/stem/descriptor/microdescriptor.py b/stem/descriptor/microdescriptor.py index f4ffe94..ffbec43 100644 --- a/stem/descriptor/microdescriptor.py +++ b/stem/descriptor/microdescriptor.py @@ -196,6 +196,9 @@ class Microdescriptor(Descriptor): :var str identifier: base64 encoded identity digest, this is only used for collision prevention (:trac:`11743`) **\*** attribute is required when we're parsed with validation + + .. versionchanged:: 1.1.0 + Added the identifier and identifier_type attributes. """ ATTRIBUTES = { diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index f465e6f..a162e2e 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -47,8 +47,19 @@ For more information see :func:`~stem.descriptor.__init__.DocumentHandler`... KeyCertificate - Certificate used to authenticate an authority DocumentSignature - Signature of a document by a directory authority DirectoryAuthority - Directory authority as defined in a v3 network status document + + +.. data:: PackageVersion + + Latest recommended version of a package that's available. + + :var str name: name of the package + :var str version: latest recommended version + :var str url: package's url + :var dict digests: mapping of digest types to their value """ +import collections import io import stem.descriptor.router_status_entry @@ -75,6 +86,13 @@ from stem.descriptor.router_status_entry import ( RouterStatusEntryMicroV3, ) +PackageVersion = collections.namedtuple('PackageVersion', [ + 'name', + 'version', + 'url', + 'digests', +]) + # Version 2 network status document fields, tuples of the form... # (keyword, is_mandatory) @@ -109,6 +127,7 @@ HEADER_STATUS_DOCUMENT_FIELDS = ( ('voting-delay', True, True, True), ('client-versions', True, True, False), ('server-versions', True, True, False), + ('package', True, True, False), ('known-flags', True, True, True), ('flag-thresholds', True, False, False), ('params', True, True, False), @@ -638,6 +657,30 @@ def _parse_footer_directory_signature_line(descriptor, entries): descriptor.signatures = signatures +def _parse_package_line(descriptor, entries): + package_versions = [] + + for value, _, _ in entries['package']: + value_comp = value.split() + + if len(value_comp) < 3: + raise ValueError("'package' must at least have a 'PackageName Version URL': %s" % value) + + name, version, url = value_comp[:3] + digests = {} + + for digest_entry in value_comp[3:]: + if '=' not in digest_entry: + raise ValueError("'package' digest entries should be 'key=value' pairs: %s" % value) + + key, value = digest_entry.split('=', 1) + digests[key] = value + + package_versions.append(PackageVersion(name, version, url, digests)) + + descriptor.packages = package_versions + + _parse_header_valid_after_line = _parse_timestamp_line('valid-after', 'valid_after') _parse_header_fresh_until_line = _parse_timestamp_line('fresh-until', 'fresh_until') _parse_header_valid_until_line = _parse_timestamp_line('valid-until', 'valid_until') @@ -669,6 +712,7 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): signatures from all authorities :var list client_versions: list of recommended client tor versions :var list server_versions: list of recommended server tor versions + :var list packages: **\*** list of :data:`~stem.descriptor.networkstatus.PackageVersion` entries :var list known_flags: **\*** list of :data:`~stem.Flag` for the router's flags :var dict params: **\*** dict of parameter(**str**) => value(**int**) mappings :var list directory_authorities: **\*** list of :class:`~stem.descriptor.networkstatus.DirectoryAuthority` @@ -689,6 +733,9 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): **\*** attribute is either required when we're parsed with validation or has a default value, others are left as None if undefined + + .. versionchanged:: 1.4.0 + Added the packages attribute. """ ATTRIBUTES = { @@ -707,6 +754,7 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): 'dist_delay': (None, _parse_header_voting_delay_line), 'client_versions': ([], _parse_header_client_versions_line), 'server_versions': ([], _parse_header_server_versions_line), + 'packages': ([], _parse_package_line), 'known_flags': ([], _parse_header_known_flags_line), 'flag_thresholds': ({}, _parse_header_flag_thresholds_line), 'params': ({}, _parse_header_parameters_line), @@ -727,6 +775,7 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): 'voting-delay': _parse_header_voting_delay_line, 'client-versions': _parse_header_client_versions_line, 'server-versions': _parse_header_server_versions_line, + 'package': _parse_package_line, 'known-flags': _parse_header_known_flags_line, 'flag-thresholds': _parse_header_flag_thresholds_line, 'params': _parse_header_parameters_line, @@ -820,7 +869,7 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): # all known header fields can only appear once except for keyword, values in list(entries.items()): - if len(values) > 1 and keyword in HEADER_FIELDS: + if len(values) > 1 and keyword in HEADER_FIELDS and keyword != 'package': raise ValueError("Network status documents can only have a single '%s' line, got %i" % (keyword, len(values))) if self._default_params: @@ -1072,6 +1121,10 @@ class DirectoryAuthority(Descriptor): authority's key certificate **\*** mandatory attribute + + .. versionchanged:: 1.4.0 + Renamed our 'fingerprint' attribute to 'v3ident' (prior attribute exists + for backward compatability, but is deprecated). """ ATTRIBUTES = { diff --git a/test/mocking.py b/test/mocking.py index 156ac4a..27b0921 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -173,6 +173,7 @@ NETWORK_STATUS_DOCUMENT_HEADER = ( ('voting-delay', '300 300'), ('client-versions', None), ('server-versions', None), + ('package', None), ('known-flags', 'Authority BadExit Exit Fast Guard HSDir Named Running Stable Unnamed V2Dir Valid'), ('params', None), ) diff --git a/test/unit/descriptor/networkstatus/document_v3.py b/test/unit/descriptor/networkstatus/document_v3.py index 2f847d7..f440bbf 100644 --- a/test/unit/descriptor/networkstatus/document_v3.py +++ b/test/unit/descriptor/networkstatus/document_v3.py @@ -15,6 +15,7 @@ from stem.descriptor.networkstatus import ( HEADER_STATUS_DOCUMENT_FIELDS, FOOTER_STATUS_DOCUMENT_FIELDS, DEFAULT_PARAMS, + PackageVersion, DirectoryAuthority, NetworkStatusDocumentV3, _parse_file, @@ -125,6 +126,7 @@ I/TJmV928na7RLZe2mGHCAW3VQOvV+QkCfj05VZ8CsY= self.assertEqual(expected_versions, document.client_versions) self.assertEqual(expected_versions, document.server_versions) self.assertEqual(expected_flags, set(document.known_flags)) + self.assertEqual([], document.packages) self.assertEqual({'CircuitPriorityHalflifeMsec': 30000, 'bwauthpid': 1}, document.params) self.assertEqual(12, document.consensus_method) @@ -248,6 +250,7 @@ DnN5aFtYKiTc19qIC7Nmo+afPdDEf0MlJvEOP5EWl3w= self.assertEqual([], document.client_versions) self.assertEqual([], document.server_versions) self.assertEqual(expected_flags, set(document.known_flags)) + self.assertEqual([], document.packages) self.assertEqual({'CircuitPriorityHalflifeMsec': 30000, 'bwauthpid': 1}, document.params) self.assertEqual(None, document.consensus_method) @@ -325,6 +328,7 @@ DnN5aFtYKiTc19qIC7Nmo+afPdDEf0MlJvEOP5EWl3w= self.assertEqual([], document.client_versions) self.assertEqual([], document.server_versions) self.assertEqual(expected_known_flags, document.known_flags) + self.assertEqual([], document.packages) self.assertEqual({}, document.flag_thresholds) self.assertEqual(DEFAULT_PARAMS, document.params) self.assertEqual((), document.directory_authorities) @@ -359,6 +363,7 @@ DnN5aFtYKiTc19qIC7Nmo+afPdDEf0MlJvEOP5EWl3w= self.assertEqual([], document.client_versions) self.assertEqual([], document.server_versions) self.assertEqual(expected_known_flags, document.known_flags) + self.assertEqual([], document.packages) self.assertEqual({}, document.flag_thresholds) self.assertEqual(DEFAULT_PARAMS, document.params) self.assertEqual({}, document.bandwidth_weights) @@ -726,6 +731,43 @@ DnN5aFtYKiTc19qIC7Nmo+afPdDEf0MlJvEOP5EWl3w= document = NetworkStatusDocumentV3(content, False) self.assertEqual([], getattr(document, attr)) + def test_packages(self): + """ + Parse the package line. These can appear multiple times, and have any + number of digests. + """ + + test_values = ( + (['Stem 1.3.0 https://stem.torproject.org/'], + [PackageVersion('Stem', '1.3.0', 'https://stem.torproject.org/', {})]), + (['Stem 1.3.0 https://stem.torproject.org/ sha1=5d676c8124b4be1f52ddc8e15ca143cad211eeb4 md5=600ad5e2fc4caf585c1bdaaa532b7e82'], + [PackageVersion('Stem', '1.3.0', 'https://stem.torproject.org/', {'sha1': '5d676c8124b4be1f52ddc8e15ca143cad211eeb4', 'md5': '600ad5e2fc4caf585c1bdaaa532b7e82'})]), + (['Stem 1.3.0 https://stem.torproject.org/', 'Txtorcon 0.13.0 https://github.com/meejah/txtorcon'], + [PackageVersion('Stem', '1.3.0', 'https://stem.torproject.org/', {}), + PackageVersion('Txtorcon', '0.13.0', 'https://github.com/meejah/txtorcon', {})]), + ) + + for test_value, expected_value in test_values: + document = get_network_status_document_v3({'package': '\npackage '.join(test_value)}) + self.assertEqual(expected_value, document.packages) + + test_values = ( + '', + ' ', + 'Stem', + 'Stem 1.3.0', + 'Stem 1.3.0 https://stem.torproject.org/ keyword_field', + 'Stem 1.3.0 https://stem.torproject.org/ keyword_field key=value', + 'Stem 1.3.0 https://stem.torproject.org/ key=value keyword_field', + ) + + for test_value in test_values: + content = get_network_status_document_v3({'package': test_value}, content = True) + self.assertRaises(ValueError, NetworkStatusDocumentV3, content, True) + + document = NetworkStatusDocumentV3(content, False) + self.assertEqual([], document.packages) + def test_known_flags(self): """ Parses some known-flag entries. Just exercising the field, there's not much

1 0

[user-manual/master] Use the new git-tb-version script to find Tor Browser version
by lunar＠torproject.org 05 Mar '15

05 Mar '15

commit 6e95e27712a1a65c9f97caf8933184d495712579 Author: Lunar <lunar(a)torproject.org> Date: Thu Mar 5 18:26:03 2015 +0100 Use the new git-tb-version script to find Tor Browser version --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index a1b12f7..714740d 100644 --- a/configure.ac +++ b/configure.ac @@ -8,12 +8,12 @@ AC_ARG_WITH(tor-browser-bundle, AC_HELP_STRING([--with-tor-browser-bundle=PROGRAM], [location of the clone of tor-browser-bundle.git]), [tor_browser_bundle_dir=$withval]) -VERSIONS_PATH="${tor_browser_bundle_dir}/gitian/versions" -if ! sh -n "$VERSIONS_PATH" 2>/dev/null; then +GET_TB_VERSION="${tor_browser_bundle_dir}/gitian/get-tb-version" +if ! test -x "$GET_TB_VERSION"; then AC_MSG_ERROR([Please clone tor-browser-bundle.git and specify its location using --with-tor-browser-bundle]) fi -TOR_BROWSER_VERSION=$(. "$VERSIONS_PATH"; echo "$TORBROWSER_VERSION") +TOR_BROWSER_VERSION=$(eval $(GIT_DIR=${tor_browser_bundle_dir}/.git $GET_TB_VERSION); echo "$TORBROWSER_VERSION") if test "x$TOR_BROWSER_VERSION" = "x"; then AC_MSG_ERROR([Couldn't determine Tor Browser version.]) fi

1 0

[ooni-probe/master] Fix typo.
by art＠torproject.org 05 Mar '15

05 Mar '15

commit 8924838a1bdd00cd560d6240efc2652b5af739c0 Author: Igor Gueths <igor.gueths(a)rackspace.com> Date: Thu Feb 26 10:56:11 2015 -0600 Fix typo. --- ooni/nettests/manipulation/daphne.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/nettests/manipulation/daphne.py b/ooni/nettests/manipulation/daphne.py index 545514b..72b5c8f 100644 --- a/ooni/nettests/manipulation/daphne.py +++ b/ooni/nettests/manipulation/daphne.py @@ -12,7 +12,7 @@ class Daphn3ClientProtocol(daphn3.Daphn3Protocol): self.current_data_received = 0 if self.current_step >= (len(self.steps) - 1): log.msg("Reached the end of the state machine") - log.msg("Censorship fingerpint bisected!") + log.msg("Censorship fingerprint bisected!") step_idx, mutation_idx = self.factory.mutation log.msg("step_idx: %s | mutation_id: %s" % (step_idx, mutation_idx)) #self.transport.loseConnection()

1 0

[ooni-probe/master] Fix typo.
by art＠torproject.org 05 Mar '15

05 Mar '15

commit ce221c097ec777ba12900f8e2fbc738afd5cc90a Author: Igor Gueths <igueths(a)lava-net.com> Date: Thu Feb 26 10:56:11 2015 -0600 Fix typo. --- ooni/nettests/manipulation/daphne.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/nettests/manipulation/daphne.py b/ooni/nettests/manipulation/daphne.py index 545514b..72b5c8f 100644 --- a/ooni/nettests/manipulation/daphne.py +++ b/ooni/nettests/manipulation/daphne.py @@ -12,7 +12,7 @@ class Daphn3ClientProtocol(daphn3.Daphn3Protocol): self.current_data_received = 0 if self.current_step >= (len(self.steps) - 1): log.msg("Reached the end of the state machine") - log.msg("Censorship fingerpint bisected!") + log.msg("Censorship fingerprint bisected!") step_idx, mutation_idx = self.factory.mutation log.msg("step_idx: %s | mutation_id: %s" % (step_idx, mutation_idx)) #self.transport.loseConnection()

1 0

[ooni-probe/master] Merge branch 'fix/typo' of https://github.com/igueths/ooni-probe into fix/typo
by art＠torproject.org 05 Mar '15

05 Mar '15

commit 61af23e983d3e35269a4884ab76188364d486927 Merge: ce221c0 8924838 Author: Igor Gueths <igueths(a)lava-net.com> Date: Thu Feb 26 11:52:43 2015 -0600 Merge branch 'fix/typo' of https://github.com/igueths/ooni-probe into fix/typo Fix author info.

1 0

[ooni-probe/master] Merge pull request #378 from igueths/fix/typo
by art＠torproject.org 05 Mar '15

05 Mar '15

commit ae8debc1614ab4b3bfbfa2845ad9c6f70632c0be Merge: e358243 61af23e Author: Arturo Filastò <arturo(a)filasto.net> Date: Fri Feb 27 12:43:54 2015 +0100 Merge pull request #378 from igueths/fix/typo Fix typo. ooni/nettests/manipulation/daphne.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[ooni-probe/master] 13581: Avoid hacking sys.path in bin/* scripts as that is a security risk.
by art＠torproject.org 05 Mar '15

05 Mar '15

commit 3bad9401e657507abea23bb4d650423bad3d3845 Author: Ximin Luo <infinity0(a)pwned.gg> Date: Sat Jan 3 03:36:02 2015 +0100 13581: Avoid hacking sys.path in bin/* scripts as that is a security risk. We want to run these scripts with extra capabilities, using setcap. However, if the end user can set PYTHONPATH, then they can feed arbitrary code into these scripts and give extra capabilities to that code, which we should not allow. Includes a ooniprobe-dev wrapper shell script to make things easier for developers running directly from the repository. The important thing is that this script is developer-only and *not* installed on end users' machines. --- bin/oonideckgen | 5 ----- bin/ooniprobe | 5 ----- bin/oonireport | 7 ------- bin/ooniresources | 6 ------ data/inputs/README | 12 ++++++------ docs/source/tests/dnsspoof.rst | 4 ++-- docs/source/tests/http_header_field_manipulation.rst | 4 ++-- docs/source/tests/http_host.rst | 4 ++-- docs/source/tests/http_invalid_request_line.rst | 4 ++-- docs/source/tests/tcpconnect.rst | 4 ++-- docs/source/tests/template.rst | 4 ++-- docs/source/tests/traceroute.rst | 4 ++-- ooni/nettests/experimental/chinatrigger.py | 2 +- ooniprobe-dev | 6 ++++++ scripts/before_i_commit.sh | 2 +- 15 files changed, 28 insertions(+), 45 deletions(-) diff --git a/bin/oonideckgen b/bin/oonideckgen index 017a5d8..a761349 100755 --- a/bin/oonideckgen +++ b/bin/oonideckgen @@ -1,11 +1,6 @@ #!/usr/bin/env python -import os -import sys import exceptions -sys.path[:] = map(os.path.abspath, sys.path) -sys.path.insert(0, os.path.abspath(os.getcwd())) - from twisted.internet import defer, reactor from ooni.utils import log diff --git a/bin/ooniprobe b/bin/ooniprobe index 5e277e8..31da086 100755 --- a/bin/ooniprobe +++ b/bin/ooniprobe @@ -1,12 +1,7 @@ #!/usr/bin/env python -import os, sys import copy_reg from twisted.internet import reactor -# Hack to set the proper sys.path. Overcomes the export PYTHONPATH pain. -sys.path[:] = map(os.path.abspath, sys.path) -sys.path.insert(0, os.path.abspath(os.getcwd())) - # This is a hack to overcome a bug in python from ooni.utils.hacks import patched_reduce_ex copy_reg._reduce_ex = patched_reduce_ex diff --git a/bin/oonireport b/bin/oonireport index 84fc80d..ee9a214 100755 --- a/bin/oonireport +++ b/bin/oonireport @@ -1,11 +1,4 @@ #!/usr/bin/env python -import os -import sys -import exceptions - -sys.path[:] = map(os.path.abspath, sys.path) -sys.path.insert(0, os.path.abspath(os.getcwd())) - from twisted.internet import defer, reactor from ooni.utils import log diff --git a/bin/ooniresources b/bin/ooniresources index e0123ac..1960a1d 100755 --- a/bin/ooniresources +++ b/bin/ooniresources @@ -1,10 +1,4 @@ #!/usr/bin/env python -import os -import sys - -sys.path[:] = map(os.path.abspath, sys.path) -sys.path.insert(0, os.path.abspath(os.getcwd())) - from twisted.internet import defer, reactor from ooni.utils import log diff --git a/data/inputs/README b/data/inputs/README index 13657b1..9a55f67 100644 --- a/data/inputs/README +++ b/data/inputs/README @@ -3,38 +3,38 @@ the correct functionality of the various OONIProbe tests. # DNS Consistency -./bin/ooniprobe -o dns_tamper_test.yamloo data/nettests/blocking/dns_consistency.py -t +./ooniprobe-dev -o dns_tamper_test.yamloo data/nettests/blocking/dns_consistency.py -t example_inputs/dns_tamper_test_resolvers.txt -f example_inputs/dns_tamper_file.txt less dns_tamper_test.yamloo # Captive Portal -./bin/ooniprobe -o captive_portal_test.yamloo data/nettests/core/captiveportal.py +./ooniprobe-dev -o captive_portal_test.yamloo data/nettests/core/captiveportal.py less captive_portal_test.yamloo # HTTP Host -./bin/ooniprobe -o http_host.yamloo data/nettests/manipulation/http_host.py -b http://ooni.nu/test -f example_inputs/http_host_file.txt +./ooniprobe-dev -o http_host.yamloo data/nettests/manipulation/http_host.py -b http://ooni.nu/test -f example_inputs/http_host_file.txt less http_host.yamloo # Keyword filtering -./bin/ooniprobe -o keyword_filtering.yamloo data/nettests/core/keyword_filtering.py -b http://ooni.nu/test/ -f test_inputs/keyword_filtering_file.txt +./ooniprobe-dev -o keyword_filtering.yamloo data/nettests/core/keyword_filtering.py -b http://ooni.nu/test/ -f test_inputs/keyword_filtering_file.txt less keyword_filtering.yamloo # URL List -./bin/ooniprobe -o url_lists.yamloo data/nettests/core/url_list.py -f test_inputs/url_lists_file.txt +./ooniprobe-dev -o url_lists.yamloo data/nettests/core/url_list.py -f test_inputs/url_lists_file.txt less url_lists.yamloo # Squid transparent proxy -./bin/ooniprobe -o squid.yamloo data/nettests/core/squid.py +./ooniprobe-dev -o squid.yamloo data/nettests/core/squid.py less squid.yamloo diff --git a/docs/source/tests/dnsspoof.rst b/docs/source/tests/dnsspoof.rst index 21c9cb4..44f372b 100644 --- a/docs/source/tests/dnsspoof.rst +++ b/docs/source/tests/dnsspoof.rst @@ -21,7 +21,7 @@ This test performs A queries to a test resolver and a known good control resolve How to run the test =================== -`./bin/ooniprobe nettests/manipulation/dns_spoof.py [-s] [-k] [-i] -r <test resolver> -h <hostname> -b IP:PORT` +`ooniprobe nettests/manipulation/dns_spoof.py [-s] [-k] [-i] -r <test resolver> -h <hostname> -b IP:PORT` *test resolver* is a single test resolver (IP address). *hostname* is the hostname to query. @@ -35,7 +35,7 @@ Sample report ============= From running: -`./bin/ooniprobe nettests/manipulation/dns_spoof.py -h torproject.org -r 4.2.2.2:53` +`ooniprobe nettests/manipulation/dns_spoof.py -h torproject.org -r 4.2.2.2:53` :: diff --git a/docs/source/tests/http_header_field_manipulation.rst b/docs/source/tests/http_header_field_manipulation.rst index f51b609..b6a0a8c 100644 --- a/docs/source/tests/http_header_field_manipulation.rst +++ b/docs/source/tests/http_header_field_manipulation.rst @@ -23,14 +23,14 @@ detected tampering. How to run the test =================== -`./bin/ooniprobe nettests/manipulation/http_header_field_manipulation.py -b <address of backend> [-h <headers>]` +`ooniprobe nettests/manipulation/http_header_field_manipulation.py -b <address of backend> [-h <headers>]` `address of backend` is the IP:PORT of the SimpleHTTPChannel backend. Sample report ============= From running: -`./bin/ooniprobe nettests/manipulation/http_header_field_manipulation.py` +`ooniprobe nettests/manipulation/http_header_field_manipulation.py` If no backend is specified, the default backend is 127.0.0.1:57001, where you will need to have oonib listening. :: diff --git a/docs/source/tests/http_host.rst b/docs/source/tests/http_host.rst index 7843344..bc78dda 100644 --- a/docs/source/tests/http_host.rst +++ b/docs/source/tests/http_host.rst @@ -39,7 +39,7 @@ test. How to run the test =================== -`./bin/ooniprobe nettest/core/http_host.py -f <input file> -b <backend url> -c <content>` +`ooniprobe nettest/core/http_host.py -f <input file> -b <backend url> -c <content>` *input_file* is a file containing the hostnames to check for censorship one per line. @@ -55,7 +55,7 @@ Sample report ============= From running: -`./bin/ooniprobe nettests/core/http_host.py` +`ooniprobe nettests/core/http_host.py` :: diff --git a/docs/source/tests/http_invalid_request_line.rst b/docs/source/tests/http_invalid_request_line.rst index f1246c4..939b0cf 100644 --- a/docs/source/tests/http_invalid_request_line.rst +++ b/docs/source/tests/http_invalid_request_line.rst @@ -81,7 +81,7 @@ is usually being split on the `.`. How to run the test =================== -`./bin/ooniprobe nettests/manipulation/http_invalid_request_line.py -b <address of backend>` +`ooniprobe nettests/manipulation/http_invalid_request_line.py -b <address of backend>` *address of the backend* is the hostname or IP address of a backend that runs a TCP echo server on port 80. @@ -91,7 +91,7 @@ Sample report From running: -`./bin/ooniprobe nettests/manipulation/http_invalid_request_line.py -b 127.0.0.1 -p 57002` +`ooniprobe nettests/manipulation/http_invalid_request_line.py -b 127.0.0.1 -p 57002` :: diff --git a/docs/source/tests/tcpconnect.rst b/docs/source/tests/tcpconnect.rst index 2eadc11..1f1e082 100644 --- a/docs/source/tests/tcpconnect.rst +++ b/docs/source/tests/tcpconnect.rst @@ -28,7 +28,7 @@ If the connection succeeds the test will report "success". How to run the test =================== -`./bin/ooniprobe nettests/core/tcpconnect.py -f <input file>` +`ooniprobe nettests/core/tcpconnect.py -f <input file>` *input file* a list of IP:PORT pairs to perform TCP connections to. @@ -36,7 +36,7 @@ Sample report ============= From running: -`./bin/ooniprobe nettests/core/tcpconnect.py -f <input file>` +`ooniprobe nettests/core/tcpconnect.py -f <input file>` :: diff --git a/docs/source/tests/template.rst b/docs/source/tests/template.rst index 62b3895..02b365d 100644 --- a/docs/source/tests/template.rst +++ b/docs/source/tests/template.rst @@ -20,13 +20,13 @@ Description How to run the test =================== -`./bin/ooniprobe nettests/core/my_test_name.py` +`ooniprobe nettests/core/my_test_name.py` Sample report ============= From running: -`./bin/ooniprobe nettests/core/my_test_name.py` +`ooniprobe nettests/core/my_test_name.py` :: diff --git a/docs/source/tests/traceroute.rst b/docs/source/tests/traceroute.rst index 8532890..021bf2b 100644 --- a/docs/source/tests/traceroute.rst +++ b/docs/source/tests/traceroute.rst @@ -47,7 +47,7 @@ received a TTL expired from a router in a certain network range. How to run the test =================== -`./bin/ooniprobe nettests/manipulation/traceroute.py -b <backend ip>`` +`ooniprobe nettests/manipulation/traceroute.py -b <backend ip>`` *backend ip* is the IP address of the backend to traceroute to @@ -56,7 +56,7 @@ Sample report From running: -`./bin/ooniprobe nettests/core/traceroute.py -b 8.8.8.8` +`ooniprobe nettests/core/traceroute.py -b 8.8.8.8` :: diff --git a/ooni/nettests/experimental/chinatrigger.py b/ooni/nettests/experimental/chinatrigger.py index de1f64d..dfc2f73 100644 --- a/ooni/nettests/experimental/chinatrigger.py +++ b/ooni/nettests/experimental/chinatrigger.py @@ -17,7 +17,7 @@ class ChinaTriggerTest(BaseScapyTest): by Philipp Winter to engage chinese probes in active scanning. Example of running it: - ./bin/ooniprobe chinatrigger -d 127.0.0.1 -p 8080 + ooniprobe chinatrigger -d 127.0.0.1 -p 8080 """ name = "chinatrigger" diff --git a/ooniprobe-dev b/ooniprobe-dev new file mode 100755 index 0000000..e0d5abb --- /dev/null +++ b/ooniprobe-dev @@ -0,0 +1,6 @@ +#!/bin/sh +# Developer script for running ooniprobe directly from the repository. +# We don't automatically add "$PWD" to PYTHONPATH as that is a security risk +# when run as /usr/bin/ooniprobe on an end user's computer. +cd "$(realpath "$(dirname "$0")")" +PYTHONPATH="$PWD" exec ./bin/ooniprobe diff --git a/scripts/before_i_commit.sh b/scripts/before_i_commit.sh index 918b137..8aca1fa 100755 --- a/scripts/before_i_commit.sh +++ b/scripts/before_i_commit.sh @@ -28,7 +28,7 @@ else echo "Assuming that your virtual environment is pre-configured..."; fi -./bin/ooniprobe -i decks/before_i_commit.testdeck +./ooniprobe-dev -i decks/before_i_commit.testdeck echo "Below you should not see anything" echo "---------------------------------"

1 0