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

[bridgedb/master] Fix bridgedb.main erroring unittests due to multi-bridgeauth code.
by isis＠torproject.org 15 Nov '17

15 Nov '17

commit c2ffe4f6785d846a083ffc347f13759e5d748c96 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Nov 1 23:51:39 2017 +0000 Fix bridgedb.main erroring unittests due to multi-bridgeauth code. --- bridgedb/main.py | 7 +++++- bridgedb/test/test_main.py | 53 ++++++++++++++++++++++++++++++++-------------- 2 files changed, 43 insertions(+), 17 deletions(-) diff --git a/bridgedb/main.py b/bridgedb/main.py index f6d16ec..cb3eee1 100644 --- a/bridgedb/main.py +++ b/bridgedb/main.py @@ -46,7 +46,12 @@ def expandBridgeAuthDir(authdir, filename): """Expands a descriptor ``filename`` relative to which of the BRIDGE_AUTHORITY_DIRECTORIES, ``authdir`` it resides within. """ - return os.path.abspath(os.path.expanduser(os.sep.join([authdir, filename]))) + path = filename + + if not authdir in filename or not os.path.isabs(filename): + path = os.path.abspath(os.path.expanduser(os.sep.join([authdir, filename]))) + + return path def load(state, hashring, clear=False): """Read and parse all descriptors, and load into a bridge hashring. diff --git a/bridgedb/test/test_main.py b/bridgedb/test/test_main.py index fddb8a9..a2e975e 100644 --- a/bridgedb/test/test_main.py +++ b/bridgedb/test/test_main.py @@ -81,9 +81,12 @@ class BridgedbTests(unittest.TestCase): fh.flush() fh.close() - def _copyDescFilesHere(self, files): + def _copyDescFilesHere(self, authdirs, files): """Copy all the **files** to the _trial_tmp/ directory. + :param list authdirs: A list of strings representing the directories + from BridgeAuthorities, as in the BRIDGE_AUTHORITY_DIRECTORIES + config option. :param list files: A list of strings representing the paths to descriptor files. This should probably be taken from a ``bridgedb.persistent.Conf`` object which has parsed the @@ -95,18 +98,23 @@ class BridgedbTests(unittest.TestCase): """ updatedPaths = [] - for f in files: - base = os.path.basename(f) - src = os.path.join(CI_RUNDIR, base) - if os.path.isfile(src): - dst = os.path.join(HERE, base) - shutil.copy(src, dst) - updatedPaths.append(dst) - else: - self.skip = True - raise unittest.SkipTest( - "Can't find mock descriptor files in %s directory" % - CI_RUNDIR) + for d in authdirs: + for f in files: + base = os.path.basename(f) + src = os.path.join(CI_RUNDIR, d, base) + if os.path.isfile(src): + dstdir = os.path.join(HERE, d) + if not os.path.isdir(dstdir): + os.mkdir(dstdir) + self._directories_created.append(dstdir) + dst = os.path.join(dstdir, base) + shutil.copy(src, dst) + updatedPaths.append(dst) + else: + self.skip = True + raise unittest.SkipTest( + "Can't find mock descriptor files in %s directory" % + CI_RUNDIR) return updatedPaths @@ -157,14 +165,24 @@ class BridgedbTests(unittest.TestCase): directory, produce a state object from the loaded bridgedb.conf file, and make an HMAC key. """ + # We'll want to nuke these after the test runs + self._directories_created = [] + # Get the bridgedb.conf file in the top-level directory of this repo: self.configFile = os.path.join(TOPDIR, 'bridgedb.conf') self.config = main.loadConfig(self.configFile) + self.config.BRIDGE_AUTHORITY_DIRECTORIES = ["from-bifroest"] # Copy the referenced descriptor files from bridgedb/run/ to CWD: - self.config.STATUS_FILE = self._copyDescFilesHere([self.config.STATUS_FILE])[0] - self.config.BRIDGE_FILES = self._copyDescFilesHere(self.config.BRIDGE_FILES) - self.config.EXTRA_INFO_FILES = self._copyDescFilesHere(self.config.EXTRA_INFO_FILES) + self.config.STATUS_FILE = self._copyDescFilesHere( + self.config.BRIDGE_AUTHORITY_DIRECTORIES, + [self.config.STATUS_FILE])[0] + self.config.BRIDGE_FILES = self._copyDescFilesHere( + self.config.BRIDGE_AUTHORITY_DIRECTORIES, + self.config.BRIDGE_FILES) + self.config.EXTRA_INFO_FILES = self._copyDescFilesHere( + self.config.BRIDGE_AUTHORITY_DIRECTORIES, + self.config.EXTRA_INFO_FILES) # Initialise the state self.state = main.persistent.State(**self.config.__dict__) @@ -185,6 +203,9 @@ class BridgedbTests(unittest.TestCase): main.updateBridgeHistory = self._orig_updateBridgeHistory sys.argv = self._orig_sys_argv + for d in self._directories_created: + shutil.rmtree(d) + def test_main_updateBridgeHistory(self): """main.updateBridgeHistory should update some timestamps for some bridges.

