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

check resp->body before copying #647

Merged
merged 1 commit into from
May 14, 2024
Merged

check resp->body before copying #647

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
4 changes: 4 additions & 0 deletions library/ziti_ctrl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,10 @@
if (resp->resp_chunked) {
resp->body = realloc(resp->body, resp->received + len);
}
if (!resp->body) {
ZITI_LOG(WARN, "could not process controller response: %zd bytes not allocated for body", len);
return;
}
memcpy(resp->body + resp->received, b, len);
resp->received += len;
}
Expand Down Expand Up @@ -509,8 +513,8 @@
CTRL_LOG(WARN, "no API session");
ziti_error err = {
.err = ZITI_AUTHENTICATION_FAILED,
.code = ERROR_CODE_UNAUTHORIZED,

Check warning on line 516 in library/ziti_ctrl.c

View workflow job for this annotation

GitHub Actions / Linux x86_64 

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

Check warning on line 516 in library/ziti_ctrl.c

View workflow job for this annotation

GitHub Actions / Linux ARM 

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

Check warning on line 516 in library/ziti_ctrl.c

View workflow job for this annotation

GitHub Actions / Linux ARM64 

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

Check warning on line 516 in library/ziti_ctrl.c

View workflow job for this annotation

GitHub Actions / MacOS x86_64 

initializing 'string' (aka 'char *') with an expression of type 'const char *const' discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers]

Check warning on line 516 in library/ziti_ctrl.c

View workflow job for this annotation

GitHub Actions / MacOS arm64 

initializing 'string' (aka 'char *') with an expression of type 'const char *const' discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers]
.message = ERROR_MSG_NO_API_SESSION_TOKEN,

Check warning on line 517 in library/ziti_ctrl.c

View workflow job for this annotation

GitHub Actions / Linux x86_64 

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

Check warning on line 517 in library/ziti_ctrl.c

View workflow job for this annotation

GitHub Actions / Linux ARM 

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

Check warning on line 517 in library/ziti_ctrl.c

View workflow job for this annotation

GitHub Actions / Linux ARM64 

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

Check warning on line 517 in library/ziti_ctrl.c

View workflow job for this annotation

GitHub Actions / MacOS x86_64 

initializing 'string' (aka 'char *') with an expression of type 'const char *const' discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers]

Check warning on line 517 in library/ziti_ctrl.c

View workflow job for this annotation

GitHub Actions / MacOS arm64 

initializing 'string' (aka 'char *') with an expression of type 'const char *const' discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers]
};
cb(NULL, &err, ctx);
return false;
Expand Down Expand Up @@ -674,7 +678,7 @@
} else {
tlsuv_http_req_header(req, "Content-Type", "application/json");
if (name != NULL) {
ziti_identity id = {.name = name};

Check warning on line 681 in library/ziti_ctrl.c

View workflow job for this annotation

GitHub Actions / Linux x86_64 

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

Check warning on line 681 in library/ziti_ctrl.c

View workflow job for this annotation

GitHub Actions / Linux ARM 

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

Check warning on line 681 in library/ziti_ctrl.c

View workflow job for this annotation

GitHub Actions / Linux ARM64 

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

Check warning on line 681 in library/ziti_ctrl.c

View workflow job for this annotation

GitHub Actions / MacOS x86_64 

initializing 'string' (aka 'char *') with an expression of type 'const char *' discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers]

Check warning on line 681 in library/ziti_ctrl.c

View workflow job for this annotation

GitHub Actions / MacOS arm64 

initializing 'string' (aka 'char *') with an expression of type 'const char *' discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers]
size_t body_len;
char *body = ziti_identity_to_json(&id, MODEL_JSON_COMPACT, &body_len);
tlsuv_http_req_data(req, body, body_len, free_body_cb);
Expand Down Expand Up @@ -805,7 +809,7 @@
snprintf(path, sizeof(path), "/current-identity/authenticators/%s/extend", authenticatorId);

ziti_extend_cert_authenticator_req extend_req;
extend_req.client_cert_csr = csr;

Check warning on line 812 in library/ziti_ctrl.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 812 in library/ziti_ctrl.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 812 in library/ziti_ctrl.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 812 in library/ziti_ctrl.c

View workflow job for this annotation

GitHub Actions / MacOS x86_64 

assigning to 'string' (aka 'char *') from 'const char *' discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers]

Check warning on line 812 in library/ziti_ctrl.c

View workflow job for this annotation

GitHub Actions / MacOS arm64 

assigning to 'string' (aka 'char *') from 'const char *' discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers]

size_t body_len;
char *body = ziti_extend_cert_authenticator_req_to_json(&extend_req, 0, &body_len);
Expand All @@ -824,7 +828,7 @@
snprintf(path, sizeof(path), "/current-identity/authenticators/%s/extend-verify", authenticatorId);

ziti_verify_extend_cert_authenticator_req verify_req;
verify_req.client_cert = client_cert;

Check warning on line 831 in library/ziti_ctrl.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 831 in library/ziti_ctrl.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 831 in library/ziti_ctrl.c

View workflow job for this annotation

GitHub Actions / MacOS x86_64 

assigning to 'string' (aka 'char *') from 'const char *' discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers]

Check warning on line 831 in library/ziti_ctrl.c

View workflow job for this annotation

GitHub Actions / MacOS arm64 

assigning to 'string' (aka 'char *') from 'const char *' discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers]

size_t body_len;
char *body = ziti_verify_extend_cert_authenticator_req_to_json(&verify_req, 0, &body_len);
Expand Down
Loading