February 2020 - tor-commits - lists.torproject.org

[translation/torbutton-torbuttondtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd
by translation＠torproject.org 27 Feb '20

27 Feb '20

commit f37e241097895e67b906d7ea5147917a3aa6c7e0 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 27 08:21:27 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- sv-SE/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv-SE/torbutton.dtd b/sv-SE/torbutton.dtd index 9f9f41a27f..d4e964d417 100644 --- a/sv-SE/torbutton.dtd +++ b/sv-SE/torbutton.dtd @@ -50,4 +50,4 @@ <!-- Onion … [View More]

1 0

[translation/torbutton-torbuttonproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties_completed
by translation＠torproject.org 27 Feb '20

27 Feb '20

commit bb7e39ad8efce45d4ffdd7dd55fb4a8c51fe7fd3 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 27 08:21:20 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- sv-SE/torbutton.properties | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sv-SE/torbutton.properties b/sv-SE/torbutton.properties index 81edc93f16..9152f746b0 100644 --- a/sv-SE/torbutton.properties +++ b/sv-SE/torbutton.properties @@ -61,… [View More]

1 0

[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation＠torproject.org 27 Feb '20

27 Feb '20

commit 0b3f5484a06c8b0dd85c9e77981248ccbda1f430 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 27 08:21:14 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- sv-SE/torbutton.properties | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sv-SE/torbutton.properties b/sv-SE/torbutton.properties index 36769e02ac..6062fc6166 100644 --- a/sv-SE/torbutton.properties +++ b/sv-SE/… [View More]

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 27 Feb '20

27 Feb '20

commit e39a3fbe03a83d84076c5e072e1c13582237b8a1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 27 07:45:28 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+nl.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contents+nl.po b/contents+nl.po index e02fec0d09..626af5cb2a 100644 --- a/contents+nl.po +++ b/contents+nl.po @@ -8,6 +8,7 @@ # erinm, 2019 # Tonnes <tonnes.mb(a)… [View More]

1 0

[stem/master] Tests required sqlite3
by atagar＠torproject.org 26 Feb '20

26 Feb '20

commit c4072bd1705e1996eecc3236995c26e9a3fbf8bd Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Feb 18 14:45:57 2020 -0800 Tests required sqlite3 Python includes sqlite3 as a builtin, but when you compile python yourself it isn't included by default. Our stem.manual attempted to account for this but our tests didn't, and with python3 the module raises a ModuleNotFoundError rather than an ImportError. Traceback (most recent call last): … [View More] File "/home/atagar/Desktop/stem/test/task.py", line 160, in _import_tests importlib.import_module(module.rsplit('.', 1)[0]) File "/home/atagar/Python-3.8.1/Lib/importlib/__init__.py", line 127, in import_module return _bootstrap._gcd_import(name[level:], package, level) File "<frozen importlib._bootstrap>", line 1014, in _gcd_import File "<frozen importlib._bootstrap>", line 991, in _find_and_load File "<frozen importlib._bootstrap>", line 975, in _find_and_load_unlocked File "<frozen importlib._bootstrap>", line 671, in _load_unlocked File "<frozen importlib._bootstrap_external>", line 783, in exec_module File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed File "/home/atagar/Desktop/stem/test/unit/manual.py", line 8, in <module> import sqlite3 File "/home/atagar/Python-3.8.1/Lib/sqlite3/__init__.py", line 23, in <module> from sqlite3.dbapi2 import * File "/home/atagar/Python-3.8.1/Lib/sqlite3/dbapi2.py", line 27, in <module> from _sqlite3 import * ModuleNotFoundError: No module named '_sqlite3' --- stem/manual.py | 6 +++--- test/require.py | 14 ++++++++++++++ test/unit/doctest.py | 6 ++++++ test/unit/manual.py | 9 ++++++++- 4 files changed, 31 insertions(+), 4 deletions(-) diff --git a/stem/manual.py b/stem/manual.py index 44117f93..367b6d7e 100644 --- a/stem/manual.py +++ b/stem/manual.py @@ -135,7 +135,7 @@ def query(query, *param): try: import sqlite3 - except ImportError: + except (ImportError, ModuleNotFoundError): raise ImportError('Querying requires the sqlite3 module') # The only reason to explicitly close the sqlite connection is to ensure @@ -386,7 +386,7 @@ class Manual(object): try: import sqlite3 - except ImportError: + except (ImportError, ModuleNotFoundError): raise ImportError('Reading a sqlite cache requires the sqlite3 module') if path is None: @@ -518,7 +518,7 @@ class Manual(object): try: import sqlite3 - except ImportError: + except (ImportError, ModuleNotFoundError): raise ImportError('Saving a sqlite cache requires the sqlite3 module') tmp_path = path + '.new' diff --git a/test/require.py b/test/require.py index 53d66f62..8054bfad 100644 --- a/test/require.py +++ b/test/require.py @@ -99,6 +99,20 @@ def command(cmd): return needs(lambda: stem.util.system.is_available(cmd), '%s unavailable' % cmd) +def module(module_name): + """ + Skip test unless this module is available. + """ + + try: + import module_name + available = True + except ImportError: + available = False + + return needs(lambda: available, '%s unavailable' % module_name) + + def version(req_version): """ Skips the test unless we meet the required version. diff --git a/test/unit/doctest.py b/test/unit/doctest.py index 84712dc2..120940ba 100644 --- a/test/unit/doctest.py +++ b/test/unit/doctest.py @@ -119,6 +119,12 @@ class TestDocumentation(unittest.TestCase): elif path.endswith('/stem/version.py'): with patch('stem.version.get_system_tor_version', Mock(return_value = stem.version.Version('0.2.1.30'))): test_run = doctest.testfile(path, **args) + elif path.endswith('/stem/manual.py'): + try: + import sqlite3 + test_run = doctest.testfile(path, **args) + except ImportError: + pass # manual module requires sqlite3 else: test_run = doctest.testfile(path, **args) diff --git a/test/unit/manual.py b/test/unit/manual.py index 006e0b3e..26cb83d8 100644 --- a/test/unit/manual.py +++ b/test/unit/manual.py @@ -5,7 +5,6 @@ Unit testing for the stem.manual module. import collections import io import os -import sqlite3 import tempfile import unittest import urllib.request @@ -90,13 +89,18 @@ def _cached_manual(): class TestManual(unittest.TestCase): + @test.require.module('sqlite3') def test_query(self): self.assertEqual("If set, this option overrides the default location and file name for Tor's cookie file. (See CookieAuthentication above.)", stem.manual.query('SELECT description FROM torrc WHERE name="CookieAuthFile"').fetchone()[0]) self.assertEqual("If set, this option overrides the default location and file name for Tor's cookie file. (See CookieAuthentication above.)", stem.manual.query('SELECT description FROM torrc WHERE name=?', 'CookieAuthFile').fetchone()[0]) + @test.require.module('sqlite3') def test_query_on_failure(self): + import sqlite3 + self.assertRaisesWith(sqlite3.OperationalError, 'near "hello": syntax error', stem.manual.query, 'hello world') + @test.require.module('sqlite3') def test_has_all_summaries(self): """ Check that we have brief, human readable summaries for all of tor's @@ -182,6 +186,7 @@ class TestManual(unittest.TestCase): self.assertEqual('Description of this new option.', option.description) @test.require.command('man') + @test.require.module('sqlite3') def test_saving_manual_as_config(self): """ Check that we can save and reload manuals as a config. @@ -198,6 +203,7 @@ class TestManual(unittest.TestCase): self.assertEqual(manual, loaded_manual) @test.require.command('man') + @test.require.module('sqlite3') def test_saving_manual_as_sqlite(self): """ Check that we can save and reload manuals as sqlite. @@ -213,6 +219,7 @@ class TestManual(unittest.TestCase): loaded_manual = stem.manual.Manual.from_cache(tmp.name) self.assertEqual(manual, loaded_manual) + @test.require.module('sqlite3') def test_cached_manual(self): manual = _cached_manual() [View Less]

1 0

[stem/master] Drop tor event version constants
by atagar＠torproject.org 26 Feb '20

26 Feb '20

commit 55906cd95062d838f14620ed4f7e1f97aedbfaa4 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Feb 18 17:32:50 2020 -0800 Drop tor event version constants I doubt anyone has ever used event versions from our Requirement constants. Retaining these within the event classes but dropping the clutter from our version module. --- stem/response/events.py | 38 ++++++++++++++++++------------------ stem/version.py | 52 ++++++-----------------------------… [View More]-------------- 2 files changed, 25 insertions(+), 65 deletions(-) diff --git a/stem/response/events.py b/stem/response/events.py index b82457e6..542c0f22 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -275,7 +275,7 @@ class BuildTimeoutSetEvent(Event): 'CLOSE_MS': 'close_timeout', 'CLOSE_RATE': 'close_rate', } - _VERSION_ADDED = stem.version.Requirement.EVENT_BUILDTIMEOUT_SET + _VERSION_ADDED = stem.version.Version('0.2.2.7-alpha') def _parse(self): # convert our integer and float parameters @@ -412,7 +412,7 @@ class CircMinorEvent(Event): 'OLD_PURPOSE': 'old_purpose', 'OLD_HS_STATE': 'old_hs_state', } - _VERSION_ADDED = stem.version.Requirement.EVENT_CIRC_MINOR + _VERSION_ADDED = stem.version.Version('0.2.3.11-alpha') def _parse(self): self.path = tuple(stem.control._parse_circ_path(self.path)) @@ -448,7 +448,7 @@ class ClientsSeenEvent(Event): 'CountrySummary': 'locales', 'IPVersions': 'ip_versions', } - _VERSION_ADDED = stem.version.Requirement.EVENT_CLIENTS_SEEN + _VERSION_ADDED = stem.version.Version('0.2.1.10-alpha') def _parse(self): if self.start_time is not None: @@ -507,7 +507,7 @@ class ConfChangedEvent(Event): """ _SKIP_PARSING = True - _VERSION_ADDED = stem.version.Requirement.EVENT_CONF_CHANGED + _VERSION_ADDED = stem.version.Version('0.2.3.3-alpha') def _parse(self): self.changed = {} @@ -538,7 +538,7 @@ class DescChangedEvent(Event): The DESCCHANGED event was introduced in tor version 0.1.2.2-alpha. """ - _VERSION_ADDED = stem.version.Requirement.EVENT_DESCCHANGED + _VERSION_ADDED = stem.version.Version('0.1.2.2-alpha') class GuardEvent(Event): @@ -560,7 +560,7 @@ class GuardEvent(Event): :var stem.GuardStatus status: status of the guard relay """ - _VERSION_ADDED = stem.version.Requirement.EVENT_GUARD + _VERSION_ADDED = stem.version.Version('0.1.2.5-alpha') _POSITIONAL_ARGS = ('guard_type', 'endpoint', 'status') def _parse(self): @@ -606,7 +606,7 @@ class HSDescEvent(Event): :var str index: computed index of the HSDir the descriptor was uploaded to or fetched from """ - _VERSION_ADDED = stem.version.Requirement.EVENT_HS_DESC + _VERSION_ADDED = stem.version.Version('0.2.5.2-alpha') _POSITIONAL_ARGS = ('action', 'address', 'authentication', 'directory', 'descriptor_id') _KEYWORD_ARGS = {'REASON': 'reason', 'REPLICA': 'replica', 'HSDIR_INDEX': 'index'} @@ -647,7 +647,7 @@ class HSDescContentEvent(Event): :var stem.descriptor.hidden_service.HiddenServiceDescriptorV2 descriptor: descriptor that was retrieved """ - _VERSION_ADDED = stem.version.Requirement.EVENT_HS_DESC_CONTENT + _VERSION_ADDED = stem.version.Version('0.2.7.1-alpha') _POSITIONAL_ARGS = ('address', 'descriptor_id', 'directory') def _parse(self): @@ -707,7 +707,7 @@ class NetworkStatusEvent(Event): """ _SKIP_PARSING = True - _VERSION_ADDED = stem.version.Requirement.EVENT_NS + _VERSION_ADDED = stem.version.Version('0.1.2.3-alpha') def _parse(self): content = str(self).lstrip('NS\n').rstrip('\nOK') @@ -731,7 +731,7 @@ class NetworkLivenessEvent(Event): statuses in the future) """ - _VERSION_ADDED = stem.version.Requirement.EVENT_NETWORK_LIVENESS + _VERSION_ADDED = stem.version.Version('0.2.7.2-alpha') _POSITIONAL_ARGS = ('status',) @@ -751,7 +751,7 @@ class NewConsensusEvent(Event): """ _SKIP_PARSING = True - _VERSION_ADDED = stem.version.Requirement.EVENT_NEWCONSENSUS + _VERSION_ADDED = stem.version.Version('0.2.1.13-alpha') def _parse(self): self.consensus_content = str(self).lstrip('NEWCONSENSUS\n').rstrip('\nOK') @@ -885,7 +885,7 @@ class SignalEvent(Event): """ _POSITIONAL_ARGS = ('signal',) - _VERSION_ADDED = stem.version.Requirement.EVENT_SIGNAL + _VERSION_ADDED = stem.version.Version('0.2.3.1-alpha') def _parse(self): # log if we recieved an unrecognized signal @@ -917,7 +917,7 @@ class StatusEvent(Event): """ _POSITIONAL_ARGS = ('runlevel', 'action') - _VERSION_ADDED = stem.version.Requirement.EVENT_STATUS + _VERSION_ADDED = stem.version.Version('0.1.2.3-alpha') def _parse(self): if self.type == 'STATUS_GENERAL': @@ -1028,7 +1028,7 @@ class StreamBwEvent(Event): """ _POSITIONAL_ARGS = ('id', 'written', 'read', 'time') - _VERSION_ADDED = stem.version.Requirement.EVENT_STREAM_BW + _VERSION_ADDED = stem.version.Version('0.1.2.8-beta') def _parse(self): if not tor_tools.is_valid_stream_id(self.id): @@ -1061,7 +1061,7 @@ class TransportLaunchedEvent(Event): """ _POSITIONAL_ARGS = ('type', 'name', 'address', 'port') - _VERSION_ADDED = stem.version.Requirement.EVENT_TRANSPORT_LAUNCHED + _VERSION_ADDED = stem.version.Version('0.2.5.0-alpha') def _parse(self): if self.type not in ('server', 'client'): @@ -1103,7 +1103,7 @@ class ConnectionBandwidthEvent(Event): 'WRITTEN': 'written', } - _VERSION_ADDED = stem.version.Requirement.EVENT_CONN_BW + _VERSION_ADDED = stem.version.Version('0.2.5.2-alpha') def _parse(self): if not self.id: @@ -1162,7 +1162,7 @@ class CircuitBandwidthEvent(Event): 'TIME': 'time', } - _VERSION_ADDED = stem.version.Requirement.EVENT_CIRC_BW + _VERSION_ADDED = stem.version.Version('0.2.5.2-alpha') def _parse(self): if not self.id: @@ -1232,7 +1232,7 @@ class CellStatsEvent(Event): 'OutboundTime': 'outbound_time', } - _VERSION_ADDED = stem.version.Requirement.EVENT_CELL_STATS + _VERSION_ADDED = stem.version.Version('0.2.5.2-alpha') def _parse(self): if self.id and not tor_tools.is_valid_circuit_id(self.id): @@ -1278,7 +1278,7 @@ class TokenBucketEmptyEvent(Event): 'LAST': 'last_refill', } - _VERSION_ADDED = stem.version.Requirement.EVENT_TB_EMPTY + _VERSION_ADDED = stem.version.Version('0.2.5.2-alpha') def _parse(self): if self.id and not tor_tools.is_valid_connection_id(self.id): diff --git a/stem/version.py b/stem/version.py index e67a93b5..5369f1ad 100644 --- a/stem/version.py +++ b/stem/version.py @@ -26,32 +26,12 @@ easily parsed and compared, for instance... Enumerations for the version requirements of features. - ===================================== =========== - Requirement Description - ===================================== =========== - **DORMANT_MODE** **DORMANT** and **ACTIVE** :data:`~stem.Signal` - **EVENT_AUTHDIR_NEWDESCS** AUTHDIR_NEWDESC events - **EVENT_BUILDTIMEOUT_SET** BUILDTIMEOUT_SET events - **EVENT_CIRC_MINOR** CIRC_MINOR events - **EVENT_CLIENTS_SEEN** CLIENTS_SEEN events - **EVENT_CONF_CHANGED** CONF_CHANGED events - **EVENT_DESCCHANGED** DESCCHANGED events - **EVENT_GUARD** GUARD events - **EVENT_HS_DESC_CONTENT** HS_DESC_CONTENT events - **EVENT_NETWORK_LIVENESS** NETWORK_LIVENESS events - **EVENT_NEWCONSENSUS** NEWCONSENSUS events - **EVENT_NS** NS events - **EVENT_SIGNAL** SIGNAL events - **EVENT_STATUS** STATUS_GENERAL, STATUS_CLIENT, and STATUS_SERVER events - **EVENT_STREAM_BW** STREAM_BW events - **EVENT_TRANSPORT_LAUNCHED** TRANSPORT_LAUNCHED events - **EVENT_CONN_BW** CONN_BW events - **EVENT_CIRC_BW** CIRC_BW events - **EVENT_CELL_STATS** CELL_STATS events - **EVENT_TB_EMPTY** TB_EMPTY events - **EVENT_HS_DESC** HS_DESC events - **HSFETCH_V3** HSFETCH for version 3 hidden services - ===================================== =========== + ===================== =========== + Requirement Description + ===================== =========== + **DORMANT_MODE** **DORMANT** and **ACTIVE** :data:`~stem.Signal` + **HSFETCH_V3** HSFETCH for version 3 hidden services + ===================== =========== """ import functools @@ -312,25 +292,5 @@ class _VersionRequirements(object): Requirement = stem.util.enum.Enum( ('DORMANT_MODE', Version('0.4.0.1-alpha')), - ('EVENT_AUTHDIR_NEWDESCS', Version('0.1.1.10-alpha')), - ('EVENT_BUILDTIMEOUT_SET', Version('0.2.2.7-alpha')), - ('EVENT_CIRC_MINOR', Version('0.2.3.11-alpha')), - ('EVENT_CLIENTS_SEEN', Version('0.2.1.10-alpha')), - ('EVENT_CONF_CHANGED', Version('0.2.3.3-alpha')), - ('EVENT_DESCCHANGED', Version('0.1.2.2-alpha')), - ('EVENT_GUARD', Version('0.1.2.5-alpha')), - ('EVENT_HS_DESC_CONTENT', Version('0.2.7.1-alpha')), - ('EVENT_NS', Version('0.1.2.3-alpha')), - ('EVENT_NETWORK_LIVENESS', Version('0.2.7.2-alpha')), - ('EVENT_NEWCONSENSUS', Version('0.2.1.13-alpha')), - ('EVENT_SIGNAL', Version('0.2.3.1-alpha')), - ('EVENT_STATUS', Version('0.1.2.3-alpha')), - ('EVENT_STREAM_BW', Version('0.1.2.8-beta')), - ('EVENT_TRANSPORT_LAUNCHED', Version('0.2.5.0-alpha')), - ('EVENT_CONN_BW', Version('0.2.5.2-alpha')), - ('EVENT_CIRC_BW', Version('0.2.5.2-alpha')), - ('EVENT_CELL_STATS', Version('0.2.5.2-alpha')), - ('EVENT_TB_EMPTY', Version('0.2.5.2-alpha')), - ('EVENT_HS_DESC', Version('0.2.5.2-alpha')), ('HSFETCH_V3', Version('0.4.1.1-alpha')), ) [View Less]

1 0

[stem/master] Drop complex version requirement class
by atagar＠torproject.org 26 Feb '20

26 Feb '20

commit 156c408fe033f30bf4c1a66bbb3f9bfade0b7b12 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Feb 18 17:36:47 2020 -0800 Drop complex version requirement class Removing a private class that supported version rule chains (for example, "check if I'm greater than 1.2.2 in the 1.2 series, or 1.3.5 in the 1.3 series"). This was only used for a single requirement check which has now been removed. We can always revive this class in the future if … [View More]it's useful. --- stem/version.py | 77 +-------------------------------------------------- test/unit/version.py | 78 ---------------------------------------------------- 2 files changed, 1 insertion(+), 154 deletions(-) diff --git a/stem/version.py b/stem/version.py index 5369f1ad..181aec8a 100644 --- a/stem/version.py +++ b/stem/version.py @@ -206,90 +206,15 @@ class Version(object): def __gt__(self, other): """ - Checks if this version meets the requirements for a given feature. We can - be compared to either a :class:`~stem.version.Version` or - :class:`~stem.version._VersionRequirements`. + Checks if this version meets the requirements for a given feature. """ - if isinstance(other, _VersionRequirements): - for rule in other.rules: - if rule(self): - return True - - return False - return self._compare(other, lambda s, o: s > o) def __ge__(self, other): - if isinstance(other, _VersionRequirements): - for rule in other.rules: - if rule(self): - return True - - return False - return self._compare(other, lambda s, o: s >= o) -class _VersionRequirements(object): - """ - Series of version constraints that can be compared to. For instance, this - allows for comparisons like 'if I'm greater than version X in the 0.2.2 - series, or greater than version Y in the 0.2.3 series'. - - This is a logical 'or' of the series of rules. - """ - - def __init__(self): - self.rules = [] - - def greater_than(self, version, inclusive = True): - """ - Adds a constraint that we're greater than the given version. - - :param stem.version.Version version: version we're checking against - :param bool inclusive: if comparison is inclusive or not - """ - - if inclusive: - self.rules.append(lambda v: version <= v) - else: - self.rules.append(lambda v: version < v) - - def less_than(self, version, inclusive = True): - """ - Adds a constraint that we're less than the given version. - - :param stem.version.Version version: version we're checking against - :param bool inclusive: if comparison is inclusive or not - """ - - if inclusive: - self.rules.append(lambda v: version >= v) - else: - self.rules.append(lambda v: version > v) - - def in_range(self, from_version, to_version, from_inclusive = True, to_inclusive = False): - """ - Adds constraint that we're within the range from one version to another. - - :param stem.version.Version from_version: beginning of the comparison range - :param stem.version.Version to_version: end of the comparison range - :param bool from_inclusive: if comparison is inclusive with the starting version - :param bool to_inclusive: if comparison is inclusive with the ending version - """ - - def new_rule(v): - if from_inclusive and to_inclusive: - return from_version <= v <= to_version - elif from_inclusive: - return from_version <= v < to_version - else: - return from_version < v < to_version - - self.rules.append(new_rule) - - Requirement = stem.util.enum.Enum( ('DORMANT_MODE', Version('0.4.0.1-alpha')), ('HSFETCH_V3', Version('0.4.1.1-alpha')), diff --git a/test/unit/version.py b/test/unit/version.py index abdb65c0..33439cf8 100644 --- a/test/unit/version.py +++ b/test/unit/version.py @@ -177,84 +177,6 @@ class TestVersion(unittest.TestCase): self.assert_string_matches('0.1.2.3') self.assert_string_matches('0.1.2') - def test_requirements_greater_than(self): - """ - Checks a VersionRequirements with a single greater_than rule. - """ - - requirements = stem.version._VersionRequirements() - requirements.greater_than(Version('0.2.2.36')) - - self.assertTrue(Version('0.2.2.36') >= requirements) - self.assertTrue(Version('0.2.2.37') >= requirements) - self.assertTrue(Version('0.2.3.36') >= requirements) - self.assertFalse(Version('0.2.2.35') >= requirements) - self.assertFalse(Version('0.2.1.38') >= requirements) - - requirements = stem.version._VersionRequirements() - requirements.greater_than(Version('0.2.2.36'), False) - - self.assertFalse(Version('0.2.2.35') >= requirements) - self.assertFalse(Version('0.2.2.36') >= requirements) - self.assertTrue(Version('0.2.2.37') >= requirements) - - def test_requirements_less_than(self): - """ - Checks a VersionRequirements with a single less_than rule. - """ - - requirements = stem.version._VersionRequirements() - requirements.less_than(Version('0.2.2.36')) - - self.assertTrue(Version('0.2.2.36') >= requirements) - self.assertTrue(Version('0.2.2.35') >= requirements) - self.assertTrue(Version('0.2.1.38') >= requirements) - self.assertFalse(Version('0.2.2.37') >= requirements) - self.assertFalse(Version('0.2.3.36') >= requirements) - - requirements = stem.version._VersionRequirements() - requirements.less_than(Version('0.2.2.36'), False) - - self.assertFalse(Version('0.2.2.37') >= requirements) - self.assertFalse(Version('0.2.2.36') >= requirements) - self.assertTrue(Version('0.2.2.35') >= requirements) - - def test_requirements_in_range(self): - """ - Checks a VersionRequirements with a single in_range rule. - """ - - requirements = stem.version._VersionRequirements() - requirements.in_range(Version('0.2.2.36'), Version('0.2.2.38')) - - self.assertFalse(Version('0.2.2.35') >= requirements) - self.assertTrue(Version('0.2.2.36') >= requirements) - self.assertTrue(Version('0.2.2.37') >= requirements) - self.assertFalse(Version('0.2.2.38') >= requirements) - - # rule for 'anything in the 0.2.2.x series' - requirements = stem.version._VersionRequirements() - requirements.in_range(Version('0.2.2.0'), Version('0.2.3.0')) - - for index in range(0, 100): - self.assertTrue(Version('0.2.2.%i' % index) >= requirements) - - def test_requirements_multiple_rules(self): - """ - Checks a VersionRequirements is the logical 'or' when it has multiple rules. - """ - - # rule to say 'anything but the 0.2.2.x series' - requirements = stem.version._VersionRequirements() - requirements.greater_than(Version('0.2.3.0')) - requirements.less_than(Version('0.2.2.0'), False) - - self.assertTrue(Version('0.2.3.0') >= requirements) - self.assertFalse(Version('0.2.2.0') >= requirements) - - for index in range(0, 100): - self.assertFalse(Version('0.2.2.%i' % index) >= requirements) - def assert_versions_match(self, version, major, minor, micro, patch, status, extra): """ Asserts that the values for a types.Version instance match the given [View Less]

1 0

[stem/master] Consistently document when cryptography is required
by atagar＠torproject.org 26 Feb '20

26 Feb '20

commit 682fdf18ae921bde1cebb3514d794ca6e18ab9d5 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Feb 18 15:54:48 2020 -0800 Consistently document when cryptography is required Audited our library's cryptography imports for exception handling when unavailable, and consistently document when it's required. --- stem/client/__init__.py | 2 ++ stem/descriptor/certificate.py | 7 +++-- stem/descriptor/hidden_service.py | 50 +… [View More]+++++++++++++++++------------- stem/util/__init__.py | 2 +- test/unit/descriptor/hidden_service_v2.py | 4 +-- test/unit/descriptor/remote.py | 9 ++++++ test/unit/descriptor/server_descriptor.py | 40 +++++++++++++++++++++---- 7 files changed, 82 insertions(+), 32 deletions(-) diff --git a/stem/client/__init__.py b/stem/client/__init__.py index 7456726a..57cd3457 100644 --- a/stem/client/__init__.py +++ b/stem/client/__init__.py @@ -300,6 +300,8 @@ class Circuit(object): :var hashlib.sha1 backward_digest: digest for backward integrity check :var bytes forward_key: forward encryption key :var bytes backward_key: backward encryption key + + :raises: **ImportError** if the cryptography module is unavailable """ def __init__(self, relay, circ_id, kdf): diff --git a/stem/descriptor/certificate.py b/stem/descriptor/certificate.py index ae2d6636..0522b883 100644 --- a/stem/descriptor/certificate.py +++ b/stem/descriptor/certificate.py @@ -247,6 +247,9 @@ class Ed25519CertificateV1(Ed25519Certificate): :param bytes signature: pre-calculated certificate signature :param cryptography.hazmat.primitives.asymmetric.ed25519.Ed25519PrivateKey signing_key: certificate signing key + + :raises: **ImportError** if key is a cryptographic type and ed25519 support + is unavailable """ def __init__(self, cert_type = None, expiration = None, key_type = None, key = None, extensions = None, signature = None, signing_key = None): @@ -364,7 +367,7 @@ class Ed25519CertificateV1(Ed25519Certificate): :raises: * **ValueError** if signing key or descriptor are invalid * **TypeError** if descriptor type is unsupported - * **ImportError** if cryptography module or ed25519 support unavailable + * **ImportError** if cryptography module with ed25519 support is unavailable """ import stem.descriptor.server_descriptor @@ -373,7 +376,7 @@ class Ed25519CertificateV1(Ed25519Certificate): from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PublicKey from cryptography.exceptions import InvalidSignature except ImportError: - raise ImportError('Certificate validation requires the cryptography module and ed25519 support') + raise ImportError('Certificate validation requires cryptography 2.6 or later') if isinstance(descriptor, stem.descriptor.server_descriptor.RelayDescriptor): signed_content = hashlib.sha256(Ed25519CertificateV1._signed_content(descriptor)).digest() diff --git a/stem/descriptor/hidden_service.py b/stem/descriptor/hidden_service.py index 980222a3..75a78d2e 100644 --- a/stem/descriptor/hidden_service.py +++ b/stem/descriptor/hidden_service.py @@ -214,7 +214,9 @@ class IntroductionPointV3(collections.namedtuple('IntroductionPointV3', ['link_s :returns: :class:`~stem.descriptor.hidden_service.IntroductionPointV3` with these attributes - :raises: **ValueError** if the address, port, or keys are malformed + :raises: + * **ValueError** if the address, port, or keys are malformed + * **ImportError** if cryptography module with ed25519 support is unavailable """ if not stem.util.connection.is_valid_port(port): @@ -244,14 +246,16 @@ class IntroductionPointV3(collections.namedtuple('IntroductionPointV3', ['link_s :returns: :class:`~stem.descriptor.hidden_service.IntroductionPointV3` with these attributes - :raises: **ValueError** if the address, port, or keys are malformed + :raises: + * **ValueError** if the address, port, or keys are malformed + * **ImportError** if cryptography module with ed25519 support is unavailable """ try: from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey from cryptography.hazmat.primitives.asymmetric.x25519 import X25519PrivateKey except ImportError: - raise ImportError('Introduction point creation requires the cryptography module ed25519 support') + raise ImportError('Introduction point creation requires cryptography 2.6 or later') if expiration is None: expiration = datetime.datetime.utcnow() + datetime.timedelta(hours = stem.descriptor.certificate.DEFAULT_EXPIRATION_HOURS) @@ -302,7 +306,7 @@ class IntroductionPointV3(collections.namedtuple('IntroductionPointV3', ['link_s :returns: ntor :class:`~cryptography.hazmat.primitives.asymmetric.x25519.X25519PublicKey` :raises: - * **ImportError** if required the cryptography module is unavailable + * **ImportError** if cryptography module with ed25519 support is unavailable * **EnvironmentError** if OpenSSL x25519 unsupported """ @@ -315,7 +319,7 @@ class IntroductionPointV3(collections.namedtuple('IntroductionPointV3', ['link_s :returns: :class:`~cryptography.hazmat.primitives.asymmetric.ed25519.Ed25519PublicKey` :raises: - * **ImportError** if required the cryptography module is unavailable + * **ImportError** if cryptography module with ed25519 support is unavailable * **EnvironmentError** if OpenSSL x25519 unsupported """ @@ -328,7 +332,7 @@ class IntroductionPointV3(collections.namedtuple('IntroductionPointV3', ['link_s :returns: encryption :class:`~cryptography.hazmat.primitives.asymmetric.x25519.X25519PublicKey` :raises: - * **ImportError** if required the cryptography module is unavailable + * **ImportError** if cryptography module with ed25519 support is unavailable * **EnvironmentError** if OpenSSL x25519 unsupported """ @@ -341,7 +345,7 @@ class IntroductionPointV3(collections.namedtuple('IntroductionPointV3', ['link_s :returns: legacy :class:`~cryptography.hazmat.primitives.asymmetric.x25519.X25519PublicKey` :raises: - * **ImportError** if required the cryptography module is unavailable + * **ImportError** if cryptography module with ed25519 support is unavailable * **EnvironmentError** if OpenSSL x25519 unsupported """ @@ -356,7 +360,7 @@ class IntroductionPointV3(collections.namedtuple('IntroductionPointV3', ['link_s from cryptography.hazmat.primitives.asymmetric.x25519 import X25519PublicKey from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PublicKey except ImportError: - raise ImportError('cryptography module unavailable') + raise ImportError('Key parsing requires cryptography 2.6 or later') if x25519: if not X25519_AVAILABLE: @@ -507,8 +511,11 @@ def _encrypt_layer(plaintext, constant, revision_counter, subcredential, blinded def _layer_cipher(constant, revision_counter, subcredential, blinded_key, salt): - from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes - from cryptography.hazmat.backends import default_backend + try: + from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes + from cryptography.hazmat.backends import default_backend + except ImportError: + raise ImportError('Layer encryption/decryption requires the cryptography module') kdf = hashlib.shake_256(blinded_key + subcredential + struct.pack('>Q', revision_counter) + salt + constant) keys = kdf.digest(S_KEY_LEN + S_IV_LEN + MAC_LEN) @@ -964,13 +971,13 @@ class HiddenServiceDescriptorV3(HiddenServiceDescriptor): :raises: * **ValueError** if parameters are malformed - * **ImportError** if cryptography is unavailable + * **ImportError** if cryptography module with ed25519 support is unavailable """ try: from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey except ImportError: - raise ImportError('Hidden service descriptor creation requires cryptography version 2.6') + raise ImportError('Hidden service descriptor creation requires cryptography 2.6 or later') if blinding_nonce and len(blinding_nonce) != 32: raise ValueError('Blinding nonce must be 32 bytes, but was %i' % len(blinding_nonce)) @@ -1058,9 +1065,7 @@ class HiddenServiceDescriptorV3(HiddenServiceDescriptor): :returns: :class:`~stem.descriptor.hidden_service.InnerLayer` with our decrypted content - :raises: - * **ImportError** if required cryptography or sha3 module is unavailable - * **ValueError** if unable to decrypt or validation fails + :raises: **ValueError** if unable to decrypt or validation fails """ if self._inner_layer is None: @@ -1091,7 +1096,8 @@ class HiddenServiceDescriptorV3(HiddenServiceDescriptor): :returns: **unicode** hidden service address - :raises: **ImportError** if sha3 unsupported + :raises: **ImportError** if key is a cryptographic type and ed25519 support + is unavailable """ key = stem.util._pubkey_bytes(key) # normalize key into bytes @@ -1111,9 +1117,7 @@ class HiddenServiceDescriptorV3(HiddenServiceDescriptor): :returns: **bytes** for the hidden service's public identity key - :raises: - * **ImportError** if sha3 unsupported - * **ValueError** if address malformed or checksum is invalid + :raises: **ValueError** if address malformed or checksum is invalid """ if onion_address.endswith('.onion'): @@ -1202,7 +1206,7 @@ class OuterLayer(Descriptor): from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey from cryptography.hazmat.primitives.asymmetric.x25519 import X25519PrivateKey except ImportError: - raise ImportError('Hidden service layer creation requires cryptography version 2.6') + raise ImportError('Hidden service layer creation requires cryptography 2.6 or later') if authorized_clients and 'auth-client' in attr: raise ValueError('Authorized clients cannot be specified through both attr and authorized_clients') @@ -1336,7 +1340,11 @@ def _blinded_pubkey(identity_key, blinding_nonce): def _blinded_sign(msg, identity_key, blinded_key, blinding_nonce): - from cryptography.hazmat.primitives import serialization + try: + from cryptography.hazmat.primitives import serialization + except ImportError: + raise ImportError('Key signing requires the cryptography module') + from stem.util import ed25519 identity_key_bytes = identity_key.private_bytes( diff --git a/stem/util/__init__.py b/stem/util/__init__.py index cde49de7..e4e08174 100644 --- a/stem/util/__init__.py +++ b/stem/util/__init__.py @@ -91,7 +91,7 @@ def _pubkey_bytes(key): from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey, Ed25519PublicKey from cryptography.hazmat.primitives.asymmetric.x25519 import X25519PrivateKey, X25519PublicKey except ImportError: - raise ImportError('Key normalization requires the cryptography module with ed25519 support') + raise ImportError('Key normalization requires cryptography 2.6 or later') if isinstance(key, (X25519PrivateKey, Ed25519PrivateKey)): return key.public_key().public_bytes( diff --git a/test/unit/descriptor/hidden_service_v2.py b/test/unit/descriptor/hidden_service_v2.py index 7112648b..ee2a9111 100644 --- a/test/unit/descriptor/hidden_service_v2.py +++ b/test/unit/descriptor/hidden_service_v2.py @@ -250,7 +250,7 @@ class TestHiddenServiceDescriptorV2(unittest.TestCase): """ with open(get_resource('hidden_service_duckduckgo'), 'rb') as descriptor_file: - desc = next(stem.descriptor.parse_file(descriptor_file, 'hidden-service-descriptor 1.0', validate = True)) + desc = next(stem.descriptor.parse_file(descriptor_file, 'hidden-service-descriptor 1.0', validate = True, skip_crypto_validation = not test.require.CRYPTOGRAPHY_AVAILABLE)) self._assert_matches_duckduckgo(desc) def test_for_duckduckgo_without_validation(self): @@ -268,7 +268,7 @@ class TestHiddenServiceDescriptorV2(unittest.TestCase): """ with open(get_resource('hidden_service_facebook'), 'rb') as descriptor_file: - desc = next(stem.descriptor.parse_file(descriptor_file, 'hidden-service-descriptor 1.0', validate = True)) + desc = next(stem.descriptor.parse_file(descriptor_file, 'hidden-service-descriptor 1.0', validate = True, skip_crypto_validation = not test.require.CRYPTOGRAPHY_AVAILABLE)) self.assertEqual('utjk4arxqg6s6zzo7n6cjnq6ot34udhr', desc.descriptor_id) self.assertEqual(2, desc.version) diff --git a/test/unit/descriptor/remote.py b/test/unit/descriptor/remote.py index 70f88b52..d3f43995 100644 --- a/test/unit/descriptor/remote.py +++ b/test/unit/descriptor/remote.py @@ -12,6 +12,7 @@ import stem import stem.descriptor import stem.descriptor.remote import stem.util.str_tools +import test.require from unittest.mock import patch, Mock, MagicMock @@ -114,6 +115,7 @@ class TestDescriptorDownloader(unittest.TestCase): reply = stem.descriptor.remote.their_server_descriptor( endpoints = [stem.ORPort('12.34.56.78', 1100)], validate = True, + skip_crypto_validation = not test.require.CRYPTOGRAPHY_AVAILABLE, ) self.assertEqual(1, len(list(reply))) @@ -137,12 +139,14 @@ class TestDescriptorDownloader(unittest.TestCase): stem.descriptor.remote.their_server_descriptor( endpoints = [stem.ORPort('12.34.56.78', 1100)], validate = True, + skip_crypto_validation = not test.require.CRYPTOGRAPHY_AVAILABLE, ).run() with patch('stem.client.Relay.connect', _orport_mock(TEST_DESCRIPTOR, response_code_header = b'HTTP/1.0 500 Kaboom\r\n')): request = stem.descriptor.remote.their_server_descriptor( endpoints = [stem.ORPort('12.34.56.78', 1100)], validate = True, + skip_crypto_validation = not test.require.CRYPTOGRAPHY_AVAILABLE, ) self.assertRaisesRegexp(stem.ProtocolError, "^Response should begin with HTTP success, but was 'HTTP/1.0 500 Kaboom'", request.run) @@ -156,6 +160,7 @@ class TestDescriptorDownloader(unittest.TestCase): reply = stem.descriptor.remote.their_server_descriptor( endpoints = [stem.DirPort('12.34.56.78', 1100)], validate = True, + skip_crypto_validation = not test.require.CRYPTOGRAPHY_AVAILABLE, ) self.assertEqual(1, len(list(reply))) @@ -177,6 +182,7 @@ class TestDescriptorDownloader(unittest.TestCase): '9695DFC35FFEB861329B9F1AB04C46397020CE31', compression = Compression.PLAINTEXT, validate = True, + skip_crypto_validation = not test.require.CRYPTOGRAPHY_AVAILABLE, )) self.assertEqual(1, len(descriptors)) @@ -192,6 +198,7 @@ class TestDescriptorDownloader(unittest.TestCase): '9695DFC35FFEB861329B9F1AB04C46397020CE31', compression = Compression.GZIP, validate = True, + skip_crypto_validation = not test.require.CRYPTOGRAPHY_AVAILABLE, )) self.assertEqual(1, len(descriptors)) @@ -285,6 +292,7 @@ class TestDescriptorDownloader(unittest.TestCase): endpoints = [stem.DirPort('128.31.0.39', 9131)], compression = Compression.PLAINTEXT, validate = True, + skip_crypto_validation = not test.require.CRYPTOGRAPHY_AVAILABLE, ) self.assertEqual(stem.DirPort('128.31.0.39', 9131), query._pick_endpoint()) @@ -366,6 +374,7 @@ class TestDescriptorDownloader(unittest.TestCase): endpoints = [stem.DirPort('128.31.0.39', 9131)], compression = Compression.PLAINTEXT, validate = True, + skip_crypto_validation = not test.require.CRYPTOGRAPHY_AVAILABLE, ) # check that iterating over the query provides the descriptors each time diff --git a/test/unit/descriptor/server_descriptor.py b/test/unit/descriptor/server_descriptor.py index 07f50013..867f98ba 100644 --- a/test/unit/descriptor/server_descriptor.py +++ b/test/unit/descriptor/server_descriptor.py @@ -170,7 +170,12 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= """ with open(get_resource('old_descriptor'), 'rb') as descriptor_file: - desc = next(stem.descriptor.parse_file(descriptor_file, 'server-descriptor 1.0', validate = True)) + desc = next(stem.descriptor.parse_file( + descriptor_file, + 'server-descriptor 1.0', + validate = True, + skip_crypto_validation = not test.require.CRYPTOGRAPHY_AVAILABLE, + )) self.assertEqual('krypton', desc.nickname) self.assertEqual('3E2F63E2356F52318B536A12B6445373808A5D6C', desc.fingerprint) @@ -219,7 +224,12 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= """ with open(get_resource('non-ascii_descriptor'), 'rb') as descriptor_file: - desc = next(stem.descriptor.parse_file(descriptor_file, 'server-descriptor 1.0', validate = True)) + desc = next(stem.descriptor.parse_file( + descriptor_file, + 'server-descriptor 1.0', + validate = True, + skip_crypto_validation = not test.require.CRYPTOGRAPHY_AVAILABLE, + )) self.assertEqual('Coruscant', desc.nickname) self.assertEqual('0B9821545C48E496AEED9ECC0DB506C49FF8158D', desc.fingerprint) @@ -307,7 +317,11 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= """ with open(get_resource('server_descriptor_with_ed25519'), 'rb') as descriptor_file: - desc = next(stem.descriptor.parse_file(descriptor_file, validate = True)).make_router_status_entry() + desc = next(stem.descriptor.parse_file( + descriptor_file, + validate = True, + skip_crypto_validation = not test.require.CRYPTOGRAPHY_AVAILABLE, + )).make_router_status_entry() self.assertEqual(stem.descriptor.router_status_entry.RouterStatusEntryV3, type(desc)) self.assertEqual('destiny', desc.nickname) @@ -339,7 +353,11 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= """ with open(get_resource('server_descriptor_with_ed25519'), 'rb') as descriptor_file: - desc = next(stem.descriptor.parse_file(descriptor_file, validate = True)) + desc = next(stem.descriptor.parse_file( + descriptor_file, + validate = True, + skip_crypto_validation = not test.require.CRYPTOGRAPHY_AVAILABLE, + )) family = set([ '$379FB450010D17078B3766C2273303C358C3A442', @@ -434,7 +452,12 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= """ with open(get_resource('cr_in_contact_line'), 'rb') as descriptor_file: - desc = next(stem.descriptor.parse_file(descriptor_file, 'server-descriptor 1.0', validate = True)) + desc = next(stem.descriptor.parse_file( + descriptor_file, + 'server-descriptor 1.0', + validate = True, + skip_crypto_validation = not test.require.CRYPTOGRAPHY_AVAILABLE, + )) self.assertEqual('pogonip', desc.nickname) self.assertEqual('6DABD62BC65D4E6FE620293157FC76968DAB9C9B', desc.fingerprint) @@ -456,7 +479,12 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= """ with open(get_resource('negative_uptime'), 'rb') as descriptor_file: - desc = next(stem.descriptor.parse_file(descriptor_file, 'server-descriptor 1.0', validate = True)) + desc = next(stem.descriptor.parse_file( + descriptor_file, + 'server-descriptor 1.0', + validate = True, + skip_crypto_validation = not test.require.CRYPTOGRAPHY_AVAILABLE, + )) self.assertEqual('TipTor', desc.nickname) self.assertEqual('137962D4931DBF08A24E843288B8A155D6D2AEDD', desc.fingerprint) [View Less]

1 0

[tor/master] Run "make autostyle"
by nickm＠torproject.org 26 Feb '20

26 Feb '20

commit 6472d9cfdf1198cf3a09659204170f9942a8fba3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 26 16:45:33 2020 -0500 Run "make autostyle" --- src/feature/hs/hs_ob.c | 2 +- src/feature/hs/hs_ob.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/feature/hs/hs_ob.c b/src/feature/hs/hs_ob.c index c18a78901..f135ecd3f 100644 --- a/src/feature/hs/hs_ob.c +++ b/src/feature/hs/hs_ob.c @@ -16,7 +16,7 @@ #include "lib/confmgt/confmgt.h" #include "… [View More]

1 0

[tor-browser-build/master] Bug 32437: Add wasi-sysroot project for RLBox
by boklm＠torproject.org 26 Feb '20

26 Feb '20

commit e8574bbde076ba917f4d3fd3e71c6c7ee10716c4 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 12 20:38:10 2020 +0000 Bug 32437: Add wasi-sysroot project for RLBox --- projects/ninja/build | 21 +++++++++++++++++++++ projects/ninja/config | 16 ++++++++++++++++ projects/wasi-sysroot/build | 32 ++++++++++++++++++++++++++++++++ projects/wasi-sysroot/config | 28 ++++++++++++++++++++++++++++ projects/wasi-sysroot/no-git.patch | 28 +++… [View More]+++++++++++++++++++++++++ 5 files changed, 125 insertions(+) diff --git a/projects/ninja/build b/projects/ninja/build new file mode 100644 index 0000000..6500ca7 --- /dev/null +++ b/projects/ninja/build @@ -0,0 +1,21 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir=/var/tmp/dist/[% project %] +[% IF c("var/linux") %] + [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), + hardened_gcc => 0 }) %] +[% END -%] +[% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] +mkdir /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %] + +./configure.py --bootstrap + +mkdir $distdir +cp ninja $distdir +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/ninja/config b/projects/ninja/config new file mode 100644 index 0000000..8615511 --- /dev/null +++ b/projects/ninja/config @@ -0,0 +1,16 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/ninja-build/ninja.git +git_hash: b25c08bda4949192c69cea4cee057887341a2ffc #v1.9.0 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +var: + container: + use_container: 1 + +input_files: + - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/linux") %]' + - name: python + project: python diff --git a/projects/wasi-sysroot/build b/projects/wasi-sysroot/build new file mode 100644 index 0000000..5ea885c --- /dev/null +++ b/projects/wasi-sysroot/build @@ -0,0 +1,32 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +# We need a link to our GCC, otherwise the system cc gets used which points to +# /usr/bin/gcc. +[% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), + hardened_gcc => 0 }) %] +ln -s gcc /var/tmp/dist/gcc/bin/cc + +distdir=/var/tmp/dist +builddir=/var/tmp/build/[% project %] +mkdir -p $distdir +tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %] +export PATH=/var/tmp/dist/binutils/bin:/var/tmp/dist/cmake/bin:/var/tmp/dist/ninja:$PATH + +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz + +mv /var/tmp/build/[% project %]-[% c('version') %] $builddir +cd $builddir +# We have no .git in our tar ball but the Makefile depends on that. Just +# hard-code the version for now. +patch -p1 < $rootdir/no-git.patch + +make -j[% c("buildconf/num_procs") %] PREFIX=$distdir/[% project %] + +cd $distdir +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/wasi-sysroot/config b/projects/wasi-sysroot/config new file mode 100644 index 0000000..512769b --- /dev/null +++ b/projects/wasi-sysroot/config @@ -0,0 +1,28 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' +version: '[% c("abbrev") %]' +git_hash: 87b7a019472770f08d49cf3b558867dc76ea74eb +git_url: https://github.com/CraneStation/wasi-sdk +git_submodule: 1 + +var: + container: + use_container: 1 + +targets: + linux: + var: + arch_deps: + - patch + +input_files: + - project: container-image + - name: gcc + project: gcc + - name: binutils + project: binutils + - name: cmake + project: cmake + - name: ninja + project: ninja + - filename: no-git.patch diff --git a/projects/wasi-sysroot/no-git.patch b/projects/wasi-sysroot/no-git.patch new file mode 100644 index 0000000..27c3446 --- /dev/null +++ b/projects/wasi-sysroot/no-git.patch @@ -0,0 +1,28 @@ +From 55a106779cd012f9cf5d6f46a7a3523de9ba93c3 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Sat, 7 Dec 2019 16:12:42 +0000 +Subject: [PATCH] No .git in our tarball + + +diff --git a/Makefile b/Makefile +index f09a901..dc114cb 100644 +--- a/Makefile ++++ b/Makefile +@@ -6,11 +6,11 @@ LLVM_PROJ_DIR?=$(ROOT_DIR)/src/llvm-project + PREFIX?=/opt/wasi-sdk + + CLANG_VERSION=$(shell ./llvm_version.sh $(LLVM_PROJ_DIR)) +-VERSION:=$(shell ./version.sh) +-DEBUG_PREFIX_MAP=-fdebug-prefix-map=$(ROOT_DIR)=wasisdk://v$(VERSION) ++#VERSION:=$(shell ./version.sh) ++DEBUG_PREFIX_MAP=-fdebug-prefix-map=$(ROOT_DIR)=wasisdk://v8.1g5225b05436ce + + default: build +- @echo "Use -fdebug-prefix-map=$(ROOT_DIR)=wasisdk://v$(VERSION)" ++ @echo "Use -fdebug-prefix-map=$(ROOT_DIR)=wasisdk://v8.1g5225b05436ce" + + clean: + rm -rf build $(PREFIX) +-- +2.24.0 + [View Less]

1 0