Skip to content

(11/n) auth follow-up coverage and resource defaulting #24

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
philipnee merged 1 commit into from
Apr 26, 2026
Merged

(11/n) auth follow-up coverage and resource defaulting #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ This project follows the spirit of Keep a Changelog and uses semantic versioning

- Internal refactor: `src/cli/start.ts` split into focused modules (`connector-loader`, `interactive`, `tunnel-controller`). Per-connector setup extracted into `src/connectors/{filesystem,obsidian,mempalace}-setup.ts`. Shared `saveConfig()` consolidated on `src/config/loader.ts`.
- `PluginSchema` is now a single-variant `z.discriminatedUnion('name', ...)` so adding a second plugin is a schema addition rather than a structural refactor.
- OAuth `/authorize` now defaults a missing `resource` parameter to the instance's canonical `/mcp` resource for client compatibility, while preserving token audience binding and still rejecting explicit wrong resources.

### Deprecated

Expand Down
41 changes: 30 additions & 11 deletions src/server/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,12 +367,14 @@ export async function startHttpServer(router: ToolRouter, options: HttpServerOpt
});

app.get('/authorize', authLimiter, oauthOriginMiddleware, (req, res) => {
const params = parseAuthorizeParams(req.query);
if ('error' in params) {
logHttpRequest(requestLog, req, 400, 'oauth.authorize', params.error);
res.status(400).type('text/plain').send(params.error);
const parsed = parseAuthorizeParams(req.query);
if ('error' in parsed) {
logHttpRequest(requestLog, req, 400, 'oauth.authorize', parsed.error);
res.status(400).type('text/plain').send(parsed.error);
return;
}
const canonicalResource = `${baseUrlFor(req)}/mcp`;
const { params, resourceDefaulted } = defaultAuthorizeResource(parsed, canonicalResource);
if (!oauth.isRedirectUriAllowed(params.clientId, params.redirectUri)) {
const rejectedHost = safeHost(params.redirectUri);
logHttpRequest(
Expand All @@ -382,7 +384,7 @@ export async function startHttpServer(router: ToolRouter, options: HttpServerOpt
res.status(400).type('text/plain').send('redirect_uri is not registered for this client');
return;
}
const resourceError = validateAuthorizeResource(params.resource, `${baseUrlFor(req)}/mcp`);
const resourceError = validateAuthorizeResource(params.resource, canonicalResource);
if (resourceError) {
const redirect = authorizeErrorRedirect(params, 'invalid_target', resourceError.description);
logHttpRequest(requestLog, req, 302, 'oauth.authorize', resourceError.code, params.clientId);
Expand All @@ -395,19 +397,22 @@ export async function startHttpServer(router: ToolRouter, options: HttpServerOpt
requestId,
redirectUri: params.redirectUri,
resource: params.resource,
resourceDefaulted,
state: params.state,
});
logHttpRequest(requestLog, req, 200, 'oauth.authorize', promptDetail, params.clientId);
res.type('text/html').send(renderAuthorizePage({ ...params, requestId }));
});

app.post('/authorize', authLimiter, oauthOriginMiddleware, (req, res) => {
const params = parseAuthorizeParams(req.body ?? {});
if ('error' in params) {
logHttpRequest(requestLog, req, 400, 'oauth.authorize', params.error);
res.status(400).type('text/plain').send(params.error);
const parsed = parseAuthorizeParams(req.body ?? {});
if ('error' in parsed) {
logHttpRequest(requestLog, req, 400, 'oauth.authorize', parsed.error);
res.status(400).type('text/plain').send(parsed.error);
return;
}
const canonicalResource = `${baseUrlFor(req)}/mcp`;
const { params, resourceDefaulted } = defaultAuthorizeResource(parsed, canonicalResource);
if (!oauth.isRedirectUriAllowed(params.clientId, params.redirectUri)) {
const rejectedHost = safeHost(params.redirectUri);
logHttpRequest(
Expand All @@ -417,7 +422,7 @@ export async function startHttpServer(router: ToolRouter, options: HttpServerOpt
res.status(400).type('text/plain').send('redirect_uri is not registered for this client');
return;
}
const resourceError = validateAuthorizeResource(params.resource, `${baseUrlFor(req)}/mcp`);
const resourceError = validateAuthorizeResource(params.resource, canonicalResource);
if (resourceError) {
const redirect = authorizeErrorRedirect(params, 'invalid_target', resourceError.description);
logHttpRequest(requestLog, req, 302, 'oauth.authorize', resourceError.code, params.clientId);
Expand All @@ -433,6 +438,7 @@ export async function startHttpServer(router: ToolRouter, options: HttpServerOpt
requestId,
redirectUri: params.redirectUri,
resource: params.resource,
resourceDefaulted,
state: params.state,
});
logHttpRequest(requestLog, req, 401, 'oauth.authorize', denyDetail, params.clientId);
Expand Down Expand Up @@ -460,6 +466,7 @@ export async function startHttpServer(router: ToolRouter, options: HttpServerOpt
requestId,
redirectUri: params.redirectUri,
resource: params.resource,
resourceDefaulted,
state: params.state,
});
logHttpRequest(requestLog, req, 302, 'oauth.authorize', approveDetail, params.clientId);
Expand Down Expand Up @@ -784,6 +791,17 @@ function parseAuthorizeParams(source: Record<string, unknown>): AuthorizeParams
};
}

function defaultAuthorizeResource(
params: AuthorizeParams,
canonicalResource: string,
): { params: AuthorizeParams; resourceDefaulted: boolean } {
if (params.resource) return { params, resourceDefaulted: false };
return {
params: { ...params, resource: canonicalResource },
resourceDefaulted: true,
};
}

function stringField(value: unknown): string | undefined {
if (typeof value !== 'string') return undefined;
const trimmed = value.trim();
Expand Down Expand Up @@ -850,9 +868,10 @@ function formatAuthorizeLogDetail(input: {
requestId: string;
redirectUri: string;
resource?: string;
resourceDefaulted?: boolean;
state?: string;
}): string {
return `${input.phase} rid=${input.requestId} redirect_host=${safeHost(input.redirectUri)} resource_host=${input.resource ? safeHost(input.resource) : '(none)'} state_hash=${hashForLog(input.state)}`;
return `${input.phase} rid=${input.requestId} redirect_host=${safeHost(input.redirectUri)} resource_host=${input.resource ? safeHost(input.resource) : '(none)'} resource_defaulted=${input.resourceDefaulted ? 'true' : 'false'} state_hash=${hashForLog(input.state)}`;
}

function hashForLog(value: string | undefined): string {
Expand Down
Loading
Loading