/*
- * Copyright (c) 1993-1996,1998-2004 Todd C. Miller <Todd.Miller@courtesan.com>
+ * Copyright (c) 1993-1996,1998-2007 Todd C. Miller <Todd.Miller@courtesan.com>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
# include <floss.h>
#endif
-#include "config.h"
+#include <config.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <signal.h>
#include <grp.h>
-#include <time.h>
+#if TIME_WITH_SYS_TIME
+# include <time.h>
+#endif
+#ifdef HAVE_SETLOCALE
+# include <locale.h>
+#endif
#include <netinet/in.h>
#include <netdb.h>
#if defined(HAVE_GETPRPWNAM) && defined(HAVE_SET_AUTH_PARAMETERS)
# define LOGIN_DEFROOTCLASS "daemon"
# endif
#endif
+#ifdef HAVE_PROJECT_H
+# include <project.h>
+# include <sys/task.h>
+#endif
+#ifdef HAVE_SELINUX
+# include <selinux/selinux.h>
+#endif
#include "sudo.h"
#include "interfaces.h"
#include "version.h"
#ifndef lint
-static const char rcsid[] = "$Sudo: sudo.c,v 1.370 2004/08/24 18:01:13 millert Exp $";
+__unused __unused static const char rcsid[] = "$Sudo: sudo.c,v 1.369.2.41 2008/06/21 19:04:07 millert Exp $";
#endif /* lint */
/*
* Prototypes
*/
-static int init_vars __P((int));
+static int init_vars __P((int, char **));
static int parse_args __P((int, char **));
static void check_sudoers __P((void));
static void initial_setup __P((void));
static void set_loginclass __P((struct passwd *));
-static void usage __P((int));
+static void set_project __P((struct passwd *));
+static void usage __P((int))
+ __attribute__((__noreturn__));
+static void usage_excl __P((int))
+ __attribute__((__noreturn__));
static void usage_excl __P((int));
static struct passwd *get_authpw __P((void));
-extern int sudo_edit __P((int, char **));
+extern int sudo_edit __P((int, char **, char **));
extern void list_matches __P((void));
extern char **rebuild_env __P((char **, int, int));
-extern char **zero_env __P((char **));
+extern void validate_env_vars __P((struct list_member *));
+extern char **insert_env_vars __P((char **, struct list_member *));
extern struct passwd *sudo_getpwnam __P((const char *));
extern struct passwd *sudo_getpwuid __P((uid_t));
extern struct passwd *sudo_pwdup __P((const struct passwd *));
+extern void runas_resetgroups __P((void));
/*
* Globals
#ifdef HAVE_BSD_AUTH_H
char *login_style;
#endif /* HAVE_BSD_AUTH_H */
-sigaction_t saved_sa_int, saved_sa_quit, saved_sa_tstp, saved_sa_chld;
-void (*set_perms) __P((int));
+sigaction_t saved_sa_int, saved_sa_quit, saved_sa_tstp;
int
int cmnd_status;
int sudo_mode;
int pwflag;
- char **new_environ;
sigaction_t sa;
extern int printmatches;
extern char **environ;
+#ifdef HAVE_SETLOCALE
+ setlocale(LC_ALL, "");
+#endif
+
Argv = argv;
if ((Argc = argc) < 1)
usage(1);
# endif
#endif /* HAVE_GETPRPWNAM && HAVE_SET_AUTH_PARAMETERS */
- /* Zero out the environment. */
- environ = zero_env(envp);
-
if (geteuid() != 0)
errx(1, "must be setuid root");
(void) sigaction(SIGINT, &sa, &saved_sa_int);
(void) sigaction(SIGQUIT, &sa, &saved_sa_quit);
(void) sigaction(SIGTSTP, &sa, &saved_sa_tstp);
- sa.sa_handler = reapchild;
- (void) sigaction(SIGCHLD, &sa, &saved_sa_chld);
/*
- * Turn off core dumps, close open files and setup set_perms().
+ * Turn off core dumps and close open files.
*/
initial_setup();
setpwent();
(void) printf("Sudo version %s\n", version);
if (getuid() == 0) {
putchar('\n');
+ (void) printf("Sudoers path: %s\n", _PATH_SUDOERS);
dump_auth_methods();
dump_defaults();
dump_interfaces();
if (user_cmnd == NULL && NewArgc == 0)
usage(1);
- cmnd_status = init_vars(sudo_mode);
+ cmnd_status = init_vars(sudo_mode, environ);
#ifdef HAVE_LDAP
validated = sudo_ldap_check(pwflag);
/* Skip reading /etc/sudoers if LDAP told us to */
- if (def_ignore_local_sudoers); /* skips */
- else if (ISSET(validated, VALIDATE_OK) && !printmatches); /* skips */
- else if (ISSET(validated, VALIDATE_OK) && printmatches)
- {
- check_sudoers(); /* check mode/owner on _PATH_SUDOERS */
+ if (!def_ignore_local_sudoers) {
+ int v;
- /* User is found in LDAP and we want a list of all sudo commands the
- * user can do, so consult sudoers but throw away result.
- */
- sudoers_lookup(pwflag);
- }
- else
-#endif
- {
check_sudoers(); /* check mode/owner on _PATH_SUDOERS */
- /* Validate the user but don't search for pseudo-commands. */
- validated = sudoers_lookup(pwflag);
+ /* Local sudoers file overrides LDAP if we have a match. */
+ v = sudoers_lookup(pwflag);
+ if (validated == VALIDATE_ERROR || ISSET(v, VALIDATE_OK))
+ validated = v;
}
+#else
+ check_sudoers(); /* check mode/owner on _PATH_SUDOERS */
- /*
- * If we are using set_perms_posix() and the stay_setuid flag was not set,
- * set the real, effective and saved uids to 0 and use set_perms_nosuid()
- * instead of set_perms_posix().
- */
-#if !defined(HAVE_SETRESUID) && !defined(HAVE_SETREUID) && \
- !defined(NO_SAVED_IDS) && defined(_SC_SAVED_IDS) && defined(_SC_VERSION)
- if (!def_stay_setuid && set_perms == set_perms_posix) {
- if (setuid(0)) {
- perror("setuid(0)");
- exit(1);
- }
- set_perms = set_perms_nosuid;
- }
+ /* Validate the user but don't search for pseudo-commands. */
+ validated = sudoers_lookup(pwflag);
#endif
+ if (safe_cmnd == NULL)
+ safe_cmnd = estrdup(user_cmnd);
/*
* Look up the timestamp dir owner if one is specified.
if (ISSET(sudo_mode, MODE_IMPLIED_SHELL) && !def_shell_noargs)
usage(1);
- /* May need to set $HOME to target user if we are running a command. */
- if (ISSET(sudo_mode, MODE_RUN) && (def_always_set_home ||
- (ISSET(sudo_mode, MODE_SHELL) && def_set_home)))
- SET(sudo_mode, MODE_RESET_HOME);
-
/* Bail if a tty is required and we don't have one. */
if (def_requiretty) {
if ((fd = open(_PATH_TTY, O_RDWR|O_NOCTTY)) == -1)
(void) close(fd);
}
+ /* User may have overriden environment resetting via the -E flag. */
+ if (ISSET(sudo_mode, MODE_PRESERVE_ENV) && ISSET(validated, FLAG_SETENV))
+ def_env_reset = FALSE;
+
+ /* Build a new environment that avoids any nasty bits. */
+ environ = rebuild_env(environ, sudo_mode, ISSET(validated, FLAG_NOEXEC));
+
/* Fill in passwd struct based on user we are authenticating as. */
auth_pw = get_authpw();
/* Require a password if sudoers says so. */
if (!ISSET(validated, FLAG_NOPASS))
- check_user(ISSET(validated, FLAG_CHECK_USER));
+ check_user(validated);
/* If run as root with SUDO_USER set, set sudo_user.pw to that user. */
if (user_uid == 0 && prev_user != NULL && strcmp(prev_user, "root") != 0) {
struct passwd *pw;
if ((pw = sudo_getpwnam(prev_user)) != NULL) {
- free(sudo_user.pw);
+ efree(sudo_user.pw);
sudo_user.pw = pw;
}
}
- /* Build a new environment that avoids any nasty bits if we have a cmnd. */
- if (ISSET(sudo_mode, MODE_RUN))
- new_environ = rebuild_env(envp, sudo_mode, ISSET(validated, FLAG_NOEXEC));
- else
- new_environ = envp;
-
if (ISSET(validated, VALIDATE_OK)) {
/* Finally tell the user if the command did not exist. */
if (cmnd_status == NOT_FOUND_DOT) {
exit(1);
}
+ /* If user specified env vars make sure sudoers allows it. */
+ if (ISSET(sudo_mode, MODE_RUN) && !ISSET(validated, FLAG_SETENV)) {
+ if (ISSET(sudo_mode, MODE_PRESERVE_ENV))
+ log_error(NO_MAIL,
+ "sorry, you are not allowed to preserve the environment");
+ else
+ validate_env_vars(sudo_user.env_vars);
+ }
+
log_auth(validated, 1);
if (sudo_mode == MODE_VALIDATE)
exit(0);
exit(0);
}
- /* This *must* have been set if we got a match but... */
- if (safe_cmnd == NULL) {
- log_error(MSG_ONLY,
- "internal error, safe_cmnd never got set for %s; %s",
- user_cmnd,
- "please report this error at http://courtesan.com/sudo/bugs/");
- }
-
/* Override user's umask if configured to do so. */
if (def_umask != 0777)
(void) umask(def_umask);
endpwent();
endgrent();
- /* Install the real environment. */
- environ = new_environ;
-
if (ISSET(sudo_mode, MODE_LOGIN_SHELL)) {
char *p;
}
if (ISSET(sudo_mode, MODE_EDIT))
- exit(sudo_edit(NewArgc, NewArgv));
+ exit(sudo_edit(NewArgc, NewArgv, envp));
+
+ /* Insert user-specified environment variables. */
+ environ = insert_env_vars(environ, sudo_user.env_vars);
/* Restore signal handlers before we exec. */
(void) sigaction(SIGINT, &saved_sa_int, NULL);
(void) sigaction(SIGQUIT, &saved_sa_quit, NULL);
(void) sigaction(SIGTSTP, &saved_sa_tstp, NULL);
- (void) sigaction(SIGCHLD, &saved_sa_chld, NULL);
#ifndef PROFILING
if (ISSET(sudo_mode, MODE_BACKGROUND) && fork() > 0)
exit(0);
- else
- EXECV(safe_cmnd, NewArgv); /* run the command */
+ else {
+#ifdef HAVE_SELINUX
+ if (is_selinux_enabled() > 0 && user_role != NULL)
+ selinux_exec(user_role, user_type, NewArgv, environ,
+ ISSET(sudo_mode, MODE_LOGIN_SHELL));
+#endif
+ execve(safe_cmnd, NewArgv, environ);
+ }
#else
exit(0);
#endif /* PROFILING */
/*
* If we got here then the exec() failed...
*/
+ if (errno == ENOEXEC) {
+ NewArgv--; /* at least one extra slot... */
+ NewArgv[0] = "sh";
+ NewArgv[1] = safe_cmnd;
+ execve(_PATH_BSHELL, NewArgv, environ);
+ }
warn("unable to execute %s", safe_cmnd);
exit(127);
} else if (ISSET(validated, FLAG_NO_USER) || (validated & FLAG_NO_HOST)) {
* load the ``interfaces'' array.
*/
static int
-init_vars(sudo_mode)
+init_vars(sudo_mode, envp)
int sudo_mode;
+ char **envp;
{
- char *p, thost[MAXHOSTNAMELEN];
+ char *p, **ep, thost[MAXHOSTNAMELEN];
int nohostname, rval;
/* Sanity check command from user. */
* "host" is the (possibly fully-qualified) hostname and
* "shost" is the unqualified form of the hostname.
*/
+ sudo_user.host_fqdn_queried = FALSE;
nohostname = gethostname(thost, sizeof(thost));
if (nohostname)
user_host = user_shost = "localhost";
/* Defer call to set_fqdn() until log_error() is safe. */
user_shost = user_host;
} else {
- if ((p = strchr(user_host, '.'))) {
- *p = '\0';
- user_shost = estrdup(user_host);
- *p = '.';
- } else {
- user_shost = user_host;
- }
+ user_shost = user_host;
}
}
if ((p = ttyname(STDIN_FILENO)) || (p = ttyname(STDOUT_FILENO))) {
- if (strncmp(p, _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0)
- p += sizeof(_PATH_DEV) - 1;
- user_tty = estrdup(p);
+ user_tty = user_ttypath = estrdup(p);
+ if (strncmp(user_tty, _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0)
+ user_tty += sizeof(_PATH_DEV) - 1;
} else
user_tty = "unknown";
+ for (ep = envp; *ep; ep++) {
+ switch (**ep) {
+ case 'P':
+ if (strncmp("PATH=", *ep, 5) == 0)
+ user_path = *ep + 5;
+ break;
+ case 'S':
+ if (strncmp("SHELL=", *ep, 6) == 0)
+ user_shell = *ep + 6;
+ else if (!user_prompt && strncmp("SUDO_PROMPT=", *ep, 12) == 0)
+ user_prompt = *ep + 12;
+ else if (strncmp("SUDO_USER=", *ep, 10) == 0)
+ prev_user = *ep + 10;
+ break;
+
+ }
+ }
+
/*
* Get a local copy of the user's struct passwd with the shadow password
* if necessary. It is assumed that euid is 0 at this point so we
/* It is now safe to use log_error() and set_perms() */
+#ifdef HAVE_GETGROUPS
+ if ((user_ngroups = getgroups(0, NULL)) > 0) {
+ user_groups = emalloc2(user_ngroups, sizeof(GETGROUPS_T));
+ if (getgroups(user_ngroups, user_groups) < 0)
+ log_error(USE_ERRNO|MSG_ONLY, "can't get group vector");
+ } else
+ user_ngroups = 0;
+#endif
+
if (def_fqdn)
set_fqdn(); /* may call log_error() */
if ((sudo_mode & (MODE_SHELL | MODE_EDIT))) {
char **dst, **src = NewArgv;
- NewArgv = (char **) emalloc2((++NewArgc + 1), sizeof(char *));
+ /* Allocate an extra slot for execve() failure (ENOEXEC). */
+ NewArgv = (char **) emalloc2((++NewArgc + 2), sizeof(char *));
+ NewArgv++;
if (ISSET(sudo_mode, MODE_EDIT))
NewArgv[0] = "sudoedit";
else if (ISSET(sudo_mode, MODE_LOGIN_SHELL))
/* copy the args from NewArgv */
for (dst = NewArgv + 1; (*dst = *src) != NULL; ++src, ++dst)
- ;
+ continue;
}
/* Set login class if applicable. */
set_loginclass(sudo_user.pw);
+ /* Set project if applicable. */
+ set_project(runas_pw);
+
/* Resolve the path and return. */
rval = FOUND;
user_stat = emalloc(sizeof(struct stat));
} else
rval = MODE_RUN;
- if (NewArgc == 0 && rval == MODE_RUN) { /* no options and no command */
- SET(rval, (MODE_IMPLIED_SHELL | MODE_SHELL));
- return(rval);
- }
-
- while (NewArgc > 0 && NewArgv[0][0] == '-') {
- if (NewArgv[0][1] != '\0' && NewArgv[0][2] != '\0')
- warnx("please use single character options");
+ while (NewArgc > 0) {
+ if (NewArgv[0][0] == '-') {
+ if (NewArgv[0][1] != '\0' && NewArgv[0][2] != '\0') {
+ warnx("please use single character options");
+ usage(1);
+ }
- switch (NewArgv[0][1]) {
- case 'p':
- /* Must have an associated prompt. */
- if (NewArgv[1] == NULL)
- usage(1);
+ switch (NewArgv[0][1]) {
+ case 'p':
+ /* Must have an associated prompt. */
+ if (NewArgv[1] == NULL)
+ usage(1);
- user_prompt = NewArgv[1];
+ user_prompt = NewArgv[1];
+ def_passprompt_override = TRUE;
- NewArgc--;
- NewArgv++;
- break;
- case 'u':
- /* Must have an associated runas user. */
- if (NewArgv[1] == NULL)
- usage(1);
+ NewArgc--;
+ NewArgv++;
+ break;
+ case 'u':
+ /* Must have an associated runas user. */
+ if (NewArgv[1] == NULL)
+ usage(1);
- user_runas = &NewArgv[1];
+ user_runas = &NewArgv[1];
- NewArgc--;
- NewArgv++;
- break;
+ NewArgc--;
+ NewArgv++;
+ break;
#ifdef HAVE_BSD_AUTH_H
- case 'a':
- /* Must have an associated authentication style. */
- if (NewArgv[1] == NULL)
- usage(1);
+ case 'a':
+ /* Must have an associated authentication style. */
+ if (NewArgv[1] == NULL)
+ usage(1);
- login_style = NewArgv[1];
+ login_style = NewArgv[1];
- NewArgc--;
- NewArgv++;
- break;
+ NewArgc--;
+ NewArgv++;
+ break;
#endif
#ifdef HAVE_LOGIN_CAP_H
- case 'c':
- /* Must have an associated login class. */
- if (NewArgv[1] == NULL)
- usage(1);
+ case 'c':
+ /* Must have an associated login class. */
+ if (NewArgv[1] == NULL)
+ usage(1);
- login_class = NewArgv[1];
- def_use_loginclass = TRUE;
+ login_class = NewArgv[1];
+ def_use_loginclass = TRUE;
- NewArgc--;
- NewArgv++;
- break;
+ NewArgc--;
+ NewArgv++;
+ break;
#endif
- case 'b':
- SET(rval, MODE_BACKGROUND);
- break;
- case 'e':
- rval = MODE_EDIT;
- if (excl && excl != 'e')
- usage_excl(1);
- excl = 'e';
- break;
- case 'v':
- rval = MODE_VALIDATE;
- if (excl && excl != 'v')
- usage_excl(1);
- excl = 'v';
- break;
- case 'i':
- SET(rval, (MODE_LOGIN_SHELL | MODE_SHELL));
- def_env_reset = TRUE;
- if (excl && excl != 'i')
- usage_excl(1);
- excl = 'i';
- break;
- case 'k':
- rval = MODE_INVALIDATE;
- if (excl && excl != 'k')
- usage_excl(1);
- excl = 'k';
- break;
- case 'K':
- rval = MODE_KILL;
- if (excl && excl != 'K')
- usage_excl(1);
- excl = 'K';
- break;
- case 'L':
- rval = MODE_LISTDEFS;
- if (excl && excl != 'L')
- usage_excl(1);
- excl = 'L';
- break;
- case 'l':
- rval = MODE_LIST;
- if (excl && excl != 'l')
- usage_excl(1);
- excl = 'l';
- break;
- case 'V':
- rval = MODE_VERSION;
- if (excl && excl != 'V')
- usage_excl(1);
- excl = 'V';
- break;
- case 'h':
- rval = MODE_HELP;
- if (excl && excl != 'h')
- usage_excl(1);
- excl = 'h';
- break;
- case 's':
- SET(rval, MODE_SHELL);
- if (excl && excl != 's')
- usage_excl(1);
- excl = 's';
- break;
- case 'H':
- SET(rval, MODE_RESET_HOME);
- break;
- case 'P':
- SET(rval, MODE_PRESERVE_GROUPS);
- break;
- case 'S':
- SET(tgetpass_flags, TGP_STDIN);
- break;
- case '-':
- NewArgc--;
- NewArgv++;
- if (rval == MODE_RUN)
- SET(rval, (MODE_IMPLIED_SHELL | MODE_SHELL));
- return(rval);
- case '\0':
- warnx("'-' requires an argument");
- usage(1);
- default:
- warnx("illegal option `%s'", NewArgv[0]);
- usage(1);
+ case 'b':
+ SET(rval, MODE_BACKGROUND);
+ break;
+ case 'e':
+ rval = MODE_EDIT;
+ if (excl && excl != 'e')
+ usage_excl(1);
+ excl = 'e';
+ break;
+ case 'v':
+ rval = MODE_VALIDATE;
+ if (excl && excl != 'v')
+ usage_excl(1);
+ excl = 'v';
+ break;
+ case 'i':
+ SET(rval, (MODE_LOGIN_SHELL | MODE_SHELL));
+ def_env_reset = TRUE;
+ if (excl && excl != 'i')
+ usage_excl(1);
+ excl = 'i';
+ break;
+ case 'k':
+ rval = MODE_INVALIDATE;
+ if (excl && excl != 'k')
+ usage_excl(1);
+ excl = 'k';
+ break;
+ case 'K':
+ rval = MODE_KILL;
+ if (excl && excl != 'K')
+ usage_excl(1);
+ excl = 'K';
+ break;
+ case 'L':
+ rval = MODE_LISTDEFS;
+ if (excl && excl != 'L')
+ usage_excl(1);
+ excl = 'L';
+ break;
+ case 'l':
+ rval = MODE_LIST;
+ if (excl && excl != 'l')
+ usage_excl(1);
+ excl = 'l';
+ break;
+ case 'V':
+ rval = MODE_VERSION;
+ if (excl && excl != 'V')
+ usage_excl(1);
+ excl = 'V';
+ break;
+ case 'h':
+ rval = MODE_HELP;
+ if (excl && excl != 'h')
+ usage_excl(1);
+ excl = 'h';
+ break;
+ case 's':
+ SET(rval, MODE_SHELL);
+ if (excl && excl != 's')
+ usage_excl(1);
+ excl = 's';
+ break;
+ case 'H':
+ SET(rval, MODE_RESET_HOME);
+ break;
+ case 'P':
+ SET(rval, MODE_PRESERVE_GROUPS);
+ break;
+ case 'S':
+ SET(tgetpass_flags, TGP_STDIN);
+ break;
+ case 'E':
+ SET(rval, MODE_PRESERVE_ENV);
+ break;
+#ifdef HAVE_SELINUX
+ case 'r':
+ /* Must have an associated SELinux role. */
+ if (NewArgv[1] == NULL)
+ usage(1);
+
+ user_role = NewArgv[1];
+
+ NewArgc--;
+ NewArgv++;
+ break;
+ case 't':
+ /* Must have an associated SELinux type. */
+ if (NewArgv[1] == NULL)
+ usage(1);
+
+ user_type = NewArgv[1];
+
+ NewArgc--;
+ NewArgv++;
+ break;
+#endif
+ case '-':
+ NewArgc--;
+ NewArgv++;
+ goto args_done;
+ case '\0':
+ warnx("'-' requires an argument");
+ usage(1);
+ default:
+ warnx("illegal option `%s'", NewArgv[0]);
+ usage(1);
+ }
+ } else if (NewArgv[0][0] != '/' && strchr(NewArgv[0], '=') != NULL) {
+ /* Could be an environment variable. */
+ struct list_member *ev;
+ ev = emalloc(sizeof(*ev));
+ ev->value = NewArgv[0];
+ ev->next = sudo_user.env_vars;
+ sudo_user.env_vars = ev;
+ } else {
+ /* Not an arg */
+ break;
}
NewArgc--;
NewArgv++;
}
-
+args_done:
+
+ if (ISSET(rval, MODE_EDIT) &&
+ (ISSET(rval, MODE_PRESERVE_ENV) || sudo_user.env_vars != NULL)) {
+ if (ISSET(rval, MODE_PRESERVE_ENV))
+ warnx("the `-E' option is not valid in edit mode");
+ if (sudo_user.env_vars != NULL)
+ warnx("you may not specify environment variables in edit mode");
+ usage(1);
+ }
+ if (ISSET(rval, MODE_PRESERVE_ENV) && ISSET(rval, MODE_LOGIN_SHELL)) {
+ warnx("you may not specify both the `-i' and `-E' options");
+ usage(1);
+ }
if (user_runas != NULL && !ISSET(rval, (MODE_EDIT|MODE_RUN))) {
if (excl != '\0')
warnx("the `-u' and '-%c' options may not be used together", excl);
usage(1);
}
-
if ((NewArgc == 0 && (rval & MODE_EDIT)) ||
(NewArgc > 0 && !(rval & (MODE_RUN | MODE_EDIT))))
usage(1);
+ if (NewArgc == 0 && rval == MODE_RUN)
+ SET(rval, (MODE_IMPLIED_SHELL | MODE_SHELL));
return(rval);
}
{
struct stat statbuf;
int rootstat, i;
- char c;
/*
* Fix the mode and group on sudoers file from old default.
log_error(0, "%s is zero length", _PATH_SUDOERS);
else if ((statbuf.st_mode & 07777) != SUDOERS_MODE)
log_error(0, "%s is mode 0%o, should be 0%o", _PATH_SUDOERS,
- (statbuf.st_mode & 07777), SUDOERS_MODE);
+ (unsigned int) (statbuf.st_mode & 07777),
+ (unsigned int) SUDOERS_MODE);
else if (statbuf.st_uid != SUDOERS_UID)
log_error(0, "%s is owned by uid %lu, should be %lu", _PATH_SUDOERS,
- (unsigned long) statbuf.st_uid, SUDOERS_UID);
+ (unsigned long) statbuf.st_uid, (unsigned long) SUDOERS_UID);
else if (statbuf.st_gid != SUDOERS_GID)
log_error(0, "%s is owned by gid %lu, should be %lu", _PATH_SUDOERS,
- (unsigned long) statbuf.st_gid, SUDOERS_GID);
+ (unsigned long) statbuf.st_gid, (unsigned long) SUDOERS_GID);
else {
/* Solaris sometimes returns EAGAIN so try 10 times */
for (i = 0; i < 10 ; i++) {
errno = 0;
if ((sudoers_fp = fopen(_PATH_SUDOERS, "r")) == NULL ||
- fread(&c, sizeof(c), 1, sudoers_fp) != 1) {
+ fgetc(sudoers_fp) == EOF) {
+ if (sudoers_fp != NULL)
+ fclose(sudoers_fp);
sudoers_fp = NULL;
if (errno != EAGAIN && errno != EWOULDBLOCK)
break;
/*
* Close all open files (except std*) and turn off core dumps.
- * Also sets the set_perms() pointer to the correct function.
*/
static void
initial_setup()
{
-#if defined(RLIMIT_CORE) && !defined(SUDO_DEVEL)
+ int miss[3], devnull = -1;
+#if defined(__linux__) || (defined(RLIMIT_CORE) && !defined(SUDO_DEVEL))
struct rlimit rl;
+#endif
+#if defined(__linux__)
+ /*
+ * Unlimit the number of processes since Linux's setuid() will
+ * apply resource limits when changing uid and return EAGAIN if
+ * nproc would be violated by the uid switch.
+ */
+ rl.rlim_cur = rl.rlim_max = RLIM_INFINITY;
+ if (setrlimit(RLIMIT_NPROC, &rl)) {
+ if (getrlimit(RLIMIT_NPROC, &rl) == 0) {
+ rl.rlim_cur = rl.rlim_max;
+ (void)setrlimit(RLIMIT_NPROC, &rl);
+ }
+ }
+#endif /* __linux__ */
+#if defined(RLIMIT_CORE) && !defined(SUDO_DEVEL)
/*
* Turn off core dumps.
*/
(void) setrlimit(RLIMIT_CORE, &rl);
#endif /* RLIMIT_CORE && !SUDO_DEVEL */
- closefrom(STDERR_FILENO + 1);
-
/*
- * Make set_perms point to the correct function.
- * If we are using setresuid() or setreuid() we only need to set this
- * once. If we are using POSIX saved uids we will switch to
- * set_perms_nosuid after sudoers has been parsed if the "stay_suid"
- * option is not set.
+ * stdin, stdout and stderr must be open; set them to /dev/null
+ * if they are closed and close all other fds.
*/
-#if defined(HAVE_SETRESUID) || defined(HAVE_SETREUID)
- set_perms = set_perms_suid;
-#else
-# if !defined(NO_SAVED_IDS) && defined(_SC_SAVED_IDS) && defined(_SC_VERSION)
- if (sysconf(_SC_SAVED_IDS) == 1 && sysconf(_SC_VERSION) >= 199009)
- set_perms = set_perms_posix;
- else
-# endif
- set_perms = set_perms_nosuid;
-#endif /* HAVE_SETRESUID || HAVE_SETREUID */
+ miss[STDIN_FILENO] = fcntl(STDIN_FILENO, F_GETFL, 0) == -1;
+ miss[STDOUT_FILENO] = fcntl(STDOUT_FILENO, F_GETFL, 0) == -1;
+ miss[STDERR_FILENO] = fcntl(STDERR_FILENO, F_GETFL, 0) == -1;
+ if (miss[STDIN_FILENO] || miss[STDOUT_FILENO] || miss[STDERR_FILENO]) {
+ if ((devnull = open(_PATH_DEVNULL, O_RDWR, 0644)) != -1) {
+ if (miss[STDIN_FILENO])
+ (void) dup2(devnull, STDIN_FILENO);
+ if (miss[STDOUT_FILENO])
+ (void) dup2(devnull, STDOUT_FILENO);
+ if (miss[STDERR_FILENO])
+ (void) dup2(devnull, STDERR_FILENO);
+ }
+ }
+ closefrom(STDERR_FILENO + 1);
}
#ifdef HAVE_LOGIN_CAP_H
}
#endif /* HAVE_LOGIN_CAP_H */
+#ifdef HAVE_PROJECT_H
+static void
+set_project(pw)
+ struct passwd *pw;
+{
+ int errflags = NO_MAIL|MSG_ONLY|NO_EXIT;
+ int errval;
+ struct project proj;
+ struct project *resultp = '\0';
+ char buf[1024];
+
+ /*
+ * Collect the default project for the user and settaskid
+ */
+ setprojent();
+ if (resultp = getdefaultproj(pw->pw_name, &proj, buf, sizeof(buf))) {
+ errval = setproject(resultp->pj_name, pw->pw_name, TASK_NORMAL);
+ if (errval != 0) {
+ switch(errval) {
+ case SETPROJ_ERR_TASK:
+ if (errno == EAGAIN)
+ log_error(errflags, "resource control limit has been reached");
+ else if (errno == ESRCH)
+ log_error(errflags, "user \"%s\" is not a member of "
+ "project \"%s\"", pw->pw_name, resultp->pj_name);
+ else if (errno == EACCES)
+ log_error(errflags, "the invoking task is final");
+ else
+ log_error(errflags, "could not join project \"%s\"",
+ resultp->pj_name);
+ break;
+ case SETPROJ_ERR_POOL:
+ if (errno == EACCES)
+ log_error(errflags, "no resource pool accepting "
+ "default bindings exists for project \"%s\"",
+ resultp->pj_name);
+ else if (errno == ESRCH)
+ log_error(errflags, "specified resource pool does "
+ "not exist for project \"%s\"", resultp->pj_name);
+ else
+ log_error(errflags, "could not bind to default "
+ "resource pool for project \"%s\"", resultp->pj_name);
+ break;
+ default:
+ if (errval <= 0) {
+ log_error(errflags, "setproject failed for project \"%s\"",
+ resultp->pj_name);
+ } else {
+ log_error(errflags, "warning, resource control assignment "
+ "failed for project \"%s\"", resultp->pj_name);
+ }
+ }
+ }
+ } else {
+ log_error(errflags, "getdefaultproj() error: %s", strerror(errno));
+ }
+ endprojent();
+}
+#else
+static void
+set_project(pw)
+ struct passwd *pw;
+{
+}
+#endif /* HAVE_PROJECT_H */
+
/*
* Look up the fully qualified domain name and set user_host and user_shost.
*/
void
set_fqdn()
{
+#ifdef HAVE_GETADDRINFO
+ struct addrinfo *res0, hint;
+#else
struct hostent *hp;
+#endif
char *p;
+#ifdef HAVE_GETADDRINFO
+ memset(&hint, 0, sizeof(hint));
+ hint.ai_family = PF_UNSPEC;
+ hint.ai_flags = AI_CANONNAME;
+ if (getaddrinfo(user_host, NULL, &hint, &res0) != 0) {
+#else
if (!(hp = gethostbyname(user_host))) {
+#endif
log_error(MSG_ONLY|NO_EXIT,
- "unable to lookup %s via gethostbyname()", user_host);
+ "unable to resolve host %s", user_host);
} else {
if (user_shost != user_host)
- free(user_shost);
- free(user_host);
+ efree(user_shost);
+ efree(user_host);
+#ifdef HAVE_GETADDRINFO
+ user_host = estrdup(res0->ai_canonname);
+ freeaddrinfo(res0);
+#else
user_host = estrdup(hp->h_name);
+#endif
}
if ((p = strchr(user_host, '.'))) {
*p = '\0';
} else {
user_shost = user_host;
}
+ sudo_user.host_fqdn_queried = TRUE;
}
/*
if (runas_pw != NULL) {
if (user_runas != &def_runas_default)
return(TRUE); /* don't override -u option */
- free(runas_pw);
+ efree(runas_pw);
}
if (*user == '#') {
runas_pw = sudo_getpwuid(atoi(user + 1));
if (runas_pw == NULL)
log_error(NO_MAIL|MSG_ONLY, "no passwd entry for %s!", user);
}
+ runas_resetgroups();
return(TRUE);
}
} else if (def_targetpw) {
if (runas_pw->pw_name == NULL)
log_error(NO_MAIL|MSG_ONLY, "no passwd entry for %lu!",
- runas_pw->pw_uid);
+ (unsigned long) runas_pw->pw_uid);
pw = runas_pw;
} else
pw = sudo_user.pw;
usage_excl(exit_val)
int exit_val;
{
- warnx("Only one of the -e, -h, -k, -K, -l, -s, -v or -V options may be used");
+ warnx("Only one of the -e, -h, i, -k, -K, -l, -s, -v or -V options may be used");
usage(exit_val);
}
usage(exit_val)
int exit_val;
{
- char **p;
- int linelen, linemax, ulen;
- static char *uvec[] = {
- " [-HPSb]",
+ char **p, **uvec[4];
+ int i, linelen, linemax, ulen, plen;
+ static char *uvec1[] = {
+ " -h |",
+ " -K |",
+ " -k |",
+ " -L |",
+ " -l |",
+ " -V |",
+ " -v",
+ NULL
+ };
+ static char *uvec2[] = {
+ " [-bEHPS]",
+#ifdef HAVE_BSD_AUTH_H
+ " [-a auth_type]",
+#endif
+#ifdef HAVE_LOGIN_CAP_H
+ " [-c class|-]",
+#endif
+#ifdef HAVE_SELINUX
+ " [-r role]",
+#endif
+ " [-p prompt]",
+#ifdef HAVE_SELINUX
+ " [-t type]",
+#endif
+ " [-u username|#uid]",
+ " [VAR=value]",
+ " {-i | -s | <command>}",
+ NULL
+ };
+ static char *uvec3[] = {
+ " -e",
+ " [-S]",
#ifdef HAVE_BSD_AUTH_H
" [-a auth_type]",
#endif
#endif
" [-p prompt]",
" [-u username|#uid]",
- " { -e file [...] | -i | -s | <command> }",
+ " file ...",
NULL
};
/*
- * For sudoedit, replace the last entry in the usage vector.
- * For sudo, print the secondary usage.
+ * Use usage vectors appropriate to the progname.
*/
if (strcmp(getprogname(), "sudoedit") == 0) {
- /* Replace the last entry in the usage vector. */
- for (p = uvec; p[1] != NULL; p++)
- continue;
- *p = " file [...]";
+ uvec[0] = uvec3 + 1;
+ uvec[1] = NULL;
} else {
- fprintf(stderr, "usage: %s -K | -L | -V | -h | -k | -l | -v\n",
- getprogname());
+ uvec[0] = uvec1;
+ uvec[1] = uvec2;
+ uvec[2] = uvec3;
+ uvec[3] = NULL;
}
/*
- * Print the main usage and wrap lines as needed.
+ * Print usage and wrap lines as needed.
* Assumes an 80-character wide terminal, which is kind of bogus...
*/
ulen = (int)strlen(getprogname()) + 7;
linemax = 80;
- linelen = linemax - ulen;
- printf("usage: %s", getprogname());
- for (p = uvec; *p != NULL; p++) {
- if (linelen == linemax || (linelen -= strlen(*p)) >= 0) {
- fputs(*p, stdout);
- } else {
- p--;
- linelen = linemax;
- printf("\n%*s", ulen, "");
+ for (i = 0; uvec[i] != NULL; i++) {
+ printf("usage: %s", getprogname());
+ linelen = linemax - ulen;
+ for (p = uvec[i]; *p != NULL; p++) {
+ plen = (int)strlen(*p);
+ if (linelen >= plen || linelen == linemax - ulen) {
+ fputs(*p, stdout);
+ linelen -= plen;
+ } else {
+ p--;
+ linelen = linemax - ulen;
+ printf("\n%*s", ulen, "");
+ }
}
+ putchar('\n');
}
- putchar('\n');
exit(exit_val);
}
projects / debian / sudo / blobdiff