aiquila-mcp 0.4.2 → 0.4.4

package/README.md

@@ -92,6 +92,8 @@ See the [Docker setup guide](https://github.com/elgorro/aiquila/blob/main/docs/m
 | `MCP_AUTH_ENABLED`   | No       | `true` to enable OAuth for remote clients     |
 | `MCP_AUTH_SECRET`    | If auth  | `openssl rand -hex 32`                        |
 | `MCP_AUTH_ISSUER`    | If auth  | public HTTPS URL of this server               |
+| `MCP_ALLOWED_HOSTS`  | No       | extra hostnames for DNS rebinding protection  |
+| `MCP_CORS_ORIGINS`   | No       | extra browser origins allowed via CORS        |
 | `LOG_LEVEL`          | No       | `trace`/`debug`/`info`/`warn`/`error`/`fatal` |
 
 ## Requirements

package/dist/auth/login-page-css.js

@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: MIT
+/**
+ * Stylesheet for the OAuth login page.
+ *
+ * Served as a standalone document at LOGIN_STYLESHEET_PATH rather than inlined
+ * in a <style> block, so the login page's CSP can drop 'unsafe-inline' entirely.
+ * Keep this free of any interpolated/user-supplied value — it is served verbatim.
+ */
+export const LOGIN_STYLESHEET = `body { font-family: sans-serif; background: #f4f6f8; display: flex; justify-content: center; align-items: center; min-height: 100vh; margin: 0; }
+.card { background: #fff; border-radius: 8px; box-shadow: 0 2px 12px rgba(0,0,0,.12); padding: 2rem; width: 100%; max-width: 360px; }
+h1 { font-size: 1.3rem; margin: 0 0 .25rem; }
+.consent-banner { background: #eef6fc; border: 1px solid #b3d7f0; border-radius: 4px; padding: .75rem 1rem; margin-bottom: 1.25rem; font-size: .85rem; color: #333; line-height: 1.6; }
+.consent-banner strong { color: #0082c9; }
+.consent-banner .detail { display: block; margin-top: .25rem; }
+.consent-banner code { background: #d6ecf9; border-radius: 3px; padding: 0 .3em; font-size: .85em; word-break: break-all; }
+label { display: block; font-size: .85rem; font-weight: 600; margin-bottom: .25rem; }
+input[type=text], input[type=password] { width: 100%; box-sizing: border-box; padding: .55rem .75rem; border: 1px solid #ccc; border-radius: 4px; font-size: 1rem; margin-bottom: 1rem; }
+button { width: 100%; padding: .65rem; background: #0082c9; color: #fff; border: none; border-radius: 4px; font-size: 1rem; cursor: pointer; }
+button:hover { background: #006fa3; }
+.error { background: #fdecea; color: #c0392b; border-radius: 4px; padding: .6rem .9rem; margin-bottom: 1rem; font-size: .9rem; }
+`;
+/** Public path the login page links its stylesheet from. */
+export const LOGIN_STYLESHEET_PATH = '/auth/login.css';

package/dist/auth/login.js

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-import { renderLoginForm } from './provider.js';
+import { renderLoginForm, applySecurityHeaders } from './provider.js';
 import { logger } from '../logger.js';
 export function loginHandler(provider) {
     return async (req, res) => {
@@ -11,7 +11,7 @@ export function loginHandler(provider) {
             return;
         }
         if (!username || !password || !client_id || !redirect_uri || !code_challenge) {
-            res
+            applySecurityHeaders(res)
                 .status(400)
                 .type('html')
                 .send(renderLoginForm({
@@ -26,7 +26,7 @@ export function loginHandler(provider) {
         }
         const client = await provider.clientsStore.getClient(client_id);
         if (!client) {
-            res
+            applySecurityHeaders(res)
                 .status(400)
                 .type('html')
                 .send(renderLoginForm({
@@ -40,7 +40,7 @@ export function loginHandler(provider) {
             return;
         }
         if (!client.redirect_uris.map(String).includes(redirect_uri)) {
-            res
+            applySecurityHeaders(res)
                 .status(400)
                 .type('html')
                 .send(renderLoginForm({
@@ -64,7 +64,7 @@ export function loginHandler(provider) {
             });
             if (!ncResp.ok) {
                 logger.warn({ user: username, status: ncResp.status }, '[auth] Login failed');
-                res
+                applySecurityHeaders(res)
                     .status(200)
                     .type('html')
                     .send(renderLoginForm({
@@ -95,7 +95,7 @@ export function loginHandler(provider) {
         }
         catch (err) {
             logger.error({ user: username, err }, '[auth] Login error');
-            res
+            applySecurityHeaders(res)
                 .status(200)
                 .type('html')
                 .send(renderLoginForm({

package/dist/auth/provider.js

@@ -3,6 +3,7 @@ import { createHash, timingSafeEqual } from 'node:crypto';
 import { SignJWT, jwtVerify } from 'jose';
 import { InvalidGrantError, InvalidTokenError, } from '@modelcontextprotocol/sdk/server/auth/errors.js';
 import { ClientsStore, CodeStore, RefreshStore } from './store.js';
+import { LOGIN_STYLESHEET_PATH } from './login-page-css.js';
 import { logger } from '../logger.js';
 // --- JWT helpers (HMAC-SHA256 via jose) ---
 async function signJwt(payload, secret, expiresInSecs) {
@@ -37,6 +38,22 @@ function escapeHtml(s) {
         .replace(/"/g, '"')
         .replace(/'/g, ''');
 }
+/**
+ * Security headers for every HTML response served by the OAuth login flow.
+ *
+ * The page has no inline <script> and no inline styles (the stylesheet is served
+ * separately from LOGIN_STYLESHEET_PATH), so the policy can deny everything by
+ * default and allow only same-origin styles.
+ */
+export const LOGIN_PAGE_CSP = "frame-ancestors 'none'; default-src 'none'; style-src 'self'; form-action 'self'; base-uri 'none'";
+/** Applies the login-flow security headers to a response. Returns the response for chaining. */
+export function applySecurityHeaders(res) {
+    return res
+        .set('X-Frame-Options', 'DENY')
+        .set('X-Content-Type-Options', 'nosniff')
+        .set('Referrer-Policy', 'no-referrer')
+        .set('Content-Security-Policy', LOGIN_PAGE_CSP);
+}
 export function renderLoginForm(opts) {
     return `<!DOCTYPE html>
 <html lang="en">
@@ -44,21 +61,7 @@ export function renderLoginForm(opts) {
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>AIquila – Sign in with Nextcloud</title>
-  <style>
-    body { font-family: sans-serif; background: #f4f6f8; display: flex; justify-content: center; align-items: center; min-height: 100vh; margin: 0; }
-    .card { background: #fff; border-radius: 8px; box-shadow: 0 2px 12px rgba(0,0,0,.12); padding: 2rem; width: 100%; max-width: 360px; }
-    h1 { font-size: 1.3rem; margin: 0 0 .25rem; }
-    p.sub { color: #555; font-size: .9rem; margin: 0 0 1.5rem; }
-    .consent-banner { background: #eef6fc; border: 1px solid #b3d7f0; border-radius: 4px; padding: .75rem 1rem; margin-bottom: 1.25rem; font-size: .85rem; color: #333; line-height: 1.6; }
-    .consent-banner strong { color: #0082c9; }
-    .consent-banner .detail { display: block; margin-top: .25rem; }
-    .consent-banner code { background: #d6ecf9; border-radius: 3px; padding: 0 .3em; font-size: .85em; word-break: break-all; }
-    label { display: block; font-size: .85rem; font-weight: 600; margin-bottom: .25rem; }
-    input[type=text], input[type=password] { width: 100%; box-sizing: border-box; padding: .55rem .75rem; border: 1px solid #ccc; border-radius: 4px; font-size: 1rem; margin-bottom: 1rem; }
-    button { width: 100%; padding: .65rem; background: #0082c9; color: #fff; border: none; border-radius: 4px; font-size: 1rem; cursor: pointer; }
-    button:hover { background: #006fa3; }
-    .error { background: #fdecea; color: #c0392b; border-radius: 4px; padding: .6rem .9rem; margin-bottom: 1rem; font-size: .9rem; }
-  </style>
+  <link rel="stylesheet" href="${LOGIN_STYLESHEET_PATH}">
 </head>
 <body>
   <div class="card">
@@ -96,9 +99,7 @@ export class NextcloudOAuthProvider {
         return this._clientsStore;
     }
     async authorize(client, params, res) {
-        res
-            .set('X-Frame-Options', 'DENY')
-            .set('Content-Security-Policy', "frame-ancestors 'none'; default-src 'self'; style-src 'unsafe-inline'")
+        applySecurityHeaders(res)
             .status(200)
             .type('html')
             .send(renderLoginForm({

package/dist/transports/http.js

@@ -9,6 +9,7 @@ import { createServer, SERVER_VERSION } from '../server.js';
 import { NextcloudOAuthProvider } from '../auth/provider.js';
 import { probeStateDir, StateDirNotWritableError, stateUnwritableMessage, markStateUnwritableWarned, } from '../auth/store.js';
 import { loginHandler } from '../auth/login.js';
+import { LOGIN_STYLESHEET, LOGIN_STYLESHEET_PATH } from '../auth/login-page-css.js';
 import { isPublicRequest } from './lazy-auth.js';
 import { logger } from '../logger.js';
 import { fetchStatus } from '../client/ocs.js';
@@ -133,7 +134,70 @@ export async function startHttp() {
             allowedHosts = [...new Set(['localhost', '127.0.0.1', ...extras])];
         }
     }
+    // Explicit CORS. Browser-based MCP clients need these headers; previously the
+    // server sent none and relied entirely on the reverse proxy. The issuer origin
+    // is trusted by default (it serves the login page), and MCP_CORS_ORIGINS adds
+    // extra origins — comma-separated, whitespace-trimmed, same idiom as
+    // MCP_ALLOWED_HOSTS. Origins are matched exactly and echoed back; the wildcard
+    // '*' is never sent, since these endpoints are credentialed.
+    const allowedOrigins = new Set();
+    const issuerForCors = process.env.MCP_AUTH_ISSUER;
+    if (authEnabled && issuerForCors) {
+        try {
+            allowedOrigins.add(new URL(issuerForCors).origin);
+        }
+        catch {
+            // Malformed issuer URL — the validation below will throw a clear error.
+        }
+    }
+    const extraOrigins = process.env.MCP_CORS_ORIGINS;
+    if (extraOrigins) {
+        for (const raw of extraOrigins.split(',')) {
+            const trimmed = raw.trim();
+            if (!trimmed)
+                continue;
+            try {
+                allowedOrigins.add(new URL(trimmed).origin);
+            }
+            catch {
+                logger.warn({ origin: trimmed }, '[startup] Ignoring malformed MCP_CORS_ORIGINS entry');
+            }
+        }
+    }
     const app = createMcpExpressApp({ host, allowedHosts });
+    // Mounted ahead of every other route so that preflights are answered before
+    // the auth chain runs — an OPTIONS request carries no Authorization header
+    // and would otherwise be rejected with 401 by requireBearerAuth.
+    app.use((req, res, next) => {
+        const origin = req.headers?.origin;
+        if (typeof origin === 'string' && allowedOrigins.has(origin)) {
+            res.setHeader('Access-Control-Allow-Origin', origin);
+            res.setHeader('Access-Control-Allow-Credentials', 'true');
+            res.setHeader('Access-Control-Allow-Headers', 'Authorization, Content-Type, Mcp-Session-Id, Mcp-Protocol-Version, Last-Event-ID');
+            res.setHeader('Access-Control-Expose-Headers', 'Mcp-Session-Id, WWW-Authenticate');
+            res.setHeader('Access-Control-Allow-Methods', 'GET, POST, DELETE, OPTIONS');
+            res.setHeader('Access-Control-Max-Age', '86400');
+        }
+        // Always vary on Origin: the response differs per origin even when no
+        // headers are added, so a shared cache must not reuse one for another.
+        res.setHeader('Vary', 'Origin');
+        if (req.method === 'OPTIONS') {
+            res.status(204).end();
+            return;
+        }
+        next();
+    });
+    // Stylesheet for the OAuth login page. Served as its own document so the page
+    // needs no inline <style>, which lets its CSP drop 'unsafe-inline'. Must stay
+    // ahead of the auth middleware — the login page is shown to anonymous users.
+    app.get(LOGIN_STYLESHEET_PATH, (_req, res) => {
+        res
+            .set('Content-Type', 'text/css; charset=utf-8')
+            .set('Cache-Control', 'public, max-age=86400')
+            .set('X-Content-Type-Options', 'nosniff')
+            .status(200)
+            .send(LOGIN_STYLESHEET);
+    });
     // Simple health check — bypasses all auth middleware so Docker health checks
     // work even before OAuth is fully configured or TLS is verified.
     app.get('/health', (_req, res) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiquila-mcp",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "Nextcloud MCP server — files, calendar, contacts, mail, maps, notes, tasks & 120+ more tools",
   "type": "module",
   "main": "dist/index.js",