Skip to content

aws: catch auth errors on XML responses #11891

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

Open
antoniomrfranco wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −10
Open

aws: catch auth errors on XML responses #11891

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
23 changes: 13 additions & 10 deletions src/aws/flb_aws_util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,16 +346,16 @@ int flb_aws_is_auth_error(char *payload, size_t payload_size)
return FLB_FALSE;
}

/* Fluent Bit calls the STS API which returns XML */
if (strcasestr(payload, "InvalidClientTokenId") != NULL) {
return FLB_TRUE;
}

if (strcasestr(payload, "AccessDenied") != NULL) {
return FLB_TRUE;
}

if (strcasestr(payload, "Expired") != NULL) {
/* STS, S3, and other AWS APIs return XML error responses */
if (strcasestr(payload, "InvalidClientTokenId") != NULL ||
strcasestr(payload, "AccessDenied") != NULL ||
strcasestr(payload, "Expired") != NULL ||
strcasestr(payload, "InvalidAccessKeyId") != NULL ||
strcasestr(payload, "SignatureDoesNotMatch") != NULL ||
strcasestr(payload, "InvalidToken") != NULL ||
strcasestr(payload, "InvalidSecurity") != NULL ||
strcasestr(payload, "TokenRefreshRequired") != NULL ||
strcasestr(payload, "InvalidSignature") != NULL) {
return FLB_TRUE;
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.

Expand All @@ -372,6 +372,9 @@ int flb_aws_is_auth_error(char *payload, size_t payload_size)
strcmp(error, "InvalidClientTokenId") == 0 ||
strcmp(error, "InvalidToken") == 0 ||
strcmp(error, "InvalidAccessKeyId") == 0 ||
strcmp(error, "InvalidSecurity") == 0 ||
strcmp(error, "TokenRefreshRequired") == 0 ||
strcmp(error, "InvalidSignature") == 0 ||
strcmp(error, "UnrecognizedClientException") == 0) {
flb_sds_destroy(error);
return FLB_TRUE;
Expand Down