Skip to content

Ensure apt keyring files are readable under restrictive umask #68742

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

Open
dinopapaya wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Ensure apt keyring files are readable under restrictive umask #68742

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 17 additions & 1 deletion salt/modules/aptpkg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2364,8 +2364,18 @@ def add_repo_key(
keyfile = key.name
if keyfile.endswith(".decrypted"):
keyfile = keyfile[:-10]
shutil.copyfile(str(key), str(keydir / keyfile))

dest_key = keydir / keyfile
shutil.copyfile(str(key), str(dest_key))

# Ensure _apt can read the keyring even under restrictive umask (e.g. 077)
try:
dest_key.chmod(0o644)
except OSError:
log.debug("Unable to chmod %s to 0644", dest_key, exc_info=True)

return True

else:
cmd.extend(["add", cached_source_path])
elif text:
Expand Down Expand Up @@ -2407,7 +2417,13 @@ def add_repo_key(
cmd_ret = _call_apt(cmd, **kwargs)

if cmd_ret["retcode"] == 0:
dest_key = keydir / keyfile
try:
dest_key.chmod(0o644)
except OSError:
log.debug("Unable to chmod %s to 0644", dest_key, exc_info=True)
return True

log.error("Unable to add repo key: %s", cmd_ret["stderr"])
return False

Expand Down