From 1edf633aaee1e20f60a5af43b2e15681976f861b Mon Sep 17 00:00:00 2001
From: rdbsolutions <rob@rdbsolutions.co.uk>
Date: Wed, 9 Apr 2025 13:38:18 +0100
Subject: [PATCH 1/4] updated git ignore

---
 .gitignore | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index e329ead9..6ed0007b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,5 +36,3 @@ pages/polling.js
 # dev apis to no include
 
 pages/api/endpoint/getaccounts_api.js
-
-pages/auth/signin2.js

From 59eaf80af3a5c6f67f50bbd9390e3f0924e63937 Mon Sep 17 00:00:00 2001
From: rdbsolutions <rob@rdbsolutions.co.uk>
Date: Wed, 9 Apr 2025 13:58:00 +0100
Subject: [PATCH 2/4] signin in fix

---
 pages/auth/signin.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pages/auth/signin.js b/pages/auth/signin.js
index 5882000b..747c76cb 100644
--- a/pages/auth/signin.js
+++ b/pages/auth/signin.js
@@ -182,7 +182,13 @@ export async function getServerSideProps(context) {
         return toUrlObj.toString(); // Return the full new URL as a string
     };
 
-    formURL = appendParamsAndPathToNewUrl(context.query.callbackUrl, formURL);
+    typeof context.query.callbackUrl != "undefined" &&
+        (formURL = appendParamsAndPathToNewUrl(
+            context.query.callbackUrl,
+            formURL
+        ));
+
+    //formURL = appendParamsAndPathToNewUrl(context.query.callbackUrl, formURL);
 
     const url = new URL(formURL); // base URL
 

From 8f9652003ef8a176ea4b24eccfa8a88259b3e80a Mon Sep 17 00:00:00 2001
From: rdbsolutions <rob@rdbsolutions.co.uk>
Date: Mon, 14 Apr 2025 15:00:14 +0100
Subject: [PATCH 3/4] Put CSP in to headers and not Meta tags

---
 components/tracking/index.js |  5 ++-
 middleware.js                | 77 ++++++++++++++++++++++++++++++++++++
 package.json                 |  4 +-
 pages/_document.js           | 12 ++++--
 4 files changed, 92 insertions(+), 6 deletions(-)
 create mode 100644 middleware.js

