Skip to content

fix: add cookie support for HTTP bearer authentication #949

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

Merged
merged 5 commits into from
Oct 26, 2024
Merged

fix: add cookie support for HTTP bearer authentication #949

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3de9698
fix: add cookie support for HTTP bearer authentication
SeokHoChoi Aug 25, 2024
2df184d
fix: Refine HTTP authentication validation based on code review feedback
SeokHoChoi Oct 18, 2024
3ae1b9a
fix: Revert unintended code style changes made during previous commit
SeokHoChoi Oct 18, 2024
6437aa0
fix: Revert unintended code style changes made during previous commit
SeokHoChoi Oct 18, 2024
122d64c
fix: fix: update validateHttp to handle missing auth headers properly
SeokHoChoi Oct 26, 2024
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
39 changes: 26 additions & 13 deletions src/middlewares/openapi.security.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ export function security(
if (success) {
next();
} else {
const errors = extractErrorsFromResults(results)
throw errors[0]
const errors = extractErrorsFromResults(results);
throw errors[0];
}
} catch (e) {
const message = e?.error?.message || 'unauthorized';
Expand Down Expand Up @@ -232,18 +232,31 @@ class AuthValidator {
const authHeader =
req.headers['authorization'] &&
req.headers['authorization'].toLowerCase();

if (!authHeader) {
throw Error(`Authorization header required`);
}

const authCookie =
req.cookies[scheme.name] || req.signedCookies?.[scheme.name];

const type = scheme.scheme && scheme.scheme.toLowerCase();
if (type === 'bearer' && !authHeader.includes('bearer')) {
throw Error(`Authorization header with scheme 'Bearer' required`);
if (type === 'bearer') {
if (authHeader && !authHeader.includes('bearer')) {
throw Error(`Authorization header with scheme 'Bearer' required`);
}

if (!authHeader && !authCookie) {
if (scheme.in === 'cookie') {
throw Error(`Cookie authentication required`);
} else {
throw Error(`Authorization header required`);
}
}
}

if (type === 'basic' && !authHeader.includes('basic')) {
throw Error(`Authorization header with scheme 'Basic' required`);

if (type === 'basic') {
if (!authHeader) {
throw Error(`Authorization header required`);
}
if (!authHeader.includes('basic')) {
throw Error(`Authorization header with scheme 'Basic' required`);
}
}
}
}
Expand Down Expand Up @@ -276,4 +289,4 @@ class Util {
o.constructor === Object
);
}
}
}
Loading