diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2014-10-20 12:00:46 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2014-10-20 14:42:47 +0200 |
| commit | 0d303f1764645284b33924c9be8bf29f0a32ca5c (patch) | |
| tree | a8765da8d91f77762e62bdca1b11fc5c70bbb1d6 /cmdline/apt-key.in | |
| parent | 4fa34122cbe347d21b3a162ff2fa75dd2e73c3a8 (diff) | |
test if TMPDIR is accessible before using
Private temporary directories as created by e.g. libpam-tmpdir are nice,
but they are also very effective in preventing our priviledge dropping
to work as TMPDIR will be set to a directory only root has access to, so
working with it as _apt will fail. We circumvent this by extending our
check for a usable TMPDIR setting by checking access rights.
Closes: 765951
Diffstat (limited to 'cmdline/apt-key.in')
| -rw-r--r-- | cmdline/apt-key.in | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in index 7a3852ee8..cf0b9a96f 100644 --- a/cmdline/apt-key.in +++ b/cmdline/apt-key.in @@ -384,8 +384,12 @@ if [ "$command" != "help" ]; then # gpg needs (in different versions more or less) files to function correctly, # so we give it its own homedir and generate some valid content for it - if [ ! -d "$TMPDIR" ]; then - unset TMPDIR + if [ -n "$TMPDIR" ]; then + # tmpdir is a directory and current user has rwx access to it + # same tests as in apt-pkg/contrib/fileutl.cc GetTempDir() + if [ ! -d "$TMPDIR" ] || [ ! -r "$TMPDIR" ] || [ ! -w "$TMPDIR" ] || [ ! -x "$TMPDIR" ]; then + unset TMPDIR + fi fi GPGHOMEDIR="$(mktemp -d)" CURRENTTRAP="${CURRENTTRAP} rm -rf '${GPGHOMEDIR}';" |