Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Passkey: Add child timeout handler #6893

Closed
wants to merge 1 commit into from
Closed

Passkey: Add child timeout handler #6893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions src/responder/pam/pamsrv_passkey.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,6 +701,7 @@ void pam_passkey_get_user_done(struct tevent_req *req)
struct pam_passkey_auth_send_state {
struct pam_data *pd;
struct tevent_context *ev;
struct tevent_timer *timeout_handler;
struct sss_child_ctx_old *child_ctx;
struct child_io_fds *io;
const char *logfile;
Expand Down Expand Up @@ -993,6 +994,24 @@ pam_passkey_auth_send(TALLOC_CTX *mem_ctx,
return req;
}

static void
passkey_child_timeout(struct tevent_context *ev,
struct tevent_timer *te,
struct timeval tv, void *pvt)
{
struct tevent_req *req =
talloc_get_type(pvt, struct tevent_req);
struct pam_passkey_auth_send_state *state =
tevent_req_data(req, struct pam_passkey_auth_send_state);

DEBUG(SSSDBG_CRIT_FAILURE, "Timeout reached for passkey child, "
"consider increasing passkey_child_timeout\n");
child_handler_destroy(state->child_ctx);
state->child_ctx = NULL;
state->child_status = ETIMEDOUT;
tevent_req_error(req, ERR_PASSKEY_CHILD_TIMEOUT);
}

static errno_t passkey_child_exec(struct tevent_req *req)
{
struct pam_passkey_auth_send_state *state;
Expand All @@ -1003,7 +1022,6 @@ static errno_t passkey_child_exec(struct tevent_req *req)
uint8_t *write_buf = NULL;
size_t write_buf_len = 0;
struct timeval tv;
bool endtime;
int ret;

state = tevent_req_data(req, struct pam_passkey_auth_send_state);
Expand Down Expand Up @@ -1043,7 +1061,7 @@ static errno_t passkey_child_exec(struct tevent_req *req)

/* Set up SIGCHLD handler */
if (state->kerberos_pa) {
ret = child_handler_setup(state->ev, child_pid, NULL, NULL, NULL);
ret = child_handler_setup(state->ev, child_pid, NULL, req, &state->child_ctx);
} else {
ret = child_handler_setup(state->ev, child_pid,
pam_passkey_auth_done, req,
Expand All @@ -1059,8 +1077,9 @@ static errno_t passkey_child_exec(struct tevent_req *req)

/* Set up timeout handler */
tv = tevent_timeval_current_ofs(state->timeout, 0);
endtime = tevent_req_set_endtime(req, state->ev, tv);
if (endtime == false) {
state->timeout_handler = tevent_add_timer(state->ev, req, tv,
passkey_child_timeout, req);
if (state->timeout_handler == NULL) {
ret = ERR_PASSKEY_CHILD;
goto done;
}
Expand Down
1 change: 1 addition & 0 deletions src/util/util_errors.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ struct err_string error_to_str[] = {
{ "p11_child timeout" }, /* ERR_P11_CHILD_TIMEOUT */
{ "PIN locked" }, /* ERR_P11_PIN_LOCKED */
{ "passkey_child failed" }, /* ERR_PASSKEY_CHILD */
{ "passkey_child timeout" }, /* ERR_PASSKEY_CHILD_TIMEOUT */
{ "Address family not supported" }, /* ERR_ADDR_FAMILY_NOT_SUPPORTED */
{ "Message sender is the bus" }, /* ERR_SBUS_SENDER_BUS */
{ "Subdomain is inactive" }, /* ERR_SUBDOM_INACTIVE */
Expand Down
1 change: 1 addition & 0 deletions src/util/util_errors.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ enum sssd_errors {
ERR_P11_CHILD_TIMEOUT,
ERR_P11_PIN_LOCKED,
ERR_PASSKEY_CHILD,
ERR_PASSKEY_CHILD_TIMEOUT,
ERR_ADDR_FAMILY_NOT_SUPPORTED,
ERR_SBUS_SENDER_BUS,
ERR_SUBDOM_INACTIVE,
Expand Down
Loading