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

fix(event_listeners): check identity type in VALIDATE_CREDENTIALS #4287

Merged
merged 1 commit into from Nov 28, 2022
Merged

fix(event_listeners): check identity type in VALIDATE_CREDENTIALS #4287

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changes/next-release/bugfix-event-listeners-44cd040f.json
View file
Open in desktop
@@ -0,0 +1,5 @@
{
"type": "bugfix",
"category": "event_listeners",
"description": "differentiate identity type in VALIDATE_CREDENTIALS listener"
}
35 changes: 26 additions & 9 deletions lib/event_listeners.js
View file
Open in desktop
Expand Up @@ -92,16 +92,33 @@ function getIdentityType(req) {

AWS.EventListeners = {
Core: new SequentialExecutor().addNamedListeners(function(add, addAsync) {
addAsync('VALIDATE_CREDENTIALS', 'validate',
function VALIDATE_CREDENTIALS(req, done) {
if (!req.service.api.signatureVersion && !req.service.config.signatureVersion) return done(); // none
req.service.config.getCredentials(function(err) {
if (err) {
req.response.error = AWS.util.error(err,
{code: 'CredentialsError', message: 'Missing credentials in config, if using AWS_CONFIG_FILE, set AWS_SDK_LOAD_CONFIG=1'});
addAsync(
'VALIDATE_CREDENTIALS', 'validate',
function VALIDATE_CREDENTIALS(req, done) {
if (!req.service.api.signatureVersion && !req.service.config.signatureVersion) return done(); // none

var identityType = getIdentityType(req);
if (identityType === 'bearer') {
req.service.config.getToken(function(err) {
if (err) {
req.response.error = AWS.util.error(err, {code: 'TokenError'});
}
done();
});
return;
}
done();
});

req.service.config.getCredentials(function(err) {
if (err) {
req.response.error = AWS.util.error(err,
{
code: 'CredentialsError',
message: 'Missing credentials in config, if using AWS_CONFIG_FILE, set AWS_SDK_LOAD_CONFIG=1'
}
);
}
done();
});
});

add('VALIDATE_REGION', 'validate', function VALIDATE_REGION(req) {
Expand Down