isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add mkdtempat() and mkostempsat() for systems without them.

Browse Source
This commit is contained in:
Todd C. Miller
2022-09-21 19:08:11 -06:00
parent 88ac5e09b6
commit 86c108b50b
6 changed files with 109 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config.h.in
View File

@@ -602,6 +602,12 @@
/* Define to 1 if you have the `mkdtemp' function. */
#undef HAVE_MKDTEMP
/* Define to 1 if you have the `mkdtempat' function. */
#undef HAVE_MKDTEMPAT
/* Define to 1 if you have the `mkostempsat' function. */
#undef HAVE_MKOSTEMPSAT
/* Define to 1 if you have the `mkstemps' function. */
#undef HAVE_MKSTEMPS

11
configure vendored
View File

@@ -23311,8 +23311,9 @@ fi
fi
done
sudo_mktemp=no
for ac_func in mkstemps mkdtemp
for ac_func in mkdtempat mkostempsat mkstemps mkdtemp
do :
as_ac_var=`printf "%s\n" "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -23323,11 +23324,12 @@ then :
_ACEOF
else $as_nop
break
sudo_mktemp=yes; break
fi
done
if test X"$ac_cv_func_mkstemps$ac_cv_func_mkdtemp" != X"yesyes"; then
# If any of the mktemp family are missing we use our own.
if test X"$sudo_mktemp" = X"yes"; then
for ac_func in arc4random random lrand48
do :
@@ -23357,9 +23359,8 @@ fi
;;
esac
# If either mkdtemp() or mkstemps() is missing, replace both.
for _sym in sudo_mkdtemp sudo_mkstemps; do
for _sym in sudo_mkdtemp sudo_mkdtempat sudo_mkostempsat sudo_mkstemp sudo_mkstemps; do
COMPAT_EXP="${COMPAT_EXP}${_sym}
"
done

9
configure.ac
View File

@@ -2957,15 +2957,16 @@ AC_CHECK_FUNCS([closefrom], [], [AC_LIBOBJ(closefrom)
# include <fcntl.h> ])
COMPAT_TEST_PROGS="${COMPAT_TEST_PROGS}${COMPAT_TEST_PROGS+ }closefrom_test"
])
AC_CHECK_FUNCS([mkstemps mkdtemp], [], [break])
if test X"$ac_cv_func_mkstemps$ac_cv_func_mkdtemp" != X"yesyes"; then
sudo_mktemp=no
AC_CHECK_FUNCS([mkdtempat mkostempsat mkstemps mkdtemp], [], [sudo_mktemp=yes; break])
# If any of the mktemp family are missing we use our own.
if test X"$sudo_mktemp" = X"yes"; then
AC_CHECK_FUNCS([arc4random random lrand48], [break])
if test X"$ac_cv_func_arc4random" != X"yes"; then
AC_CHECK_FUNCS([getentropy])
fi
AC_LIBOBJ(mktemp)
# If either mkdtemp() or mkstemps() is missing, replace both.
SUDO_APPEND_COMPAT_EXP(sudo_mkdtemp sudo_mkstemps)
SUDO_APPEND_COMPAT_EXP(sudo_mkdtemp sudo_mkdtempat sudo_mkostempsat sudo_mkstemp sudo_mkstemps)
COMPAT_TEST_PROGS="${COMPAT_TEST_PROGS}${COMPAT_TEST_PROGS+ }mktemp_test"
fi
AX_FUNC_SNPRINTF

13
include/sudo_compat.h
View File

@@ -494,14 +494,23 @@ sudo_dso_public int sudo_mkdirat(int dfd, const char *path, mode_t mode);
# undef mkdirat
# define mkdirat(_a, _b, _c) sudo_mkdirat((_a), (_b), (_c))
#endif /* HAVE_MKDIRAT */
#if !defined(HAVE_MKDTEMP) || !defined(HAVE_MKSTEMPS)
#if !defined(HAVE_MKDTEMP) || !defined(HAVE_MKDTEMPAT) || !defined(HAVE_MKOSTEMPSAT) || !defined(HAVE_MKSTEMPS)
sudo_dso_public char *sudo_mkdtemp(char *path);
# undef mkdtemp
# define mkdtemp(_a) sudo_mkdtemp((_a))
sudo_dso_public char *sudo_mkdtempat(int dfd, char *path);
# undef mkdtempat
# define mkdtempat(_a, _b) sudo_mkdtempat((_a), (_b))
sudo_dso_public int sudo_mkostempsat(int dfd, char *path, int slen, int flags);
# undef mkostempsat
# define mkostempsat(_a, _b, _c, _d) sudo_mkostempsat((_a), (_b), (_c), (_d))
sudo_dso_public int sudo_mkstemp(char *path);
# undef mkstemp
# define mkstemp(_a) sudo_mkstemp((_a))
sudo_dso_public int sudo_mkstemps(char *path, int slen);
# undef mkstemps
# define mkstemps(_a, _b) sudo_mkstemps((_a), (_b))
#endif /* !HAVE_MKDTEMP || !HAVE_MKSTEMPS */
#endif /* !HAVE_MKDTEMP || !HAVE_MKDTEMPAT || !HAVE_MKOSTEMPSAT || !HAVE_MKSTEMPS */
#ifndef HAVE_NANOSLEEP
sudo_dso_public int sudo_nanosleep(const struct timespec *timeout, struct timespec *remainder);
#undef nanosleep

102
lib/util/mktemp.c
View File

@@ -1,7 +1,7 @@
/*
* SPDX-License-Identifier: ISC
*
* Copyright (c) 2001, 2003, 2004, 2008-2011, 2013, 2015, 2017, 2018
* Copyright (c) 2001, 2003, 2004, 2008-2011, 2013, 2015, 2017, 2018, 2022
* Todd C. Miller <Todd.Miller@sudo.ws>
*
* Permission to use, copy, modify, and distribute this software for any
@@ -24,7 +24,7 @@
#include <config.h>
#if !defined(HAVE_MKSTEMPS) || !defined(HAVE_MKDTEMP)
#if !defined(HAVE_MKDTEMP) || !defined(HAVE_MKDTEMPAT) || !defined(HAVE_MKOSTEMPSAT) || !defined(HAVE_MKSTEMPS)
#include <sys/stat.h>
@@ -32,9 +32,7 @@
#include <fcntl.h>
#include <limits.h>
#include <stdio.h>
#ifdef HAVE_STDLIB_H
# include <stdlib.h>
#endif /* HAVE_STDLIB_H */
#include <stdlib.h>
#if defined(HAVE_STDINT_H)
# include <stdint.h>
#elif defined(HAVE_INTTYPES_H)
@@ -55,12 +53,14 @@
#define NUM_CHARS (sizeof(TEMPCHARS) - 1)
#define MIN_X 6
#define MKOTEMP_FLAGS (O_APPEND | O_CLOEXEC | O_SYNC)
static int
mktemp_internal(char *path, int slen, int mode)
mktemp_internal(int dfd, char *path, int slen, int mode, int flags)
{
char *start, *cp, *ep;
const char tempchars[] = TEMPCHARS;
unsigned int r, tries;
unsigned int tries;
size_t len;
int fd;
@@ -71,31 +71,43 @@ mktemp_internal(char *path, int slen, int mode)
}
ep = path + len - slen;
tries = 1;
for (start = ep; start > path && start[-1] == 'X'; start--) {
if (tries < INT_MAX / NUM_CHARS)
tries *= NUM_CHARS;
}
tries *= 2;
for (start = ep; start > path && start[-1] == 'X'; start--)
;
if (ep - start < MIN_X) {
errno = EINVAL;
return -1;
}
do {
for (cp = start; cp != ep; cp++) {
r = arc4random_uniform(NUM_CHARS);
*cp = tempchars[r];
if (flags & ~MKOTEMP_FLAGS) {
errno = EINVAL;
return -1;
}
flags |= O_CREAT | O_EXCL | O_RDWR;
tries = INT_MAX;
do {
cp = start;
do {
unsigned short rbuf[16];
unsigned int i;
/*
* Avoid lots of arc4random() calls by using
* a buffer sized for up to 16 Xs at a time.
*/
arc4random_buf(rbuf, sizeof(rbuf));
for (i = 0; i < nitems(rbuf) && cp != ep; i++)
*cp++ = tempchars[rbuf[i] % NUM_CHARS];
} while (cp != ep);
switch (mode) {
case MKTEMP_FILE:
fd = open(path, O_CREAT|O_EXCL|O_RDWR, S_IRUSR|S_IWUSR);
fd = openat(dfd, path, flags, S_IRUSR|S_IWUSR);
if (fd != -1 || errno != EEXIST)
return fd;
break;
case MKTEMP_DIR:
if (mkdir(path, S_IRWXU) == 0)
if (mkdirat(dfd, path, S_IRWXU) == 0)
return 0;
if (errno != EEXIST)
return -1;
@@ -107,17 +119,53 @@ mktemp_internal(char *path, int slen, int mode)
return -1;
}
int
sudo_mkstemps(char *path, int slen)
{
return mktemp_internal(path, slen, MKTEMP_FILE);
}
char *
sudo_mkdtemp(char *path)
{
if (mktemp_internal(path, 0, MKTEMP_DIR) == -1)
if (mktemp_internal(AT_FDCWD, path, 0, MKTEMP_DIR, 0) == -1)
return NULL;
return path;
}
#endif /* !HAVE_MKSTEMPS || !HAVE_MKDTEMP */
char *
sudo_mkdtempat(int dfd, char *path)
{
if (mktemp_internal(dfd, path, 0, MKTEMP_DIR, 0) == -1)
return NULL;
return path;
}
int
sudo_mkostempsat(int dfd, char *path, int slen, int flags)
{
return mktemp_internal(dfd, path, slen, MKTEMP_FILE, flags);
}
#ifdef notyet
int
sudo_mkostemps(char *path, int slen, int flags)
{
return mktemp_internal(AT_FDCWD, path, slen, MKTEMP_FILE, flags);
}
#endif
int
sudo_mkstemp(char *path)
{
return mktemp_internal(AT_FDCWD, path, 0, MKTEMP_FILE, 0);
}
#ifdef notyet
int
sudo_mkostemp(char *path, int flags)
{
return mktemp_internal(AT_FDCWD, path, 0, MKTEMP_FILE, flags);
}
#endif
int
sudo_mkstemps(char *path, int slen)
{
return mktemp_internal(AT_FDCWD, path, slen, MKTEMP_FILE, 0);
}
#endif /* !HAVE_MKDTEMP || !HAVE_MKDTEMPAT || !HAVE_MKOSTEMPSAT || !HAVE_MKSTEMPS */

8
plugins/python/regress/iohelpers.h
View File

@@ -20,16 +20,20 @@
#define PYTHON_IO_HELPERS
#include <config.h>
#include "sudo_compat.h"
#include <stdio.h>
#include <stdlib.h>
#ifdef HAVE_STDBOOL_H
# include <stdbool.h>
#else
# include "compat/stdbool.h"
#endif /* HAVE_STDBOOL_H */
#include <string.h>
#include <stdarg.h>
#include <signal.h>
#include <pwd.h>
#include <stdbool.h>
#include "sudo_compat.h"
#define MAX_OUTPUT (2 << 16)