diff --git a/components/tracking/index.js b/components/tracking/index.js
index 2b1e026d..1bdbf3b4 100644
--- a/components/tracking/index.js
+++ b/components/tracking/index.js
@@ -6,11 +6,13 @@ export const Tracking = ({ googleTagManagerID, nonce, cookieObj }) => {
     return (
         <Fragment>
             <script
+                nonce={nonce}
                 async
                 // strategy="afterInteractive"
                 src={`https://www.googletagmanager.com/gtag/js?id=${googleTagManagerID}`}
             />
             <script
+                nonce={nonce}
                 async
                 id="google-analytics"
                 // strategy="afterInteractive"
@@ -48,10 +50,11 @@ export const Tracking = ({ googleTagManagerID, nonce, cookieObj }) => {
     );
 };
 
-export const TrackingNoScript = ({ googleTagManagerID }) => (
+export const TrackingNoScript = ({ nonce, googleTagManagerID }) => (
     <Fragment>
         <noscript>
             <iframe
+                nonce={nonce}
                 title="google analytics"
                 src={`https://www.googletagmanager.com/ns.html?id=${googleTagManagerID}`}
                 height="0"
diff --git a/middleware.js b/middleware.js
new file mode 100644
index 00000000..08fce44b
--- /dev/null
+++ b/middleware.js
@@ -0,0 +1,77 @@
+import { NextResponse } from "next/server";
+
+export function middleware(request) {
+    const nonce = Buffer.from(crypto.randomUUID()).toString("base64");
+    const cspHeader = `
+    default-src 'self';
+    script-src 'self' 'nonce-${nonce}' 'strict-dynamic' https: http: ${
+        process.env.NODE_ENV === "production" ? "" : `'unsafe-eval'`
+    };
+    style-src 'self' 'unsafe-eval' 'unsafe-inline';
+    img-src 'self' blob: data:;
+    connect-src 'self' http://127.0.0.1 https://uksouth-1.in.applicationinsights.azure.com https://ukwest-0.in.applicationinsights.azure.com https://js.monitor.azure.com https://region1.google-analytics.com;
+    font-src 'self'  https://pro.fontawesome.com/ https://fonts.gstatic.com/ ;
+    object-src 'none';
+    base-uri 'self';
+    form-action 'self' ${process.env.NEXTAUTH_URL}; 
+    frame-ancestors 'none';
+    upgrade-insecure-requests;
+    frame-src https://datamap.gov.wales;
+`;
+
+    // csp += `base-uri 'self';`;
+    // csp += `script-src 'self' 'unsafe-eval' 'unsafe-inline' https://ukwest-0.in.applicationinsights.azure.com https://region1.google-analytics.com https://www.google-analytics.com/ https://tagmanager.google.com/ https://www.googletagmanager.com/;`;
+    // csp += `style-src 'self' 'unsafe-inline' https://pro.fontawesome.com/ https://www.google-analytics.com https://tagmanager.google.com/ https://www.googletagmanager.com/ https://fonts.googleapis.com/;`;
+    // csp += `img-src 'self' 'unsafe-inline' https://maps.gstatic.com  https://www.gov.wales https://gov.wales https://fonts.gstatic.com https://www.googletagmanager.com https://www.google-analytics.com https://ssl.gstatic.com/  blob: data:;`;
+    // csp += `connect-src 'self' http://127.0.0.1 https://uksouth-1.in.applicationinsights.azure.com https://ukwest-0.in.applicationinsights.azure.com https://js.monitor.azure.com https://region1.google-analytics.com;`;
+
+    // csp += `form-action 'self' ` + process.env.NEXTAUTH_URL + ` ;`;
+    // csp += `object-src 'self' data:;`;
+    // csp += `default-src 'self' https://www.google-analytics.com;`;
+
+    // csp += `font-src 'self' 'unsafe-inline' https://pro.fontawesome.com/ https://fonts.gstatic.com/ data:;`;
+    // csp += `frame-src https://datamap.gov.wales`;
+
+    // Replace newline characters and spaces
+    const contentSecurityPolicyHeaderValue = cspHeader
+        .replace(/\s{2,}/g, " ")
+        .trim();
+
+    const requestHeaders = new Headers(request.headers);
+    requestHeaders.set("x-nonce", nonce);
+    requestHeaders.set(
+        "Content-Security-Policy",
+        contentSecurityPolicyHeaderValue
+    );
+
+    const response = NextResponse.next({
+        request: {
+            headers: requestHeaders,
+        },
+    });
+    response.headers.set(
+        "Content-Security-Policy",
+        contentSecurityPolicyHeaderValue
+    );
+
+    return response;
+}
+
+export const config = {
+    matcher: [
+        /*
+         * Match all request paths except for the ones starting with:
+         * - api (API routes)
+         * - _next/static (static files)
+         * - _next/image (image optimization files)
+         * - favicon.ico (favicon file)
+         */
+        {
+            source: "/((?!api|_next/static|_next/image|favicon.ico).*)",
+            missing: [
+                { type: "header", key: "next-router-prefetch" },
+                { type: "header", key: "purpose", value: "prefetch" },
+            ],
+        },
+    ],
+};
diff --git a/package.json b/package.json
index 04575588..25e7f5bd 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
         "dev:app": "node ./server/server.js",
         "build": "NODE_ENV=production node_modules/next/dist/bin/next build",
         "start2": "NODE_ENV=production node ./server/server.js",
-        "start": "node_modules/next/dist/bin/next start",
+        "start": "NODE_ENV=production node_modules/next/dist/bin/next start",
         "lint": "next lint"
     },
     "browser": {
@@ -104,4 +104,4 @@
         "eslint-plugin-jsdoc": "^48.2.3",
         "prisma": "^5.0.0"
     }
-}
+}
\ No newline at end of file
diff --git a/pages/_document.js b/pages/_document.js
index 71b93947..13dbbf39 100644
--- a/pages/_document.js
+++ b/pages/_document.js
@@ -28,14 +28,20 @@ class MyDocument extends Document {
             path: "/",
         });
 
