/*
- * Copyright (c) 2000-2005, 2007-2008, 2010-2011
+ * Copyright (c) 2000-2005, 2007-2008, 2010-2013
* Todd C. Miller <Todd.Miller@courtesan.com>
*
* Permission to use, copy, modify, and distribute this software for any
#include <config.h>
#include <sys/types.h>
-#include <sys/param.h>
#include <stdio.h>
#ifdef STDC_HEADERS
# include <stdlib.h>
#include "sudoers.h"
#include "sudo_auth.h"
-extern char *login_style; /* from sudo.c */
+# ifndef LOGIN_DEFROOTCLASS
+# define LOGIN_DEFROOTCLASS "daemon"
+# endif
+
+extern char *login_style; /* from sudoers.c */
+
+struct bsdauth_state {
+ auth_session_t *as;
+ login_cap_t *lc;
+};
int
bsdauth_init(struct passwd *pw, sudo_auth *auth)
{
- static auth_session_t *as;
- extern login_cap_t *lc; /* from sudo.c */
+ static struct bsdauth_state state;
+ debug_decl(bsdauth_init, SUDO_DEBUG_AUTH)
+
+ /* Get login class based on auth user, which may not be invoking user. */
+ if (pw->pw_class && *pw->pw_class)
+ state.lc = login_getclass(pw->pw_class);
+ else
+ state.lc = login_getclass(pw->pw_uid ? LOGIN_DEFCLASS : LOGIN_DEFROOTCLASS);
+ if (state.lc == NULL) {
+ log_warning(USE_ERRNO|NO_MAIL,
+ N_("unable to get login class for user %s"), pw->pw_name);
+ debug_return_int(AUTH_FATAL);
+ }
- if ((as = auth_open()) == NULL) {
- log_error(USE_ERRNO|NO_EXIT|NO_MAIL,
- _("unable to begin bsd authentication"));
- return AUTH_FATAL;
+ if ((state.as = auth_open()) == NULL) {
+ log_warning(USE_ERRNO|NO_MAIL,
+ N_("unable to begin bsd authentication"));
+ login_close(state.lc);
+ debug_return_int(AUTH_FATAL);
}
/* XXX - maybe sanity check the auth style earlier? */
- login_style = login_getstyle(lc, login_style, "auth-sudo");
+ login_style = login_getstyle(state.lc, login_style, "auth-sudo");
if (login_style == NULL) {
- log_error(NO_EXIT|NO_MAIL, _("invalid authentication type"));
- auth_close(as);
- return AUTH_FATAL;
+ log_warning(NO_MAIL, N_("invalid authentication type"));
+ auth_close(state.as);
+ login_close(state.lc);
+ debug_return_int(AUTH_FATAL);
}
- if (auth_setitem(as, AUTHV_STYLE, login_style) < 0 ||
- auth_setitem(as, AUTHV_NAME, pw->pw_name) < 0 ||
- auth_setitem(as, AUTHV_CLASS, login_class) < 0) {
- log_error(NO_EXIT|NO_MAIL, _("unable to setup authentication"));
- auth_close(as);
- return AUTH_FATAL;
+ if (auth_setitem(state.as, AUTHV_STYLE, login_style) < 0 ||
+ auth_setitem(state.as, AUTHV_NAME, pw->pw_name) < 0 ||
+ auth_setitem(state.as, AUTHV_CLASS, login_class) < 0) {
+ log_warning(NO_MAIL, N_("unable to setup authentication"));
+ auth_close(state.as);
+ login_close(state.lc);
+ debug_return_int(AUTH_FATAL);
}
- auth->data = (void *) as;
- return AUTH_SUCCESS;
+ auth->data = (void *) &state;
+ debug_return_int(AUTH_SUCCESS);
}
int
size_t len;
int authok = 0;
sigaction_t sa, osa;
- auth_session_t *as = (auth_session_t *) auth->data;
+ auth_session_t *as = ((struct bsdauth_state *) auth->data)->as;
+ debug_decl(bsdauth_verify, SUDO_DEBUG_AUTH)
/* save old signal handler */
sigemptyset(&sa.sa_mask);
(void) sigaction(SIGCHLD, &osa, NULL);
if (authok)
- return AUTH_SUCCESS;
+ debug_return_int(AUTH_SUCCESS);
if (!pass)
- return AUTH_INTR;
+ debug_return_int(AUTH_INTR);
if ((s = auth_getvalue(as, "errormsg")) != NULL)
- log_error(NO_EXIT|NO_MAIL, "%s", s);
- return AUTH_FAILURE;
+ log_warning(NO_MAIL, "%s", s);
+ debug_return_int(AUTH_FAILURE);
}
int
bsdauth_cleanup(struct passwd *pw, sudo_auth *auth)
{
- auth_session_t *as = (auth_session_t *) auth->data;
+ struct bsdauth_state *state = auth->data;
+ debug_decl(bsdauth_cleanup, SUDO_DEBUG_AUTH)
- auth_close(as);
+ if (state != NULL) {
+ auth_close(state->as);
+ login_close(state->lc);
+ }
- return AUTH_SUCCESS;
+ debug_return_int(AUTH_SUCCESS);
}