password fix
This commit is contained in:
@ -1,20 +1,61 @@
|
|||||||
import { NextResponse } from 'next/server';
|
import { NextResponse } from 'next/server';
|
||||||
|
|
||||||
|
function getValidUsers() {
|
||||||
|
const users = {};
|
||||||
|
|
||||||
|
// Support multiple users format: "user1:pass1,user2:pass2"
|
||||||
|
if (process.env.BASIC_AUTH_USERS) {
|
||||||
|
const pairs = process.env.BASIC_AUTH_USERS.split(',');
|
||||||
|
for (const pair of pairs) {
|
||||||
|
const trimmed = pair.trim();
|
||||||
|
if (!trimmed) continue;
|
||||||
|
// Split on first colon
|
||||||
|
const colonIdx = trimmed.indexOf(':');
|
||||||
|
if (colonIdx !== -1) {
|
||||||
|
const username = trimmed.slice(0, colonIdx).trim().toLowerCase();
|
||||||
|
const password = trimmed.slice(colonIdx + 1).trim();
|
||||||
|
if (username && password) {
|
||||||
|
users[username] = password;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fallback / Single user format: BASIC_AUTH_USER and BASIC_AUTH_PASSWORD
|
||||||
|
if (process.env.BASIC_AUTH_USER && process.env.BASIC_AUTH_PASSWORD) {
|
||||||
|
const username = process.env.BASIC_AUTH_USER.trim().toLowerCase();
|
||||||
|
const password = process.env.BASIC_AUTH_PASSWORD.trim();
|
||||||
|
if (username && password) {
|
||||||
|
users[username] = password;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return users;
|
||||||
|
}
|
||||||
|
|
||||||
export function middleware(req) {
|
export function middleware(req) {
|
||||||
const basicAuth = req.headers.get('authorization');
|
const basicAuth = req.headers.get('authorization');
|
||||||
const url = req.nextUrl;
|
const validUsers = getValidUsers();
|
||||||
|
|
||||||
// Read credentials from environment variables
|
// If any credentials are configured in ENV, enforce auth
|
||||||
const user = process.env.BASIC_AUTH_USER;
|
if (Object.keys(validUsers).length > 0) {
|
||||||
const pwd = process.env.BASIC_AUTH_PASSWORD;
|
|
||||||
|
|
||||||
if (user && pwd) {
|
|
||||||
if (basicAuth) {
|
if (basicAuth) {
|
||||||
const authValue = basicAuth.split(' ')[1];
|
try {
|
||||||
const [providedUser, providedPwd] = atob(authValue).split(':');
|
const authValue = basicAuth.split(' ')[1];
|
||||||
|
if (authValue) {
|
||||||
|
const decoded = atob(authValue);
|
||||||
|
const colonIdx = decoded.indexOf(':');
|
||||||
|
if (colonIdx !== -1) {
|
||||||
|
const providedUser = decoded.slice(0, colonIdx).trim().toLowerCase();
|
||||||
|
const providedPwd = decoded.slice(colonIdx + 1);
|
||||||
|
|
||||||
if (providedUser === user && providedPwd === pwd) {
|
if (validUsers[providedUser] && validUsers[providedUser] === providedPwd) {
|
||||||
return NextResponse.next();
|
return NextResponse.next();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
// Ignore decoding errors and fall through to 401
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -27,12 +68,11 @@ export function middleware(req) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// If no credentials are set in ENV, just allow access
|
// If no credentials are set in ENV, allow access
|
||||||
return NextResponse.next();
|
return NextResponse.next();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ensure the middleware only runs for paths that need protection.
|
// Ensure the middleware only runs for paths that need protection.
|
||||||
// Exclude static assets, API routes if public (though we probably want API secure too), and Next.js internals.
|
|
||||||
export const config = {
|
export const config = {
|
||||||
matcher: [
|
matcher: [
|
||||||
/*
|
/*
|
||||||
|
|||||||
Reference in New Issue
Block a user