-        return { ...initialProps, useGATracking, cookieObj };
+        const headers = ctx.req?.headers;
+        const generatedNonce = headers?.["x-nonce"];
+
+        return { ...initialProps, useGATracking, cookieObj, generatedNonce };
     }
 
     render() {
         const googleTagManagerID = process.env.GOOGLE_TAG_MANAGER || null;
         const { useGATracking, locale, cookieObj } = this.props;
 
-        const generatedNonce = nanoid();
+        //const generatedNonce = nanoid();
+        const generatedNonce = this.props.generatedNonce;
+
+        console.log("this is the nonce:", generatedNonce);
 
         let csp = ``;
         csp += `base-uri 'self';`;
@@ -51,7 +57,7 @@ class MyDocument extends Document {
         return (
             <Html lang={locale}>
                 <Head nonce={generatedNonce}>
-                    <meta httpEquiv="Content-Security-Policy" content={csp} />
+                    {/* <meta httpEquiv="Content-Security-Policy" content={csp} /> */}
                     {useGATracking && (
                         <Tracking
                             googleTagManagerID={"G-GTWW3JT03Z"}

From 8f1b2b63b4f9ec8d2898fbe2b9cc5a4237bb34f6 Mon Sep 17 00:00:00 2001
From: rdbsolutions <rob@rdbsolutions.co.uk>
Date: Mon, 14 Apr 2025 18:00:30 +0100
Subject: [PATCH 4/4] csp fix removed matcher

---
 components/tracking/index.js |  2 +-
 middleware.js                | 50 +++++++++++++++++++-----------------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/components/tracking/index.js b/components/tracking/index.js
index 1bdbf3b4..5439f388 100644
--- a/components/tracking/index.js
+++ b/components/tracking/index.js
@@ -50,7 +50,7 @@ export const Tracking = ({ googleTagManagerID, nonce, cookieObj }) => {
     );
 };
 
-export const TrackingNoScript = ({ nonce, googleTagManagerID }) => (
+export const TrackingNoScript = ({ googleTagManagerID, nonce }) => (
     <Fragment>
         <noscript>
             <iframe
diff --git a/middleware.js b/middleware.js
index 08fce44b..a07e56ce 100644
--- a/middleware.js
+++ b/middleware.js
@@ -2,21 +2,23 @@ import { NextResponse } from "next/server";
 
 export function middleware(request) {
     const nonce = Buffer.from(crypto.randomUUID()).toString("base64");
-    const cspHeader = `
+    const cspHeader =
+        `
     default-src 'self';
     script-src 'self' 'nonce-${nonce}' 'strict-dynamic' https: http: ${
-        process.env.NODE_ENV === "production" ? "" : `'unsafe-eval'`
-    };
+            process.env.NODE_ENV === "production" ? "" : `'unsafe-eval'`
+        };
     style-src 'self' 'unsafe-eval' 'unsafe-inline';
-    img-src 'self' blob: data:;
+    img-src 'self' 'unsafe-inline'  https://www.gov.wales https://gov.wales https://fonts.gstatic.com https://www.googletagmanager.com  blob: data:;
     connect-src 'self' http://127.0.0.1 https://uksouth-1.in.applicationinsights.azure.com https://ukwest-0.in.applicationinsights.azure.com https://js.monitor.azure.com https://region1.google-analytics.com;
     font-src 'self'  https://pro.fontawesome.com/ https://fonts.gstatic.com/ ;
     object-src 'none';
     base-uri 'self';
-    form-action 'self' ${process.env.NEXTAUTH_URL}; 
+    form-action 'self' ` +
+        process.env.NEXTAUTH_URL +
+        `; 
     frame-ancestors 'none';
     upgrade-insecure-requests;
-    frame-src https://datamap.gov.wales;
 `;
 
     // csp += `base-uri 'self';`;
@@ -57,21 +59,21 @@ export function middleware(request) {
     return response;
 }
 
-export const config = {
-    matcher: [
-        /*
-         * Match all request paths except for the ones starting with:
-         * - api (API routes)
-         * - _next/static (static files)
-         * - _next/image (image optimization files)
-         * - favicon.ico (favicon file)
-         */
-        {
-            source: "/((?!api|_next/static|_next/image|favicon.ico).*)",
-            missing: [
-                { type: "header", key: "next-router-prefetch" },
-                { type: "header", key: "purpose", value: "prefetch" },
-            ],
-        },
-    ],
-};
+// export const config = {
+//     matcher: [
+//         /*
+//          * Match all request paths except for the ones starting with:
+//          * - api (API routes)
+//          * - _next/static (static files)
+//          * - _next/image (image optimization files)
+//          * - favicon.ico (favicon file)
+//          */
+//         {
+//             source: "/((?!api|_next/static|_next/image|favicon.ico).*)",
+//             missing: [
+//                 { type: "header", key: "next-router-prefetch" },
+//                 { type: "header", key: "purpose", value: "prefetch" },
+//             ],
+//         },
+//     ],
+// };