From 2d75d3f494b34b47a03bcf386fd6858e6fb98213 Mon Sep 17 00:00:00 2001 From: andrei kulakov Date: Fri, 21 Jan 2022 02:40:32 -0500 Subject: [PATCH 1/2] bpo-21987: Fix TarFile.getmember getting a dir with a trailing slash (GH-30283) (cherry picked from commit cfadcc31ea84617b1c73022ce54d4ae831333e8d) Co-authored-by: andrei kulakov --- Lib/tarfile.py | 2 +- Lib/test/test_tarfile.py | 19 +++++++++++++++++++ .../2021-12-28-11-55-10.bpo-21987.avBK-p.rst | 2 ++ 3 files changed, 22 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 043a4ab5a52a6f..a738e25684c481 100755 --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -1785,7 +1785,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 06fb97212d8567..4303ff3344e2b7 100644 --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py @@ -219,6 +219,25 @@ 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): + 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: + self.assertEqual( + tar.getmember(name), + tar.getmember(name + '/') + ) + 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 de1411dc3f89402fa7be44d19b68597224efdc6e Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Sun, 23 Jan 2022 10:04:57 +0200 Subject: [PATCH 2/2] Update Lib/test/test_tarfile.py --- Lib/test/test_tarfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py index 4303ff3344e2b7..a4b63ff82b3ae3 100644 --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py @@ -225,7 +225,7 @@ def test_add_dir_getmember(self): self.add_dir_and_getmember('a'*101) def add_dir_and_getmember(self, name): - with os_helper.temp_cwd(): + with support.temp_cwd(): with tarfile.open(tmpname, 'w') as tar: try: os.mkdir(name)