Skip to content

feat: remove csp (and add ds_store to gitignore) #309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qamarq merged 1 commit into from
Feb 12, 2026
Merged

feat: remove csp (and add ds_store to gitignore) #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.env
/node_modules
.DS_Store
4 changes: 0 additions & 4 deletions frontend/src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import type { Metadata } from "next";
import { Space_Grotesk } from "next/font/google";
import { headers } from "next/headers";
import Script from "next/script";
import type React from "react";

Expand Down Expand Up @@ -99,8 +98,6 @@ export default async function RootLayout({
children: React.ReactNode;
}) {
const user = await auth({ noThrow: true, type: "adonis" });
const headersList = await headers();
const nonce = headersList.get("x-nonce");

return (
<html lang="pl" suppressHydrationWarning={true} className="scroll-smooth">
Expand All @@ -121,7 +118,6 @@ export default async function RootLayout({
src="https://analytics.solvro.pl/script.js"
data-website-id="ab126a0c-c0ab-401b-bf9d-da652aab69ec"
data-domains="planer.solvro.pl"
nonce={nonce ?? undefined}
/>
<Toaster richColors={true} />
</body>
Expand Down
28 changes: 0 additions & 28 deletions frontend/src/middleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,41 +4,13 @@ import { NextResponse } from "next/server";
import { auth } from "./lib/auth";

export async function middleware(request: NextRequest) {
const nonce = Buffer.from(crypto.randomUUID()).toString("base64");
const cspHeader = `
default-src 'self' 'nonce-${nonce}' https://fonts.googleapis.com https://fonts.gstatic.com https://analytics.solvro.pl ${process.env.NODE_ENV === "development" ? "http://localhost:3333" : ""};
script-src 'self' 'nonce-${nonce}' 'strict-dynamic' ${process.env.NODE_ENV === "development" ? "'unsafe-eval'" : ""} https://analytics.solvro.pl;
style-src 'self' 'unsafe-inline';
img-src 'self' blob: data: https://avatars.githubusercontent.com https://wit.pwr.edu.pl https://cms.solvro.pl https://apps.usos.pwr.edu.pl;
font-src 'self';
object-src 'none';
base-uri 'self';
form-action 'self';
frame-ancestors 'none';
upgrade-insecure-requests;
`;

const contentSecurityPolicyHeaderValue = cspHeader
.replaceAll(/\s{2,}/g, " ")
.trim();

const requestHeaders = new Headers(request.headers);
requestHeaders.set("x-nonce", nonce);

requestHeaders.set(
"Content-Security-Policy",
contentSecurityPolicyHeaderValue,
);

const nextResponse = NextResponse.next({
request: {
headers: requestHeaders,
},
});
nextResponse.headers.set(
"Content-Security-Policy",
contentSecurityPolicyHeaderValue,
);

const payload = {
adonisSession: request.cookies.get("adonis-session")?.value ?? "",
Expand Down
Loading