actual-mcp-server 0.8.10 → 0.8.13

package/README.md

@@ -628,6 +628,11 @@ OIDC_RESOURCE=your-client-id    # must match 'aud' JWT claim
 OIDC_SCOPES=                    # leave empty for Casdoor
 ```
 
+**OAuth discovery endpoints (automatic in OIDC mode).** When `AUTH_PROVIDER=oidc`, the server publishes the two metadata documents an OAuth client needs to bootstrap a login, so `mcp-remote` and Claude.ai's native connector can discover the flow without manual endpoint configuration:
+
+- `GET /.well-known/oauth-protected-resource` (RFC 9728): identifies this server as a protected resource and points at your `OIDC_ISSUER` as the authorization server.
+- `GET /.well-known/oauth-authorization-server` (RFC 8414, #285): the authorization server metadata (its `authorization_endpoint` / `token_endpoint` / `registration_endpoint`), re-served from your IdP's own OpenID discovery document. This is here because several clients look for it on the resource-server origin, and some IdPs (e.g. Authentik) do not expose it where those clients look. It is fetched once at startup and served verbatim, exposes only endpoints your IdP already publishes publicly, and requires no authentication (a client reads it before it has a token). No extra configuration is needed; it is absent when `AUTH_PROVIDER` is not `oidc`.
+
 See [AI Client Setup, OIDC](docs/guides/AI_CLIENT_SETUP.md#oidc-authentication-multi-user) for `AUTH_BUDGET_ACL` format and Casdoor notes.
 
 ---
@@ -722,4 +727,4 @@ The software is provided **as-is**, without warranty of any kind. The author acc
 
 ---
 
-**Version:** 0.8.10 | **Tool Count:** 71 (verified LibreChat-compatible)
+**Version:** 0.8.13 | **Tool Count:** 71 (verified LibreChat-compatible)

package/dist/src/lib/actual-adapter.js

@@ -1361,14 +1361,46 @@ export async function mergePayees(targetId, mergeIds) {
         await withConcurrency(() => retry(() => rawMergePayees(targetId, mergeIds), { retries: 0, backoffMs: 200 }));
     });
 }
+/**
+ * Does a serialized Actual rule reference this payee? The payee id lives INSIDE a
+ * condition or action whose `field` is 'payee': as `value` (op 'is'/'isNot') or as
+ * a member of `value` (op 'oneOf', an array). A serialized rule has NO top-level
+ * `payee_id` column, so the original BUG-3 post-filter (`r.payee_id === payeeId`)
+ * matched nothing and made actual_payee_rules_get always return empty. This mirrors
+ * `@actual-app/api`'s own getRulesForPayee, which scans payee-typed ids in the rule.
+ */
+export function ruleReferencesPayee(rule, payeeId) {
+    const r = rule;
+    const clauses = [
+        ...(Array.isArray(r?.conditions) ? r.conditions : []),
+        ...(Array.isArray(r?.actions) ? r.actions : []),
+    ];
+    return clauses.some((c) => {
+        if (c?.field !== 'payee')
+            return false;
+        return Array.isArray(c.value) ? c.value.includes(payeeId) : c?.value === payeeId;
+    });
+}
 export async function getPayeeRules(payeeId) {
     return withActualApi(async () => {
         observability.incrementToolCall('actual.payees.getPayeeRules').catch(() => { });
         const allRules = await withConcurrency(() => retry(() => rawGetPayeeRules(payeeId), { retries: 2, backoffMs: 200 }));
         if (!Array.isArray(allRules))
             return [];
-        // API ignores payeeId filter — apply post-filter (BUG-3)
-        return allRules.filter((r) => r?.payee_id === payeeId);
+        // Defensive narrowing to the requested payee. @actual-app/api already scopes
+        // payee-rules-get to the id; the filter must use the real rule shape (payee
+        // referenced in a condition/action), NOT a nonexistent `payee_id` column.
+        const filtered = allRules.filter((r) => ruleReferencesPayee(r, payeeId));
+        // Upstream already scopes to the payee, so this filter should be a no-op. If it
+        // ever drops rows, the serialized rule shape has drifted and the predicate is now
+        // silently under-matching: exactly the failure class that made #284 return empty
+        // for months. Surface it instead of hiding it.
+        if (filtered.length !== allRules.length) {
+            logger.debug('[ADAPTER] getPayeeRules post-filter dropped rows; rule shape may have drifted', {
+                payeeId, upstream: allRules.length, kept: filtered.length,
+            });
+        }
+        return filtered;
     });
 }
 export async function batchBudgetUpdates(fn) {

package/dist/src/lib/oidc-discovery.js

@@ -172,11 +172,21 @@ export function resolveJwksUri(discoveryDoc, issuer, allowInsecure = false, trus
     return jwks.toString();
 }
 /**
- * Fetch the issuer's OpenID discovery document and return a validated `jwks_uri`.
- * Fails closed on any problem (non-https issuer, redirect, non-200, bad JSON,
- * missing/invalid/cross-host jwks_uri). `fetchImpl` is injectable for testing.
+ * Fetch the issuer's OpenID discovery document ONCE and return both the raw
+ * document and its validated `jwks_uri` (#285). Fails closed on any problem
+ * (non-https issuer, redirect, non-200, bad JSON, missing/invalid/cross-host
+ * jwks_uri). `fetchImpl` is injectable for testing.
+ *
+ * The returned `metadata` is the IdP's own public discovery document. Its
+ * intended second use (beyond resolving the JWKS URI) is to be re-served
+ * verbatim at `/.well-known/oauth-authorization-server` as RFC 8414 Authorization
+ * Server Metadata, so a client that resolves that well-known path against this
+ * resource server (as mcp-remote and Claude.ai do) can find the IdP's
+ * `token_endpoint`. Because this fetch happens ONCE at startup and the document
+ * is served from memory, no request ever triggers an outbound fetch (no
+ * request-path SSRF surface).
  */
-export async function discoverJwksUri(issuer, allowInsecure = false, trustedHosts = [], fetchImpl = fetch) {
+export async function discoverOidcMetadata(issuer, allowInsecure = false, trustedHosts = [], fetchImpl = fetch) {
     assertSecureIssuer(issuer, allowInsecure);
     const base = issuer.endsWith('/') ? issuer.slice(0, -1) : issuer;
     const discoveryUrl = `${base}/.well-known/openid-configuration`;
@@ -200,7 +210,20 @@ export async function discoverJwksUri(issuer, allowInsecure = false, trustedHost
     catch {
         throw new Error(`OIDC discovery document at ${discoveryUrl} is not valid JSON`);
     }
+    // resolveJwksUri validates that `doc` is an object AND resolves/validates the
+    // jwks_uri (https, same-origin or explicitly allowlisted). It throws (fail
+    // closed) on any problem, so reaching past it guarantees a usable object with a
+    // trusted jwks_uri before the document is exposed.
     const jwksUri = resolveJwksUri(doc, issuer, allowInsecure, trustedHosts);
     logger.info('Resolved JWKS URI from OIDC discovery', { jwksUri });
+    return { jwksUri, metadata: doc };
+}
+/**
+ * Back-compat convenience: resolve only the validated `jwks_uri`. Delegates to
+ * discoverOidcMetadata so the single hardened fetch and every fail-closed check
+ * are shared. Retained for callers (and their tests) that only need the key set.
+ */
+export async function discoverJwksUri(issuer, allowInsecure = false, trustedHosts = [], fetchImpl = fetch) {
+    const { jwksUri } = await discoverOidcMetadata(issuer, allowInsecure, trustedHosts, fetchImpl);
     return jwksUri;
 }

package/dist/src/server/httpServer.js

@@ -13,7 +13,7 @@ import config from '../config.js';
 import { createRemoteJWKSet, jwtVerify } from 'jose';
 import { MCPAuthTokenVerificationError } from 'mcp-auth';
 import { createMcpAuth } from '../auth/setup.js';
-import { discoverJwksUri, buildTrustedJwksHosts } from '../lib/oidc-discovery.js';
+import { discoverOidcMetadata, buildTrustedJwksHosts } from '../lib/oidc-discovery.js';
 import { buildAcceptedAudiences } from '../lib/oidc-audiences.js';
 import { budgetAclMiddleware } from '../auth/budget-acl.js';
 import * as https from 'node:https';
@@ -86,7 +86,24 @@ advertisedUrl) {
             // #254: opt-in cross-origin JWKS trusted hosts (e.g. Google serves keys from
             // www.googleapis.com). Parsed fail-fast here at the composition root and
             // threaded as a parameter; empty (the default) keeps same-origin-only.
-            const jwksUri = await discoverJwksUri(config.OIDC_ISSUER, config.OIDC_ALLOW_INSECURE_ISSUER, buildTrustedJwksHosts(config.OIDC_JWKS_TRUSTED_HOSTS));
+            const { jwksUri, metadata: oidcMetadata } = await discoverOidcMetadata(config.OIDC_ISSUER, config.OIDC_ALLOW_INSECURE_ISSUER, buildTrustedJwksHosts(config.OIDC_JWKS_TRUSTED_HOSTS));
+            // #285: serve RFC 8414 OAuth Authorization Server Metadata at this origin so
+            // mcp-remote and Claude.ai's native OAuth connector can discover the IdP's
+            // token_endpoint. We already serve RFC 9728 protected-resource metadata (whose
+            // authorization_servers points at the IdP), but several clients resolve the
+            // oauth-authorization-server well-known path against the RESOURCE server root,
+            // and some IdPs (e.g. Authentik) do not expose it where those clients look.
+            // The document is the IdP's own public discovery doc, fetched ONCE above (so no
+            // request-path fetch and no SSRF surface) and re-served verbatim as a BARE JSON
+            // object. Never emit a {jsonrpc,result} envelope on a well-known metadata path:
+            // that shape is not RFC-compliant and would break client parsing (the server-info
+            // probe was moved off this reserved path to /mcp-info as a bare object in #286).
+            // Unauthenticated by design: a client reads this before it holds a token, so it is
+            // registered here, before the bearer-auth middleware, and only when
+            // AUTH_PROVIDER=oidc (this block).
+            app.get('/.well-known/oauth-authorization-server', (_req, res) => {
+                res.json(oidcMetadata);
+            });
             const jwks = createRemoteJWKSet(new URL(jwksUri));
             const customJwtVerify = async (token) => {
                 // Enforce the audience claim (#160, OWASP A07). Without it, any
@@ -568,34 +585,26 @@ advertisedUrl) {
         }
         await transport.handleRequest(req, res);
     });
-    // quick GET info endpoints (some clients probe)
+    // Quick GET server-info probe used by our test harness (testMcpClient.ts, the
+    // Playwright E2E) to check the server is up and advertises tools before the full
+    // JSON-RPC handshake. #286: this used to live on /.well-known/oauth-protected-resource
+    // wrapped in a {jsonrpc,result} envelope, which squatted the RFC 9728 reserved OAuth
+    // path with non-metadata (a strict OAuth client probing it got garbage). It now lives
+    // on the non-reserved /mcp-info as a BARE object. The reserved OAuth path is therefore
+    // unregistered in non-OIDC mode (it correctly 404s: a static-bearer server has no
+    // authorization server to advertise), and in OIDC mode mcpAuth.protectedResourceMetadataRouter()
+    // (registered above) still serves the compliant RFC 9728 document.
     const serverIp = process.env.MCP_BRIDGE_PUBLIC_HOST || getLocalIp();
-    app.get('/.well-known/oauth-protected-resource', (_req, res) => {
-        res.json({
-            jsonrpc: '2.0',
-            result: {
-                description: serverDescription || "Actual MCP server",
-                instructions: serverInstructions || "Welcome to the Actual MCP server.",
-                serverInstructions: { instructions: serverInstructions || "Welcome to the Actual MCP server." },
-                capabilities: capabilities && Object.keys(capabilities).length ? capabilities : { tools: toolsList.reduce((a, n) => ({ ...a, [n]: {} }), {}) },
-                tools: toolsList,
-                advertisedUrl: advertisedUrl || `${scheme}://${serverIp}:${port}${httpPath}`,
-            },
-        });
-    });
-    app.get('/.well-known/oauth-protected-resource/http', (_req, res) => {
-        res.json({
-            jsonrpc: '2.0',
-            result: {
-                description: serverDescription || "Actual MCP server",
-                instructions: serverInstructions || "Welcome to the Actual MCP server.",
-                serverInstructions: { instructions: serverInstructions || "Welcome to the Actual MCP server." },
-                capabilities: capabilities && Object.keys(capabilities).length ? capabilities : { tools: toolsList.reduce((a, n) => ({ ...a, [n]: {} }), {}) },
-                tools: toolsList,
-                advertisedUrl: advertisedUrl || `${scheme}://${serverIp}:${port}${httpPath}`,
-            },
-        });
+    const mcpInfo = () => ({
+        description: serverDescription || "Actual MCP server",
+        instructions: serverInstructions || "Welcome to the Actual MCP server.",
+        serverInstructions: { instructions: serverInstructions || "Welcome to the Actual MCP server." },
+        capabilities: capabilities && Object.keys(capabilities).length ? capabilities : { tools: toolsList.reduce((a, n) => ({ ...a, [n]: {} }), {}) },
+        tools: toolsList,
+        advertisedUrl: advertisedUrl || `${scheme}://${serverIp}:${port}${httpPath}`,
     });
+    app.get('/mcp-info', (_req, res) => { res.json(mcpInfo()); });
+    app.get('/mcp-info/http', (_req, res) => { res.json(mcpInfo()); });
     app.get('/health', (_req, res) => {
         const state = getConnectionState();
         const poolStats = state.connectionPool || null;

package/dist/src/tests/testMcpClient.js

@@ -4,8 +4,10 @@ export async function testMcpClient(advertisedUrl, _port, httpPath) {
     const fetchAny = globalFetch ?? (await import('node-fetch')).default;
     const fetchFn = fetchAny;
     const base = new URL(advertisedUrl);
-    // quick probe endpoint
-    const probeUrl = `${base.origin}/.well-known/oauth-protected-resource`;
+    // quick probe endpoint (#286: the server-info probe moved off the reserved
+    // /.well-known/oauth-protected-resource OAuth path to the non-reserved /mcp-info,
+    // now a bare object; the `result ?? raw` unwrap below tolerates both shapes).
+    const probeUrl = `${base.origin}/mcp-info`;
     console.info(`MCP client test: probing ${probeUrl}`);
     const probeRes = await fetchFn(probeUrl, { method: 'GET' });
     if (!probeRes.ok) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "actual-mcp-server",
   "displayName": "Actual MCP Server",
-  "version": "0.8.10",
+  "version": "0.8.13",
   "engines": {
     "node": ">=22.0.0",
     "npm": ">=10.0.0"
@@ -30,7 +30,7 @@
     "verify-tools": "npm run build && node scripts/verify-tools.js",
     "check:coverage": "node scripts/list-actual-api-methods.mjs",
     "direct-sync": "node scripts/direct-sync/bank-sync-direct.mjs",
-    "test:unit-js": "node tests/unit/transactions_create.test.js && node tests/unit/generated_tools.smoke.test.js && node tests/unit/schema_validation.test.js && node tests/unit/config_https_validation.test.js && node tests/unit/config_data_dir.test.js && node tests/unit/config_drift.test.js && node tests/unit/port_alignment.test.js && node tests/unit/dockerfile_data_dir_alignment.test.js && node tests/unit/unraid_template_alignment.test.js && node tests/unit/entrypoint_invariants.test.js && node tests/unit/compose_profile_sync.test.js && node tests/unit/advertised_tools_sync.test.js && node tests/unit/knip_config.test.js && node tests/unit/readme_stats_sync.test.js && node tests/unit/config_insecure_upstream.test.js && node tests/unit/workflow_release_guards.test.js && node tests/unit/bot_target_branch.test.js && node tests/unit/auth_posture.test.js && node tests/unit/auth_posture_wiring.test.js && node tests/unit/auth-acl.test.js && node tests/unit/bug76.test.js && node tests/unit/budgets_setAmount.test.js && node tests/unit/budgets_transfer.test.js && node tests/unit/transactions_uncategorized.test.js && node tests/unit/httpServer_session_init.test.js && node tests/unit/httpServer_session_not_found.test.js && node tests/unit/manual_mcp_client_retry.test.js && node tests/unit/manual_mcp_client_session.test.js && node tests/unit/manual_mcp_client_circuit.test.js && node tests/unit/manual_runner_killswitch.test.js && node tests/unit/adapter_auth_rate_limit.test.js && node tests/unit/adapter_session_reuse.test.js && node tests/unit/retry_classifier.test.js && node tests/unit/adapter_module_surface.test.js && node tests/unit/adapter_nonidempotent_no_retry.test.js && node tests/unit/pool_liveness.test.js && node tests/unit/pool_shutdown_all.test.js && node tests/unit/query_where_operators.test.js && node tests/unit/query_run_validation.test.js && node tests/unit/adapter_with_write_session.test.js && node tests/unit/category_groups_delete.test.js && node tests/unit/rules_delete.test.js && node tests/unit/schedules_delete.test.js && node tests/unit/payees_delete.test.js && node tests/unit/rules_create_or_update.test.js && node tests/unit/unhandled-rejection.test.js && node tests/unit/rejection-allowlist-purity.test.js && node tests/unit/httpServer_bearer_auth.test.js && node tests/unit/httpServer_oidc_audience.test.js && node tests/unit/httpServer_oidc_auth_verification.test.js && node tests/unit/httpServer_oidc_jwks_discovery.test.js && node tests/unit/httpServer_body_limit.test.js && node tests/unit/httpServer_bind_host.test.js && node tests/unit/adapter_write_pool_cooperation.test.js && node tests/unit/budget_acl_enforcement.test.js && node tests/unit/budget_preference_store.test.js && node tests/unit/budget_preference_restore.test.js && node tests/unit/tags_list.test.js && node tests/unit/tags_create.test.js && node tests/unit/tags_update.test.js && node tests/unit/tags_delete.test.js && node tests/unit/notes_get.test.js && node tests/unit/notes_update.test.js && node tests/unit/payees_common_list.test.js && node tests/unit/transactions_update_guard.test.js && node tests/unit/entities_search.test.js && node tests/unit/transactions_import_schema.test.js && node tests/unit/tool_schema_shape.test.js && node tests/unit/zod_error_format.test.js && node tests/unit/tool_count_sync.test.js && node tests/unit/stdio_transport.test.js && node tests/unit/logger_structured.test.js && node tests/unit/logger_redaction.test.js && node tests/unit/logger_correlation.test.js && node tests/unit/check_coverage.test.js && node tests/unit/adapter_op_timeout.test.js && node tests/unit/adapter_write_queue_wakeup.test.js && node tests/unit/ci_workflow_guards.test.js && node tests/unit/node_version_guard.test.js && node tests/unit/node_version_drift.test.js && node tests/unit/observability_smoke.test.js && node tests/unit/residue_pattern.test.js && node tests/unit/dual_transport_gate.test.js && node tests/unit/manual_assertions_use_helper.test.js && node tests/unit/server_version_guard.test.js",
+    "test:unit-js": "node tests/unit/transactions_create.test.js && node tests/unit/generated_tools.smoke.test.js && node tests/unit/schema_validation.test.js && node tests/unit/config_https_validation.test.js && node tests/unit/config_data_dir.test.js && node tests/unit/config_drift.test.js && node tests/unit/port_alignment.test.js && node tests/unit/dockerfile_data_dir_alignment.test.js && node tests/unit/unraid_template_alignment.test.js && node tests/unit/entrypoint_invariants.test.js && node tests/unit/compose_profile_sync.test.js && node tests/unit/advertised_tools_sync.test.js && node tests/unit/knip_config.test.js && node tests/unit/readme_stats_sync.test.js && node tests/unit/config_insecure_upstream.test.js && node tests/unit/workflow_release_guards.test.js && node tests/unit/bot_target_branch.test.js && node tests/unit/auth_posture.test.js && node tests/unit/auth_posture_wiring.test.js && node tests/unit/auth-acl.test.js && node tests/unit/bug76.test.js && node tests/unit/budgets_setAmount.test.js && node tests/unit/budgets_transfer.test.js && node tests/unit/transactions_uncategorized.test.js && node tests/unit/httpServer_session_init.test.js && node tests/unit/httpServer_session_not_found.test.js && node tests/unit/manual_mcp_client_retry.test.js && node tests/unit/manual_mcp_client_session.test.js && node tests/unit/manual_mcp_client_circuit.test.js && node tests/unit/manual_runner_killswitch.test.js && node tests/unit/adapter_auth_rate_limit.test.js && node tests/unit/adapter_session_reuse.test.js && node tests/unit/retry_classifier.test.js && node tests/unit/adapter_module_surface.test.js && node tests/unit/adapter_nonidempotent_no_retry.test.js && node tests/unit/pool_liveness.test.js && node tests/unit/pool_shutdown_all.test.js && node tests/unit/query_where_operators.test.js && node tests/unit/query_run_validation.test.js && node tests/unit/adapter_with_write_session.test.js && node tests/unit/category_groups_delete.test.js && node tests/unit/rules_delete.test.js && node tests/unit/schedules_delete.test.js && node tests/unit/payees_delete.test.js && node tests/unit/rules_create_or_update.test.js && node tests/unit/unhandled-rejection.test.js && node tests/unit/rejection-allowlist-purity.test.js && node tests/unit/httpServer_bearer_auth.test.js && node tests/unit/httpServer_oidc_audience.test.js && node tests/unit/httpServer_oidc_auth_verification.test.js && node tests/unit/httpServer_oidc_jwks_discovery.test.js && node tests/unit/httpServer_body_limit.test.js && node tests/unit/httpServer_bind_host.test.js && node tests/unit/adapter_write_pool_cooperation.test.js && node tests/unit/budget_acl_enforcement.test.js && node tests/unit/budget_preference_store.test.js && node tests/unit/budget_preference_restore.test.js && node tests/unit/tags_list.test.js && node tests/unit/tags_create.test.js && node tests/unit/tags_update.test.js && node tests/unit/tags_delete.test.js && node tests/unit/notes_get.test.js && node tests/unit/notes_update.test.js && node tests/unit/payees_common_list.test.js && node tests/unit/transactions_update_guard.test.js && node tests/unit/entities_search.test.js && node tests/unit/transactions_import_schema.test.js && node tests/unit/tool_schema_shape.test.js && node tests/unit/zod_error_format.test.js && node tests/unit/tool_count_sync.test.js && node tests/unit/stdio_transport.test.js && node tests/unit/logger_structured.test.js && node tests/unit/logger_redaction.test.js && node tests/unit/logger_correlation.test.js && node tests/unit/check_coverage.test.js && node tests/unit/adapter_op_timeout.test.js && node tests/unit/adapter_write_queue_wakeup.test.js && node tests/unit/ci_workflow_guards.test.js && node tests/unit/node_version_guard.test.js && node tests/unit/node_version_drift.test.js && node tests/unit/observability_smoke.test.js && node tests/unit/residue_pattern.test.js && node tests/unit/dual_transport_gate.test.js && node tests/unit/manual_assertions_use_helper.test.js && node tests/unit/server_version_guard.test.js && node tests/unit/payee_rules_reference_filter.test.js && node tests/unit/oidc_metadata_discovery.test.js && node tests/unit/httpServer_oauth_metadata_route.test.js && node tests/unit/httpServer_mcp_info_route.test.js",
     "test:adapter": "npm run build && node dist/src/tests_adapter_runner.js",
     "test:e2e": "npx playwright test",
     "test:e2e:docker": "./tests/e2e/run-docker-e2e.sh",