Thanks to visit codestin.com
Credit goes to github.com

Skip to content

gh-112887: Fix tarfile FilterError handling to skip member extraction #112954

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

Closed
wants to merge 3 commits into from
+38 −8
Closed

gh-112887: Fix tarfile FilterError handling to skip member extraction #112954

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c981c3d
Fix tarfile FilterError handling to skip member extraction
mattprodani Dec 1, 2023
191998a
add and fix tests for filtererror
mattprodani Dec 1, 2023
9812823
📜🤖 Added by blurb_it.
blurb-it[bot] Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix tarfile FilterError handling to skip member extraction 
In `tarfile` library, FilterError with error_level set to 0 correctly logged a debugging
message but did not properly skip extraction of a member. Updates filter
functions to return None when a FilterError is seen, as stated in docs.
  • Loading branch information
@mattprodani
mattprodani committed Dec 1, 2023
commit c981c3d267c719aa1f658733635e1e7072b6e46b
16 changes: 8 additions & 8 deletions Lib/tarfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2309,21 +2309,21 @@ def _get_extract_tarinfo(self, member, filter_function, path):
else:
tarinfo = member

unfiltered = tarinfo
filtered = None
try:
tarinfo = filter_function(tarinfo, path)
filtered = filter_function(tarinfo, path)
except (OSError, FilterError) as e:
self._handle_fatal_error(e)
except ExtractError as e:
self._handle_nonfatal_error(e)
if tarinfo is None:
self._dbg(2, "tarfile: Excluded %r" % unfiltered.name)
if filtered is None:
self._dbg(2, "tarfile: Excluded %r" % tarinfo.name)
return None
# Prepare the link target for makelink().
if tarinfo.islnk():
tarinfo = copy.copy(tarinfo)
tarinfo._link_target = os.path.join(path, tarinfo.linkname)
return tarinfo
if filtered.islnk():
filtered = copy.copy(filtered)
filtered._link_target = os.path.join(path, filtered.linkname)
return filtered

def _extract_one(self, tarinfo, path, set_attrs, numeric_owner):
"""Extract from filtered tarinfo to disk"""
Expand Down