FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-91387: Strip trailing slash from tarfile longname directories by cfernald · Pull Request #32423 · python/cpython · GitHub

/ cpython Public

gh-91387: Strip trailing slash from tarfile longname directories #32423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ethanfurman merged 5 commits into from
Jun 17, 2022
Conversation 11 Commits 5 Checks 0 Files changed
Merged

gh-91387: Strip trailing slash from tarfile longname directories #32423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0900563
bpo-47231: Strip trailing slash from tarfile longname directories
cfernald Apr 8, 2022
3c1a545
📜🤖 Added by blurb_it.
blurb-it[bot] Apr 8, 2022
007f23a
Merge branch 'main' into fix_tarfile_longpath_dirs
cfernald Apr 25, 2022
151bee8
Merge branch 'main' into fix_tarfile_longpath_dirs
brettcannon Jun 7, 2022
bcfd09a
Apply suggestions from code review
brettcannon Jun 17, 2022
File filter

Filter by extension

Filter by extension .py  (2) .rst  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
10 changes: 10 additions & 0 deletions Lib/tarfile.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -1163,6 +1163,11 @@ def _proc_builtin(self, tarfile):
# header information.
self._apply_pax_info(tarfile.pax_headers, tarfile.encoding, tarfile.errors)

# Remove redundant slashes from directories. This is to be consistent
# with frombuf().
if self.isdir():
self.name = self.name.rstrip("/")

return self

def _proc_gnulong(self, tarfile):
Expand All @@ -1185,6 +1190,11 @@ def _proc_gnulong(self, tarfile):
elif self.type == GNUTYPE_LONGLINK:
next.linkname = nts(buf, tarfile.encoding, tarfile.errors)

# Remove redundant slashes from directories. This is to be consistent
# with frombuf().
if next.isdir():
next.name = next.name.removesuffix("/")

return next

def _proc_sparse(self, tarfile):
Expand Down
17 changes: 17 additions & 0 deletions Lib/test/test_tarfile.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ def test_add_dir_getmember(self):
def add_dir_and_getmember(self, name):
with os_helper.temp_cwd():
with tarfile.open(tmpname, 'w') as tar:
tar.format = tarfile.USTAR_FORMAT
Comment thread
gpshead marked this conversation as resolved.
try:
os.mkdir(name)
tar.add(name)
Expand Down Expand Up @@ -1020,11 +1021,26 @@ def test_header_offset(self):
"iso8859-1", "strict")
self.assertEqual(tarinfo.type, self.longnametype)

def test_longname_directory(self):
# Test reading a longlink directory. Issue #47231.
longdir = ('a' * 101) + '/'
with os_helper.temp_cwd():
with tarfile.open(tmpname, 'w') as tar:
tar.format = self.format
try:
os.mkdir(longdir)
tar.add(longdir)
finally:
os.rmdir(longdir)
with tarfile.open(tmpname) as tar:
self.assertIsNotNone(tar.getmember(longdir))
self.assertIsNotNone(tar.getmember(longdir.removesuffix('/')))

class GNUReadTest(LongnameTest, ReadTest, unittest.TestCase):

subdir = "gnu"
longnametype = tarfile.GNUTYPE_LONGNAME
format = tarfile.GNU_FORMAT

# Since 3.2 tarfile is supposed to accurately restore sparse members and
# produce files with holes. This is what we actually want to test here.
Expand Down Expand Up @@ -1084,6 +1100,7 @@ class PaxReadTest(LongnameTest, ReadTest, unittest.TestCase):

subdir = "pax"
longnametype = tarfile.XHDTYPE
format = tarfile.PAX_FORMAT

def test_pax_global_headers(self):
tar = tarfile.open(tarname, encoding="iso8859-1")
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2022-04-08-22-12-11.bpo-47231.lvyglt.rst
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed an issue with inconsistent trailing slashes in tarfile longname directories.
Back | FazBrowse Home | New Git URL