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

[stem/master] Test that we install all modules
by atagar＠torproject.org 04 Nov '16

04 Nov '16

commit ff6afbc7732ef321b261d649c470838d472a1e8f Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Nov 3 19:11:20 2016 -0700 Test that we install all modules I've screwed up on this enough times that we might as well have a test for it. :P --- test/integ/installation.py | 15 +++++++-------- test/settings.cfg | 1 + test/unit/installation.py | 47 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 8 deletions(-) diff --git a/test/integ/installation.py b/test/integ/installation.py index 50c0339..007b911 100644 --- a/test/integ/installation.py +++ b/test/integ/installation.py @@ -8,8 +8,7 @@ import stem import stem.util.system import test.runner - -BASE_DIRECTORY = os.path.sep.join(__file__.split(os.path.sep)[:-3]) +import test.util class TestInstallation(unittest.TestCase): @@ -22,13 +21,13 @@ class TestInstallation(unittest.TestCase): self.skip_reason = None self.installation_error = None - if not os.path.exists(os.path.join(BASE_DIRECTORY, 'setup.py')): + if not os.path.exists(os.path.join(test.util.STEM_BASE, 'setup.py')): self.skip_reason = '(only for git checkout)' original_cwd = os.getcwd() try: - os.chdir(BASE_DIRECTORY) + os.chdir(test.util.STEM_BASE) stem.util.system.call(sys.executable + ' setup.py install --prefix /tmp/stem_test') stem.util.system.call(sys.executable + ' setup.py clean --all') # tidy up the build directory site_packages_paths = glob.glob('/tmp/stem_test/lib*/*/site-packages') @@ -79,12 +78,12 @@ class TestInstallation(unittest.TestCase): expected, installed = set(), set() - for root, dirnames, filenames in os.walk(os.path.join(BASE_DIRECTORY, 'stem')): + for root, dirnames, filenames in os.walk(os.path.join(test.util.STEM_BASE, 'stem')): for filename in filenames: - file_format = filename.split('.')[-1] + file_format = filename.split('.')[-1] - if file_format not in ('pyc', 'swp', 'swo'): - expected.add(os.path.join(root, filename)[len(BASE_DIRECTORY) + 1:]) + if file_format not in ('pyc', 'swp', 'swo'): + expected.add(os.path.join(root, filename)[len(test.util.STEM_BASE) + 1:]) for root, dirnames, filenames in os.walk(self.site_packages_path): for filename in filenames: diff --git a/test/settings.cfg b/test/settings.cfg index 4579f09..e5174d2 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -170,6 +170,7 @@ test.unit_tests |test.unit.util.term.TestTerminal |test.unit.util.tor_tools.TestTorTools |test.unit.util.__init__.TestBaseUtil +|test.unit.installation.TestInstallation |test.unit.descriptor.export.TestExport |test.unit.descriptor.reader.TestDescriptorReader |test.unit.descriptor.remote.TestDescriptorDownloader diff --git a/test/unit/installation.py b/test/unit/installation.py new file mode 100644 index 0000000..6d36b7e --- /dev/null +++ b/test/unit/installation.py @@ -0,0 +1,47 @@ +import os +import re +import unittest + +import test.runner +import test.util + + +class TestInstallation(unittest.TestCase): + # TODO: remove when dropping support for python 2.6 + skip_reason = 'setUpClass() unsupported in python 2.6' + + @classmethod + def setUpClass(self): + setup_path = os.path.join(test.util.STEM_BASE, 'setup.py') + self.skip_reason = None + self.setup_contents = False + + if os.path.exists(setup_path): + with open(setup_path) as setup_file: + self.setup_contents = setup_file.read() + else: + self.skip_reason = '(only for git checkout)' + + def test_installation_has_all_modules(self): + if self.skip_reason: + test.runner.skip(self, self.skip_reason) + return True + + # Modules cited my our setup.py looks like... + # + # packages = ['stem', 'stem.descriptor', 'stem.util'], + + modules = re.search('packages = \[(.*)\]', self.setup_contents).group(1).replace("'", '').replace(',', '').split() + module_paths = dict([(m, os.path.join(test.util.STEM_BASE, m.replace('.', os.path.sep))) for m in modules]) + + for module, path in module_paths.items(): + if not os.path.exists(path): + self.fail("module %s from our setup.py doesn't exit at %s" % (module, path)) + + for entry in os.walk(os.path.join(test.util.STEM_BASE, 'stem')): + path = entry[0] + + if path.endswith('__pycache__'): + continue + elif path not in module_paths.values(): + self.fail("%s isn't installed by our setup.py" % path)

1 0

[stem/master] Test that we install all non-source files
by atagar＠torproject.org 04 Nov '16

04 Nov '16

commit f7be7a8236217fcc57e1a7829ca2affa12d7df8d Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Nov 3 19:32:22 2016 -0700 Test that we install all non-source files Another easy gotcha that's bitten me before. Like modules, non-source files need to be explicitely listed. --- test/unit/installation.py | 49 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 7 deletions(-) diff --git a/test/unit/installation.py b/test/unit/installation.py index 6d36b7e..6bd8f63 100644 --- a/test/unit/installation.py +++ b/test/unit/installation.py @@ -1,3 +1,4 @@ +import json import os import re import unittest @@ -22,7 +23,7 @@ class TestInstallation(unittest.TestCase): else: self.skip_reason = '(only for git checkout)' - def test_installation_has_all_modules(self): + def test_installs_all_modules(self): if self.skip_reason: test.runner.skip(self, self.skip_reason) return True @@ -31,17 +32,51 @@ class TestInstallation(unittest.TestCase): # # packages = ['stem', 'stem.descriptor', 'stem.util'], - modules = re.search('packages = \[(.*)\]', self.setup_contents).group(1).replace("'", '').replace(',', '').split() + modules = json.loads(re.search('packages = (\[.*\])', self.setup_contents).group(1).replace("'", '"')) module_paths = dict([(m, os.path.join(test.util.STEM_BASE, m.replace('.', os.path.sep))) for m in modules]) for module, path in module_paths.items(): if not os.path.exists(path): - self.fail("module %s from our setup.py doesn't exit at %s" % (module, path)) + self.fail("setup.py's module %s doesn't exist at %s" % (module, path)) for entry in os.walk(os.path.join(test.util.STEM_BASE, 'stem')): - path = entry[0] + directory = entry[0] - if path.endswith('__pycache__'): + if directory.endswith('__pycache__'): continue - elif path not in module_paths.values(): - self.fail("%s isn't installed by our setup.py" % path) + elif directory not in module_paths.values(): + self.fail("setup.py doesn't install %s" % directory) + + def test_installs_all_data_files(self): + if self.skip_reason: + test.runner.skip(self, self.skip_reason) + return True + + # Checking that we have all non-source files. Data looks like... + # + # package_data = {'stem': ['cached_tor_manual.cfg', 'settings.cfg']}, + + package_data = json.loads(re.search('package_data = (\{.*\})', self.setup_contents).group(1).replace("'", '"')) + data_files = [] + + for module, files in package_data.items(): + for module_file in files: + data_files.append(os.path.join(test.util.STEM_BASE, module.replace('.', os.path.sep), module_file)) + + for path in data_files: + if not os.path.exists(path): + self.fail("setup.py installs a data file that doesn't exist: %s" % path) + + for entry in os.walk(os.path.join(test.util.STEM_BASE, 'stem')): + directory = entry[0] + + if directory.endswith('__pycache__'): + continue + + for filename in entry[2]: + path = os.path.join(directory, filename) + + if path.endswith('.py') or path.endswith('.pyc'): + continue + elif path not in data_files: + self.fail("setup.py doesn't install %s" % path)

1 0

[stem/master] Duplicate key in test_cwd_lsof()
by atagar＠torproject.org 04 Nov '16

04 Nov '16

commit 139e598af7529b270eaf279ed4d89d47bfdcba56 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Nov 3 19:33:38 2016 -0700 Duplicate key in test_cwd_lsof() Oops, good catch on... https://trac.torproject.org/projects/tor/ticket/20477#comment:5 --- test/unit/util/system.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/util/system.py b/test/unit/util/system.py index 509b9cb..e519aec 100644 --- a/test/unit/util/system.py +++ b/test/unit/util/system.py @@ -362,7 +362,7 @@ class TestSystem(unittest.TestCase): responses = { '75717': ['p75717', 'n/Users/atagar/tor/src/or'], - '75717': ['p75717', 'fcwd', 'n/Users/atagar/tor/src/or'], + '75718': ['p75718', 'fcwd', 'n/Users/atagar/tor/src/or'], '1234': ['malformed output'], '7878': [], } @@ -370,7 +370,7 @@ class TestSystem(unittest.TestCase): call_mock.side_effect = mock_call(system.GET_CWD_LSOF, responses) for test_input in responses: - expected_response = '/Users/atagar/tor/src/or' if test_input == '75717' else None + expected_response = '/Users/atagar/tor/src/or' if test_input in ('75717', '75718') else None self.assertEqual(expected_response, system.cwd(test_input)) def test_tail(self):

1 0

[translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed
by translation＠torproject.org 04 Nov '16

04 Nov '16

commit 3d1995a3f827bd10d53253e1b4aced9687e2d5c4 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 4 01:47:20 2016 +0000 Update translations for torbutton-abouttorproperties_completed --- vi/abouttor.properties | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/vi/abouttor.properties b/vi/abouttor.properties index b8a93ad..7984d21 100644 --- a/vi/abouttor.properties +++ b/vi/abouttor.properties @@ -19,3 +19,10 @@ aboutTor.searchDC.privacy=Tìm kiếm <a href="%1$S">một cách an toàn</a>v aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ + +aboutTor.donationBanner.donate=Tài trợ ngay bây giờ! +aboutTor.donationBanner.heart=Tor đang ở trái tim của sự tự do trên Internet +aboutTor.donationBanner.tagline1=Hàng triệu người tin vào Tor vì an ninh trực tuyến và sự riêng tư +aboutTor.donationBanner.tagline2=Một mạng lưới của những người đang bảo vệ người +aboutTor.donationBanner.tagline3=Sự giám sát = Sự đàn áp +aboutTor.donationBanner.tagline4=Đang bảo vệ các nhà báo, nhà hoạt động & những người thổi còi từ năm 2006

1 0

[translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
by translation＠torproject.org 04 Nov '16

04 Nov '16

commit 6ce4b41f35edb33b0d200ec74266e58770c6cf46 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 4 01:47:16 2016 +0000 Update translations for torbutton-abouttorproperties --- vi/abouttor.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vi/abouttor.properties b/vi/abouttor.properties index de7f01a..7984d21 100644 --- a/vi/abouttor.properties +++ b/vi/abouttor.properties @@ -20,9 +20,9 @@ aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ -aboutTor.donationBanner.donate=Donate Now! -aboutTor.donationBanner.heart=Tor is at the heart of Internet freedom -aboutTor.donationBanner.tagline1=Millions of People Depend on Tor for Online Security & Privacy -aboutTor.donationBanner.tagline2=A Network of People Protecting People -aboutTor.donationBanner.tagline3=Surveillance = Oppression -aboutTor.donationBanner.tagline4=Protecting Journalists, Activists & Whistleblowers Since 2006 +aboutTor.donationBanner.donate=Tài trợ ngay bây giờ! +aboutTor.donationBanner.heart=Tor đang ở trái tim của sự tự do trên Internet +aboutTor.donationBanner.tagline1=Hàng triệu người tin vào Tor vì an ninh trực tuyến và sự riêng tư +aboutTor.donationBanner.tagline2=Một mạng lưới của những người đang bảo vệ người +aboutTor.donationBanner.tagline3=Sự giám sát = Sự đàn áp +aboutTor.donationBanner.tagline4=Đang bảo vệ các nhà báo, nhà hoạt động & những người thổi còi từ năm 2006

1 0

[tor-messenger-build/master] Use the more general input file name
by arlo＠torproject.org 03 Nov '16

03 Nov '16

commit 6c4c6eb095a1e562db6647b93262e80858a360fd Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Nov 3 16:11:22 2016 -0700 Use the more general input file name --- projects/tor-messenger/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index c855675..821cd4e 100755 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -93,12 +93,12 @@ mv bundle tor-messenger makensis tor-messenger.nsi tar xf $rootdir/[% c('input_files_by_name/python-future') %] -cd future-0.16.0/ +cd $(echo [% c('input_files_by_name/python-future') %] | sed s/\.tar\.gz$//) python setup.py install --user cd .. tar xf $rootdir/[% c('input_files_by_name/python-pefile') %] -cd pefile-2016.3.28/ +cd $(echo [% c('input_files_by_name/python-pefile') %] | sed s/\.tar\.gz$//) python setup.py install --user cd ..

1 0

[tor/master] Split a wide line
by nickm＠torproject.org 03 Nov '16

03 Nov '16

commit bd6aa4f3d19a571adeaa956728f7e842d847c4ee Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 3 19:12:18 2016 -0400 Split a wide line --- src/or/rendservice.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index d31081a..7083051 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -281,7 +281,8 @@ rend_add_service(rend_service_t *service) * lock file. But this is enough to detect a simple mistake that * at least one person has actually made. */ - if (!rend_service_is_ephemeral(service)) { /* Skip dupe for ephemeral services. */ + if (!rend_service_is_ephemeral(service)) { + /* Skip dupe for ephemeral services. */ SMARTLIST_FOREACH(rend_service_list, rend_service_t*, ptr, dupe = dupe || !strcmp(ptr->directory, service->directory));

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug20526_030_01'
by nickm＠torproject.org 03 Nov '16

03 Nov '16

commit e8624b72a83074e00859581c34c23d4779f00010 Merge: b96bb82 922bc45 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 3 19:09:42 2016 -0400 Merge remote-tracking branch 'dgoulet/bug20526_030_01' src/or/rendservice.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)

1 0

[tor/master] hs: Added rend_service_is_ephemeral() and made related code use it
by nickm＠torproject.org 03 Nov '16

03 Nov '16

commit 922bc45a5646a45096ee7370409b405ce71a77f5 Author: Ivan Markin <twim(a)riseup.net> Date: Tue Nov 1 18:40:41 2016 -0100 hs: Added rend_service_is_ephemeral() and made related code use it Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/rendservice.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index ab7ec3f..4902580 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -116,12 +116,20 @@ static const char *hostname_fname = "hostname"; static const char *client_keys_fname = "client_keys"; static const char *sos_poison_fname = "onion_service_non_anonymous"; +/** Tells if onion service <b>s</b> is ephemeral. +*/ +static unsigned int +rend_service_is_ephemeral(const struct rend_service_t *s) +{ + return (s->directory == NULL); +} + /** Returns a escaped string representation of the service, <b>s</b>. */ static const char * rend_service_escaped_dir(const struct rend_service_t *s) { - return (s->directory) ? escaped(s->directory) : "[EPHEMERAL]"; + return rend_service_is_ephemeral(s) ? "[EPHEMERAL]" : escaped(s->directory); } /** A list of rend_service_t's for services run on this OP. @@ -273,7 +281,7 @@ rend_add_service(rend_service_t *service) * lock file. But this is enough to detect a simple mistake that * at least one person has actually made. */ - if (service->directory != NULL) { /* Skip dupe for ephemeral services. */ + if (!rend_service_is_ephemeral(service)) { /* Skip dupe for ephemeral services. */ SMARTLIST_FOREACH(rend_service_list, rend_service_t*, ptr, dupe = dupe || !strcmp(ptr->directory, service->directory)); @@ -868,7 +876,7 @@ rend_service_del_ephemeral(const char *service_id) "removal."); return -1; } - if (s->directory) { + if (!rend_service_is_ephemeral(s)) { log_warn(LD_CONFIG, "Requested non-ephemeral Onion Service for removal."); return -1; } @@ -992,7 +1000,7 @@ service_is_single_onion_poisoned(const rend_service_t *service) char *poison_fname = NULL; file_status_t fstatus; - if (!service->directory) { + if (rend_service_is_ephemeral(service)) { return 0; } @@ -1078,7 +1086,7 @@ poison_new_single_onion_hidden_service_dir(const rend_service_t *service) int retval = -1; char *poison_fname = NULL; - if (!service->directory) { + if (rend_service_is_ephemeral(service)) { log_info(LD_REND, "Ephemeral HS started in non-anonymous mode."); return 0; } @@ -1220,7 +1228,7 @@ rend_services_add_filenames_to_lists(smartlist_t *open_lst, if (!rend_service_list) return; SMARTLIST_FOREACH_BEGIN(rend_service_list, rend_service_t *, s) { - if (s->directory) { + if (!rend_service_is_ephemeral(s)) { rend_service_add_filenames_to_list(open_lst, s); smartlist_add_strdup(stat_lst, s->directory); }

1 0

[tor/master] changes file for 20526
by nickm＠torproject.org 03 Nov '16

03 Nov '16

commit 91053a072c09cb0bbb60fbb334656b05be87da81 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 3 19:10:02 2016 -0400 changes file for 20526 --- changes/20526 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/20526 b/changes/20526 new file mode 100644 index 0000000..0924daf --- /dev/null +++ b/changes/20526 @@ -0,0 +1,5 @@ + o Refactoring (onion services): + - Introduce rend_service_is_ephemeral() that tells if given onion + service is ephemeral. Replace unclear NULL-checkings for service + directory with this function. + Closes ticket 20526.

1 0