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

Support Empty Identity Source for Request Lambda Authorisers #1720

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Support Empty Identity Source for Request Lambda Authorisers #1720

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
74e7651
add empty identity sources for request authorisers
aidant Aug 11, 2023
b83a333
Merge remote-tracking branch 'upstream/master'
aidant Nov 21, 2023
56f233f
fix formatting from editor
aidant Nov 21, 2023
a032cae
fix bad bracket from merge conflict
aidant Nov 21, 2023
27c62d4
change identity source to none from null
aidant Nov 21, 2023
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
28 changes: 16 additions & 12 deletions src/events/http/createAuthScheme.js
View file
Open in desktop
Expand Up @@ -71,13 +71,12 @@ export default function createAuthScheme(authorizerOptions, provider, lambda) {
} else if (identitySourceType === IDENTITY_SOURCE_TYPE_QUERYSTRING) {
const queryStringParameters = parseQueryStringParameters(url) ?? {}
authorization = queryStringParameters[identitySourceField]
} else {
throw new Error(
`No Authorization source has been specified. This should never happen. (λ: ${authFunName})`,
)
}

if (authorization === undefined) {
if (
authorization === undefined &&
authorizerOptions.type !== 'request'
) {
log.error(
`Identity Source is null for ${identitySourceType} ${identitySourceField} (λ: ${authFunName})`,
)
Expand Down Expand Up @@ -266,10 +265,13 @@ export default function createAuthScheme(authorizerOptions, provider, lambda) {
return identitySourceMatch[expectedLength - 1]
}

if (
authorizerOptions.type !== 'request' ||
authorizerOptions.identitySource
) {
if (authorizerOptions.identitySource === '') {
identitySourceField = null
identitySourceType = null
return finalizeAuthScheme()
}

if (authorizerOptions.identitySource) {
const headerRegExp = /^(method.|\$)request.header.((?:\w+-?)+\w+)$/
const queryStringRegExp =
/^(method.|\$)request.querystring.((?:\w+-?)+\w+)$/
Expand All @@ -291,9 +293,11 @@ export default function createAuthScheme(authorizerOptions, provider, lambda) {
return finalizeAuthScheme()
}

throw new Error(
`Serverless Offline only supports retrieving tokens from headers and querystring parameters (λ: ${authFunName})`,
)
if (authorizerOptions.type !== 'request') {
throw new Error(
`Serverless Offline only supports retrieving tokens from headers and querystring parameters (λ: ${authFunName})`,
)
}
}

return finalizeAuthScheme()
Expand Down