1 0

[bridgedb/master] Upgrade coveralls dependency to 1.2.0.
by isis＠torproject.org 15 Nov '17

15 Nov '17

commit 93fc704cf3350313512df0d41d0ea7dd7b5901ac Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Nov 1 20:54:38 2017 +0000 Upgrade coveralls dependency to 1.2.0. --- .travis.requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.requirements.txt b/.travis.requirements.txt index 092d4f2..e05e643 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -14,7 +14,7 @@ # #------------------------------------------------------------------------------ coverage==4.2 -coveralls==0.4.2 +coveralls==1.2.0 git+https://git.torproject.org/user/isis/leekspin.git@bad0bed11a9018f65555b… mechanize==0.2.5 sure==1.2.2

1 0

[bridgedb/develop] Merge branch 'master' into develop
by isis＠torproject.org 15 Nov '17

15 Nov '17

commit bbd40684b566faafdc87255d5358deca8a1aeb38 Merge: b4d32c7 659b4ed Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Sep 12 21:33:22 2017 +0000 Merge branch 'master' into develop

1 0

[tor/release-0.3.2] Merge branch 'bug24279_030' into maint-0.3.2
by nickm＠torproject.org 15 Nov '17

15 Nov '17

commit 67c62394bc0c8a1c7beb689908b968af454a828a Merge: ae8683621 f28559fd2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 15 15:09:33 2017 -0500 Merge branch 'bug24279_030' into maint-0.3.2 changes/bug24279 | 4 ++++ configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.2] Changes file for 24279.
by nickm＠torproject.org 15 Nov '17

15 Nov '17

commit f28559fd2a70ae8e30477c3d6fa2ffc499a63e34 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 15 15:09:11 2017 -0500 Changes file for 24279. --- changes/bug24279 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug24279 b/changes/bug24279 new file mode 100644 index 000000000..b2d5698bb --- /dev/null +++ b/changes/bug24279 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation, hardening): + - Fix a memory leak warning in one of the libevent-related + configuration tests that could occur when manually specifying + -fsanitize=address. Fixes bug 24279; bugfix on 0.3.0.2-alpha.

1 0

[tor/release-0.3.2] whoops; add missing credit.
by nickm＠torproject.org 15 Nov '17

15 Nov '17

commit 7548805850439bd6d6cff1c858c707ccbca94d29 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 15 15:11:15 2017 -0500 whoops; add missing credit. --- changes/bug24279 | 1 + 1 file changed, 1 insertion(+) diff --git a/changes/bug24279 b/changes/bug24279 index b2d5698bb..ab2932b34 100644 --- a/changes/bug24279 +++ b/changes/bug24279 @@ -2,3 +2,4 @@ - Fix a memory leak warning in one of the libevent-related configuration tests that could occur when manually specifying -fsanitize=address. Fixes bug 24279; bugfix on 0.3.0.2-alpha. + Found and patched by Alex Xu.

1 0

[tor/release-0.3.2] Fix configure libevent memory leak
by nickm＠torproject.org 15 Nov '17

15 Nov '17

commit 74b7bfbe471c953269ba8e5f4d808db3c0a9c8a6 Author: Alex Xu (Hello71) <alex_y_xu(a)yahoo.ca> Date: Sun Oct 29 13:14:58 2017 +0000 Fix configure libevent memory leak Breaks build with externally-specified hardening flags. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 315bd2df3..8f56b8e80 100644 --- a/configure.ac +++ b/configure.ac @@ -527,7 +527,7 @@ struct event_base *event_base_new(void);], #ifdef _WIN32 {WSADATA d; WSAStartup(0x101,&d); } #endif -event_base_new(); +event_base_free(event_base_new()); ], [--with-libevent-dir], [/opt/libevent]) dnl Determine the incantation needed to link libevent.

1 0

[tor/release-0.3.2] Merge branch 'bug24279_030' into maint-0.3.2
by nickm＠torproject.org 15 Nov '17

15 Nov '17

commit 56b7407a9096eeed8af1b45bda5a149e7ffabb2c Merge: 67c62394b 754880585 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 15 15:11:26 2017 -0500 Merge branch 'bug24279_030' into maint-0.3.2 changes/bug24279 | 1 + 1 file changed, 1 insertion(+)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 15 Nov '17

15 Nov '17

commit 2367b1ed319a138c40708f511cd6d5575109cece Merge: 01c5d4583 56b7407a9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 15 15:11:30 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24279 | 5 +++++ configure.ac | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/master] Changes file for 24279.
by nickm＠torproject.org 15 Nov '17

15 Nov '17

commit f28559fd2a70ae8e30477c3d6fa2ffc499a63e34 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 15 15:09:11 2017 -0500 Changes file for 24279. --- changes/bug24279 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug24279 b/changes/bug24279 new file mode 100644 index 000000000..b2d5698bb --- /dev/null +++ b/changes/bug24279 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation, hardening): + - Fix a memory leak warning in one of the libevent-related + configuration tests that could occur when manually specifying + -fsanitize=address. Fixes bug 24279; bugfix on 0.3.0.2-alpha.

1 0