Opensearch embed changes

apps/link/app/(main)/_components/Home.tsx

@@ -3,9 +3,10 @@
 import { FC } from "react";
 import { OpenSearchWrapper } from "@link-stack/leafcutter-ui";
 
-export const Home: FC = () => (
-  <OpenSearchWrapper
-    url="/app/visualize#/edit/237b8f00-e6a0-11ee-94b3-d7b7409294e7?embed=true"
-    marginTop="0"
-  />
+type HomeProps = {
+  url: string;
+};
+
+export const Home: FC<HomeProps> = ({ url }) => (
+  <OpenSearchWrapper url={url} margin={0} />
 );

apps/link/app/(main)/_components/Sidebar.tsx

@@ -501,7 +501,17 @@ export const Sidebar: FC<SidebarProps> = ({
               selected={pathname.endsWith("/reporting")}
               open={open}
             />
-            {leafcutterEnabled && (
+            {roles.includes("admin") && leafcutterEnabled && (
+              <MenuItem
+                name="Opensearch"
+                href="/opensearch"
+                Icon={InsightsIcon}
+                iconSize={20}
+                selected={pathname.startsWith("/opensearch")}
+                open={open}
+              />
+            )}
+            {false && leafcutterEnabled && (
               <MenuItem
                 name="Leafcutter"
                 href="/leafcutter"

apps/link/app/(main)/opensearch/page.tsx

@@ -0,0 +1,5 @@
+import { OpenSearchWrapper } from "@link-stack/leafcutter-ui";
+
+export default function Page() {
+  return <OpenSearchWrapper url="/app/visualize#/" margin={50} />;
+}

apps/link/app/(main)/page.tsx

@@ -1,9 +1,10 @@
 import { Metadata } from "next";
 import { redirect } from "next/navigation";
-import { getServerSession } from "app/_lib/authentication";
-import { Home } from "@link-stack/leafcutter-ui";
-import { getUserVisualizations } from "@link-stack/opensearch-common";
-import { LeafcutterWrapper } from "@link-stack/leafcutter-ui";
+import { Home } from "./_components/Home";
+// import { getServerSession } from "app/_lib/authentication";
+// import { Home } from "@link-stack/leafcutter-ui";
+// import { getUserVisualizations } from "@link-stack/opensearch-common";
+// import { LeafcutterWrapper } from "@link-stack/leafcutter-ui";
 
 export const metadata: Metadata = {
   title: "CDR Link - Home",
@@ -11,21 +12,31 @@ export const metadata: Metadata = {
 
 export default async function Page() {
   const leafcutterEnabled = process.env.LEAFCUTTER_ENABLED === "true";
+  const dashboardURL = process.env.LEAFCUTTER_DEFAULT_DASHBOARD_URL;
 
   if (!leafcutterEnabled) {
     redirect("/overview/recent");
   }
-
+  /*
   const session = await getServerSession();
   const {
     user: { email },
   }: any = session;
-
-  const visualizations = await getUserVisualizations(email ?? "none", 20);
+   */
+  let visualizations = [];
+  /*
+  try {
+    visualizations = await getUserVisualizations(email ?? "none", 20);
+  } catch (e) {
+    console.error(e.meta);
+  }
 
   return (
     <LeafcutterWrapper>
       <Home visualizations={visualizations} showWelcome={false} />
     </LeafcutterWrapper>
   );
+   */
+
+  return <Home url={dashboardURL} />;
 }

apps/link/middleware.ts

@@ -15,6 +15,7 @@ const rewriteURL = (
   console.log(`Rewriting ${request.url} to ${destinationURL}`);
   const requestHeaders = new Headers(request.headers);
   requestHeaders.delete("x-forwarded-user");
+  requestHeaders.delete("x-forwarded-roles");
   requestHeaders.delete("connection");
 
   for (const [key, value] of Object.entries(headers)) {
@@ -29,6 +30,9 @@ const rewriteURL = (
 const checkRewrites = async (request: NextRequestWithAuth) => {
   const linkBaseURL = process.env.LINK_URL ?? "http://localhost:3000";
   const zammadURL = process.env.ZAMMAD_URL ?? "http://zammad-nginx:8080";
+  const opensearchBaseURL =
+    process.env.OPENSEARCH_DASHBOARDS_URL ??
+    "http://opensearch-dashboards:5601";
 
   const zammadPaths = [
     "/zammad",
@@ -40,9 +44,20 @@ const checkRewrites = async (request: NextRequestWithAuth) => {
   ];
   const { token } = request.nextauth;
   const email = token?.email?.toLowerCase() ?? "unknown";
-  let headers = { "x-forwarded-user": email };
+  const roles = (token?.roles as string[]) ?? [];
+  let headers = {
+    "x-forwarded-user": email,
+    "x-forwarded-roles": roles.join(","),
+  };
 
-  if (request.nextUrl.pathname.startsWith("/zammad")) {
+  if (request.nextUrl.pathname.startsWith("/dashboards")) {
+    return rewriteURL(
+      request,
+      `${linkBaseURL}/dashboards`,
+      opensearchBaseURL,
+      headers,
+    );
+  } else if (request.nextUrl.pathname.startsWith("/zammad")) {
     return rewriteURL(request, `${linkBaseURL}/zammad`, zammadURL, headers);
   } else if (zammadPaths.some((p) => request.nextUrl.pathname.startsWith(p))) {
     return rewriteURL(request, linkBaseURL, zammadURL, headers);
@@ -51,6 +66,7 @@ const checkRewrites = async (request: NextRequestWithAuth) => {
     const nonce = Buffer.from(crypto.randomUUID()).toString("base64");
     const cspHeader = `
     default-src 'self';
+    frame-src 'self' https://digiresilience.org;
     connect-src 'self';
     script-src 'self' 'nonce-${nonce}' 'strict-dynamic' ${isDev ? "'unsafe-eval'" : ""};
     style-src 'self' 'unsafe-inline';

apps/link/next.config.js

@@ -20,7 +20,7 @@ const nextConfig = {
           },
           {
             key: "X-Frame-Options",
-            value: "DENY",
+            value: "SAMEORIGIN",
           },
           {
             key: "X-Content-Type-Options",