embedaddon/sudo/plugins/sudoers/match.c - diff

Return to match.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / sudo / plugins / sudoers

Diff for /embedaddon/sudo/plugins/sudoers/match.c between versions 1.1.1.1 and 1.1.1.4

version 1.1.1.1, 2012/02/21 16:23:02	version 1.1.1.4, 2013/07/22 10:46:12
Line 1	Line 1
/*	/*
* Copyright (c) 1996, 1998-2005, 2007-2011	* Copyright (c) 1996, 1998-2005, 2007-2013
* Todd C. Miller <Todd.Miller@courtesan.com>	* Todd C. Miller <Todd.Miller@courtesan.com>
*	*
* Permission to use, copy, modify, and distribute this software for any	* Permission to use, copy, modify, and distribute this software for any
Line 24	Line 24
#include <config.h>	#include <config.h>

#include <sys/types.h>	#include <sys/types.h>
#include <sys/param.h>
#include <sys/stat.h>	#include <sys/stat.h>
#include <stdio.h>	#include <stdio.h>
#ifdef STDC_HEADERS	#ifdef STDC_HEADERS
Line 41	Line 40
#ifdef HAVE_STRINGS_H	#ifdef HAVE_STRINGS_H
# include <strings.h>	# include <strings.h>
#endif /* HAVE_STRINGS_H */	#endif /* HAVE_STRINGS_H */
	#if defined(HAVE_STDINT_H)
	# include <stdint.h>
	#elif defined(HAVE_INTTYPES_H)
	# include <inttypes.h>
	#endif
#ifdef HAVE_UNISTD_H	#ifdef HAVE_UNISTD_H
# include <unistd.h>	# include <unistd.h>
#endif /* HAVE_UNISTD_H */	#endif /* HAVE_UNISTD_H */
#ifdef HAVE_FNMATCH	#ifdef HAVE_FNMATCH
# include <fnmatch.h>	# include <fnmatch.h>
	#else
	# include "compat/fnmatch.h"
#endif /* HAVE_FNMATCH */	#endif /* HAVE_FNMATCH */
#ifdef HAVE_EXTENDED_GLOB	#ifndef SUDOERS_NAME_MATCH
# include <glob.h>	# ifdef HAVE_GLOB
#endif /* HAVE_EXTENDED_GLOB */	# include <glob.h>
	# else
	# include "compat/glob.h"
	# endif /* HAVE_GLOB */
	#endif /* SUDOERS_NAME_MATCH */
#ifdef HAVE_NETGROUP_H	#ifdef HAVE_NETGROUP_H
# include <netgroup.h>	# include <netgroup.h>
	#else
	# include <netdb.h>
#endif /* HAVE_NETGROUP_H */	#endif /* HAVE_NETGROUP_H */
#include <ctype.h>
#include <pwd.h>
#include <grp.h>
#include <netdb.h>
#ifdef HAVE_DIRENT_H	#ifdef HAVE_DIRENT_H
# include <dirent.h>	# include <dirent.h>
# define NAMLEN(dirent) strlen((dirent)->d_name)	# define NAMLEN(dirent) strlen((dirent)->d_name)
Line 73	Line 81
# include <ndir.h>	# include <ndir.h>
# endif	# endif
#endif	#endif
	#include <ctype.h>
	#include <pwd.h>
	#include <grp.h>
	#include <errno.h>

#include "sudoers.h"	#include "sudoers.h"
#include "parse.h"	#include "parse.h"
	#include "sha2.h"
#include <gram.h>	#include <gram.h>

#ifndef HAVE_FNMATCH
# include "compat/fnmatch.h"
#endif /* HAVE_FNMATCH */
#ifndef HAVE_EXTENDED_GLOB
# include "compat/glob.h"
#endif /* HAVE_EXTENDED_GLOB */

static struct member_list empty;	static struct member_list empty;

static int command_matches_dir(char *, size_t);	static bool command_matches_dir(char *, size_t);
static int command_matches_glob(char , char );	#ifndef SUDOERS_NAME_MATCH
static int command_matches_fnmatch(char , char );	static bool command_matches_glob(char , char );
static int command_matches_normal(char , char );	#endif
	static bool command_matches_fnmatch(char , char );
	static bool command_matches_normal(char , char , struct sudo_digest *);

/*	/*
* Returns TRUE if string 's' contains meta characters.	* Returns true if string 's' contains meta characters.
*/	*/
#define has_meta(s) (strpbrk(s, "\\?*[]") != NULL)	#define has_meta(s) (strpbrk(s, "\\?*[]") != NULL)

