From eee67b7446efeb51f945e5a1cf4127ee7d05c6eb Mon Sep 17 00:00:00 2001 From: andrei kulakov Date: Tue, 28 Dec 2021 11:57:09 -0500 Subject: [PATCH 1/4] fix getmember with traling slash; add test and news entry --- Lib/tarfile.py | 4 +++- Lib/test/test_tarfile.py | 23 +++++++++++++++++++ .../2021-12-28-11-55-10.bpo-21987.avBK-p.rst | 2 ++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Library/2021-12-28-11-55-10.bpo-21987.avBK-p.rst diff --git a/Lib/tarfile.py b/Lib/tarfile.py index c1ee1222e09b5a..2bc3b1f3599c50 100755 --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -1610,6 +1610,8 @@ def not_compressed(comptype): if fileobj is not None: saved_pos = fileobj.tell() try: + if fileobj is not None and saved_pos==BLOCKSIZE: + fileobj.seek(0) return func(name, "r", fileobj, **kwargs) except (ReadError, CompressionError) as e: error_msgs.append(f'- method {comptype}: {e!r}') @@ -1789,7 +1791,7 @@ def getmember(self, name): than once in the archive, its last occurrence is assumed to be the most up-to-date version. """ - tarinfo = self._getmember(name) + tarinfo = self._getmember(name.rstrip('/')) if tarinfo is None: raise KeyError("filename %r not found" % name) return tarinfo diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py index e4b5c52bf1eaf4..282aaa47cd6398 100644 --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py @@ -220,6 +220,29 @@ def test_fileobj_symlink2(self): def test_issue14160(self): self._test_fileobj_link("symtype2", "ustar/regtype") + def test_add_dir_getmember(self): + # bpo-21987 + self.add_dir_and_getmember('bar') + self.add_dir_and_getmember('a'*101) + + def add_dir_and_getmember(self, name): + tar = tarfile.open(tmpname, 'w') + cwd = os.getcwd() + try: + os.chdir(TEMPDIR) + os.mkdir(name) + tar.add(name) + finally: + os.rmdir(name) + os.chdir(cwd) + tar.close() + tar = tarfile.open(tmpname) + try: + tar.getmember(name) + tar.getmember(name + '/') + finally: + tar.close() + class GzipUstarReadTest(GzipTest, UstarReadTest): pass diff --git a/Misc/NEWS.d/next/Library/2021-12-28-11-55-10.bpo-21987.avBK-p.rst b/Misc/NEWS.d/next/Library/2021-12-28-11-55-10.bpo-21987.avBK-p.rst new file mode 100644 index 00000000000000..305dd16d53b495 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-12-28-11-55-10.bpo-21987.avBK-p.rst @@ -0,0 +1,2 @@ +Fix an issue with :meth:`tarfile.TarFile.getmember` getting a directory name +with a trailing slash. From 859d70d4b4016346d60f733ce6cfb306192dfa70 Mon Sep 17 00:00:00 2001 From: andrei kulakov Date: Tue, 28 Dec 2021 11:59:12 -0500 Subject: [PATCH 2/4] remove seek change --- Lib/tarfile.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/Lib/tarfile.py b/Lib/tarfile.py index 2bc3b1f3599c50..e187da2b1994a6 100755 --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -1610,8 +1610,6 @@ def not_compressed(comptype): if fileobj is not None: saved_pos = fileobj.tell() try: - if fileobj is not None and saved_pos==BLOCKSIZE: - fileobj.seek(0) return func(name, "r", fileobj, **kwargs) except (ReadError, CompressionError) as e: error_msgs.append(f'- method {comptype}: {e!r}') From 153667fd1e8817db0eac0b5884ba2fd16c9291b6 Mon Sep 17 00:00:00 2001 From: andrei kulakov Date: Tue, 28 Dec 2021 14:49:38 -0500 Subject: [PATCH 3/4] use context managers and os_helper.temp_cwd in the test --- Lib/test/test_tarfile.py | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py index 282aaa47cd6398..4527673ec649b7 100644 --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py @@ -226,22 +226,16 @@ def test_add_dir_getmember(self): self.add_dir_and_getmember('a'*101) def add_dir_and_getmember(self, name): - tar = tarfile.open(tmpname, 'w') - cwd = os.getcwd() - try: - os.chdir(TEMPDIR) - os.mkdir(name) - tar.add(name) - finally: - os.rmdir(name) - os.chdir(cwd) - tar.close() - tar = tarfile.open(tmpname) - try: - tar.getmember(name) - tar.getmember(name + '/') - finally: - tar.close() + with os_helper.temp_cwd(): + with tarfile.open(tmpname, 'w') as tar: + try: + os.mkdir(name) + tar.add(name) + finally: + os.rmdir(name) + with tarfile.open(tmpname) as tar: + tar.getmember(name) + tar.getmember(name + '/') class GzipUstarReadTest(GzipTest, UstarReadTest): pass From 6dc0ed3c6c9347618e0d7d55fd08124cd8eb865a Mon Sep 17 00:00:00 2001 From: andrei kulakov Date: Wed, 19 Jan 2022 11:59:54 -0500 Subject: [PATCH 4/4] test that tar members looked up with/without trailing slash are the same --- Lib/test/test_tarfile.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py index 4527673ec649b7..1357df57eb1797 100644 --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py @@ -234,8 +234,10 @@ def add_dir_and_getmember(self, name): finally: os.rmdir(name) with tarfile.open(tmpname) as tar: - tar.getmember(name) - tar.getmember(name + '/') + self.assertEqual( + tar.getmember(name), + tar.getmember(name + '/') + ) class GzipUstarReadTest(GzipTest, UstarReadTest): pass