Skip to content

uri_signing: address memory leak with the internal jwt struct #8229

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

Merged
traeak merged 1 commit into from
Aug 18, 2021
Merged

uri_signing: address memory leak with the internal jwt struct #8229

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
3 changes: 2 additions & 1 deletion plugins/experimental/uri_signing/jwt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ parse_jwt(json_t *raw)
}

struct jwt *jwt = malloc(sizeof *jwt);
jwt->raw = raw;
jwt->iss = json_string_value(json_object_get(raw, "iss"));
jwt->sub = json_string_value(json_object_get(raw, "sub"));
jwt->aud = json_object_get(raw, "aud");
Expand All @@ -76,7 +77,7 @@ jwt_delete(struct jwt *jwt)
return;
}

json_decref(jwt->aud);
json_decref(jwt->raw);
free(jwt);
}

Expand Down
1 change: 1 addition & 0 deletions plugins/experimental/uri_signing/jwt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <jansson.h>

struct jwt {
json_t *raw;
const char *iss;
const char *sub;
json_t *aud;
Expand Down
18 changes: 12 additions & 6 deletions plugins/experimental/uri_signing/parse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ validate_jws(cjose_jws_t *jws, struct config *cfg, const char *uri, size_t uri_c
cjose_err cerr;
memset(&cerr, 0, sizeof(cjose_err));
size_t pt_ct;
const char *pt;
char const *pt;
if (!cjose_jws_get_plaintext(jws, (uint8_t **)&pt, &pt_ct, &cerr)) {
PluginDebug("Cannot get plaintext for %16p", jws);
return false;
Expand All @@ -175,14 +175,20 @@ validate_jws(cjose_jws_t *jws, struct config *cfg, const char *uri, size_t uri_c

json_error_t jerr;
memset(&jerr, 0, sizeof(json_error_t));
struct jwt *jwt = parse_jwt(json_loadb(pt, pt_ct, 0, &jerr));
TimerDebug("parsing jwt");
if (!jwt) {
json_t *const jwk_json = json_loadb(pt, pt_ct, 0, &jerr);
if (!jwk_json) {
if (jerr.text[0]) {
PluginDebug("Cannot parse json for %16p: %.*s '%s'", jws, (int)pt_ct, pt, jerr.text);
PluginDebug("Cannot load json for %16p: %.*s '%s'", jws, (int)pt_ct, pt, jerr.text);
} else {
PluginDebug("Cannot parse jwt for %16p: %.*s", jws, (int)pt_ct, pt);
PluginDebug("Cannot load json for %16p: %.*s", jws, (int)pt_ct, pt);
}
return false;
}
struct jwt *jwt = parse_jwt(jwk_json);

TimerDebug("parsing jwt");
if (!jwt) {
json_decref(jwk_json);
return NULL;
}

Expand Down
37 changes: 16 additions & 21 deletions plugins/experimental/uri_signing/unit_tests/uri_signing_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,16 +144,20 @@ jwt_parsing_helper(const char *jwt_string)
{
fprintf(stderr, "Parsing JWT from string: %s\n", jwt_string);
bool resp;
json_error_t jerr = {};
size_t pt_ct = strlen(jwt_string);
struct jwt *jwt = parse_jwt(json_loadb(jwt_string, pt_ct, 0, &jerr));
json_error_t jerr = {};
size_t pt_ct = strlen(jwt_string);
struct json_t *const jwk_json = json_loadb(jwt_string, pt_ct, 0, &jerr);
if (!jwk_json) {
return false;
}

if (jwt) {
resp = jwt_validate(jwt);
} else {
resp = false;
struct jwt *jwt = parse_jwt(jwk_json);
if (!jwt) {
json_decref(jwk_json);
return false;
}

resp = jwt_validate(jwt);
jwt_delete(jwt);
return resp;
}
Expand Down Expand Up @@ -601,7 +605,6 @@ TEST_CASE("6", "[AudTests]")
json_t *raw = json_loads("{\"aud\": \"tester\"}", 0, err);
json_t *aud = json_object_get(raw, "aud");
REQUIRE(jwt_check_aud(aud, "tester"));
json_decref(aud);
json_decref(raw);
}

Expand All @@ -610,7 +613,6 @@ TEST_CASE("6", "[AudTests]")
json_t *raw = json_loads("{\"aud\": [ \"foo\", \"bar\", \"tester\"]}", 0, err);
json_t *aud = json_object_get(raw, "aud");
REQUIRE(jwt_check_aud(aud, "tester"));
json_decref(aud);
json_decref(raw);
}

Expand All @@ -619,7 +621,6 @@ TEST_CASE("6", "[AudTests]")
json_t *raw = json_loads("{\"aud\": \"foo\"}", 0, err);
json_t *aud = json_object_get(raw, "aud");
REQUIRE(!jwt_check_aud(aud, "tester"));
json_decref(aud);
json_decref(raw);
}

Expand All @@ -628,7 +629,6 @@ TEST_CASE("6", "[AudTests]")
json_t *raw = json_loads("{\"aud\": [\"foo\", \"bar\", \"foobar\"]}", 0, err);
json_t *aud = json_object_get(raw, "aud");
REQUIRE(!jwt_check_aud(aud, "tester"));
json_decref(aud);
json_decref(raw);
}

Expand All @@ -637,7 +637,6 @@ TEST_CASE("6", "[AudTests]")
json_t *raw = json_loads("{\"aud\": 1}", 0, err);
json_t *aud = json_object_get(raw, "aud");
REQUIRE(!jwt_check_aud(aud, "tester"));
json_decref(aud);
json_decref(raw);
}

Expand All @@ -646,7 +645,6 @@ TEST_CASE("6", "[AudTests]")
json_t *raw = json_loads("{\"aud\": [1, \"foo\", \"bar\", \"tester\"]}", 0, err);
json_t *aud = json_object_get(raw, "aud");
REQUIRE(jwt_check_aud(aud, "tester"));
json_decref(aud);
json_decref(raw);
}

Expand All @@ -655,7 +653,6 @@ TEST_CASE("6", "[AudTests]")
json_t *raw = json_loads("{\"aud\": \"TESTer\"}", 0, err);
json_t *aud = json_object_get(raw, "aud");
REQUIRE(!jwt_check_aud(aud, "tester"));
json_decref(aud);
json_decref(raw);
}

Expand All @@ -664,7 +661,6 @@ TEST_CASE("6", "[AudTests]")
json_t *raw = json_loads("{\"aud\": [1, \"foo\", \"bar\", \"Tester\"]}", 0, err);
json_t *aud = json_object_get(raw, "aud");
REQUIRE(!jwt_check_aud(aud, "tester"));
json_decref(aud);
json_decref(raw);
}

Expand Down Expand Up @@ -700,13 +696,12 @@ jws_validation_helper(const char *url, const char *package, struct config *cfg)
return false;
}
struct jwt *jwt = validate_jws(jws, cfg, uri_strip, strip_ct);
if (jwt) {
jwt_delete(jwt);
cjose_jws_release(jws);
return true;
}
cjose_jws_release(jws);
return false;
if (!jwt) {
return false;
}
jwt_delete(jwt);
return true;
}

TEST_CASE("8", "[TestsWithConfig]")
Expand Down