@promptbook/cli 0.112.0-127 → 0.112.0-129

package/apps/agents-server/src/middleware/resolveAccessControlResponse.ts

@@ -19,6 +19,7 @@ export async function resolveAccessControlResponse(options: {
     readonly request: NextRequest;
     readonly isAccessRestricted: boolean;
     readonly applyResponseHeaders: ApplyResponseHeaders;
+    readonly requestHeaders: Headers;
 }): Promise<NextResponse | null> {
     if (options.request.method === 'OPTIONS') {
         return createOptionsResponse();
@@ -31,7 +32,7 @@ export async function resolveAccessControlResponse(options: {
     const path = options.request.nextUrl.pathname;
 
     if (isAllowedPathWhileRestricted(path)) {
-        const response = NextResponse.next();
+        const response = NextResponse.next({ request: { headers: options.requestHeaders } });
         await options.applyResponseHeaders(response);
         return response;
     }
@@ -39,7 +40,7 @@ export async function resolveAccessControlResponse(options: {
     if (options.request.headers.get('accept')?.includes('text/html')) {
         const restrictedUrl = options.request.nextUrl.clone();
         restrictedUrl.pathname = '/restricted';
-        const response = NextResponse.rewrite(restrictedUrl);
+        const response = NextResponse.rewrite(restrictedUrl, { request: { headers: options.requestHeaders } });
         await options.applyResponseHeaders(response);
         return response;
     }

package/apps/agents-server/src/middleware/resolveMiddlewareResponse.ts

@@ -23,6 +23,7 @@ export async function resolveMiddlewareResponse(options: {
     readonly customDomainResolution: CustomDomainResolution | null;
     readonly isEmbeddingAllowed: boolean;
     readonly applyResponseHeaders: ApplyResponseHeaders;
+    readonly requestHeaders: Headers;
 }): Promise<NextResponse> {
     const rootAgentRedirectResponse = createRootAgentRedirectResponse(options.request);
     if (rootAgentRedirectResponse) {
@@ -33,15 +34,18 @@ export async function resolveMiddlewareResponse(options: {
     const customDomainRewriteResponse = createCustomDomainRewriteResponse(
         options.request,
         options.customDomainResolution,
+        options.requestHeaders,
     );
     if (customDomainRewriteResponse) {
         await options.applyResponseHeaders(customDomainRewriteResponse);
         return customDomainRewriteResponse;
     }
 
-    const response = NextResponse.next();
-    applyEmbeddingHeader(response, options.request.nextUrl, options.isEmbeddingAllowed);
+    const response = NextResponse.next({ request: { headers: options.requestHeaders } });
+    // Note: The base Content Security Policy is applied first so the embedding header can append its
+    //       own `frame-ancestors` directive without dropping the strict `script-src` policy.
     await options.applyResponseHeaders(response);
+    applyEmbeddingHeader(response, options.request.nextUrl, options.isEmbeddingAllowed);
     return response;
 }
 
@@ -78,6 +82,7 @@ function createRootAgentRedirectResponse(request: NextRequest): NextResponse | n
  *
  * @param request - Incoming middleware request.
  * @param customDomainResolution - Resolved custom-domain mapping.
+ * @param requestHeaders - Forwarded request headers already carrying the per-request CSP nonce.
  * @returns Rewrite response, or `null` when no custom-domain mapping exists.
  *
  * @private function of resolveMiddlewareResponse
@@ -85,6 +90,7 @@ function createRootAgentRedirectResponse(request: NextRequest): NextResponse | n
 function createCustomDomainRewriteResponse(
     request: NextRequest,
     customDomainResolution: CustomDomainResolution | null,
+    requestHeaders: Headers,
 ): NextResponse | null {
     if (!customDomainResolution) {
         return null;
@@ -93,7 +99,6 @@ function createCustomDomainRewriteResponse(
     const rewriteUrl = request.nextUrl.clone();
     rewriteUrl.pathname = `/${customDomainResolution.agentName}`;
 
-    const requestHeaders = new Headers(request.headers);
     requestHeaders.set('x-promptbook-server', customDomainResolution.server.domain);
 
     return NextResponse.rewrite(rewriteUrl, {

package/apps/agents-server/src/middleware.ts

@@ -1,5 +1,10 @@
 import { NextRequest, NextResponse } from 'next/server';
 import { applyVisibilityHeaders } from './middleware/applyVisibilityHeaders';
+import {
+    applyContentSecurityPolicyHeader,
+    applyContentSecurityPolicyToRequestHeaders,
+    generateContentSecurityPolicyNonce,
+} from './middleware/contentSecurityPolicy';
 import { createMiddlewareRequestContext } from './middleware/createMiddlewareRequestContext';
 import { resolveAccessControlResponse } from './middleware/resolveAccessControlResponse';
 import { resolveMiddlewareResponse } from './middleware/resolveMiddlewareResponse';
@@ -12,8 +17,15 @@ import { resolveMiddlewareResponse } from './middleware/resolveMiddlewareRespons
  * @returns Middleware response.
  */
 export async function middleware(request: NextRequest): Promise<NextResponse> {
+    // Note: A fresh, single-use nonce is issued per request so that only inline scripts explicitly
+    //       rendered by the server (theme bootstrap, custom JavaScript, analytics) are allowed to run.
+    const contentSecurityPolicyNonce = generateContentSecurityPolicyNonce();
+    const requestHeaders = new Headers(request.headers);
+    applyContentSecurityPolicyToRequestHeaders(requestHeaders, contentSecurityPolicyNonce);
+
     const middlewareRequestContext = await createMiddlewareRequestContext(request);
     const applyResponseHeaders = async (response: NextResponse): Promise<void> => {
+        applyContentSecurityPolicyHeader(response, contentSecurityPolicyNonce);
         await applyVisibilityHeaders({
             canQueryServerTables: middlewareRequestContext.canQueryServerTables,
             request,
@@ -27,6 +39,7 @@ export async function middleware(request: NextRequest): Promise<NextResponse> {
         applyResponseHeaders,
         isAccessRestricted: middlewareRequestContext.isAccessRestricted,
         request,
+        requestHeaders,
     });
 
     if (accessControlResponse) {
@@ -38,6 +51,7 @@ export async function middleware(request: NextRequest): Promise<NextResponse> {
         customDomainResolution: middlewareRequestContext.customDomainResolution,
         isEmbeddingAllowed: middlewareRequestContext.isEmbeddingAllowed,
         request,
+        requestHeaders,
     });
 }