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

when using ottca enrollment er->cert is null and segfaults on strlen #680

Merged
merged 3 commits into from
Jul 1, 2024
Merged

when using ottca enrollment er->cert is null and segfaults on strlen #680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cca06ed
when using ottca enrollment er->cert is null and segfaults on strlen
dovholuknf Jun 29, 2024
f64285c
update to use tlsuv for file:/ etc
dovholuknf Jun 28, 2024
89da877
use mac-13
dovholuknf Jul 1, 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
4 changes: 2 additions & 2 deletions .github/workflows/build-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ jobs:
- { name: 'Linux x86_64', runner: 'ubuntu-20.04', target: 'linux-x64', builder: 'openziti/ziti-builder:1.0.7' }
- { name: 'Linux ARM', runner: 'ubuntu-20.04', target: 'linux-arm', builder: 'openziti/ziti-builder:1.0.7' }
- { name: 'Linux ARM64', runner: 'ubuntu-20.04', target: 'linux-arm64', builder: 'openziti/ziti-builder:1.0.7' }
- { name: 'MacOS x86_64', runner: 'macOS-11', target: 'macOS-x64' }
- { name: 'MacOS arm64', runner: 'macOS-11', target: 'macOS-arm64' }
- { name: 'MacOS x86_64', runner: 'macOS-13', target: 'macOS-x64' }
- { name: 'MacOS arm64', runner: 'macOS-13', target: 'macOS-arm64' }
- { name: 'Windows x86_64', runner: 'windows-2022', target: 'windows-x64' }
- { name: 'Windows ARM64', runner: 'windows-2022', target: 'windows-arm64' }

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ jobs:
- { name: 'Linux x86_64', runner: 'ubuntu-20.04', target: 'linux-x64', builder: 'openziti/ziti-builder:1.0.11', test: 'true' }
- { name: 'Linux ARM', runner: 'ubuntu-20.04', target: 'linux-arm', builder: 'openziti/ziti-builder:1.0.11' }
- { name: 'Linux ARM64', runner: 'ubuntu-20.04', target: 'linux-arm64', builder: 'openziti/ziti-builder:1.0.11' }
- { name: 'MacOS x86_64', runner: 'macOS-11', target: 'macOS-x64', test: 'true' }
- { name: 'MacOS arm64', runner: 'macOS-11', target: 'macOS-arm64' }
- { name: 'MacOS x86_64', runner: 'macOS-13', target: 'macOS-x64', test: 'true' }
- { name: 'MacOS arm64', runner: 'macOS-13', target: 'macOS-arm64' }
- { name: 'Windows x86_64', runner: 'windows-2022', target: 'windows-x64', test: 'true' }
- { name: 'Windows ARM64', runner: 'windows-2022', target: 'windows-arm64' }
steps:
Expand Down
7 changes: 5 additions & 2 deletions library/ziti.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,11 @@
if (val != NULL) {
if (strncmp("file:", val, 5) == 0) {
// load file
*res = val + strlen("file://");
len = strlen(*res) + 1;
struct tlsuv_url_s url;
tlsuv_parse_url(&url, val);
size_t start = strlen(val) - strlen(url.path);
*res = url.path;
len = url.path_len;
} else if (strncmp("pem:", val, 4) == 0) {
// load inline PEM
*res = val + 4;
Expand Down Expand Up @@ -212,14 +215,14 @@
ziti_context ctx = NULL;
PREPF(ziti, ziti_errorstr);

if (options->config == NULL) {

Check warning on line 218 in library/ziti.c

View workflow job for this annotation

GitHub Actions / Linux x86_64 

'config' is deprecated: ignored, will be removed [-Wdeprecated-declarations]

Check warning on line 218 in library/ziti.c

View workflow job for this annotation

GitHub Actions / Linux ARM64 

'config' is deprecated: ignored, will be removed [-Wdeprecated-declarations]

Check warning on line 218 in library/ziti.c

View workflow job for this annotation

GitHub Actions / Linux ARM 

'config' is deprecated: ignored, will be removed [-Wdeprecated-declarations]
ZITI_LOG(ERROR, "config or controller/tls has to be set");
return ZITI_INVALID_CONFIG;
}
ctx = calloc(1, sizeof(*ctx));

if (options->config != NULL) {

Check warning on line 224 in library/ziti.c

View workflow job for this annotation

GitHub Actions / Linux x86_64 

'config' is deprecated: ignored, will be removed [-Wdeprecated-declarations]

Check warning on line 224 in library/ziti.c

View workflow job for this annotation

GitHub Actions / Linux ARM64 

'config' is deprecated: ignored, will be removed [-Wdeprecated-declarations]

Check warning on line 224 in library/ziti.c

View workflow job for this annotation

GitHub Actions / Linux ARM 

'config' is deprecated: ignored, will be removed [-Wdeprecated-declarations]
TRY(ziti, ziti_load_config(&ctx->config, options->config));

Check warning on line 225 in library/ziti.c

View workflow job for this annotation

GitHub Actions / Linux ARM64 

'config' is deprecated: ignored, will be removed [-Wdeprecated-declarations]

Check warning on line 225 in library/ziti.c

View workflow job for this annotation

GitHub Actions / Linux ARM 

'config' is deprecated: ignored, will be removed [-Wdeprecated-declarations]
}

if (ctx->config.id.ca && strncmp(ctx->config.id.ca, "file://", strlen("file://")) == 0) {
Expand Down
8 changes: 3 additions & 5 deletions library/ziti_enroll.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,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 107 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 107 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 107 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 107 in library/ziti_enroll.c

View workflow job for this annotation

GitHub Actions / MacOS x86_64 

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

Check warning on line 107 in library/ziti_enroll.c

View workflow job for this annotation

GitHub Actions / MacOS arm64 

assigning to 'char *' from 'const char *' 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 @@ -237,8 +237,7 @@
if (enroll_req->enroll_cb) {
enroll_req->enroll_cb(NULL, ZITI_JWT_INVALID, err->code, enroll_req->external_enroll_ctx);
}
}
else {
} else {
ZITI_LOG(DEBUG, "successfully enrolled with controller %s", ctrl->url);

ziti_config cfg = {0};
Expand All @@ -247,12 +246,11 @@
cfg.id.key = strdup(enroll_req->ecfg->private_key);

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

Expand Down
Loading