fix(hsts): rework file path resolution

mdn · Jul 24, 2024 · ce1dc5d · ce1dc5d
1 parent 0ea5178
commit ce1dc5d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/analyzer/hsts.js b/src/analyzer/hsts.js
@@ -1,5 +1,8 @@
 import fs from "fs";
-import path from "path";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+const dirname = path.dirname(fileURLToPath(import.meta.url));
 
 /**
  * @type {import("../types.js").Hsts | null}
@@ -11,10 +14,15 @@ let hstsMap = null;
  */
 export function hsts() {
   if (!hstsMap) {
+    const filePath = path.join(
+      dirname,
+      "..",
+      "..",
+      "conf",
+      "hsts-preload.json"
+    );
     hstsMap = new Map(
-      Object.entries(
-        JSON.parse(fs.readFileSync(path.resolve(import.meta.dirname, "../../conf/hsts-preload.json"), "utf8"))
-      )
+      Object.entries(JSON.parse(fs.readFileSync(filePath, "utf8")))
     );
   }
   return hstsMap;

diff --git a/src/database/repository.js b/src/database/repository.js
@@ -105,7 +105,6 @@ export async function insertTestResults(pool, siteId, scanId, scanResult) {
     const scoreModifier = t.scoreModifier;
     delete t.scoreModifier;
     delete t.scoreDescription;
-    delete t.name;
 
     return [
       siteId,