Skip to content

gh-107902: Don't test setting suid/sgid on systems that don't support them #108368

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
encukou merged 2 commits into from
Sep 4, 2023
Merged

gh-107902: Don't test setting suid/sgid on systems that don't support them #108368

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b26a475
gh-107902: Don't test setting suid/sgid on systems that don't support…
encukou Aug 23, 2023
316b32b
Test suid bit on directories
encukou Aug 24, 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
gh-107902: Don't test setting suid/sgid on systems that don't support… 
… them
  • Loading branch information
@encukou
encukou committed Aug 23, 2023
commit b26a4750b7d527f875d8276083a07c998609fc2a
33 changes: 19 additions & 14 deletions Lib/test/test_tarfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3809,33 +3809,38 @@ def test_modes(self):
arc.add('no_bits', mode='?---------')
arc.add('dir/', mode='?---rwsrwt')

# On some systems, setting the sticky bit is a no-op.
# Check if that's the case.
# On some systems, setting the uid, gid, and/or sticky bit is a no-ops.
# Check which bits we can set, so we can compare tarfile machinery to
# a simple chmod.
tmp_filename = os.path.join(TEMPDIR, "tmp.file")
with open(tmp_filename, 'w'):
pass
os.chmod(tmp_filename, os.stat(tmp_filename).st_mode | stat.S_ISVTX)
have_sticky_files = (os.stat(tmp_filename).st_mode & stat.S_ISVTX)
new_mode = (os.stat(tmp_filename).st_mode
| stat.S_ISVTX | stat.S_ISGID | stat.S_ISUID)
os.chmod(tmp_filename, new_mode)
got_mode = os.stat(tmp_filename).st_mode
_t_file = 't' if (got_mode & stat.S_ISVTX) else 'x'
_suid_file = 's' if (got_mode & stat.S_ISUID) else 'x'
_sgid_file = 's' if (got_mode & stat.S_ISGID) else 'x'
os.unlink(tmp_filename)

os.mkdir(tmp_filename)
os.chmod(tmp_filename, os.stat(tmp_filename).st_mode | stat.S_ISVTX)
have_sticky_dirs = (os.stat(tmp_filename).st_mode & stat.S_ISVTX)
new_mode = os.stat(tmp_filename).st_mode | stat.S_ISVTX | stat.S_ISGID
os.chmod(tmp_filename, new_mode)
got_mode = os.stat(tmp_filename).st_mode
_t_dir = 't' if (got_mode & stat.S_ISVTX) else 'x'
_suid_dir = 's' if (got_mode & stat.S_ISUID) else 'x'
Comment thread
ethanfurman marked this conversation as resolved.
_sgid_dir = 's' if (got_mode & stat.S_ISGID) else 'x'
os.rmdir(tmp_filename)

with self.check_context(arc.open(), 'fully_trusted'):
if have_sticky_files:
self.expect_file('all_bits', mode='?rwsrwsrwt')
else:
self.expect_file('all_bits', mode='?rwsrwsrwx')
self.expect_file('all_bits',
mode=f'?rw{_suid_file}rw{_sgid_file}rw{_t_file}')
self.expect_file('perm_bits', mode='?rwxrwxrwx')
self.expect_file('exec_group_other', mode='?rw-rwxrwx')
self.expect_file('read_group_only', mode='?---r-----')
self.expect_file('no_bits', mode='?---------')
if have_sticky_dirs:
self.expect_file('dir/', mode='?---rwsrwt')
else:
self.expect_file('dir/', mode='?---rwsrwx')
self.expect_file('dir/', mode=f'?---rw{_sgid_dir}rw{_t_dir}')

with self.check_context(arc.open(), 'tar'):
self.expect_file('all_bits', mode='?rwxr-xr-x')
Expand Down