[Python-checkins] [3.9] bpo-21987: Fix TarFile.getmember getting a dir with a trailing slash (GH-30283) (GH-30738)

Sun Jan 23 12:54:23 EST 2022

https://github.com/python/cpython/commit/94d6434ba7ec3e4b154e515c5583b0b665ab0b09
commit: 94d6434ba7ec3e4b154e515c5583b0b665ab0b09
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2022年01月23日T19:54:13+02:00
summary:
[3.9] bpo-21987: Fix TarFile.getmember getting a dir with a trailing slash (GH-30283) (GH-30738)
(cherry picked from commit cfadcc31ea84617b1c73022ce54d4ae831333e8d)
Co-authored-by: andrei kulakov <andrei.avk at gmail.com>
files:
A Misc/NEWS.d/next/Library/2021-12-28-11-55-10.bpo-21987.avBK-p.rst
M Lib/tarfile.py
M Lib/test/test_tarfile.py

diff --git a/Lib/tarfile.py b/Lib/tarfile.py
index 043a4ab5a52a6..a738e25684c48 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 06fb97212d856..a4b63ff82b3ae 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 support.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 0000000000000..305dd16d53b49
--- /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.
