summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSumit Bose <sbose@redhat.com>2010-04-28 15:12:57 +0200
committerStephen Gallagher <sgallagh@redhat.com>2010-05-16 13:28:12 -0400
commit5f2593e24f565b202821329f1f9cb103241d80bb (patch)
tree38787fbdd9bcfbe6290d55bf5ebf81f8cc7300a2
parentec93a5f5d677b006923cc3691e79735f9e40be33 (diff)
downloadsssd-5f2593e24f565b202821329f1f9cb103241d80bb.tar.gz
sssd-5f2593e24f565b202821329f1f9cb103241d80bb.tar.bz2
sssd-5f2593e24f565b202821329f1f9cb103241d80bb.zip
Make Kerberos authentication a tevent_req
To allow other providers to include Kerberos authentication the main part is put into a tevent request.
-rw-r--r--src/providers/krb5/krb5_auth.c553
-rw-r--r--src/providers/krb5/krb5_auth.h7
2 files changed, 345 insertions, 215 deletions
diff --git a/src/providers/krb5/krb5_auth.c b/src/providers/krb5/krb5_auth.c
index e1aaebf4..a3ae3942 100644
--- a/src/providers/krb5/krb5_auth.c
+++ b/src/providers/krb5/krb5_auth.c
@@ -6,7 +6,7 @@
Authors:
Sumit Bose <sbose@redhat.com>
- Copyright (C) 2009 Red Hat
+ Copyright (C) 2009-2010 Red Hat
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -320,13 +320,58 @@ static struct krb5_ctx *get_krb5_ctx(struct be_req *be_req)
static void krb_reply(struct be_req *req, int dp_err, int result);
+static int krb5_cleanup(void *ptr)
+{
+ struct krb5child_req *kr = talloc_get_type(ptr, struct krb5child_req);
+
+ if (kr == NULL) return EOK;
+
+ child_cleanup(kr->read_from_child_fd, kr->write_to_child_fd);
+ memset(kr, 0, sizeof(struct krb5child_req));
+
+ return EOK;
+}
+
+static errno_t krb5_setup(TALLOC_CTX *mem_ctx, struct pam_data *pd,
+ struct krb5_ctx *krb5_ctx,
+ struct krb5child_req **krb5_req)
+{
+ struct krb5child_req *kr = NULL;
+
+ kr = talloc_zero(mem_ctx, struct krb5child_req);
+ if (kr == NULL) {
+ DEBUG(1, ("talloc failed.\n"));
+ return ENOMEM;
+ }
+ kr->read_from_child_fd = -1;
+ kr->write_to_child_fd = -1;
+ kr->is_offline = false;
+ kr->active_ccache_present = true;
+ talloc_set_destructor((TALLOC_CTX *) kr, krb5_cleanup);
+
+ kr->pd = pd;
+ kr->krb5_ctx = krb5_ctx;
+
+ *krb5_req = kr;
+
+ return EOK;
+}
+
+struct handle_child_state {
+ struct tevent_context *ev;
+ struct krb5child_req *kr;
+ uint8_t *buf;
+ ssize_t len;
+};
+
static void krb5_child_timeout(struct tevent_context *ev,
struct tevent_timer *te,
struct timeval tv, void *pvt)
{
- struct krb5child_req *kr = talloc_get_type(pvt, struct krb5child_req);
- struct be_req *be_req = kr->req;
- struct pam_data *pd = kr->pd;
+ struct tevent_req *req = talloc_get_type(pvt, struct tevent_req);
+ struct handle_child_state *state = tevent_req_data(req,
+ struct handle_child_state);
+ struct krb5child_req *kr = state->kr;
int ret;
if (kr->timeout_handler == NULL) {
@@ -340,25 +385,24 @@ static void krb5_child_timeout(struct tevent_context *ev,
DEBUG(1, ("kill failed [%d][%s].\n", errno, strerror(errno)));
}
- talloc_zfree(kr);
-
- pd->pam_status = PAM_AUTHINFO_UNAVAIL;
- be_mark_offline(be_req->be_ctx);
-
- krb_reply(be_req, DP_ERR_OFFLINE, pd->pam_status);
+ tevent_req_error(req, ETIMEDOUT);
}
-static errno_t activate_child_timeout_handler(struct krb5child_req *kr)
+static errno_t activate_child_timeout_handler(struct tevent_req *req,
+ struct tevent_context *ev,
+ struct krb5child_req *kr)
{
struct timeval tv;
+ struct handle_child_state *state = tevent_req_data(req,
+ struct handle_child_state);
tv = tevent_timeval_current();
tv = tevent_timeval_add(&tv,
dp_opt_get_int(kr->krb5_ctx->opts,
KRB5_AUTH_TIMEOUT),
0);
- kr->timeout_handler = tevent_add_timer(kr->req->be_ctx->ev, kr, tv,
- krb5_child_timeout, kr);
+ kr->timeout_handler = tevent_add_timer(ev, state, tv,
+ krb5_child_timeout, req);
if (kr->timeout_handler == NULL) {
DEBUG(1, ("tevent_add_timer failed.\n"));
return ENOMEM;
@@ -367,61 +411,8 @@ static errno_t activate_child_timeout_handler(struct krb5child_req *kr)
return EOK;
}
-static int krb5_cleanup(void *ptr)
-{
- struct krb5child_req *kr = talloc_get_type(ptr, struct krb5child_req);
-
- if (kr == NULL) return EOK;
-
- child_cleanup(kr->read_from_child_fd, kr->write_to_child_fd);
- memset(kr, 0, sizeof(struct krb5child_req));
-
- return EOK;
-}
-
-static errno_t krb5_setup(struct be_req *req, struct krb5child_req **krb5_req)
-{
- struct krb5child_req *kr = NULL;
- struct krb5_ctx *krb5_ctx;
- struct pam_data *pd;
- errno_t err;
-
- pd = talloc_get_type(req->req_data, struct pam_data);
-
- krb5_ctx = get_krb5_ctx(req);
- if (krb5_ctx == NULL) {
- DEBUG(1, ("Kerberos context not available.\n"));
- err = EINVAL;
- goto failed;
- }
-
- kr = talloc_zero(req, struct krb5child_req);
- if (kr == NULL) {
- DEBUG(1, ("talloc failed.\n"));
- err = ENOMEM;
- goto failed;
- }
- kr->read_from_child_fd = -1;
- kr->write_to_child_fd = -1;
- kr->is_offline = false;
- kr->active_ccache_present = true;
- talloc_set_destructor((TALLOC_CTX *) kr, krb5_cleanup);
-
- kr->pd = pd;
- kr->req = req;
- kr->krb5_ctx = krb5_ctx;
-
- *krb5_req = kr;
-
- return EOK;
-
-failed:
- talloc_zfree(kr);
-
- return err;
-}
-
-static errno_t fork_child(struct krb5child_req *kr)
+static errno_t fork_child(struct tevent_req *req, struct tevent_context *ev,
+ struct krb5child_req *kr)
{
int pipefd_to_child[2];
int pipefd_from_child[2];
@@ -476,7 +467,7 @@ static errno_t fork_child(struct krb5child_req *kr)
fd_nonblocking(kr->read_from_child_fd);
fd_nonblocking(kr->write_to_child_fd);
- err = activate_child_timeout_handler(kr);
+ err = activate_child_timeout_handler(req, ev, kr);
if (err != EOK) {
DEBUG(1, ("activate_child_timeout_handler failed.\n"));
}
@@ -490,13 +481,6 @@ static errno_t fork_child(struct krb5child_req *kr)
return EOK;
}
-struct handle_child_state {
- struct tevent_context *ev;
- struct krb5child_req *kr;
- uint8_t *buf;
- ssize_t len;
-};
-
static void handle_child_step(struct tevent_req *subreq);
static void handle_child_done(struct tevent_req *subreq);
@@ -525,7 +509,7 @@ static struct tevent_req *handle_child_send(TALLOC_CTX *mem_ctx,
goto fail;
}
- ret = fork_child(kr);
+ ret = fork_child(req, ev, kr);
if (ret != EOK) {
DEBUG(1, ("fork_child failed.\n"));
goto fail;
@@ -610,27 +594,65 @@ static int handle_child_recv(struct tevent_req *req,
return EOK;
}
-static void krb5_resolve_kdc_done(struct tevent_req *req);
-static void krb5_resolve_kpasswd_done(struct tevent_req *req);
-static void krb5_find_ccache_step(struct krb5child_req *kr);
-static void krb5_save_ccname_done(struct krb5child_req *kr);
+static void krb5_resolve_kdc_done(struct tevent_req *subreq);
+static void krb5_resolve_kpasswd_done(struct tevent_req *subreq);
+static void krb5_find_ccache_step(struct tevent_req *req);
+static void krb5_save_ccname_done(struct tevent_req *req);
static void krb5_child_done(struct tevent_req *req);
-void krb5_pam_handler(struct be_req *be_req)
-{
+struct krb5_auth_state {
+ struct tevent_context *ev;
+ struct be_ctx *be_ctx;
struct pam_data *pd;
+ struct krb5_ctx *krb5_ctx;
+ struct krb5child_req *kr;
+
+ int pam_status;
+ int dp_err;
+};
+
+int krb5_auth_recv(struct tevent_req *req, int *pam_status, int *dp_err)
+{
+ struct krb5_auth_state *state = tevent_req_data(req, struct krb5_auth_state);
+
+ *pam_status = state->pam_status;
+ *dp_err = state->dp_err;
+
+ TEVENT_REQ_RETURN_ON_ERROR(req);
+
+ return EOK;
+}
+
+struct tevent_req *krb5_auth_send(TALLOC_CTX *mem_ctx,
+ struct tevent_context *ev,
+ struct be_ctx *be_ctx,
+ struct pam_data *pd,
+ struct krb5_ctx *krb5_ctx)
+{
const char **attrs;
- int pam_status = PAM_SYSTEM_ERR;
- int dp_err = DP_ERR_FATAL;
+ struct krb5_auth_state *state;
struct ldb_result *res;
struct krb5child_req *kr = NULL;
const char *ccache_file = NULL;
const char *realm;
krb5_error_code kerr;
struct tevent_req *req;
+ struct tevent_req *subreq;
int ret;
- pd = talloc_get_type(be_req->req_data, struct pam_data);
+ req = tevent_req_create(mem_ctx, &state, struct krb5_auth_state);
+ if (req == NULL) {
+ DEBUG(1, ("tevent_req_create failed.\n"));
+ return NULL;
+ }
+
+ state->ev = ev;
+ state->be_ctx = be_ctx;
+ state->pd = pd;
+ state->krb5_ctx = krb5_ctx;
+ state->kr = NULL;
+ state->pam_status = PAM_SYSTEM_ERR;
+ state->dp_err = DP_ERR_FATAL;
switch (pd->cmd) {
case SSS_PAM_AUTHENTICATE:
@@ -639,8 +661,9 @@ void krb5_pam_handler(struct be_req *be_req)
case SSS_PAM_CHAUTHTOK_PRELIM:
if (pd->priv == 1 && pd->authtok_size == 0) {
DEBUG(4, ("Password reset by root is not supported.\n"));
- pam_status = PAM_PERM_DENIED;
- dp_err = DP_ERR_OK;
+ state->pam_status = PAM_PERM_DENIED;
+ state->dp_err = DP_ERR_OK;
+ ret = EOK;
goto done;
}
break;
@@ -648,26 +671,29 @@ void krb5_pam_handler(struct be_req *be_req)
case SSS_PAM_SETCRED:
case SSS_PAM_OPEN_SESSION:
case SSS_PAM_CLOSE_SESSION:
- pam_status = PAM_SUCCESS;
- dp_err = DP_ERR_OK;
+ state->pam_status = PAM_SUCCESS;
+ state->dp_err = DP_ERR_OK;
+ ret = EOK;
goto done;
break;
default:
DEBUG(4, ("krb5 does not handles pam task %d.\n", pd->cmd));
- pam_status = PAM_MODULE_UNKNOWN;
- dp_err = DP_ERR_OK;
+ state->pam_status = PAM_MODULE_UNKNOWN;
+ state->dp_err = DP_ERR_OK;
+ ret = EOK;
goto done;
}
- if (be_is_offline(be_req->be_ctx) &&
+ if (be_is_offline(be_ctx) &&
(pd->cmd == SSS_PAM_CHAUTHTOK || pd->cmd == SSS_PAM_CHAUTHTOK_PRELIM)) {
DEBUG(9, ("Password changes are not possible while offline.\n"));
- pam_status = PAM_AUTHINFO_UNAVAIL;
- dp_err = DP_ERR_OFFLINE;
+ state->pam_status = PAM_AUTHINFO_UNAVAIL;
+ state->dp_err = DP_ERR_OFFLINE;
+ ret = EOK;
goto done;
}
- attrs = talloc_array(be_req, const char *, 6);
+ attrs = talloc_array(state, const char *, 6);
if (attrs == NULL) {
goto done;
}
@@ -679,40 +705,45 @@ void krb5_pam_handler(struct be_req *be_req)
attrs[4] = SYSDB_GIDNUM;
attrs[5] = NULL;
- ret = sysdb_get_user_attr(be_req, be_req->be_ctx->sysdb,
- be_req->be_ctx->domain, pd->user,
- attrs, &res);
- if (ret) {
- DEBUG(5, ("sysdb search for upn of user [%s] failed.\n", pd->user));
+ ret = krb5_setup(state, pd, krb5_ctx, &state->kr);
+ if (ret != EOK) {
+ DEBUG(1, ("krb5_setup failed.\n"));
goto done;
}
+ kr = state->kr;
- ret = krb5_setup(be_req, &kr);
- if (ret != EOK) {
- DEBUG(1, ("krb5_setup failed.\n"));
- goto failed;
+ ret = sysdb_get_user_attr(state, be_ctx->sysdb, be_ctx->domain,
+ state->pd->user, attrs, &res);
+ if (ret) {
+ DEBUG(5, ("sysdb search for upn of user [%s] failed.\n", pd->user));
+ state->pam_status = PAM_SYSTEM_ERR;
+ state->dp_err = DP_ERR_OK;
+ goto done;
}
- realm = dp_opt_get_cstring(kr->krb5_ctx->opts, KRB5_REALM);
+ realm = dp_opt_get_cstring(krb5_ctx->opts, KRB5_REALM);
if (realm == NULL) {
DEBUG(1, ("Missing Kerberos realm.\n"));
- goto failed;
+ ret = ENOENT;
+ goto done;
}
switch (res->count) {
case 0:
DEBUG(5, ("No attributes for user [%s] found.\n", pd->user));
- goto failed;
+ ret = ENOENT;
+ goto done;
break;
case 1:
kr->upn = ldb_msg_find_attr_as_string(res->msgs[0], SYSDB_UPN, NULL);
if (kr->upn == NULL) {
/* NOTE: this is a hack, works only in some environments */
- kr->upn = talloc_asprintf(be_req, "%s@%s", pd->user, realm);
+ kr->upn = talloc_asprintf(kr, "%s@%s", pd->user, realm);
if (kr->upn == NULL) {
DEBUG(1, ("failed to build simple upn.\n"));
- goto failed;
+ ret = ENOMEM;
+ goto done;
}
DEBUG(9, ("Using simple UPN [%s].\n", kr->upn));
}
@@ -726,13 +757,15 @@ void krb5_pam_handler(struct be_req *be_req)
kr->uid = ldb_msg_find_attr_as_uint64(res->msgs[0], SYSDB_UIDNUM, 0);
if (kr->uid == 0) {
DEBUG(4, ("UID for user [%s] not known.\n", pd->user));
- goto failed;
+ ret = ENOENT;
+ goto done;
}
kr->gid = ldb_msg_find_attr_as_uint64(res->msgs[0], SYSDB_GIDNUM, 0);
if (kr->gid == 0) {
DEBUG(4, ("GID for user [%s] not known.\n", pd->user));
- goto failed;
+ ret = ENOENT;
+ goto done;
}
ccache_file = ldb_msg_find_attr_as_string(res->msgs[0],
@@ -743,14 +776,15 @@ void krb5_pam_handler(struct be_req *be_req)
&kr->active_ccache_present);
if (ret != EOK) {
DEBUG(1, ("check_if_ccache_file_is_used failed.\n"));
- goto failed;
+ goto done;
}
kerr = check_for_valid_tgt(ccache_file, realm, kr->upn,
&kr->valid_tgt_present);
if (kerr != 0) {
DEBUG(1, ("check_for_valid_tgt failed.\n"));
- goto failed;
+ ret = kerr;
+ goto done;
}
} else {
kr->active_ccache_present = false;
@@ -766,82 +800,82 @@ void krb5_pam_handler(struct be_req *be_req)
default:
DEBUG(1, ("User search for (%s) returned > 1 results!\n", pd->user));
- goto failed;
+ ret = EINVAL;
+ goto done;
break;
}
kr->srv = NULL;
kr->kpasswd_srv = NULL;
- req = be_resolve_server_send(kr, be_req->be_ctx->ev, be_req->be_ctx,
- kr->krb5_ctx->service->name);
+ subreq = be_resolve_server_send(state, state->ev, state->be_ctx,
+ krb5_ctx->service->name);
if (req == NULL) {
DEBUG(1, ("be_resolve_server_send failed.\n"));
- goto failed;
+ ret = ENOMEM;
+ goto done;
}
- tevent_req_set_callback(req, krb5_resolve_kdc_done, kr);
+ tevent_req_set_callback(subreq, krb5_resolve_kdc_done, req);
- return;
+ return req;
-failed:
- talloc_free(kr);
done:
- pd->pam_status = pam_status;
- krb_reply(be_req, dp_err, pd->pam_status);
+ if (ret == EOK) {
+ tevent_req_done(req);
+ } else {
+ tevent_req_error(req, ret);
+ }
+ tevent_req_post(req, state->ev);
+ return req;
}
-static void krb5_resolve_kdc_done(struct tevent_req *req)
+static void krb5_resolve_kdc_done(struct tevent_req *subreq)
{
- struct krb5child_req *kr = tevent_req_callback_data(req,
- struct krb5child_req);
+ struct tevent_req *req = tevent_req_callback_data(subreq, struct tevent_req);
+ struct krb5_auth_state *state = tevent_req_data(req, struct krb5_auth_state);
+ struct krb5child_req *kr = state->kr;
int ret;
- struct pam_data *pd = kr->pd;
- struct be_req *be_req = kr->req;
- ret = be_resolve_server_recv(req, &kr->srv);
- talloc_zfree(req);
+ ret = be_resolve_server_recv(subreq, &kr->srv);
+ talloc_zfree(subreq);
if (ret) {
/* all servers have been tried and none
* was found good, setting offline,
* but we still have to call the child to setup
* the ccache file. */
- be_mark_offline(be_req->be_ctx);
+ be_mark_offline(state->be_ctx);
kr->is_offline = true;
} else {
- if (pd->cmd == SSS_PAM_CHAUTHTOK &&
+ if (state->pd->cmd == SSS_PAM_CHAUTHTOK &&
kr->krb5_ctx->kpasswd_service != NULL) {
- req = be_resolve_server_send(kr, be_req->be_ctx->ev, be_req->be_ctx,
- kr->krb5_ctx->kpasswd_service->name);
+ subreq = be_resolve_server_send(state, state->ev, state->be_ctx,
+ kr->krb5_ctx->kpasswd_service->name);
if (req == NULL) {
DEBUG(1, ("be_resolve_server_send failed.\n"));
+ ret = ENOMEM;
goto failed;
}
- tevent_req_set_callback(req, krb5_resolve_kpasswd_done, kr);
+ tevent_req_set_callback(subreq, krb5_resolve_kpasswd_done, req);
return;
}
}
- krb5_find_ccache_step(kr);
+ krb5_find_ccache_step(req);
return;
failed:
- talloc_free(kr);
-
- pd->pam_status = PAM_SYSTEM_ERR;
- krb_reply(be_req, DP_ERR_FATAL, pd->pam_status);
+ tevent_req_error(req, ret);
}
-static void krb5_resolve_kpasswd_done(struct tevent_req *req)
+static void krb5_resolve_kpasswd_done(struct tevent_req *subreq)
{
- struct krb5child_req *kr = tevent_req_callback_data(req,
- struct krb5child_req);
+ struct tevent_req *req = tevent_req_callback_data(subreq, struct tevent_req);
+ struct krb5_auth_state *state = tevent_req_data(req, struct krb5_auth_state);
int ret;
- struct pam_data *pd = kr->pd;
- struct be_req *be_req = kr->req;
- ret = be_resolve_server_recv(req, &kr->kpasswd_srv);
+ ret = be_resolve_server_recv(subreq, &state->kr->kpasswd_srv);
talloc_zfree(req);
if (ret) {
/* all kpasswd servers have been tried and none was found good, but the
@@ -849,30 +883,41 @@ static void krb5_resolve_kpasswd_done(struct tevent_req *req)
* authentication. We return an PAM error here, but do not mark the
* backend offline. */
- talloc_free(kr);
- pd->pam_status = PAM_AUTHTOK_LOCK_BUSY;
- krb_reply(be_req, DP_ERR_OK, pd->pam_status);
+ state->pam_status = PAM_AUTHTOK_LOCK_BUSY;
+ state->dp_err = DP_ERR_OK;
+ tevent_req_done(req);
+ return;
}
- krb5_find_ccache_step(kr);
+ krb5_find_ccache_step(req);
}
-static void krb5_find_ccache_step(struct krb5child_req *kr)
+static void krb5_find_ccache_step(struct tevent_req *req)
{
+ struct krb5_auth_state *state = tevent_req_data(req, struct krb5_auth_state);
int ret;
- int pam_status = PAM_SYSTEM_ERR;
- int dp_err = DP_ERR_FATAL;
+ struct krb5child_req *kr = state->kr;
struct pam_data *pd = kr->pd;
- struct be_req *be_req = kr->req;
char *msg;
size_t offset = 0;
bool private_path = false;
- struct tevent_req *req = NULL;
-
+ struct tevent_req *subreq = NULL;
+
+ /* The ccache file should be (re)created if one of the following conditions
+ * is true:
+ * - it doesn't exist (kr->ccname == NULL)
+ * - the backend is online and the current ccache file is not used, i.e
+ * the related user is currently not logged in
+ * (!be_is_offline(state->be_ctx) && !kr->active_ccache_present)
+ * - the backend is offline and the current cache file not used and
+ * it does not contain a valid tgt
+ * (be_is_offline(state->be_ctx) &&
+ * !kr->active_ccache_present && !kr->valid_tgt_present)
+ */
if (kr->ccname == NULL ||
- (be_is_offline(be_req->be_ctx) && !kr->active_ccache_present &&
+ (be_is_offline(state->be_ctx) && !kr->active_ccache_present &&
!kr->valid_tgt_present) ||
- (!be_is_offline(be_req->be_ctx) && !kr->active_ccache_present)) {
+ (!be_is_offline(state->be_ctx) && !kr->active_ccache_present)) {
DEBUG(9, ("Recreating ccache file.\n"));
if (kr->ccname != NULL) {
if (strncmp(kr->ccname, "FILE:", 5) == 0) {
@@ -881,12 +926,14 @@ static void krb5_find_ccache_step(struct krb5child_req *kr)
if (kr->ccname[offset] != '/') {
DEBUG(1, ("Ccache file name [%s] is not an absolute path.\n",
kr->ccname + offset));
+ ret = EINVAL;
goto done;
}
ret = unlink(kr->ccname + offset);
if (ret == -1 && errno != ENOENT) {
- DEBUG(1, ("unlink [%s] failed [%d][%s].\n", kr->ccname,
- errno, strerror(errno)));
+ ret = errno;
+ DEBUG(1, ("unlink [%s] failed [%d][%s].\n", kr->ccname, ret,
+ strerror(ret)));
goto done;
}
}
@@ -896,6 +943,7 @@ static void krb5_find_ccache_step(struct krb5child_req *kr)
true, &private_path);
if (kr->ccname == NULL) {
DEBUG(1, ("expand_ccname_template failed.\n"));
+ ret = ENOMEM;
goto done;
}
@@ -908,7 +956,7 @@ static void krb5_find_ccache_step(struct krb5child_req *kr)
}
}
- if (be_is_offline(be_req->be_ctx)) {
+ if (be_is_offline(state->be_ctx)) {
DEBUG(9, ("Preparing for offline operation.\n"));
kr->is_offline = true;
@@ -917,6 +965,7 @@ static void krb5_find_ccache_step(struct krb5child_req *kr)
msg = talloc_asprintf(pd, "%s=%s", CCACHE_ENV_NAME, kr->ccname);
if (msg == NULL) {
DEBUG(1, ("talloc_asprintf failed.\n"));
+ ret = ENOMEM;
goto done;
}
@@ -926,48 +975,53 @@ static void krb5_find_ccache_step(struct krb5child_req *kr)
DEBUG(1, ("pam_add_response failed.\n"));
}
- pam_status = PAM_AUTHINFO_UNAVAIL;
- dp_err = DP_ERR_OFFLINE;
+ state->pam_status = PAM_AUTHINFO_UNAVAIL;
+ state->dp_err = DP_ERR_OFFLINE;
+ ret = EOK;
goto done;
}
memset(pd->authtok, 0, pd->authtok_size);
pd->authtok_size = 0;
if (kr->active_ccache_present) {
- ret = krb5_save_ccname(kr, be_req->be_ctx->sysdb,
- be_req->be_ctx->domain, pd->user,
+ ret = krb5_save_ccname(state, state->be_ctx->sysdb,
+ state->be_ctx->domain, pd->user,
kr->ccname);
if (ret) {
DEBUG(1, ("krb5_save_ccname failed.\n"));
goto done;
}
- krb5_save_ccname_done(kr);
+ krb5_save_ccname_done(req);
return;
}
}
- req = handle_child_send(kr, be_req->be_ctx->ev, kr);
- if (req == NULL) {
+ subreq = handle_child_send(state, state->ev, kr);
+ if (subreq == NULL) {
DEBUG(1, ("handle_child_send failed.\n"));
+ ret = ENOMEM;
goto done;
}
- tevent_req_set_callback(req, krb5_child_done, kr);
+ tevent_req_set_callback(subreq, krb5_child_done, req);
return;
done:
- talloc_free(kr);
- pd->pam_status = pam_status;
- krb_reply(be_req, dp_err, pd->pam_status);
+ if (ret == EOK) {
+ tevent_req_done(req);
+ } else {
+ tevent_req_error(req, ret);
+ }
}
-static void krb5_child_done(struct tevent_req *req)
+static void krb5_child_done(struct tevent_req *subreq)
{
- struct krb5child_req *kr = tevent_req_callback_data(req,
- struct krb5child_req);
- struct pam_data *pd = kr->pd;
- struct be_req *be_req = kr->req;
+ struct tevent_req *req = tevent_req_callback_data(subreq, struct tevent_req);
+ struct krb5_auth_state *state = tevent_req_data(req, struct krb5_auth_state);
+
+ struct krb5child_req *kr = state->kr;
+ struct pam_data *pd = state->pd;
int ret;
uint8_t *buf = NULL;
ssize_t len = -1;
@@ -976,19 +1030,25 @@ static void krb5_child_done(struct tevent_req *req)
int32_t *msg_status;
int32_t *msg_type;
int32_t *msg_len;
- int pam_status = PAM_SYSTEM_ERR;
- int dp_err = DP_ERR_FATAL;
- ret = handle_child_recv(req, pd, &buf, &len);
+ ret = handle_child_recv(subreq, pd, &buf, &len);
talloc_zfree(kr->timeout_handler);
- talloc_zfree(req);
+ talloc_zfree(subreq);
if (ret != EOK) {
DEBUG(1, ("child failed (%d [%s])\n", ret, strerror(ret)));
- goto done;
+ if (ret == ETIMEDOUT) {
+ state->pam_status = PAM_AUTHINFO_UNAVAIL;
+ state->dp_err = DP_ERR_OFFLINE;
+ tevent_req_done(req);
+ } else {
+ tevent_req_error(req, ret);
+ }
+ return;
}
if ((size_t) len < 3*sizeof(int32_t)) {
DEBUG(1, ("message too short.\n"));
+ ret = EINVAL;
goto done;
}
@@ -1011,22 +1071,25 @@ static void krb5_child_done(struct tevent_req *req)
}
if (*msg_status != PAM_SUCCESS && *msg_status != PAM_AUTHINFO_UNAVAIL) {
- pam_status = *msg_status;
- dp_err = DP_ERR_OK;
+ state->pam_status = *msg_status;
+ state->dp_err = DP_ERR_OK;
ret = pam_add_response(pd, *msg_type, *msg_len, &buf[p]);
if (ret != EOK) {
+ /* This is not a fatal error */
DEBUG(1, ("pam_add_response failed.\n"));
}
+ ret = EOK;
goto done;
} else {
- pd->pam_status = *msg_status;
+ state->pam_status = *msg_status;
}
if (*msg_status == PAM_SUCCESS && pd->cmd == SSS_PAM_CHAUTHTOK_PRELIM) {
- pam_status = PAM_SUCCESS;
- dp_err = DP_ERR_OK;
+ state->pam_status = PAM_SUCCESS;
+ state->dp_err = DP_ERR_OK;
+ ret = EOK;
goto done;
}
@@ -1037,11 +1100,13 @@ static void krb5_child_done(struct tevent_req *req)
*msg_len-pref_len);
if (kr->ccname == NULL) {
DEBUG(1, ("talloc_strndup failed.\n"));
+ ret = ENOMEM;
goto done;
}
} else {
DEBUG(1, ("Missing ccache name in child response [%.*s].\n", *msg_len,
&buf[p]));
+ ret = EINVAL;
goto done;
}
@@ -1049,7 +1114,7 @@ static void krb5_child_done(struct tevent_req *req)
if (kr->srv != NULL) {
fo_set_port_status(kr->srv, PORT_NOT_WORKING);
}
- be_mark_offline(be_req->be_ctx);
+ be_mark_offline(state->be_ctx);
kr->is_offline = true;
} else if (kr->srv != NULL) {
fo_set_port_status(kr->srv, PORT_WORKING);
@@ -1064,37 +1129,38 @@ static void krb5_child_done(struct tevent_req *req)
}
struct sysdb_attrs *attrs;
- attrs = sysdb_new_attrs(kr);
+ attrs = sysdb_new_attrs(state);
ret = sysdb_attrs_add_string(attrs, SYSDB_CCACHE_FILE, kr->ccname);
if (ret != EOK) {
DEBUG(1, ("sysdb_attrs_add_string failed.\n"));
goto done;
}
- ret = krb5_save_ccname(kr, be_req->be_ctx->sysdb,
- be_req->be_ctx->domain,
+ ret = krb5_save_ccname(state, state->be_ctx->sysdb,
+ state->be_ctx->domain,
pd->user, kr->ccname);
if (ret) {
DEBUG(1, ("krb5_save_ccname_send failed.\n"));
goto done;
}
- krb5_save_ccname_done(kr);
+ krb5_save_ccname_done(req);
return;
done:
- talloc_free(kr);
- pd->pam_status = pam_status;
- krb_reply(be_req, dp_err, pd->pam_status);
+ if (ret == EOK) {
+ tevent_req_done(req);
+ } else {
+ tevent_req_error(req, ret);
+ }
}
-static void krb5_save_ccname_done(struct krb5child_req *kr)
+static void krb5_save_ccname_done(struct tevent_req *req)
{
+ struct krb5_auth_state *state = tevent_req_data(req, struct krb5_auth_state);
+ struct krb5child_req *kr = state->kr;
struct pam_data *pd = kr->pd;
- struct be_req *be_req = kr->req;
struct krb5_ctx *krb5_ctx = kr->krb5_ctx;
- int pam_status = PAM_SYSTEM_ERR;
- int dp_err = DP_ERR_FATAL;
int ret;
char *password = NULL;
@@ -1108,28 +1174,29 @@ static void krb5_save_ccname_done(struct krb5child_req *kr)
if (kr->is_offline) {
DEBUG(4, ("Backend is marked offline, retry later!\n"));
- pam_status = PAM_AUTHINFO_UNAVAIL;
- dp_err = DP_ERR_OFFLINE;
+ state->pam_status = PAM_AUTHINFO_UNAVAIL;
+ state->dp_err = DP_ERR_OFFLINE;
+ ret = EOK;
goto done;
}
- if (be_req->be_ctx->domain->cache_credentials == TRUE) {
+ if (state->be_ctx->domain->cache_credentials == TRUE) {
/* password caching failures are not fatal errors */
- pam_status = PAM_SUCCESS;
- dp_err = DP_ERR_OK;
+ state->pam_status = PAM_SUCCESS;
+ state->dp_err = DP_ERR_OK;
switch(pd->cmd) {
case SSS_PAM_AUTHENTICATE:
case SSS_PAM_CHAUTHTOK_PRELIM:
- password = talloc_size(be_req, pd->authtok_size + 1);
+ password = talloc_size(state, pd->authtok_size + 1);
if (password != NULL) {
memcpy(password, pd->authtok, pd->authtok_size);
password[pd->authtok_size] = '\0';
}
break;
case SSS_PAM_CHAUTHTOK:
- password = talloc_size(be_req, pd->newauthtok_size + 1);
+ password = talloc_size(state, pd->newauthtok_size + 1);
if (password != NULL) {
memcpy(password, pd->newauthtok, pd->newauthtok_size);
password[pd->newauthtok_size] = '\0';
@@ -1141,13 +1208,14 @@ static void krb5_save_ccname_done(struct krb5child_req *kr)
if (password == NULL) {
DEBUG(0, ("password not available, offline auth may not work.\n"));
+ ret = EOK; /* password caching failures are not fatal errors */
goto done;
}
talloc_set_destructor((TALLOC_CTX *)password, password_destructor);
- ret = sysdb_cache_password(be_req, be_req->be_ctx->sysdb,
- be_req->be_ctx->domain, pd->user,
+ ret = sysdb_cache_password(state, state->be_ctx->sysdb,
+ state->be_ctx->domain, pd->user,
password);
if (ret) {
DEBUG(2, ("Failed to cache password, offline auth may not work."
@@ -1155,14 +1223,17 @@ static void krb5_save_ccname_done(struct krb5child_req *kr)
}
}
- pam_status = PAM_SUCCESS;
- dp_err = DP_ERR_OK;
+ state->pam_status = PAM_SUCCESS;
+ state->dp_err = DP_ERR_OK;
+ ret = EOK;
done:
- talloc_free(kr);
+ if (ret == EOK) {
+ tevent_req_done(req);
+ } else {
+ tevent_req_error(req, ret);
+ }
- pd->pam_status = pam_status;
- krb_reply(be_req, dp_err, pd->pam_status);
}
static void krb_reply(struct be_req *req, int dp_err, int result)
@@ -1170,3 +1241,57 @@ static void krb_reply(struct be_req *req, int dp_err, int result)
req->fn(req, dp_err, result, NULL);
}
+void krb5_auth_done(struct tevent_req *req);
+
+void krb5_pam_handler(struct be_req *be_req)
+{
+ struct tevent_req *req;
+ struct pam_data *pd;
+ struct krb5_ctx *krb5_ctx;
+
+ pd = talloc_get_type(be_req->req_data, struct pam_data);
+
+ krb5_ctx = get_krb5_ctx(be_req);
+ if (krb5_ctx == NULL) {
+ DEBUG(1, ("Kerberos context not available.\n"));
+ goto failed;
+ }
+
+ req = krb5_auth_send(be_req, be_req->be_ctx->ev, be_req->be_ctx, pd,
+ krb5_ctx);
+ if (req == NULL) {
+ DEBUG(1, ("krb5_auth_send failed.\n"));
+ goto failed;
+ }
+
+ tevent_req_set_callback(req, krb5_auth_done, be_req);
+
+ return;
+
+failed:
+ pd->pam_status = PAM_SYSTEM_ERR;
+ krb_reply(be_req, DP_ERR_FATAL, pd->pam_status);
+}
+
+void krb5_auth_done(struct tevent_req *req)
+{
+ int ret;
+ struct be_req *be_req = tevent_req_callback_data(req, struct be_req);
+ int pam_status;
+ int dp_err;
+ struct pam_data *pd;
+
+ pd = talloc_get_type(be_req->req_data, struct pam_data);
+
+ ret = krb5_auth_recv(req, &pam_status, &dp_err);
+ talloc_zfree(req);
+ if (ret) {
+ pd->pam_status = PAM_SYSTEM_ERR;
+ dp_err = DP_ERR_OK;
+ } else {
+ pd->pam_status = pam_status;
+ }
+
+ krb_reply(be_req, dp_err, pd->pam_status);
+}
+
diff --git a/src/providers/krb5/krb5_auth.h b/src/providers/krb5/krb5_auth.h
index 9f8c4144..e614d5c3 100644
--- a/src/providers/krb5/krb5_auth.h
+++ b/src/providers/krb5/krb5_auth.h
@@ -44,7 +44,6 @@ struct krb5child_req {
int read_from_child_fd;
int write_to_child_fd;
- struct be_req *req;
struct pam_data *pd;
struct krb5_ctx *krb5_ctx;
@@ -99,4 +98,10 @@ struct krb5_ctx {
void krb5_pam_handler(struct be_req *be_req);
+struct tevent_req *krb5_auth_send(TALLOC_CTX *mem_ctx,
+ struct tevent_context *ev,
+ struct be_ctx *be_ctx,
+ struct pam_data *pd,
+ struct krb5_ctx *krb5_ctx);
+int krb5_auth_recv(struct tevent_req *req, int *pam_status, int *dp_err);
#endif /* __KRB5_AUTH_H__ */