Skip to content
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

Update mechanism to set permissions for files with execute permissions while extracting sdists. #8375

Merged
merged 3 commits into from
Jun 3, 2020
Merged

Update mechanism to set permissions for files with execute permissions while extracting sdists. #8375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc86b7f
Use bitwise AND to set file permissions
deveshks Jun 2, 2020
20a933d
Add news entry
deveshks Jun 2, 2020
a8e20e3
Rename function
deveshks Jun 2, 2020
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
Empty file added news/5F187A50-7217-4F88-8902-548C9F534E55.trivial
View file
Open in desktop
Empty file.
17 changes: 11 additions & 6 deletions src/pip/_internal/utils/unpacking.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,15 @@ def is_within_directory(directory, target):
return prefix == abs_directory


def set_extracted_file_to_default_mode_plus_executable(path):
# type: (Union[str, Text]) -> None
"""
Make file present at path have execute for user/group/world
(chmod +x) is no-op on windows per python docs
"""
os.chmod(path, (0o777 & ~current_umask() | 0o111))


def unzip_file(filename, location, flatten=True):
# type: (str, str, bool) -> None
"""
Expand Down Expand Up @@ -140,9 +149,7 @@ def unzip_file(filename, location, flatten=True):
# if mode and regular file and any execute permissions for
# user/group/world?
if mode and stat.S_ISREG(mode) and mode & 0o111:
# make dest file have execute for user/group/world
# (chmod +x) no-op on windows per python docs
os.chmod(fn, (0o777 - current_umask() | 0o111))
set_extracted_file_to_default_mode_plus_executable(fn)
finally:
zipfp.close()

Expand Down Expand Up @@ -225,9 +232,7 @@ def untar_file(filename, location):
tar.utime(member, path) # type: ignore
# member have any execute permissions for user/group/world?
if member.mode & 0o111:
# make dest file have execute for user/group/world
# no-op on windows per python docs
os.chmod(path, (0o777 - current_umask() | 0o111))
set_extracted_file_to_default_mode_plus_executable(path)
finally:
tar.close()

Expand Down