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

bump oidc callback buffer, log access token content #809

Merged
merged 1 commit into from
Jan 15, 2025
Merged

bump oidc callback buffer, log access token content #809

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
1 change: 1 addition & 0 deletions inc_internal/oidc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ extern "C" {
#define OIDC_TOKEN_OK (0)
#define OIDC_TOTP_NEEDED (1)
#define OIDC_TOTP_FAILED (2)
#define OIDC_TOKEN_FAILED (3)

typedef struct oidc_client_s oidc_client_t;
typedef void (*oidc_config_cb)(oidc_client_t *, int, const char *);
Expand Down
28 changes: 26 additions & 2 deletions library/oidc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ static void ext_accept(uv_work_t *wr) {
return;
}

char buf[1024];
char buf[4096];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some tokens are bigger than others... :)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this does not get receive token

ssize_t c;
#if _WIN32
c = recv(clt, buf, sizeof(buf) -1, 0);
Expand Down Expand Up @@ -816,6 +816,25 @@ int oidc_client_close(oidc_client_t *clt, oidc_close_cb cb) {
return 0;
}

static const char *jwt_payload(const char *jwt) {
static uint8_t payload[4096];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

imo, seems like it would be better to pass the length or use a #define ?

size_t payload_len;
jwt = strchr(jwt, '.');
if (jwt == NULL) {
ZITI_LOG(ERROR, "invalid JWT provided");
return "<invalid JWT>";
}

jwt++;
const char *end;
if (sodium_base642bin(payload, sizeof(payload), jwt, strlen(jwt), NULL,
&payload_len, &end, sodium_base64_VARIANT_URLSAFE_NO_PADDING) == 0) {
payload[payload_len] = '\0';
return (const char*)payload;
}
return "<JWT too long?>";
}

static void oidc_client_set_tokens(oidc_client_t *clt, json_object *tok_json) {
if (clt->tokens) {
json_object_put(clt->tokens);
Expand All @@ -825,7 +844,12 @@ static void oidc_client_set_tokens(oidc_client_t *clt, json_object *tok_json) {
if (clt->token_cb) {
struct json_object *access_token = json_object_object_get(clt->tokens, "access_token");
if (access_token) {
clt->token_cb(clt, OIDC_TOKEN_OK, json_object_get_string(access_token));
const char *token = json_object_get_string(access_token);
ZITI_LOG(DEBUG, "access_token=%s", jwt_payload(token));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this will be really useful to debug! thx

clt->token_cb(clt, OIDC_TOKEN_OK, token);
} else {
ZITI_LOG(ERROR, "access_token was not provided by IdP");
clt->token_cb(clt, OIDC_TOKEN_FAILED, NULL);
}
}
struct json_object *refresher = json_object_object_get(clt->tokens, "refresh_token");
Expand Down
Loading