Merge pull request #224 from NFDI4Chem/orgins-validation

feat: validate origins based on hostnames
NFDI4Chem · Aug 14, 2024 · 2767263 · 2767263
2 parents e650dad + 5d32319
commit 2767263
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/allowed-origins.json b/src/allowed-origins.json
@@ -24,7 +24,7 @@
     "https://chemotion-t-02.zdv.uni-mainz.de",
     "https://pregl.ac.rwth-aachen.de",
     "https://schindler-ag.rwth-aachen.de",
-    "10.195.9.248",
+    "http://10.195.9.248",
     "https://dev1.zit.ph.tum.de",
     "https://org2619.chemie.uni-leipzig.de",
     "https://chemotion.ac.chemie.intern.uni-leipzig.de",

diff --git a/src/events/event.ts b/src/events/event.ts
@@ -15,6 +15,9 @@ function on<T extends EventType>(
   } = {},
 ) {
   const { eventOptions, allowedOrigins = [] } = options;
+  const allowedHostnames = new Set(
+    allowedOrigins.map(getHostName).filter(Boolean),
+  );
 
   function listener(event: MessageEvent) {
     const {
@@ -27,7 +30,7 @@ function on<T extends EventType>(
     const skipOriginCheck =
       allowedOrigins.length === 0 || allowedOrigins.includes('*');
 
-    if (!skipOriginCheck && !allowedOrigins.includes(url.origin)) {
+    if (!skipOriginCheck && !allowedHostnames.has(getHostName(url.origin))) {
       throw new Error(`Invalid Origin ${origin}`);
     }
 
@@ -40,4 +43,16 @@ function on<T extends EventType>(
   return () => window.removeEventListener(`message`, listener);
 }
 
+function getHostName(origin: string) {
+  try {
+    const { hostname } = new URL(origin);
+    return hostname;
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.log(error);
+    // return null If the URL is invalid
+    return null;
+  }
+}
+
 export default { trigger, on };