Skip to content

fix: OIDC auth with MFA #873

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

Merged
ekoby merged 2 commits into from
May 22, 2025
Merged

fix: OIDC auth with MFA #873

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb51dd4
fix: OIDC auth with MFA
ekoby May 22, 2025
a442340
Merge branch 'main' into ha.mfa
ekoby May 22, 2025
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
6 changes: 3 additions & 3 deletions library/oidc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,8 +477,8 @@
path = "/oidc/login/cert";
}
ZITI_LOG(DEBUG, "login with path[%s] ", path);
tlsuv_http_set_path_prefix(&req->clt->http, path);
tlsuv_http_req_t *login_req = tlsuv_http_req(&req->clt->http, "POST", NULL, login_cb, req);
tlsuv_http_set_path_prefix(&req->clt->http, NULL);
tlsuv_http_req_t *login_req = tlsuv_http_req(&req->clt->http, "POST", path, login_cb, req);
if (req->clt->jwt_token_auth) {
tlsuv_http_req_header(login_req, "Authorization", req->clt->jwt_token_auth);
}
Expand Down Expand Up @@ -609,8 +609,8 @@
send(clt, resp, sizeof(resp), 0);
send(clt, buf, c, 0);
#else
write(clt, resp, sizeof(resp));

Check warning on line 612 in library/oidc.c

View workflow job for this annotation

GitHub Actions / Linux ARM64 

ignoring return value of 'write', declared with attribute warn_unused_result [-Wunused-result]

Check warning on line 612 in library/oidc.c

View workflow job for this annotation

GitHub Actions / Linux x86_64 

ignoring return value of 'write', declared with attribute warn_unused_result [-Wunused-result]
write(clt, buf, c);

Check warning on line 613 in library/oidc.c

View workflow job for this annotation

GitHub Actions / Linux ARM64 

ignoring return value of 'write', declared with attribute warn_unused_result [-Wunused-result]

Check warning on line 613 in library/oidc.c

View workflow job for this annotation

GitHub Actions / Linux x86_64 

ignoring return value of 'write', declared with attribute warn_unused_result [-Wunused-result]
#endif
close_socket(clt);
return;
Expand Down Expand Up @@ -844,7 +844,7 @@
int oidc_client_mfa(oidc_client_t *clt, const char *code) {
struct auth_req *req = clt->request;
assert(req);

tlsuv_http_set_path_prefix(&clt->http, NULL);
tlsuv_http_req_t *r = tlsuv_http_req(&clt->http, "POST", "/oidc/login/totp", on_totp, req);
tlsuv_http_req_form(r, 2, (tlsuv_http_pair[]){
{"id", req->id},
Expand Down
Loading