Line 101 static int command_matches_normal(char , char );	Line 109 static int command_matches_normal(char , char );
* Check for user described by pw in a list of members.	* Check for user described by pw in a list of members.
* Returns ALLOW, DENY or UNSPEC.	* Returns ALLOW, DENY or UNSPEC.
*/	*/
static int	int
_userlist_matches(struct passwd pw, struct member_list list)	userlist_matches(struct passwd pw, struct member_list list)
{	{
struct member *m;	struct member *m;
struct alias *a;	struct alias *a;
int rval, matched = UNSPEC;	int rval, matched = UNSPEC;
	debug_decl(userlist_matches, SUDO_DEBUG_MATCH)

tq_foreach_rev(list, m) {	tq_foreach_rev(list, m) {
switch (m->type) {	switch (m->type) {
Line 122 _userlist_matches(struct passwd *pw, struct member_lis	Line 131 _userlist_matches(struct passwd *pw, struct member_lis
matched = !m->negated;	matched = !m->negated;
break;	break;
case ALIAS:	case ALIAS:
if ((a = alias_find(m->name, USERALIAS)) != NULL) {	if ((a = alias_get(m->name, USERALIAS)) != NULL) {
rval = _userlist_matches(pw, &a->members);	rval = userlist_matches(pw, &a->members);
if (rval != UNSPEC)	if (rval != UNSPEC)
matched = m->negated ? !rval : rval;	matched = m->negated ? !rval : rval;
	alias_put(a);
break;	break;
}	}
/* FALLTHROUGH */	/* FALLTHROUGH */
Line 137 _userlist_matches(struct passwd *pw, struct member_lis	Line 147 _userlist_matches(struct passwd *pw, struct member_lis
if (matched != UNSPEC)	if (matched != UNSPEC)
break;	break;
}	}
return matched;	debug_return_bool(matched);
}	}

int
userlist_matches(struct passwd pw, struct member_list list)
{
alias_seqno++;
return _userlist_matches(pw, list);
}

/*	/*
* Check for user described by pw in a list of members.	* Check for user described by pw in a list of members.
* If both lists are empty compare against def_runas_default.	* If both lists are empty compare against def_runas_default.
* Returns ALLOW, DENY or UNSPEC.	* Returns ALLOW, DENY or UNSPEC.
*/	*/
static int	int
_runaslist_matches(struct member_list user_list, struct member_list group_list)	runaslist_matches(struct member_list *user_list,
	struct member_list group_list, struct member *matching_user,
	struct member **matching_group)
{	{
struct member *m;	struct member *m;
struct alias *a;	struct alias *a;
int rval;	int rval;
int user_matched = UNSPEC;	int user_matched = UNSPEC;
int group_matched = UNSPEC;	int group_matched = UNSPEC;
	debug_decl(runaslist_matches, SUDO_DEBUG_MATCH)

if (runas_pw != NULL) {	if (runas_pw != NULL) {
/* If no runas user or runas group listed in sudoers, use default. */	/* If no runas user or runas group listed in sudoers, use default. */
if (tq_empty(user_list) && tq_empty(group_list))	if (tq_empty(user_list) && tq_empty(group_list))
return userpw_matches(def_runas_default, runas_pw->pw_name, runas_pw);	debug_return_int(userpw_matches(def_runas_default, runas_pw->pw_name, runas_pw));

tq_foreach_rev(user_list, m) {	tq_foreach_rev(user_list, m) {
switch (m->type) {	switch (m->type) {
Line 180 _runaslist_matches(struct member_list *user_list, stru	Line 186 _runaslist_matches(struct member_list *user_list, stru
user_matched = !m->negated;	user_matched = !m->negated;
break;	break;
case ALIAS:	case ALIAS:
if ((a = alias_find(m->name, RUNASALIAS)) != NULL) {	if ((a = alias_get(m->name, RUNASALIAS)) != NULL) {
rval = _runaslist_matches(&a->members, &empty);	rval = runaslist_matches(&a->members, &empty,
	matching_user, NULL);
if (rval != UNSPEC)	if (rval != UNSPEC)
user_matched = m->negated ? !rval : rval;	user_matched = m->negated ? !rval : rval;
	alias_put(a);
break;	break;
}	}
/* FALLTHROUGH */	/* FALLTHROUGH */
Line 191 _runaslist_matches(struct member_list *user_list, stru	Line 199 _runaslist_matches(struct member_list *user_list, stru
if (userpw_matches(m->name, runas_pw->pw_name, runas_pw))	if (userpw_matches(m->name, runas_pw->pw_name, runas_pw))
user_matched = !m->negated;	user_matched = !m->negated;
break;	break;
	case MYSELF:
	if (!ISSET(sudo_user.flags, RUNAS_USER_SPECIFIED) \|\|
	strcmp(user_name, runas_pw->pw_name) == 0)
	user_matched = !m->negated;
	break;
}	}
if (user_matched != UNSPEC)	if (user_matched != UNSPEC) {
	if (matching_user != NULL && m->type != ALIAS)
	*matching_user = m;
break;	break;
	}
}	}
}	}

Line 208 _runaslist_matches(struct member_list *user_list, stru	Line 224 _runaslist_matches(struct member_list *user_list, stru
group_matched = !m->negated;	group_matched = !m->negated;
break;	break;
case ALIAS:	case ALIAS:
if ((a = alias_find(m->name, RUNASALIAS)) != NULL) {	if ((a = alias_get(m->name, RUNASALIAS)) != NULL) {
rval = _runaslist_matches(&empty, &a->members);	rval = runaslist_matches(&empty, &a->members,
	NULL, matching_group);
if (rval != UNSPEC)	if (rval != UNSPEC)
group_matched = m->negated ? !rval : rval;	group_matched = m->negated ? !rval : rval;
	alias_put(a);
break;	break;
}	}
/* FALLTHROUGH */	/* FALLTHROUGH */
Line 220 _runaslist_matches(struct member_list *user_list, stru	Line 238 _runaslist_matches(struct member_list *user_list, stru
group_matched = !m->negated;	group_matched = !m->negated;
break;	break;
}	}
if (group_matched != UNSPEC)	if (group_matched != UNSPEC) {
	if (matching_group != NULL && m->type != ALIAS)
	*matching_group = m;
break;	break;
	}
}	}
if (group_matched == UNSPEC) {	if (group_matched == UNSPEC) {
if (runas_pw != NULL && runas_pw->pw_gid == runas_gr->gr_gid)	if (runas_pw != NULL && runas_pw->pw_gid == runas_gr->gr_gid)
Line 230 _runaslist_matches(struct member_list *user_list, stru	Line 251 _runaslist_matches(struct member_list *user_list, stru
}	}

if (user_matched == DENY \|\| group_matched == DENY)	if (user_matched == DENY \|\| group_matched == DENY)
return DENY;	debug_return_int(DENY);
if (user_matched == group_matched \|\| runas_gr == NULL)	if (user_matched == group_matched \|\| runas_gr == NULL)
return user_matched;	debug_return_int(user_matched);
return UNSPEC;	debug_return_int(UNSPEC);
}	}

int
runaslist_matches(struct member_list user_list, struct member_list group_list)
{
alias_seqno++;
return _runaslist_matches(user_list ? user_list : &empty,
group_list ? group_list : &empty);
}

/*	/*
* Check for host and shost in a list of members.	* Check for host and shost in a list of members.
* Returns ALLOW, DENY or UNSPEC.	* Returns ALLOW, DENY or UNSPEC.
*/	*/
static int	int
_hostlist_matches(struct member_list *list)	hostlist_matches(struct member_list *list)
{	{
struct member *m;	struct member *m;
struct alias *a;	struct alias *a;
int rval, matched = UNSPEC;	int rval, matched = UNSPEC;
	debug_decl(hostlist_matches, SUDO_DEBUG_MATCH)

tq_foreach_rev(list, m) {	tq_foreach_rev(list, m) {
switch (m->type) {	switch (m->type) {
Line 269 _hostlist_matches(struct member_list *list)	Line 283 _hostlist_matches(struct member_list *list)
matched = !m->negated;	matched = !m->negated;
break;	break;
case ALIAS:	case ALIAS:
if ((a = alias_find(m->name, HOSTALIAS)) != NULL) {	if ((a = alias_get(m->name, HOSTALIAS)) != NULL) {
rval = _hostlist_matches(&a->members);	rval = hostlist_matches(&a->members);
if (rval != UNSPEC)	if (rval != UNSPEC)
matched = m->negated ? !rval : rval;	matched = m->negated ? !rval : rval;
	alias_put(a);
break;	break;
}	}
/* FALLTHROUGH */	/* FALLTHROUGH */
Line 284 _hostlist_matches(struct member_list *list)	Line 299 _hostlist_matches(struct member_list *list)
if (matched != UNSPEC)	if (matched != UNSPEC)
break;	break;
}	}
return matched;	debug_return_bool(matched);
}	}

int
hostlist_matches(struct member_list *list)
{
alias_seqno++;
return _hostlist_matches(list);
}

/*	/*
* Check for cmnd and args in a list of members.	* Check for cmnd and args in a list of members.
* Returns ALLOW, DENY or UNSPEC.	* Returns ALLOW, DENY or UNSPEC.
*/	*/
static int	int
_cmndlist_matches(struct member_list *list)	cmndlist_matches(struct member_list *list)
{	{
struct member *m;	struct member *m;
int matched = UNSPEC;	int matched = UNSPEC;
	debug_decl(cmndlist_matches, SUDO_DEBUG_MATCH)

tq_foreach_rev(list, m) {	tq_foreach_rev(list, m) {
matched = cmnd_matches(m);	matched = cmnd_matches(m);
if (matched != UNSPEC)	if (matched != UNSPEC)
break;	break;
}	}
return matched;	debug_return_bool(matched);
}	}

int
cmndlist_matches(struct member_list *list)
{
alias_seqno++;
return _cmndlist_matches(list);
}

/*	/*
* Check cmnd and args.	* Check cmnd and args.
* Returns ALLOW, DENY or UNSPEC.	* Returns ALLOW, DENY or UNSPEC.
Line 329 cmnd_matches(struct member *m)	Line 331 cmnd_matches(struct member *m)
struct alias *a;	struct alias *a;
struct sudo_command *c;	struct sudo_command *c;
int rval, matched = UNSPEC;	int rval, matched = UNSPEC;
	debug_decl(cmnd_matches, SUDO_DEBUG_MATCH)

switch (m->type) {	switch (m->type) {
case ALL:	case ALL:
matched = !m->negated;	matched = !m->negated;
break;	break;
case ALIAS:	case ALIAS:
alias_seqno++;	if ((a = alias_get(m->name, CMNDALIAS)) != NULL) {
if ((a = alias_find(m->name, CMNDALIAS)) != NULL) {	rval = cmndlist_matches(&a->members);
rval = _cmndlist_matches(&a->members);
if (rval != UNSPEC)	if (rval != UNSPEC)
matched = m->negated ? !rval : rval;	matched = m->negated ? !rval : rval;
	alias_put(a);
}	}
break;	break;
case COMMAND:	case COMMAND:
c = (struct sudo_command *)m->name;	c = (struct sudo_command *)m->name;
if (command_matches(c->cmnd, c->args))	if (command_matches(c->cmnd, c->args, c->digest))
matched = !m->negated;	matched = !m->negated;
break;	break;
}	}
return matched;	debug_return_bool(matched);
}	}

static int	static bool
command_args_match(sudoers_cmnd, sudoers_args)	command_args_match(char sudoers_cmnd, char sudoers_args)
char *sudoers_cmnd;
char *sudoers_args;
{	{
int flags = 0;	int flags = 0;
	debug_decl(command_args_match, SUDO_DEBUG_MATCH)

/*	/*
* If no args specified in sudoers, any user args are allowed.	* If no args specified in sudoers, any user args are allowed.
Line 364 command_args_match(sudoers_cmnd, sudoers_args)	Line 366 command_args_match(sudoers_cmnd, sudoers_args)
*/	*/
if (!sudoers_args \|\|	if (!sudoers_args \|\|
(!user_args && sudoers_args && !strcmp("\"\"", sudoers_args)))	(!user_args && sudoers_args && !strcmp("\"\"", sudoers_args)))
return TRUE;	debug_return_bool(true);
/*	/*
* If args are specified in sudoers, they must match the user args.	* If args are specified in sudoers, they must match the user args.
* If running as sudoedit, all args are assumed to be paths.	* If running as sudoedit, all args are assumed to be paths.
Line 374 command_args_match(sudoers_cmnd, sudoers_args)	Line 376 command_args_match(sudoers_cmnd, sudoers_args)
if (strcmp(sudoers_cmnd, "sudoedit") == 0)	if (strcmp(sudoers_cmnd, "sudoedit") == 0)
flags = FNM_PATHNAME;	flags = FNM_PATHNAME;
if (fnmatch(sudoers_args, user_args ? user_args : "", flags) == 0)	if (fnmatch(sudoers_args, user_args ? user_args : "", flags) == 0)
return TRUE;	debug_return_bool(true);
}	}
return FALSE;	debug_return_bool(false);
}	}

/*	/*
* If path doesn't end in /, return TRUE iff cmnd & path name the same inode;	* If path doesn't end in /, return true iff cmnd & path name the same inode;
* otherwise, return TRUE if user_cmnd names one of the inodes in path.	* otherwise, return true if user_cmnd names one of the inodes in path.
*/	*/
int	bool
command_matches(char sudoers_cmnd, char sudoers_args)	command_matches(char sudoers_cmnd, char sudoers_args, struct sudo_digest *digest)
{	{
	debug_decl(command_matches, SUDO_DEBUG_MATCH)

/* Check for pseudo-commands */	/* Check for pseudo-commands */
if (sudoers_cmnd[0] != '/') {	if (sudoers_cmnd[0] != '/') {
/*	/*
Line 396 command_matches(char sudoers_cmnd, char sudoers_args	Line 400 command_matches(char sudoers_cmnd, char sudoers_args
*/	*/
if (strcmp(sudoers_cmnd, "sudoedit") != 0 \|\|	if (strcmp(sudoers_cmnd, "sudoedit") != 0 \|\|
strcmp(user_cmnd, "sudoedit") != 0)	strcmp(user_cmnd, "sudoedit") != 0)
return FALSE;	debug_return_bool(false);
if (command_args_match(sudoers_cmnd, sudoers_args)) {	if (command_args_match(sudoers_cmnd, sudoers_args)) {
efree(safe_cmnd);	efree(safe_cmnd);
safe_cmnd = estrdup(sudoers_cmnd);	safe_cmnd = estrdup(sudoers_cmnd);
return TRUE;	debug_return_bool(true);
} else	} else
return FALSE;	debug_return_bool(false);
}	}

if (has_meta(sudoers_cmnd)) {	if (has_meta(sudoers_cmnd)) {
Line 410 command_matches(char sudoers_cmnd, char sudoers_args	Line 414 command_matches(char sudoers_cmnd, char sudoers_args
* If sudoers_cmnd has meta characters in it, we need to	* If sudoers_cmnd has meta characters in it, we need to
* use glob(3) and/or fnmatch(3) to do the matching.	* use glob(3) and/or fnmatch(3) to do the matching.
*/	*/
	#ifdef SUDOERS_NAME_MATCH
	debug_return_bool(command_matches_fnmatch(sudoers_cmnd, sudoers_args));
	#else
if (def_fast_glob)	if (def_fast_glob)
return command_matches_fnmatch(sudoers_cmnd, sudoers_args);	debug_return_bool(command_matches_fnmatch(sudoers_cmnd, sudoers_args));
return command_matches_glob(sudoers_cmnd, sudoers_args);	debug_return_bool(command_matches_glob(sudoers_cmnd, sudoers_args));
	#endif
}	}
return command_matches_normal(sudoers_cmnd, sudoers_args);	debug_return_bool(command_matches_normal(sudoers_cmnd, sudoers_args, digest));
}	}

static int	static bool
command_matches_fnmatch(char sudoers_cmnd, char sudoers_args)	command_matches_fnmatch(char sudoers_cmnd, char sudoers_args)
{	{
	debug_decl(command_matches_fnmatch, SUDO_DEBUG_MATCH)

/*	/*
* Return true if fnmatch(3) succeeds AND	* Return true if fnmatch(3) succeeds AND
* a) there are no args in sudoers OR	* a) there are no args in sudoers OR
Line 428 command_matches_fnmatch(char sudoers_cmnd, char sudo	Line 438 command_matches_fnmatch(char sudoers_cmnd, char sudo
* else return false.	* else return false.
*/	*/
if (fnmatch(sudoers_cmnd, user_cmnd, FNM_PATHNAME) != 0)	if (fnmatch(sudoers_cmnd, user_cmnd, FNM_PATHNAME) != 0)
return FALSE;	debug_return_bool(false);
if (command_args_match(sudoers_cmnd, sudoers_args)) {	if (command_args_match(sudoers_cmnd, sudoers_args)) {
if (safe_cmnd)	if (safe_cmnd)
free(safe_cmnd);	free(safe_cmnd);
safe_cmnd = estrdup(user_cmnd);	safe_cmnd = estrdup(user_cmnd);
return TRUE;	debug_return_bool(true);
} else	}
return FALSE;	debug_return_bool(false);
}	}

static int	#ifndef SUDOERS_NAME_MATCH
	static bool
command_matches_glob(char sudoers_cmnd, char sudoers_args)	command_matches_glob(char sudoers_cmnd, char sudoers_args)
{	{
struct stat sudoers_stat;	struct stat sudoers_stat;
size_t dlen;	size_t dlen;
char *ap, base, *cp;	char *ap, base, *cp;
glob_t gl;	glob_t gl;
	debug_decl(command_matches_glob, SUDO_DEBUG_MATCH)

/*	/*
* First check to see if we can avoid the call to glob(3).	* First check to see if we can avoid the call to glob(3).
Line 456 command_matches_glob(char sudoers_cmnd, char sudoers	Line 468 command_matches_glob(char sudoers_cmnd, char sudoers
if ((base = strrchr(sudoers_cmnd, '/')) != NULL) {	if ((base = strrchr(sudoers_cmnd, '/')) != NULL) {
base++;	base++;
if (!has_meta(base) && strcmp(user_base, base) != 0)	if (!has_meta(base) && strcmp(user_base, base) != 0)
return FALSE;	debug_return_bool(false);
}	}
}	}
/*	/*
Line 466 command_matches_glob(char sudoers_cmnd, char sudoers	Line 478 command_matches_glob(char sudoers_cmnd, char sudoers
* c) there are args in sudoers and on command line and they match	* c) there are args in sudoers and on command line and they match
* else return false.	* else return false.
*/	*/
#define GLOB_FLAGS (GLOB_NOSORT \| GLOB_MARK \| GLOB_BRACE \| GLOB_TILDE)	if (glob(sudoers_cmnd, GLOB_NOSORT, NULL, &gl) != 0 \|\| gl.gl_pathc == 0) {
if (glob(sudoers_cmnd, GLOB_FLAGS, NULL, &gl) != 0 \|\| gl.gl_pathc == 0) {
globfree(&gl);	globfree(&gl);
return FALSE;	debug_return_bool(false);
}	}
/* For each glob match, compare basename, st_dev and st_ino. */	/* For each glob match, compare basename, st_dev and st_ino. */
for (ap = gl.gl_pathv; (cp = *ap) != NULL; ap++) {	for (ap = gl.gl_pathv; (cp = *ap) != NULL; ap++) {
Line 477 command_matches_glob(char sudoers_cmnd, char sudoers	Line 488 command_matches_glob(char sudoers_cmnd, char sudoers
dlen = strlen(cp);	dlen = strlen(cp);
if (cp[dlen - 1] == '/') {	if (cp[dlen - 1] == '/') {
if (command_matches_dir(cp, dlen))	if (command_matches_dir(cp, dlen))
return TRUE;	debug_return_bool(true);
continue;	continue;
}	}

Line 499 command_matches_glob(char sudoers_cmnd, char sudoers	Line 510 command_matches_glob(char sudoers_cmnd, char sudoers
}	}
globfree(&gl);	globfree(&gl);
if (cp == NULL)	if (cp == NULL)
return FALSE;	debug_return_bool(false);

if (command_args_match(sudoers_cmnd, sudoers_args)) {	if (command_args_match(sudoers_cmnd, sudoers_args)) {
efree(safe_cmnd);	efree(safe_cmnd);
safe_cmnd = estrdup(user_cmnd);	safe_cmnd = estrdup(user_cmnd);
return TRUE;	debug_return_bool(true);
}	}
return FALSE;	debug_return_bool(false);
}	}
	#endif /* SUDOERS_NAME_MATCH */

static int	#ifdef SUDOERS_NAME_MATCH
command_matches_normal(char sudoers_cmnd, char sudoers_args)	static bool
	command_matches_normal(char sudoers_cmnd, char sudoers_args, struct sudo_digest *digest)
{	{
	size_t dlen;
	debug_decl(command_matches_normal, SUDO_DEBUG_MATCH)

	dlen = strlen(sudoers_cmnd);

	/* If it ends in '/' it is a directory spec. */
	if (sudoers_cmnd[dlen - 1] == '/')
	debug_return_bool(command_matches_dir(sudoers_cmnd, dlen));

	if (strcmp(user_cmnd, sudoers_cmnd) == 0) {
	if (command_args_match(sudoers_cmnd, sudoers_args)) {
	efree(safe_cmnd);
	safe_cmnd = estrdup(sudoers_cmnd);
	debug_return_bool(true);
	}
	}
	debug_return_bool(false);
	}
	#else /* !SUDOERS_NAME_MATCH */

	static struct digest_function {
	const char *digest_name;
	const unsigned int digest_len;
	void (init)(SHA2_CTX );
	void (update)(SHA2_CTX , const unsigned char *, size_t);
	void (final)(unsigned char , SHA2_CTX *);
	} digest_functions[] = {
	{
	"SHA224",
	SHA224_DIGEST_LENGTH,
	SHA224Init,
	SHA224Update,
	SHA224Final
	}, {
	"SHA256",
	SHA256_DIGEST_LENGTH,
	SHA256Init,
	SHA256Update,
	SHA256Final
	}, {
	"SHA384",
	SHA384_DIGEST_LENGTH,
	SHA384Init,
	SHA384Update,
	SHA384Final
	}, {
	"SHA512",
	SHA512_DIGEST_LENGTH,
	SHA512Init,
	SHA512Update,
	SHA512Final
	}, {
	NULL
	}
	};

	static bool
	digest_matches(char file, struct sudo_digest sd)
	{
	unsigned char file_digest[SHA512_DIGEST_LENGTH];
	unsigned char sudoers_digest[SHA512_DIGEST_LENGTH];
	unsigned char buf[32 * 1024];
	struct digest_function *func = NULL;
	size_t nread;
	SHA2_CTX ctx;
	FILE *fp;
	unsigned int i;
	debug_decl(digest_matches, SUDO_DEBUG_MATCH)

	for (i = 0; digest_functions[i].digest_name != NULL; i++) {
	if (sd->digest_type == i) {
	func = &digest_functions[i];
	break;
	}
	}
	if (func == NULL) {
	warningx(_("unsupported digest type %d for %s"), sd->digest_type, file);
	debug_return_bool(false);
	}
	if (strlen(sd->digest_str) == func->digest_len * 2) {
	/* Convert the command digest from ascii hex to binary. */
	for (i = 0; i < func->digest_len; i++) {
	if (!isxdigit((unsigned char)sd->digest_str[i + i]) \|\|
	!isxdigit((unsigned char)sd->digest_str[i + i + 1])) {
	goto bad_format;
	}
	sudoers_digest[i] = hexchar(&sd->digest_str[i + i]);
	}
	} else {
	size_t len = base64_decode(sd->digest_str, sudoers_digest,
	sizeof(sudoers_digest));
	if (len != func->digest_len)
	goto bad_format;
	}

	if ((fp = fopen(file, "r")) == NULL) {
	sudo_debug_printf(SUDO_DEBUG_INFO, "unable to open %s: %s",
	file, strerror(errno));
	debug_return_bool(false);
	}

	func->init(&ctx);
	while ((nread = fread(buf, 1, sizeof(buf), fp)) != 0) {
	func->update(&ctx, buf, nread);
	}
	if (ferror(fp)) {
	warningx(_("%s: read error"), file);
	fclose(fp);
	debug_return_bool(false);
	}
	fclose(fp);
	func->final(file_digest, &ctx);

	debug_return_bool(memcmp(file_digest, sudoers_digest, func->digest_len) == 0);
	bad_format:
	warningx(_("digest for %s (%s) is not in %s form"), file,
	sd->digest_str, func->digest_name);
	debug_return_bool(false);
	}

	static bool
	command_matches_normal(char sudoers_cmnd, char sudoers_args, struct sudo_digest *digest)
	{
struct stat sudoers_stat;	struct stat sudoers_stat;
char *base;	char *base;
size_t dlen;	size_t dlen;
	debug_decl(command_matches_normal, SUDO_DEBUG_MATCH)

/* If it ends in '/' it is a directory spec. */	/* If it ends in '/' it is a directory spec. */
dlen = strlen(sudoers_cmnd);	dlen = strlen(sudoers_cmnd);
if (sudoers_cmnd[dlen - 1] == '/')	if (sudoers_cmnd[dlen - 1] == '/')
return command_matches_dir(sudoers_cmnd, dlen);	debug_return_bool(command_matches_dir(sudoers_cmnd, dlen));

/* Only proceed if user_base and basename(sudoers_cmnd) match */	/* Only proceed if user_base and basename(sudoers_cmnd) match */
if ((base = strrchr(sudoers_cmnd, '/')) == NULL)	if ((base = strrchr(sudoers_cmnd, '/')) == NULL)
Line 528 command_matches_normal(char sudoers_cmnd, char sudoe	Line 665 command_matches_normal(char sudoers_cmnd, char sudoe
base++;	base++;
if (strcmp(user_base, base) != 0 \|\|	if (strcmp(user_base, base) != 0 \|\|
stat(sudoers_cmnd, &sudoers_stat) == -1)	stat(sudoers_cmnd, &sudoers_stat) == -1)
return FALSE;	debug_return_bool(false);

/*	/*
* Return true if inode/device matches AND	* Return true if inode/device matches AND
* a) there are no args in sudoers OR	* a) there are no args in sudoers OR
* b) there are no args on command line and none req by sudoers OR	* b) there are no args on command line and none req by sudoers OR
* c) there are args in sudoers and on command line and they match	* c) there are args in sudoers and on command line and they match
	* d) there is a digest and it matches
*/	*/
if (user_stat != NULL &&	if (user_stat != NULL &&
(user_stat->st_dev != sudoers_stat.st_dev \|\|	(user_stat->st_dev != sudoers_stat.st_dev \|\|
user_stat->st_ino != sudoers_stat.st_ino))	user_stat->st_ino != sudoers_stat.st_ino))
return FALSE;	debug_return_bool(false);
if (command_args_match(sudoers_cmnd, sudoers_args)) {	if (!command_args_match(sudoers_cmnd, sudoers_args))
efree(safe_cmnd);	debug_return_bool(false);
safe_cmnd = estrdup(sudoers_cmnd);	if (digest != NULL && !digest_matches(sudoers_cmnd, digest)) {
return TRUE;	/* XXX - log functions not available but we should log very loudly */
	debug_return_bool(false);
}	}
return FALSE;	efree(safe_cmnd);
	safe_cmnd = estrdup(sudoers_cmnd);
	debug_return_bool(true);
}	}
	#endif /* SUDOERS_NAME_MATCH */

	#ifdef SUDOERS_NAME_MATCH
/*	/*
* Return TRUE if user_cmnd names one of the inodes in dir, else FALSE.	* Return true if user_cmnd begins with sudoers_dir, else false.
	* Note that sudoers_dir include the trailing '/'
*/	*/
static int	static bool
command_matches_dir(char *sudoers_dir, size_t dlen)	command_matches_dir(char *sudoers_dir, size_t dlen)
{	{
	debug_decl(command_matches_dir, SUDO_DEBUG_MATCH)
	debug_return_bool(strncmp(user_cmnd, sudoers_dir, dlen) == 0);
	}
	#else /* !SUDOERS_NAME_MATCH */
	/*
	* Return true if user_cmnd names one of the inodes in dir, else false.
	*/
	static bool
	command_matches_dir(char *sudoers_dir, size_t dlen)
	{
struct stat sudoers_stat;	struct stat sudoers_stat;
struct dirent *dent;	struct dirent *dent;
char buf[PATH_MAX];	char buf[PATH_MAX];
DIR *dirp;	DIR *dirp;
	debug_decl(command_matches_dir, SUDO_DEBUG_MATCH)

/*	/*
* Grot through directory entries, looking for user_base.	* Grot through directory entries, looking for user_base.
*/	*/
dirp = opendir(sudoers_dir);	dirp = opendir(sudoers_dir);
if (dirp == NULL)	if (dirp == NULL)
return FALSE;	debug_return_bool(false);

if (strlcpy(buf, sudoers_dir, sizeof(buf)) >= sizeof(buf)) {	if (strlcpy(buf, sudoers_dir, sizeof(buf)) >= sizeof(buf)) {
closedir(dirp);	closedir(dirp);
return FALSE;	debug_return_bool(false);
}	}
while ((dent = readdir(dirp)) != NULL) {	while ((dent = readdir(dirp)) != NULL) {
/* ignore paths > PATH_MAX (XXX - log) */	/* ignore paths > PATH_MAX (XXX - log) */
Line 590 command_matches_dir(char *sudoers_dir, size_t dlen)	Line 745 command_matches_dir(char *sudoers_dir, size_t dlen)
}	}

closedir(dirp);	closedir(dirp);
return dent != NULL;	debug_return_bool(dent != NULL);
}	}
	#endif /* SUDOERS_NAME_MATCH */

/*	/*
* Returns TRUE if the hostname matches the pattern, else FALSE	* Returns true if the hostname matches the pattern, else false
*/	*/
int	bool
hostname_matches(char shost, char lhost, char *pattern)	hostname_matches(char shost, char lhost, char *pattern)
{	{
	debug_decl(hostname_matches, SUDO_DEBUG_MATCH)

if (has_meta(pattern)) {	if (has_meta(pattern)) {
if (strchr(pattern, '.'))	if (strchr(pattern, '.'))
return !fnmatch(pattern, lhost, FNM_CASEFOLD);	debug_return_bool(!fnmatch(pattern, lhost, FNM_CASEFOLD));
else	else
return !fnmatch(pattern, shost, FNM_CASEFOLD);	debug_return_bool(!fnmatch(pattern, shost, FNM_CASEFOLD));
} else {	} else {
if (strchr(pattern, '.'))	if (strchr(pattern, '.'))
return !strcasecmp(lhost, pattern);	debug_return_bool(!strcasecmp(lhost, pattern));
else	else
return !strcasecmp(shost, pattern);	debug_return_bool(!strcasecmp(shost, pattern));
}	}
}	}

/*	/*
* Returns TRUE if the user/uid from sudoers matches the specified user/uid,	* Returns true if the user/uid from sudoers matches the specified user/uid,
* else returns FALSE.	* else returns false.
*/	*/
int	bool
userpw_matches(char sudoers_user, char user, struct passwd *pw)	userpw_matches(char sudoers_user, char user, struct passwd *pw)
{	{
	debug_decl(userpw_matches, SUDO_DEBUG_MATCH)

if (pw != NULL && *sudoers_user == '#') {	if (pw != NULL && *sudoers_user == '#') {
uid_t uid = (uid_t) atoi(sudoers_user + 1);	uid_t uid = (uid_t) atoi(sudoers_user + 1);
if (uid == pw->pw_uid)	if (uid == pw->pw_uid)
return TRUE;	debug_return_bool(true);
}	}
return strcmp(sudoers_user, user) == 0;	debug_return_bool(strcmp(sudoers_user, user) == 0);
}	}

/*	/*
* Returns TRUE if the group/gid from sudoers matches the specified group/gid,	* Returns true if the group/gid from sudoers matches the specified group/gid,
* else returns FALSE.	* else returns false.
*/	*/
int	bool
group_matches(char sudoers_group, struct group gr)	group_matches(char sudoers_group, struct group gr)
{	{
	debug_decl(group_matches, SUDO_DEBUG_MATCH)

if (*sudoers_group == '#') {	if (*sudoers_group == '#') {
gid_t gid = (gid_t) atoi(sudoers_group + 1);	gid_t gid = (gid_t) atoi(sudoers_group + 1);
if (gid == gr->gr_gid)	if (gid == gr->gr_gid)
return TRUE;	debug_return_bool(true);
}	}
return strcmp(gr->gr_name, sudoers_group) == 0;	debug_return_bool(strcmp(gr->gr_name, sudoers_group) == 0);
}	}

/*	/*
* Returns TRUE if the given user belongs to the named group,	* Returns true if the given user belongs to the named group,
* else returns FALSE.	* else returns false.
*/	*/
int	bool
usergr_matches(char group, char user, struct passwd *pw)	usergr_matches(char group, char user, struct passwd *pw)
{	{
int matched = FALSE;	int matched = false;
struct passwd *pw0 = NULL;	struct passwd *pw0 = NULL;
	debug_decl(usergr_matches, SUDO_DEBUG_MATCH)

/* make sure we have a valid usergroup, sudo style */	/* make sure we have a valid usergroup, sudo style */
if (*group++ != '%')	if (*group++ != '%')
Line 669 usergr_matches(char group, char user, struct passwd	Line 832 usergr_matches(char group, char user, struct passwd
}	}

if (user_in_group(pw, group)) {	if (user_in_group(pw, group)) {
matched = TRUE;	matched = true;
goto done;	goto done;
}	}

/* not a Unix group, could be an external group */	/* not a Unix group, could be an external group */
if (def_group_plugin && group_plugin_query(user, group, pw)) {	if (def_group_plugin && group_plugin_query(user, group, pw)) {
matched = TRUE;	matched = true;
goto done;	goto done;
}	}

done:	done:
if (pw0 != NULL)	if (pw0 != NULL)
pw_delref(pw0);	sudo_pw_delref(pw0);

return matched;	debug_return_bool(matched);
}	}

	#ifdef HAVE_INNETGR
/*	/*
* Returns TRUE if "host" and "user" belong to the netgroup "netgr",	* Get NIS-style domain name and return a malloc()ed copy or NULL if none.
* else return FALSE. Either of "host", "shost" or "user" may be NULL	*/
	static char *
	sudo_getdomainname(void)
	{
	char *domain = NULL;
	#ifdef HAVE_GETDOMAINNAME
	char buf, cp;

	buf = emalloc(HOST_NAME_MAX + 1);
	if (getdomainname(buf, HOST_NAME_MAX + 1) == 0 && *buf != '\0') {
	domain = buf;
	for (cp = buf; *cp != '\0'; cp++) {
	/* Check for illegal characters, Linux may use "(none)". */
	if (cp == '(' \|\| cp == ')' \|\| cp == ',' \|\| cp == ' ') {
	domain = NULL;
	break;
	}
	}
	}
	if (domain == NULL)
	efree(buf);
	#endif /* HAVE_GETDOMAINNAME */
	return domain;
	}
	#endif /* HAVE_INNETGR */

	/*
	* Returns true if "host" and "user" belong to the netgroup "netgr",
	* else return false. Either of "host", "shost" or "user" may be NULL
* in which case that argument is not checked...	* in which case that argument is not checked...
*	*
* XXX - swap order of host & shost	* XXX - swap order of host & shost
*/	*/
int	bool
netgr_matches(char netgr, char lhost, char shost, char user)	netgr_matches(char netgr, char lhost, char shost, char user)
{	{
	#ifdef HAVE_INNETGR
static char *domain;	static char *domain;
#ifdef HAVE_GETDOMAINNAME
static int initialized;	static int initialized;
#endif	#endif
	debug_decl(netgr_matches, SUDO_DEBUG_MATCH)

	#ifdef HAVE_INNETGR
/* make sure we have a valid netgroup, sudo style */	/* make sure we have a valid netgroup, sudo style */
if (*netgr++ != '+')	if (*netgr++ != '+')
return FALSE;	debug_return_bool(false);

#ifdef HAVE_GETDOMAINNAME
/* get the domain name (if any) */	/* get the domain name (if any) */
if (!initialized) {	if (!initialized) {
domain = (char *) emalloc(MAXHOSTNAMELEN + 1);	domain = sudo_getdomainname();
if (getdomainname(domain, MAXHOSTNAMELEN + 1) == -1 \|\| *domain == '\0') {
efree(domain);
domain = NULL;
}
initialized = 1;	initialized = 1;
}	}
#endif /* HAVE_GETDOMAINNAME */

#ifdef HAVE_INNETGR
if (innetgr(netgr, lhost, user, domain))	if (innetgr(netgr, lhost, user, domain))
return TRUE;	debug_return_bool(true);
else if (lhost != shost && innetgr(netgr, shost, user, domain))	else if (lhost != shost && innetgr(netgr, shost, user, domain))
return TRUE;	debug_return_bool(true);
#endif /* HAVE_INNETGR */	#endif /* HAVE_INNETGR */

return FALSE;	debug_return_bool(false);
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.1.1
changed lines
	Added in v.1.1.1.4