From e54869c98cab30c9ae15513ebd37dd5aa73c057a Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Fri, 27 Nov 2020 12:18:44 +0200 Subject: [PATCH 1/2] Tests: Fix first line of test server output Signed-off-by: Jussi Kukkonen --- tests/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/utils.py b/tests/utils.py index ea85d320..8e8c07bd 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -299,7 +299,7 @@ def flush_log(self): break if len(self.__logged_messages) > 0: - title = "Test server (" + self.server + ") output:" + title = "Test server (" + self.server + ") output:\n" message = [title] + self.__logged_messages self.__logger.info('| '.join(message)) self.__logged_messages = [] From 6101817b4ce98e6f7e6ff7606bd8ef418bd32b0a Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Fri, 27 Nov 2020 12:19:01 +0200 Subject: [PATCH 2/2] Updater: Close temp file in exception cases If during updater.download_target() the download succeeds but a later check fails (e.g. BadHashError), remember to close the tempfile. Signed-off-by: Jussi Kukkonen --- tuf/client/updater.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tuf/client/updater.py b/tuf/client/updater.py index fe563cec..d9ffb1f0 100755 --- a/tuf/client/updater.py +++ b/tuf/client/updater.py @@ -1320,10 +1320,12 @@ def _get_target_file(self, target_filepath, file_length, file_hashes, return file_object except Exception as exception: - # Remember the error from this mirror, and "reset" the target file. + # Remember the error from this mirror, close tempfile if one was opened logger.debug('Update failed from ' + file_mirror + '.') file_mirror_errors[file_mirror] = exception - file_object = None + if file_object is not None: + file_object.close() + file_object = None logger.debug('Failed to update ' + repr(target_filepath) + ' from' ' all mirrors: ' + repr(file_mirror_errors))