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

fix memory leaks during enrollment #702

Merged
merged 2 commits into from
Aug 8, 2024
Merged

fix memory leaks during enrollment #702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab5200f
fix memory leaks in during enrollment
ekoby Aug 8, 2024
443ab73
prefix keychain key name with `ziti://`
ekoby Aug 8, 2024
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
3 changes: 2 additions & 1 deletion includes/ziti/ziti.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,8 @@ typedef void (*ziti_close_cb)(ziti_connection conn);
* @return #ZITI_OK or corresponding #ZITI_ERRORS
*/
ZITI_FUNC
extern int ziti_enroll(ziti_enroll_opts *opts, uv_loop_t *loop, ziti_enroll_cb enroll_cb, void *enroll_ctx);
extern int ziti_enroll(const ziti_enroll_opts *opts, uv_loop_t *loop,
ziti_enroll_cb enroll_cb, void *enroll_ctx);

/**
* Provide app information to Ziti SDK.
Expand Down
19 changes: 14 additions & 5 deletions library/ziti_enroll.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@
return ZITI_OK;
}

int ziti_enroll(ziti_enroll_opts *opts, uv_loop_t *loop, ziti_enroll_cb enroll_cb, void *enroll_ctx) {
int ziti_enroll(const ziti_enroll_opts *opts, uv_loop_t *loop,
ziti_enroll_cb enroll_cb, void *enroll_ctx) {
uv_timeval64_t start_time;
uv_gettimeofday(&start_time);

Expand All @@ -105,7 +106,7 @@
if (opts->jwt) {
TRY(ziti, load_jwt(opts->jwt, ecfg, &ecfg->zejh, &ecfg->zej));
} else {
ecfg->raw_jwt = opts->jwt_content;

Check warning on line 109 in library/ziti_enroll.c

View workflow job for this annotation

GitHub Actions / Linux ARM64 

assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]

Check warning on line 109 in library/ziti_enroll.c

View workflow job for this annotation

GitHub Actions / Linux ARM 

assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]

Check warning on line 109 in library/ziti_enroll.c

View workflow job for this annotation

GitHub Actions / Linux x86_64 

assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]

Check warning on line 109 in library/ziti_enroll.c

View workflow job for this annotation

GitHub Actions / MacOS x86_64 

assigning to 'char *' from 'const char *const' discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers]

Check warning on line 109 in library/ziti_enroll.c

View workflow job for this annotation

GitHub Actions / MacOS arm64 

assigning to 'char *' from 'const char *const' discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers]
TRY(ziti, load_jwt_content(ecfg, &ecfg->zejh, &ecfg->zej));
}
TRY(ziti, check_cert_required(ecfg));
Expand Down Expand Up @@ -149,12 +150,14 @@
ziti_err = ZITI_PKCS7_ASN1_PARSING_FAILED;
TRY(TLS, enroll_req->ecfg->tls->parse_pkcs7_certs(
&chain, base64_encoded_pkcs7, strlen(base64_encoded_pkcs7)));
free(base64_encoded_pkcs7);

char *ca = NULL;
size_t total_pem_len = 0;

ziti_err = ZITI_INVALID_CONFIG;
TRY(TLS, chain->to_pem(chain, 1, &ca, &total_pem_len));
chain->free(chain);

ZITI_LOG(DEBUG, "CA PEM len = %zd", total_pem_len);
ZITI_LOG(TRACE, "CA PEM:\n%s", ca);
Expand Down Expand Up @@ -182,9 +185,9 @@
tlsuv_parse_url(&url, enroll_req->ecfg->zej->controller);

string_buf_t *keyname_buf = new_string_buf();
string_buf_fmt(keyname_buf, "keychain:%s@%.*s",
string_buf_fmt(keyname_buf, "keychain:ziti://%s@%.*s:%d",
enroll_req->ecfg->zej->subject,
(int)url.hostname_len, url.hostname);
(int)url.hostname_len, url.hostname, url.port);
char *keyname_ref = string_buf_to_string(keyname_buf, NULL);
delete_string_buf(keyname_buf);

Expand Down Expand Up @@ -248,6 +251,7 @@
enroll_req->enroll_cb(NULL, ERR(ziti), err ? err->code : "enroll failed", enroll_req->ecfg->external_enroll_ctx);
}
}
free(enroll_req);
}

static void enroll_cb(ziti_enrollment_resp *er, const ziti_error *err, void *enroll_ctx) {
Expand All @@ -270,20 +274,25 @@
cfg.id.key = strdup(enroll_req->ecfg->private_key);

tlsuv_certificate_t c = NULL;
if (er->cert != NULL && enroll_req->ecfg->tls->load_cert(&c, er->cert, strlen(er->cert)) == 0 &&
if (er->cert != NULL &&
enroll_req->ecfg->pk->store_certificate != NULL &&
enroll_req->ecfg->tls->load_cert(&c, er->cert, strlen(er->cert)) == 0 &&
enroll_req->ecfg->pk->store_certificate(enroll_req->ecfg->pk, c) == 0) {
ZITI_LOG(INFO, "stored certificate to PKCS#11 token");
} else {
cfg.id.cert = er->cert ? strdup(er->cert) : strdup(enroll_req->ecfg->own_cert);
}

if (c != NULL) {
c->free(c);
}

if (enroll_req->enroll_cb) {
enroll_req->enroll_cb(&cfg, ZITI_OK, NULL, enroll_req->external_enroll_ctx);
}

free_ziti_config(&cfg);
}

free_ziti_enrollment_resp_ptr(er);
FREE(enroll_req);
}
3 changes: 2 additions & 1 deletion programs/sample_enroll/sample_enroll.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ int main(int argc, char **argv) {
}

Ziti_lib_init();
char *cfg;
char *cfg = NULL;
size_t len;
int rc = Ziti_enroll_identity(jwt, key, cert, &cfg, &len);
if (rc == ZITI_OK) {
Expand All @@ -140,5 +140,6 @@ int main(int argc, char **argv) {
} else {
printf("err = %d(%s)\n", rc, ziti_errorstr(rc));
}
free(cfg);
Ziti_lib_shutdown();
}
Loading