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

fix internal OIDC path handling. #816

Merged
merged 1 commit into from
Jan 28, 2025
Merged

fix internal OIDC path handling. #816

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
2 changes: 1 addition & 1 deletion deps/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if (NOT TARGET tlsuv)
else ()
FetchContent_Declare(tlsuv
GIT_REPOSITORY https://github.com/openziti/tlsuv.git
GIT_TAG v0.33.4
GIT_TAG v0.33.5
)
FetchContent_MakeAvailable(tlsuv)
endif (tlsuv_DIR)
Expand Down
5 changes: 4 additions & 1 deletion library/ha_auth.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,18 @@ ziti_auth_method_t *new_ha_auth(uv_loop_t *l, model_list* urls, tls_context *tls
.name = "ziti-internal-oidc",
.enabled = true,
.provider_url = (char*) model_list_head(&auth->urls),
.target_token = ziti_target_token_access_token,
};

model_list_append(&auth->config.scopes, "offline_access");

oidc_client_init(l, &auth->oidc, &auth->config, tls);
return &auth->api;
}

static void close_cb(oidc_client_t *oidc) {
struct ha_auth_s *auth = HA_AUTH_FROM_OIDC(oidc);
model_list_clear(&auth->urls, free);
model_list_clear(&auth->config.scopes, NULL);
free(auth);
}

Expand Down
5 changes: 3 additions & 2 deletions library/oidc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ static void login_cb(tlsuv_http_resp_t *http_resp, void *ctx) {
const char *redirect = tlsuv_http_resp_header(http_resp, "Location");
struct tlsuv_url_s uri;
tlsuv_parse_url(&uri, redirect);

tlsuv_http_set_path_prefix(&req->clt->http, NULL);
tlsuv_http_req(&req->clt->http, "GET", uri.path, code_cb, req);
} else {
failed_auth_req(req, http_resp->status);
Expand All @@ -474,7 +474,8 @@ static void auth_cb(tlsuv_http_resp_t *http_resp, void *ctx) {
path = "/oidc/login/cert";
}
ZITI_LOG(DEBUG, "login with path[%s] ", path);
tlsuv_http_req_t *login_req = tlsuv_http_req(&req->clt->http, "POST", path, login_cb, req);
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);
if (req->clt->jwt_token_auth) {
tlsuv_http_req_header(login_req, "Authorization", req->clt->jwt_token_auth);
}
Expand Down
18 changes: 11 additions & 7 deletions library/ziti.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,21 +326,25 @@

bool changed = false;
for (int i = 0; ctrls[i] != NULL; i++) {
const ziti_controller_detail *detail = ctrls[i];
const api_address *api = model_list_head(&detail->apis.edge);
ZTX_LOG(INFO, "controller[%s/%s] url[%s]", detail->name, detail->id, FIELD_OR_ELSE(api, url, "<unset>"));
ziti_controller_detail *detail = ctrls[i];
const api_address *edge_api = model_list_head(&detail->apis.edge);

model_map_set(&ztx->ctrl_details, detail->id, detail);
if (edge_api && edge_api->url) {
ZTX_LOG(INFO, "controller[%s/%s] url[%s]", detail->name, detail->id, edge_api->url);

if (api->url) {
char *old_url = model_map_remove(&diff, api->url);
model_map_set(&ztx->ctrl_details, detail->id, detail);

char *old_url = model_map_remove(&diff, edge_api->url);
if (old_url == NULL) {
changed = true;
} else {
free(old_url);
}

model_list_append(&ztx->config.controllers, strdup(api->url));
model_list_append(&ztx->config.controllers, strdup(edge_api->url));
} else {
ZTX_LOG(INFO, "controller[%s/%s]: no Edge API", detail->name, detail->id);
free_ziti_controller_detail_ptr(detail);
}
}
changed = changed || (model_map_size(&diff) > 0);
Expand Down Expand Up @@ -1710,7 +1714,7 @@
id_it = model_list_it_remove(id_it);
}

MODEL_MAP_FOREACH(conn_id, conn, &ztx->connections) {

Check warning on line 1717 in library/ziti.c

View workflow job for this annotation

GitHub Actions / MacOS arm64 

comparison between pointer and integer ('uint32_t' (aka 'unsigned int') and 'void *') [-Wpointer-integer-compare]

Check warning on line 1717 in library/ziti.c

View workflow job for this annotation

GitHub Actions / MacOS x86_64 

comparison between pointer and integer ('uint32_t' (aka 'unsigned int') and 'void *') [-Wpointer-integer-compare]
if (conn->type == Server) {
update_bindings(conn);
}
Expand Down
Loading