Skip to content

Commit 9bc754f

Browse files
authored
Merge pull request #1892 from leandroluk/fix/v13-authorizer-override-ignored-when-noauth
fix: keep authorizer override when noAuth is true (v13)
2 parents cd8ea35 + b05840e commit 9bc754f

2 files changed

Lines changed: 23 additions & 3 deletions

File tree

src/events/http/HttpServer.js

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Buffer } from "node:buffer"
22
import { readFile } from "node:fs/promises"
33
import { createRequire } from "node:module"
44
import { join, resolve } from "node:path"
5-
import { exit } from "node:process"
5+
import { exit, env } from "node:process"
66
import h2o2 from "@hapi/h2o2"
77
import { Server } from "@hapi/hapi"
88
import { log } from "../../utils/log.js"
@@ -613,7 +613,27 @@ export default class HttpServer {
613613
const hasCustomAuthProvider =
614614
customizations?.offline?.customAuthenticationProvider
615615

616-
if (!endpoint.authorizer && !hasCustomAuthProvider) {
616+
const authorizerOverrideHeader =
617+
request.headers["sls-offline-authorizer-override"]
618+
const authorizerOverrideEnv = env.AUTHORIZER
619+
const hasAuthorizerOverride = [
620+
authorizerOverrideHeader,
621+
authorizerOverrideEnv,
622+
].some((value) => {
623+
if (!value) return false
624+
try {
625+
parse(value)
626+
return true
627+
} catch {
628+
return false
629+
}
630+
})
631+
632+
if (
633+
!endpoint.authorizer &&
634+
!hasCustomAuthProvider &&
635+
!hasAuthorizerOverride
636+
) {
617637
log.debug("no authorizer configured, deleting authorizer payload")
618638
delete event.requestContext.authorizer
619639
}

tests/integration/override-authorizer/override-authorizer.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ describe("override authorizer tests", function desc() {
3434
})
3535

3636
afterEach(async () => {
37-
env.AUTHORIZER = undefined
37+
delete env.AUTHORIZER
3838
await teardown()
3939
})
4040

0 commit comments

Comments
 (0)