fix: update authorization header handling to prevent empty values and show validation error
This commit is contained in:
parent
17ace55bbf
commit
30f9855fd5
3 changed files with 28 additions and 9 deletions
|
|
@ -162,14 +162,8 @@ const App = () => {
|
||||||
return migrateFromLegacyAuth(legacyToken, legacyHeaderName);
|
return migrateFromLegacyAuth(legacyToken, legacyHeaderName);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Default to Authorization: Bearer as the most common case
|
// Default to empty array
|
||||||
return [
|
return [];
|
||||||
{
|
|
||||||
name: "Authorization",
|
|
||||||
value: "Bearer ",
|
|
||||||
enabled: true,
|
|
||||||
},
|
|
||||||
];
|
|
||||||
});
|
});
|
||||||
|
|
||||||
const [pendingSampleRequests, setPendingSampleRequests] = useState<
|
const [pendingSampleRequests, setPendingSampleRequests] = useState<
|
||||||
|
|
|
||||||
|
|
@ -97,9 +97,10 @@ jest.mock("@modelcontextprotocol/sdk/client/auth.js", () => ({
|
||||||
}));
|
}));
|
||||||
|
|
||||||
// Mock the toast hook
|
// Mock the toast hook
|
||||||
|
const mockToast = jest.fn();
|
||||||
jest.mock("@/lib/hooks/useToast", () => ({
|
jest.mock("@/lib/hooks/useToast", () => ({
|
||||||
useToast: () => ({
|
useToast: () => ({
|
||||||
toast: jest.fn(),
|
toast: mockToast,
|
||||||
}),
|
}),
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
|
@ -940,6 +941,13 @@ describe("useConnection", () => {
|
||||||
expect(headers).toHaveProperty("Authorization", "Bearer mock-token");
|
expect(headers).toHaveProperty("Authorization", "Bearer mock-token");
|
||||||
// Should not have the x-custom-auth-headers since Authorization is standard
|
// Should not have the x-custom-auth-headers since Authorization is standard
|
||||||
expect(headers).not.toHaveProperty("x-custom-auth-headers");
|
expect(headers).not.toHaveProperty("x-custom-auth-headers");
|
||||||
|
|
||||||
|
// Should show toast notification for empty Authorization header
|
||||||
|
expect(mockToast).toHaveBeenCalledWith({
|
||||||
|
title: "Invalid Authorization Header",
|
||||||
|
description: expect.any(String),
|
||||||
|
variant: "destructive",
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
test("prioritizes custom headers over legacy auth", async () => {
|
test("prioritizes custom headers over legacy auth", async () => {
|
||||||
|
|
|
||||||
|
|
@ -400,6 +400,23 @@ export function useConnection({
|
||||||
// Use custom headers (migration is handled in App.tsx)
|
// Use custom headers (migration is handled in App.tsx)
|
||||||
let finalHeaders: CustomHeaders = customHeaders || [];
|
let finalHeaders: CustomHeaders = customHeaders || [];
|
||||||
|
|
||||||
|
// Check for empty Authorization headers and show validation error
|
||||||
|
const hasEmptyAuthHeader = finalHeaders.some(
|
||||||
|
(header) =>
|
||||||
|
header.enabled &&
|
||||||
|
header.name.trim().toLowerCase() === "authorization" &&
|
||||||
|
(!header.value.trim() || header.value.trim() === "Bearer"),
|
||||||
|
);
|
||||||
|
|
||||||
|
if (hasEmptyAuthHeader) {
|
||||||
|
toast({
|
||||||
|
title: "Invalid Authorization Header",
|
||||||
|
description:
|
||||||
|
"Authorization header is enabled but empty. Please add a token or disable the header. It will be added automatically.",
|
||||||
|
variant: "destructive",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
// Check if we need to inject OAuth token
|
// Check if we need to inject OAuth token
|
||||||
// This handles both empty headers and default "Bearer " placeholder headers
|
// This handles both empty headers and default "Bearer " placeholder headers
|
||||||
const isEmptyAuthHeader = (header: CustomHeaders[number]) =>
|
const isEmptyAuthHeader = (header: CustomHeaders[number]) =>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue