X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=env.c;h=3049dff93308329d357e87b80e8601289ec3d85b;hb=d05be6e87c9a996ff984c7ff7f57bfff53588f87;hp=9d3a765654650bae103bd55d4471c82995744353;hpb=5878be6905c405a47131294cf0e7465be0a73570;p=debian%2Fsudo diff --git a/env.c b/env.c index 9d3a765..3049dff 100644 --- a/env.c +++ b/env.c @@ -1,5 +1,6 @@ /* - * Copyright (c) 2000-2004 Todd C. Miller + * Copyright (c) 2000-2005, 2007-2009 + * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -18,7 +19,7 @@ * Materiel Command, USAF, under agreement number F39502-99-1-0512. */ -#include "config.h" +#include #include #include @@ -42,45 +43,75 @@ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ -#ifdef HAVE_ERR_H -# include -#else -# include "emul/err.h" -#endif /* HAVE_ERR_H */ +#include +#include #include #include "sudo.h" #ifndef lint -static const char rcsid[] = "$Sudo: env.c,v 1.42 2004/09/08 15:57:49 millert Exp $"; +__unused static const char rcsid[] = "$Sudo: env.c,v 1.106 2009/06/23 18:24:42 millert Exp $"; #endif /* lint */ /* * Flags used in rebuild_env() */ #undef DID_TERM -#define DID_TERM 0x01 +#define DID_TERM 0x0001 #undef DID_PATH -#define DID_PATH 0x02 +#define DID_PATH 0x0002 #undef DID_HOME -#define DID_HOME 0x04 +#define DID_HOME 0x0004 #undef DID_SHELL -#define DID_SHELL 0x08 +#define DID_SHELL 0x0008 #undef DID_LOGNAME -#define DID_LOGNAME 0x10 +#define DID_LOGNAME 0x0010 #undef DID_USER -#define DID_USER 0x20 +#define DID_USER 0x0020 +#undef DID_USERNAME +#define DID_USERNAME 0x0040 +#undef DID_MAX +#define DID_MAX 0x00ff + +#undef KEPT_TERM +#define KEPT_TERM 0x0100 +#undef KEPT_PATH +#define KEPT_PATH 0x0200 +#undef KEPT_HOME +#define KEPT_HOME 0x0400 +#undef KEPT_SHELL +#define KEPT_SHELL 0x0800 +#undef KEPT_LOGNAME +#define KEPT_LOGNAME 0x1000 +#undef KEPT_USER +#define KEPT_USER 0x2000 +#undef KEPT_USERNAME +#define KEPT_USERNAME 0x4000 +#undef KEPT_MAX +#define KEPT_MAX 0xff00 #undef VNULL -#define VNULL (VOID *)NULL +#define VNULL (void *)NULL + +struct environment { + char **envp; /* pointer to the new environment */ + size_t env_size; /* size of new_environ in char **'s */ + size_t env_len; /* number of slots used, not counting NULL */ +}; /* * Prototypes */ -char **rebuild_env __P((char **, int, int)); -char **zero_env __P((char **)); -static void insert_env __P((char *, int)); -static char *format_env __P((char *, ...)); +void rebuild_env __P((int, int)); +static void sudo_setenv __P((const char *, const char *, int)); +static void sudo_putenv __P((char *, int, int)); + +extern char **environ; /* global environment */ + +/* + * Copy of the sudo-managed environment. + */ +static struct environment env; /* * Default table of "bad" variables to remove from the environment. @@ -100,8 +131,10 @@ static const char *initial_badenv_table[] = { "SHLIB_PATH", #endif /* __hpux */ #ifdef _AIX + "LDR_*", "LIBPATH", -#endif /* _AIX */ + "AUTHSTATE", +#endif #ifdef __APPLE__ "DYLD_*", #endif @@ -112,18 +145,38 @@ static const char *initial_badenv_table[] = { #endif /* HAVE_KERB4 */ #ifdef HAVE_KERB5 "KRB5_CONFIG*", + "KRB5_KTNAME", #endif /* HAVE_KERB5 */ #ifdef HAVE_SECURID "VAR_ACE", "USR_ACE", "DLC_ACE", #endif /* HAVE_SECURID */ - "TERMINFO", - "TERMINFO_DIRS", - "TERMPATH", + "TERMINFO", /* terminfo, exclusive path to terminfo files */ + "TERMINFO_DIRS", /* terminfo, path(s) to terminfo files */ + "TERMPATH", /* termcap, path(s) to termcap files */ "TERMCAP", /* XXX - only if it starts with '/' */ - "ENV", - "BASH_ENV", + "ENV", /* ksh, file to source before script runs */ + "BASH_ENV", /* bash, file to source before script runs */ + "PS4", /* bash, prefix for lines in xtrace mode */ + "GLOBIGNORE", /* bash, globbing patterns to ignore */ + "SHELLOPTS", /* bash, extra command line options */ + "JAVA_TOOL_OPTIONS", /* java, extra command line options */ + "PERLIO_DEBUG ", /* perl, debugging output file */ + "PERLLIB", /* perl, search path for modules/includes */ + "PERL5LIB", /* perl 5, search path for modules/includes */ + "PERL5OPT", /* perl 5, extra command line options */ + "PERL5DB", /* perl 5, command used to load debugger */ + "FPATH", /* ksh, search path for functions */ + "NULLCMD", /* zsh, command for null file redirection */ + "READNULLCMD", /* zsh, command for null file redirection */ + "ZDOTDIR", /* zsh, search path for dot files */ + "TMPPREFIX", /* zsh, prefix for temporary files */ + "PYTHONHOME", /* python, module search path */ + "PYTHONPATH", /* python, search path */ + "PYTHONINSPECT", /* python, allow inspection */ + "RUBYLIB", /* ruby, library load path */ + "RUBYOPT", /* ruby, extra command line options */ NULL }; @@ -131,182 +184,376 @@ static const char *initial_badenv_table[] = { * Default table of variables to check for '%' and '/' characters. */ static const char *initial_checkenv_table[] = { - "LC_*", + "COLORTERM", "LANG", "LANGUAGE", + "LC_*", + "LINGUAS", + "TERM", NULL }; -static char **new_environ; /* Modified copy of the environment */ -static size_t env_size; /* size of new_environ in char **'s */ -static size_t env_len; /* number of slots used, not counting NULL */ +/* + * Default table of variables to preserve in the environment. + */ +static const char *initial_keepenv_table[] = { + "COLORS", + "DISPLAY", + "HOME", + "HOSTNAME", + "KRB5CCNAME", + "LS_COLORS", + "MAIL", + "PATH", + "PS1", + "PS2", + "TZ", + "XAUTHORITY", + "XAUTHORIZATION", + NULL +}; /* - * Zero out environment and replace with a minimal set of KRB5CCNAME - * USER, LOGNAME, HOME, TZ, PATH (XXX - should just set path to default) - * May set user_path, user_shell, and/or user_prompt as side effects. + * Similar to setenv(3) but operates on sudo's private copy of the environment + * (not environ) and it always overwrites. The dupcheck param determines + * whether we need to verify that the variable is not already set. */ -char ** -zero_env(envp) - char **envp; +static void +sudo_setenv(var, val, dupcheck) + const char *var; + const char *val; + int dupcheck; { - static char *newenv[9]; - char **ep, **nep = newenv; - char **ne_last = &newenv[(sizeof(newenv) / sizeof(newenv[0])) - 1]; - extern char *prev_user; - - for (ep = envp; *ep; ep++) { - switch (**ep) { - case 'H': - if (strncmp("HOME=", *ep, 5) == 0) - break; - continue; - case 'K': - if (strncmp("KRB5CCNAME=", *ep, 11) == 0) - break; - continue; - case 'L': - if (strncmp("LOGNAME=", *ep, 8) == 0) - break; - continue; - case 'P': - if (strncmp("PATH=", *ep, 5) == 0) { - user_path = *ep + 5; - /* XXX - set to sane default instead of user's? */ - break; - } - continue; - 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; - continue; - case 'T': - if (strncmp("TZ=", *ep, 3) == 0) - break; - continue; - case 'U': - if (strncmp("USER=", *ep, 5) == 0) - break; - continue; - default: - continue; - } + char *estring; + size_t esize; - /* Deal with multiply defined variables (take first instance) */ - for (nep = newenv; *nep; nep++) { - if (**nep == **ep) - break; - } - if (*nep == NULL) { - if (nep < ne_last) - *nep++ = *ep; - else - errx(1, "internal error, attempt to write outside newenv"); - } + esize = strlen(var) + 1 + strlen(val) + 1; + estring = emalloc(esize); + + /* Build environment string and insert it. */ + if (strlcpy(estring, var, esize) >= esize || + strlcat(estring, "=", esize) >= esize || + strlcat(estring, val, esize) >= esize) { + + errorx(1, "internal error, sudo_setenv() overflow"); } + sudo_putenv(estring, dupcheck, TRUE); +} + +/* + * Version of setenv(3) that uses our own environ pointer. + * Will sync with environ as needed. + */ +int +setenv(var, val, overwrite) + const char *var; + const char *val; + int overwrite; +{ + char *estring, *ep; + const char *cp; + size_t esize; + + if (!var || *var == '\0') + return(EINVAL); -#ifdef HAVE_LDAP /* - * Prevent OpenLDAP from reading any user dotfiles - * or files in the current directory. - * - */ - if (nep < ne_last) - *nep++ = "LDAPNOINIT=1"; - else - errx(1, "internal error, attempt to write outside newenv"); -#endif + * POSIX says a var name with '=' is an error but BSD + * just ignores the '=' and anything after it. + */ + for (cp = var; *cp && *cp != '='; cp++) + ; + esize = (size_t)(cp - var) + 2; + if (val) { + esize += strlen(val); /* glibc treats a NULL val as "" */ + } - return(&newenv[0]); + /* Allocate and fill in estring. */ + estring = ep = emalloc(esize); + for (cp = var; *cp && *cp != '='; cp++) + *ep++ = *cp; + *ep++ = '='; + if (val) { + for (cp = val; *cp; cp++) + *ep++ = *cp; + } + *ep = '\0'; + + /* Sync env.envp with environ as needed. */ + if (env.envp != environ) { + char **ep; + size_t len; + + for (ep = environ; *ep != NULL; ep++) + continue; + len = ep - environ; + if (len + 2 > env.env_size) { + efree(env.envp); + env.env_size = len + 2 + 128; + env.envp = emalloc2(env.env_size, sizeof(char *)); +#ifdef ENV_DEBUG + memset(env.envp, 0, env.env_size * sizeof(char *)); +#endif + } + memcpy(env.envp, environ, len * sizeof(char *)); + env.envp[len] = NULL; + env.env_len = len; + environ = env.envp; +#ifdef ENV_DEBUG + } else { + if (env.envp[env.env_len] != NULL) + errorx(1, "setenv: corrupted envp, len mismatch"); +#endif + } + sudo_putenv(estring, TRUE, overwrite); + return(0); } /* - * Given a variable and value, allocate and format an environment string. + * Version of unsetenv(3) that uses our own environ pointer. + * Will sync with environ as needed. */ -static char * -#ifdef __STDC__ -format_env(char *var, ...) +#ifdef UNSETENV_VOID +void #else -format_env(var, va_alist) - char *var; - va_dcl +int #endif +unsetenv(var) + const char *var; { - char *estring; - char *val; - size_t esize; - va_list ap; + char **ep; + size_t len; -#ifdef __STDC__ - va_start(ap, var); + if (strchr(var, '=') != NULL) { + errno = EINVAL; +#ifdef UNSETENV_VOID + return; #else - va_start(ap); + return(-1); #endif - esize = strlen(var) + 2; - while ((val = va_arg(ap, char *)) != NULL) - esize += strlen(val); - va_end(ap); - estring = (char *) emalloc(esize); + } - /* Store variable name and the '=' separator. */ - if (strlcpy(estring, var, esize) >= esize || - strlcat(estring, "=", esize) >= esize) { + /* Make sure we are operating on the current environment. */ + /* XXX - this could be optimized to include the search */ + if (env.envp != environ) { + for (ep = environ; *ep != NULL; ep++) + continue; + len = ep - environ; + if (len + 1 > env.env_size) { + efree(env.envp); + env.env_size = len + 1 + 128; + env.envp = emalloc2(env.env_size, sizeof(char *)); +#ifdef ENV_DEBUG + memset(env.envp, 0, env.env_size * sizeof(char *)); +#endif + } + memcpy(env.envp, environ, len * sizeof(char *)); + env.envp[len] = NULL; + env.env_len = len; + environ = env.envp; +#ifdef ENV_DEBUG + } else { + if (env.envp[env.env_len] != NULL) + errorx(1, "unsetenv: corrupted envp, len mismatch"); +#endif + } - errx(1, "internal error, format_env() overflow"); + len = strlen(var); + for (ep = env.envp; *ep; ep++) { + if (strncmp(var, *ep, len) == 0 && (*ep)[len] == '=') { + /* Found it; shift remainder + NULL over by one and update len. */ + memmove(ep, ep + 1, + (env.env_len - (ep - env.envp)) * sizeof(char *)); + env.env_len--; + break; + } } +#ifndef UNSETENV_VOID + return(0); +#endif +} - /* Now store the variable's value (if any) */ -#ifdef __STDC__ - va_start(ap, var); +/* + * Version of putenv(3) that uses our own environ pointer. + * Will sync with environ as needed. + */ +int +#ifdef PUTENV_CONST +putenv(const char *string) #else - va_start(ap); +putenv(string) + char *string; #endif - while ((val = va_arg(ap, char *)) != NULL) { - if (strlcat(estring, val, esize) >= esize) - errx(1, "internal error, format_env() overflow"); +{ + if (strchr(string, '=') == NULL) { + errno = EINVAL; + return(-1); } - va_end(ap); - - return(estring); + /* Sync env.envp with environ as needed. */ + if (env.envp != environ) { + char **ep; + size_t len; + + for (ep = environ; *ep != NULL; ep++) + continue; + len = ep - environ; + if (len + 2 > env.env_size) { + efree(env.envp); + env.env_size = len + 2 + 128; + env.envp = emalloc2(env.env_size, sizeof(char *)); +#ifdef ENV_DEBUG + memset(env.envp, 0, env.env_size * sizeof(char *)); +#endif + } + memcpy(env.envp, environ, len * sizeof(char *)); + env.envp[len] = NULL; + env.env_len = len; + environ = env.envp; +#ifdef ENV_DEBUG + } else { + if (env.envp[env.env_len] != NULL) + errorx(1, "putenv: corrupted envp, len mismatch"); +#endif + } + sudo_putenv((char *)string, TRUE, TRUE); + return(0); } /* - * Insert str into new_environ, assumes str has an '=' in it. - * NOTE: no other routines may modify new_environ, env_size, or env_len. + * Similar to putenv(3) but operates on sudo's private copy of the + * environment (not environ) and it always overwrites. The dupcheck param + * determines whether we need to verify that the variable is not already set. + * Will only overwrite an existing variable if overwrite is set. */ static void -insert_env(str, dupcheck) +sudo_putenv(str, dupcheck, overwrite) char *str; int dupcheck; + int overwrite; { - char **nep; - size_t varlen; + char **ep; + size_t len; /* Make sure there is room for the new entry plus a NULL. */ - if (env_len + 2 > env_size) { - env_size += 128; - new_environ = erealloc3(new_environ, env_size, sizeof(char *)); + if (env.env_len + 2 > env.env_size) { + env.env_size += 128; + env.envp = erealloc3(env.envp, env.env_size, sizeof(char *)); +#ifdef ENV_DEBUG + memset(env.envp + env.env_len, 0, + (env.env_size - env.env_len) * sizeof(char *)); +#endif + environ = env.envp; } - if (dupcheck) { - varlen = (strchr(str, '=') - str) + 1; +#ifdef ENV_DEBUG + if (env.envp[env.env_len] != NULL) + errorx(1, "sudo_putenv: corrupted envp, len mismatch"); +#endif - for (nep = new_environ; *nep; nep++) { - if (strncmp(str, *nep, varlen) == 0) { - *nep = str; + if (dupcheck) { + len = (strchr(str, '=') - str) + 1; + for (ep = env.envp; *ep; ep++) { + if (strncmp(str, *ep, len) == 0) { + if (overwrite) + *ep = str; return; } } } else - nep = &new_environ[env_len]; + ep = env.envp + env.env_len; + + env.env_len++; + *ep++ = str; + *ep = NULL; +} + +/* + * Check the env_delete blacklist. + * Returns TRUE if the variable was found, else false. + */ +static int +matches_env_delete(var) + const char *var; +{ + struct list_member *cur; + size_t len; + int iswild, match = FALSE; + + /* Skip anything listed in env_delete. */ + for (cur = def_env_delete; cur; cur = cur->next) { + len = strlen(cur->value); + /* Deal with '*' wildcard */ + if (cur->value[len - 1] == '*') { + len--; + iswild = TRUE; + } else + iswild = FALSE; + if (strncmp(cur->value, var, len) == 0 && + (iswild || var[len] == '=')) { + match = TRUE; + break; + } + } + return(match); +} + +/* + * Apply the env_check list. + * Returns TRUE if the variable is allowed, FALSE if denied + * or -1 if no match. + */ +static int +matches_env_check(var) + const char *var; +{ + struct list_member *cur; + size_t len; + int iswild, keepit = -1; + + for (cur = def_env_check; cur; cur = cur->next) { + len = strlen(cur->value); + /* Deal with '*' wildcard */ + if (cur->value[len - 1] == '*') { + len--; + iswild = TRUE; + } else + iswild = FALSE; + if (strncmp(cur->value, var, len) == 0 && + (iswild || var[len] == '=')) { + keepit = !strpbrk(var, "/%"); + break; + } + } + return(keepit); +} - env_len++; - *nep++ = str; - *nep = NULL; +/* + * Check the env_keep list. + * Returns TRUE if the variable is allowed else FALSE. + */ +static int +matches_env_keep(var) + const char *var; +{ + struct list_member *cur; + size_t len; + int iswild, keepit = FALSE; + + for (cur = def_env_keep; cur; cur = cur->next) { + len = strlen(cur->value); + /* Deal with '*' wildcard */ + if (cur->value[len - 1] == '*') { + len--; + iswild = TRUE; + } else + iswild = FALSE; + if (strncmp(cur->value, var, len) == 0 && + (iswild || var[len] == '=')) { + keepit = TRUE; + break; + } + } + return(keepit); } /* @@ -314,28 +561,31 @@ insert_env(str, dupcheck) * variables from the old one or start with a clean slate. * Also adds sudo-specific variables (SUDO_*). */ -char ** -rebuild_env(envp, sudo_mode, noexec) - char **envp; +void +rebuild_env(sudo_mode, noexec) int sudo_mode; int noexec; { - char **ep, *cp, *ps1; - int okvar, iswild, didvar; - size_t len; - struct list_member *cur; + char **old_envp, **ep, *cp, *ps1; + char idbuf[MAX_UID_T_LEN]; + unsigned int didvar; /* * Either clean out the environment or reset to a safe default. */ ps1 = NULL; didvar = 0; - if (def_env_reset) { - int keepit; - + env.env_len = 0; + env.env_size = 128; + old_envp = env.envp; + env.envp = emalloc2(env.env_size, sizeof(char *)); +#ifdef ENV_DEBUG + memset(env.envp, 0, env.env_size * sizeof(char *)); +#endif + if (def_env_reset || ISSET(sudo_mode, MODE_LOGIN_SHELL)) { /* Pull in vars we want to keep from the old environment. */ - for (ep = envp; *ep; ep++) { - keepit = 0; + for (ep = environ; *ep; ep++) { + int keepit; /* Skip variables with values beginning with () (bash functions) */ if ((cp = strchr(*ep, '=')) != NULL) { @@ -343,22 +593,14 @@ rebuild_env(envp, sudo_mode, noexec) continue; } - for (cur = def_env_keep; cur; cur = cur->next) { - len = strlen(cur->value); - /* Deal with '*' wildcard */ - if (cur->value[len - 1] == '*') { - len--; - iswild = 1; - } else - iswild = 0; - if (strncmp(cur->value, *ep, len) == 0 && - (iswild || (*ep)[len] == '=')) { - /* We always preserve TERM, no special treatment needed. */ - if (strncmp(*ep, "TERM=", 5) != 0) - keepit = 1; - break; - } - } + /* + * First check certain variables for '%' and '/' characters. + * If no match there, check the keep list. + * If nothing matched, we remove it from the environment. + */ + keepit = matches_env_check(*ep); + if (keepit == -1) + keepit = matches_env_keep(*ep); /* For SUDO_PS1 -> PS1 conversion. */ if (strncmp(*ep, "SUDO_PS1=", 8) == 0) @@ -371,31 +613,33 @@ rebuild_env(envp, sudo_mode, noexec) if (strncmp(*ep, "HOME=", 5) == 0) SET(didvar, DID_HOME); break; + case 'L': + if (strncmp(*ep, "LOGNAME=", 8) == 0) + SET(didvar, DID_LOGNAME); + break; + case 'P': + if (strncmp(*ep, "PATH=", 5) == 0) + SET(didvar, DID_PATH); + break; case 'S': if (strncmp(*ep, "SHELL=", 6) == 0) SET(didvar, DID_SHELL); break; - case 'L': - if (strncmp(*ep, "LOGNAME=", 8) == 0) - SET(didvar, DID_LOGNAME); + case 'T': + if (strncmp(*ep, "TERM=", 5) == 0) + SET(didvar, DID_TERM); break; case 'U': if (strncmp(*ep, "USER=", 5) == 0) SET(didvar, DID_USER); + if (strncmp(*ep, "USERNAME=", 5) == 0) + SET(didvar, DID_USERNAME); break; } - insert_env(*ep, 0); - } else { - /* Preserve TERM and PATH, ignore anything else. */ - if (!ISSET(didvar, DID_TERM) && strncmp(*ep, "TERM=", 5) == 0) { - insert_env(*ep, 0); - SET(didvar, DID_TERM); - } else if (!ISSET(didvar, DID_PATH) && strncmp(*ep, "PATH=", 5) == 0) { - insert_env(*ep, 0); - SET(didvar, DID_PATH); - } + sudo_putenv(*ep, FALSE, FALSE); } } + didvar |= didvar << 8; /* convert DID_* to KEPT_* */ /* * Add in defaults. In -i mode these come from the runas user, @@ -403,27 +647,32 @@ rebuild_env(envp, sudo_mode, noexec) * on sudoers options). */ if (ISSET(sudo_mode, MODE_LOGIN_SHELL)) { - insert_env(format_env("HOME", runas_pw->pw_dir, VNULL), 0); - insert_env(format_env("SHELL", runas_pw->pw_shell, VNULL), 0); - insert_env(format_env("LOGNAME", runas_pw->pw_name, VNULL), 0); - insert_env(format_env("USER", runas_pw->pw_name, VNULL), 0); + sudo_setenv("HOME", runas_pw->pw_dir, ISSET(didvar, DID_HOME)); + sudo_setenv("SHELL", runas_pw->pw_shell, ISSET(didvar, DID_SHELL)); + sudo_setenv("LOGNAME", runas_pw->pw_name, + ISSET(didvar, DID_LOGNAME)); + sudo_setenv("USER", runas_pw->pw_name, ISSET(didvar, DID_USER)); + sudo_setenv("USERNAME", runas_pw->pw_name, + ISSET(didvar, DID_USERNAME)); } else { if (!ISSET(didvar, DID_HOME)) - insert_env(format_env("HOME", user_dir, VNULL), 0); + sudo_setenv("HOME", user_dir, FALSE); if (!ISSET(didvar, DID_SHELL)) - insert_env(format_env("SHELL", sudo_user.pw->pw_shell, VNULL), 0); + sudo_setenv("SHELL", sudo_user.pw->pw_shell, FALSE); if (!ISSET(didvar, DID_LOGNAME)) - insert_env(format_env("LOGNAME", user_name, VNULL), 0); + sudo_setenv("LOGNAME", user_name, FALSE); if (!ISSET(didvar, DID_USER)) - insert_env(format_env("USER", user_name, VNULL), 0); + sudo_setenv("USER", user_name, FALSE); + if (!ISSET(didvar, DID_USERNAME)) + sudo_setenv("USERNAME", user_name, FALSE); } } else { /* - * Copy envp entries as long as they don't match env_delete or + * Copy environ entries as long as they don't match env_delete or * env_check. */ - for (ep = envp; *ep; ep++) { - okvar = 1; + for (ep = environ; *ep; ep++) { + int okvar; /* Skip variables with values beginning with () (bash functions) */ if ((cp = strchr(*ep, '=')) != NULL) { @@ -431,36 +680,13 @@ rebuild_env(envp, sudo_mode, noexec) continue; } - /* Skip anything listed in env_delete. */ - for (cur = def_env_delete; cur && okvar; cur = cur->next) { - len = strlen(cur->value); - /* Deal with '*' wildcard */ - if (cur->value[len - 1] == '*') { - len--; - iswild = 1; - } else - iswild = 0; - if (strncmp(cur->value, *ep, len) == 0 && - (iswild || (*ep)[len] == '=')) { - okvar = 0; - } - } - - /* Check certain variables for '%' and '/' characters. */ - for (cur = def_env_check; cur && okvar; cur = cur->next) { - len = strlen(cur->value); - /* Deal with '*' wildcard */ - if (cur->value[len - 1] == '*') { - len--; - iswild = 1; - } else - iswild = 0; - if (strncmp(cur->value, *ep, len) == 0 && - (iswild || (*ep)[len] == '=') && - strpbrk(*ep, "/%")) { - okvar = 0; - } - } + /* + * First check variables against the blacklist in env_delete. + * If no match there check for '%' and '/' characters. + */ + okvar = matches_env_delete(*ep) != TRUE; + if (okvar) + okvar = matches_env_check(*ep) != FALSE; if (okvar) { if (strncmp(*ep, "SUDO_PS1=", 9) == 0) @@ -469,30 +695,41 @@ rebuild_env(envp, sudo_mode, noexec) SET(didvar, DID_PATH); else if (strncmp(*ep, "TERM=", 5) == 0) SET(didvar, DID_TERM); - insert_env(*ep, 0); + sudo_putenv(*ep, FALSE, FALSE); } } } - /* Provide default values for $TERM and $PATH if they are not set. */ - if (!ISSET(didvar, DID_TERM)) - insert_env("TERM=unknown", 0); - if (!ISSET(didvar, DID_PATH)) - insert_env(format_env("PATH", _PATH_DEFPATH, VNULL), 0); - -#ifdef SECURE_PATH - /* Replace the PATH envariable with a secure one. */ - insert_env(format_env("PATH", SECURE_PATH, VNULL), 1); -#endif + /* Replace the PATH envariable with a secure one? */ + if (def_secure_path && !user_is_exempt()) { + sudo_setenv("PATH", def_secure_path, TRUE); + SET(didvar, DID_PATH); + } - /* Set $USER and $LOGNAME to target if "set_logname" is true. */ + /* Set $USER, $LOGNAME and $USERNAME to target if "set_logname" is true. */ + /* XXX - not needed for MODE_LOGIN_SHELL */ if (def_set_logname && runas_pw->pw_name) { - insert_env(format_env("LOGNAME", runas_pw->pw_name, VNULL), 1); - insert_env(format_env("USER", runas_pw->pw_name, VNULL), 1); + if (!ISSET(didvar, KEPT_LOGNAME)) + sudo_setenv("LOGNAME", runas_pw->pw_name, TRUE); + if (!ISSET(didvar, KEPT_USER)) + sudo_setenv("USER", runas_pw->pw_name, TRUE); + if (!ISSET(didvar, KEPT_USERNAME)) + sudo_setenv("USERNAME", runas_pw->pw_name, TRUE); } /* Set $HOME for `sudo -H'. Only valid at PERM_FULL_RUNAS. */ - if (ISSET(sudo_mode, MODE_RESET_HOME) && runas_pw->pw_dir) - insert_env(format_env("HOME", runas_pw->pw_dir, VNULL), 1); + /* XXX - not needed for MODE_LOGIN_SHELL */ + if (runas_pw->pw_dir) { + if (ISSET(sudo_mode, MODE_RESET_HOME) || + (ISSET(sudo_mode, MODE_RUN) && (def_always_set_home || + (ISSET(sudo_mode, MODE_SHELL) && def_set_home)))) + sudo_setenv("HOME", runas_pw->pw_dir, TRUE); + } + + /* Provide default values for $TERM and $PATH if they are not set. */ + if (!ISSET(didvar, DID_TERM)) + sudo_putenv("TERM=unknown", FALSE, FALSE); + if (!ISSET(didvar, DID_PATH)) + sudo_setenv("PATH", _PATH_DEFPATH, FALSE); /* * Preload a noexec file? For a list of LD_PRELOAD-alikes, see @@ -501,35 +738,173 @@ rebuild_env(envp, sudo_mode, noexec) */ if (noexec && def_noexec_file != NULL) { #if defined(__darwin__) || defined(__APPLE__) - insert_env(format_env("DYLD_INSERT_LIBRARIES", def_noexec_file, VNULL), 1); - insert_env(format_env("DYLD_FORCE_FLAT_NAMESPACE", VNULL), 1); + sudo_setenv("DYLD_INSERT_LIBRARIES", def_noexec_file, TRUE); + sudo_setenv("DYLD_FORCE_FLAT_NAMESPACE", "", TRUE); #else # if defined(__osf__) || defined(__sgi) - insert_env(format_env("_RLD_LIST", def_noexec_file, ":DEFAULT", VNULL), 1); + easprintf(&cp, "%s:DEFAULT", def_noexec_file); + sudo_setenv("_RLD_LIST", cp, TRUE); + efree(cp); # else - insert_env(format_env("LD_PRELOAD", def_noexec_file, VNULL), 1); -# endif -#endif +# ifdef _AIX + sudo_setenv("LDR_PRELOAD", def_noexec_file, TRUE); +# else + sudo_setenv("LD_PRELOAD", def_noexec_file, TRUE); +# endif /* _AIX */ +# endif /* __osf__ || __sgi */ +#endif /* __darwin__ || __APPLE__ */ } /* Set PS1 if SUDO_PS1 is set. */ - if (ps1) - insert_env(ps1, 1); + if (ps1 != NULL) + sudo_putenv(ps1, TRUE, TRUE); /* Add the SUDO_COMMAND envariable (cmnd + args). */ - if (user_args) - insert_env(format_env("SUDO_COMMAND", user_cmnd, " ", user_args, VNULL), 1); - else - insert_env(format_env("SUDO_COMMAND", user_cmnd, VNULL), 1); + if (user_args) { + easprintf(&cp, "%s %s", user_cmnd, user_args); + sudo_setenv("SUDO_COMMAND", cp, TRUE); + efree(cp); + } else + sudo_setenv("SUDO_COMMAND", user_cmnd, TRUE); /* Add the SUDO_USER, SUDO_UID, SUDO_GID environment variables. */ - insert_env(format_env("SUDO_USER", user_name, VNULL), 1); - easprintf(&cp, "SUDO_UID=%lu", (unsigned long) user_uid); - insert_env(cp, 1); - easprintf(&cp, "SUDO_GID=%lu", (unsigned long) user_gid); - insert_env(cp, 1); + sudo_setenv("SUDO_USER", user_name, TRUE); + snprintf(idbuf, sizeof(idbuf), "%lu", (unsigned long) user_uid); + sudo_setenv("SUDO_UID", idbuf, TRUE); + snprintf(idbuf, sizeof(idbuf), "%lu", (unsigned long) user_gid); + sudo_setenv("SUDO_GID", idbuf, TRUE); + + /* Install new environment. */ + environ = env.envp; + efree(old_envp); +} + +void +insert_env_vars(env_vars) + struct list_member *env_vars; +{ + struct list_member *cur; + + if (env_vars == NULL) + return; + + /* Add user-specified environment variables. */ + for (cur = env_vars; cur != NULL; cur = cur->next) + putenv(cur->value); +} + +/* + * Validate the list of environment variables passed in on the command + * line against env_delete, env_check, and env_keep. + * Calls log_error() if any specified variables are not allowed. + */ +void +validate_env_vars(env_vars) + struct list_member *env_vars; +{ + struct list_member *var; + char *eq, *bad = NULL; + size_t len, blen = 0, bsize = 0; + int okvar; + + for (var = env_vars; var != NULL; var = var->next) { + if (def_secure_path && !user_is_exempt() && + strncmp(var->value, "PATH=", 5) == 0) { + okvar = FALSE; + } else if (def_env_reset) { + okvar = matches_env_check(var->value); + if (okvar == -1) + okvar = matches_env_keep(var->value); + } else { + okvar = matches_env_delete(var->value) == FALSE; + if (okvar == FALSE) + okvar = matches_env_check(var->value) != FALSE; + } + if (okvar == FALSE) { + /* Not allowed, add to error string, allocating as needed. */ + if ((eq = strchr(var->value, '=')) != NULL) + *eq = '\0'; + len = strlen(var->value) + 2; + if (blen + len >= bsize) { + do { + bsize += 1024; + } while (blen + len >= bsize); + bad = erealloc(bad, bsize); + bad[blen] = '\0'; + } + strlcat(bad, var->value, bsize); + strlcat(bad, ", ", bsize); + blen += len; + if (eq != NULL) + *eq = '='; + } + } + if (bad != NULL) { + bad[blen - 2] = '\0'; /* remove trailing ", " */ + log_error(NO_MAIL, + "sorry, you are not allowed to set the following environment variables: %s", bad); + /* NOTREACHED */ + efree(bad); + } +} - return(new_environ); +/* + * Read in /etc/environment ala AIX and Linux. + * Lines may be in either of three formats: + * NAME=VALUE + * NAME="VALUE" + * NAME='VALUE' + * with an optional "export" prefix so the shell can source the file. + * Invalid lines, blank lines, or lines consisting solely of a comment + * character are skipped. + */ +void +read_env_file(path, overwrite) + const char *path; + int overwrite; +{ + FILE *fp; + char *cp, *var, *val; + size_t var_len, val_len; + + if ((fp = fopen(path, "r")) == NULL) + return; + + while ((var = sudo_parseln(fp)) != NULL) { + /* Skip blank or comment lines */ + if (*var == '\0') + continue; + + /* Skip optional "export " */ + if (strncmp(var, "export", 6) == 0 && isspace((unsigned char) var[6])) { + var += 7; + while (isspace((unsigned char) *var)) { + var++; + } + } + + /* Must be of the form name=["']value['"] */ + for (val = var; *val != '\0' && *val != '='; val++) + ; + if (var == val || *val != '=') + continue; + var_len = (size_t)(val - var); + val_len = strlen(++val); + + /* Strip leading and trailing single/double quotes */ + if ((val[0] == '\'' || val[0] == '\"') && val[0] == val[val_len - 1]) { + val[val_len - 1] = '\0'; + val++; + val_len -= 2; + } + + cp = emalloc(var_len + 1 + val_len + 1); + memcpy(cp, var, var_len + 1); /* includes '=' */ + memcpy(cp + var_len + 1, val, val_len + 1); /* includes NUL */ + + sudo_putenv(cp, TRUE, overwrite); + } + fclose(fp); } void @@ -538,7 +913,7 @@ init_envtables() struct list_member *cur; const char **p; - /* Fill in "env_delete" variable. */ + /* Fill in the "env_delete" list. */ for (p = initial_badenv_table; *p; p++) { cur = emalloc(sizeof(struct list_member)); cur->value = estrdup(*p); @@ -546,11 +921,19 @@ init_envtables() def_env_delete = cur; } - /* Fill in "env_check" variable. */ + /* Fill in the "env_check" list. */ for (p = initial_checkenv_table; *p; p++) { cur = emalloc(sizeof(struct list_member)); cur->value = estrdup(*p); cur->next = def_env_check; def_env_check = cur; } + + /* Fill in the "env_keep" list. */ + for (p = initial_keepenv_table; *p; p++) { + cur = emalloc(sizeof(struct list_member)); + cur->value = estrdup(*p); + cur->next = def_env_keep; + def_env_keep = cur; + } }