Put CSP in to headers and not Meta tags
This commit is contained in:
@@ -6,11 +6,13 @@ export const Tracking = ({ googleTagManagerID, nonce, cookieObj }) => {
|
|||||||
return (
|
return (
|
||||||
<Fragment>
|
<Fragment>
|
||||||
<script
|
<script
|
||||||
|
nonce={nonce}
|
||||||
async
|
async
|
||||||
// strategy="afterInteractive"
|
// strategy="afterInteractive"
|
||||||
src={`https://www.googletagmanager.com/gtag/js?id=${googleTagManagerID}`}
|
src={`https://www.googletagmanager.com/gtag/js?id=${googleTagManagerID}`}
|
||||||
/>
|
/>
|
||||||
<script
|
<script
|
||||||
|
nonce={nonce}
|
||||||
async
|
async
|
||||||
id="google-analytics"
|
id="google-analytics"
|
||||||
// strategy="afterInteractive"
|
// strategy="afterInteractive"
|
||||||
@@ -48,10 +50,11 @@ export const Tracking = ({ googleTagManagerID, nonce, cookieObj }) => {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export const TrackingNoScript = ({ googleTagManagerID }) => (
|
export const TrackingNoScript = ({ nonce, googleTagManagerID }) => (
|
||||||
<Fragment>
|
<Fragment>
|
||||||
<noscript>
|
<noscript>
|
||||||
<iframe
|
<iframe
|
||||||
|
nonce={nonce}
|
||||||
title="google analytics"
|
title="google analytics"
|
||||||
src={`https://www.googletagmanager.com/ns.html?id=${googleTagManagerID}`}
|
src={`https://www.googletagmanager.com/ns.html?id=${googleTagManagerID}`}
|
||||||
height="0"
|
height="0"
|
||||||
|
|||||||
@@ -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" },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
+2
-2
@@ -8,7 +8,7 @@
|
|||||||
"dev:app": "node ./server/server.js",
|
"dev:app": "node ./server/server.js",
|
||||||
"build": "NODE_ENV=production node_modules/next/dist/bin/next build",
|
"build": "NODE_ENV=production node_modules/next/dist/bin/next build",
|
||||||
"start2": "NODE_ENV=production node ./server/server.js",
|
"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"
|
"lint": "next lint"
|
||||||
},
|
},
|
||||||
"browser": {
|
"browser": {
|
||||||
@@ -104,4 +104,4 @@
|
|||||||
"eslint-plugin-jsdoc": "^48.2.3",
|
"eslint-plugin-jsdoc": "^48.2.3",
|
||||||
"prisma": "^5.0.0"
|
"prisma": "^5.0.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+9
-3
@@ -28,14 +28,20 @@ class MyDocument extends Document {
|
|||||||
path: "/",
|
path: "/",
|
||||||
});
|
});
|
||||||
|
|
||||||
return { ...initialProps, useGATracking, cookieObj };
|
const headers = ctx.req?.headers;
|
||||||
|
const generatedNonce = headers?.["x-nonce"];
|
||||||
|
|
||||||
|
return { ...initialProps, useGATracking, cookieObj, generatedNonce };
|
||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const googleTagManagerID = process.env.GOOGLE_TAG_MANAGER || null;
|
const googleTagManagerID = process.env.GOOGLE_TAG_MANAGER || null;
|
||||||
const { useGATracking, locale, cookieObj } = this.props;
|
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 = ``;
|
let csp = ``;
|
||||||
csp += `base-uri 'self';`;
|
csp += `base-uri 'self';`;
|
||||||
@@ -51,7 +57,7 @@ class MyDocument extends Document {
|
|||||||
return (
|
return (
|
||||||
<Html lang={locale}>
|
<Html lang={locale}>
|
||||||
<Head nonce={generatedNonce}>
|
<Head nonce={generatedNonce}>
|
||||||
<meta httpEquiv="Content-Security-Policy" content={csp} />
|
{/* <meta httpEquiv="Content-Security-Policy" content={csp} /> */}
|
||||||
{useGATracking && (
|
{useGATracking && (
|
||||||
<Tracking
|
<Tracking
|
||||||
googleTagManagerID={"G-GTWW3JT03Z"}
|
googleTagManagerID={"G-GTWW3JT03Z"}
|
||||||
|
|||||||
Reference in New Issue
Block a user