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

avoid concurrent api-session requests #553

Merged
merged 4 commits into from
Sep 19, 2023
Merged

avoid concurrent api-session requests #553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
090c6af
avoid launching concurrent /current-api-session requests
ekoby Sep 19, 2023
aa7fef7
clear session key/cert when clearing api-session
ekoby Sep 19, 2023
b799dab
disable using api-session certificates (for now)
ekoby Sep 19, 2023
8897e18
log level
ekoby Sep 19, 2023
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
1 change: 1 addition & 0 deletions inc_internal/zt_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ struct ziti_ctx {
bool enabled;
int ctrl_status;

bool active_session_request;
ziti_api_session *api_session;
uv_timeval64_t api_session_expires_at;
ziti_api_session_state api_session_state;
Expand Down
55 changes: 43 additions & 12 deletions library/ziti.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,20 +129,15 @@ static int parse_getopt(const char *q, const char *opt, char *out, size_t maxout
return ZITI_INVALID_CONFIG;
}

int load_tls(ziti_config *cfg, tls_context **ctx) {
static int init_tls_from_config(tls_context *tls, ziti_config *cfg) {
PREP(ziti);

// load ca from ziti config if present
const char *ca;
size_t ca_len = parse_ref(cfg->id.ca, &ca);
tls_context *tls = default_tls_context(ca, ca_len);
tlsuv_private_key_t pk;

if (cfg->id.key == NULL) {
TRY(ziti, ("TLS key should be provided", ZITI_INVALID_CONFIG));
}
TRY(ziti, cfg->id.key == NULL ? ZITI_INVALID_CONFIG : ZITI_OK);

TRY(ziti, load_key_internal(tls, &pk, cfg->id.key));

tls_cert c = NULL;
if (cfg->id.cert) {
const char *cert;
Expand All @@ -154,11 +149,27 @@ int load_tls(ziti_config *cfg, tls_context **ctx) {
CATCH(ziti) {
return ERR(ziti);
}

*ctx = tls;
return ZITI_OK;
}

int load_tls(ziti_config *cfg, tls_context **ctx) {

// load ca from ziti config if present
const char *ca;
size_t ca_len = parse_ref(cfg->id.ca, &ca);
tls_context *tls = default_tls_context(ca, ca_len);

int rc = init_tls_from_config(tls, cfg);

if (rc == ZITI_OK) {
*ctx = tls;
} else {
tls->free_ctx(tls);
*ctx = NULL;
}
return rc;
}

int ziti_set_client_cert(ziti_context ztx, const char *cert_buf, size_t cert_len, const char *key_buf, size_t key_len) {
tlsuv_private_key_t pk;
tls_cert c;
Expand Down Expand Up @@ -264,6 +275,17 @@ void ziti_set_unauthenticated(ziti_context ztx) {
FREE(ztx->api_session);
ztx->api_session_state = ZitiApiSessionStateUnauthenticated;

if (ztx->sessionKey) {
init_tls_from_config(ztx->tlsCtx, &ztx->config);
if (ztx->sessonCert) {
ztx->tlsCtx->free_cert(&ztx->sessonCert);
ztx->sessonCert = NULL;
}

ztx->sessionKey->free(ztx->sessionKey);
ztx->sessionKey = NULL;
}

ziti_ctrl_clear_api_session(&ztx->controller);
}

Expand Down Expand Up @@ -866,8 +888,13 @@ static void api_session_refresh(uv_timer_t *t) {
if (ztx->api_session_state == ZitiApiSessionStatePartiallyAuthenticated || ztx->api_session_state == ZitiApiSessionStateFullyAuthenticated) {
struct ziti_init_req *req = calloc(1, sizeof(struct ziti_init_req));
req->ztx = ztx;
ZTX_LOG(DEBUG, "api_session_refresh refreshing api session by querying controller");
ziti_ctrl_current_api_session(&ztx->controller, api_session_cb, req);
if (ztx->active_session_request) {
ZTX_LOG(DEBUG, "active refresh request: skipping");
} else {
ztx->active_session_request = true;
ZTX_LOG(DEBUG, "api_session_refresh refreshing api session by querying controller");
ziti_ctrl_current_api_session(&ztx->controller, api_session_cb, req);
}
} else {
ZTX_LOG(DEBUG, "api_session_refresh refreshing api session skipped, waiting for api session state change");
}
Expand Down Expand Up @@ -1443,6 +1470,8 @@ static void session_post_auth_query_cb(ziti_context ztx, int status, void *ctx)
ziti_ctrl_current_api_session(&ztx->controller, update_session_data, ztx);
}

// disable this until we figure out expiration and rolling requirements
#if ENABLE_SESSION_CERTIFICATES
if (ztx->sessionKey == NULL) {
char common_name[128];
snprintf(common_name, sizeof(common_name), "%s-%u-%" PRIu64,
Expand All @@ -1460,6 +1489,7 @@ static void session_post_auth_query_cb(ziti_context ztx, int status, void *ctx)

ziti_ctrl_create_api_certificate(&ztx->controller, ztx->sessionCsr, on_create_cert, ztx);
}
#endif


ziti_services_refresh(ztx, true);
Expand Down Expand Up @@ -1541,6 +1571,7 @@ static void api_session_cb(ziti_api_session *session, const ziti_error *err, voi
struct ziti_init_req *init_req = ctx;
ziti_context ztx = init_req->ztx;
ztx->loop_thread = uv_thread_self();
ztx->active_session_request = false;

int errCode = err ? err->err : ZITI_OK;

Expand Down
Loading