refactor: using python scripts for preparing extensions for chromium

4 files changed, 57 insertions, 30 deletions

diff --git a/modules/web/chromium/browserpass.nix b/modules/web/chromium/browserpass.nix
index 6bef374..9186a7d 100644
--- a/modules/web/chromium/browserpass.nix
+++ b/modules/web/chromium/browserpass.nix
@@ -9,12 +9,13 @@ let
   patchedHost =
     pkgs.runCommand "com.github.browserpass.native.json"
       {
-        nativeBuildInputs = [ pkgs.jq ];
+        nativeBuildInputs = [ pkgs.python3 ];
       }
       ''
-        jq '.allowed_origins = ["chrome-extension://${config.web.chromium.extensions.browserpass.id}/"]' \
+        python3 ${./patch_native_host.py} \
+          ${config.web.chromium.extensions.browserpass.id} \
           ${config.programs.browserpass.package}/lib/browserpass/hosts/chromium/com.github.browserpass.native.json \
-          > $out
+          $out
       '';
 in
 {
diff --git a/modules/web/chromium/extensions/inject_extension_key.py b/modules/web/chromium/extensions/inject_extension_key.py
new file mode 100644
index 0000000..f1b7055
--- /dev/null
+++ b/modules/web/chromium/extensions/inject_extension_key.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+import json
+import re
+import sys
+
+manifest_path = sys.argv[1]
+ext_key = sys.argv[2]
+
+with open(manifest_path, "r", encoding="utf-8", errors="ignore") as f:
+    content = f.read()
+
+pattern = r"(\"[^\"]*?\")|//.*?$|/\*.*?\*/"
+clean = re.sub(
+    pattern,
+    lambda m: m.group(1) if m.group(1) else "",
+    content,
+    flags=re.DOTALL | re.MULTILINE,
+)
+
+clean = re.sub(r",\s*([\]}])", r"\1", clean)
+
+data = json.loads(clean)
+data["key"] = ext_key
+
+with open(manifest_path, "w", encoding="utf-8") as f:
+    json.dump(data, f, indent=2)
diff --git a/modules/web/chromium/extensions/lib.nix b/modules/web/chromium/extensions/lib.nix
index 1197868..fed6846 100644
--- a/modules/web/chromium/extensions/lib.nix
+++ b/modules/web/chromium/extensions/lib.nix
@@ -201,33 +201,12 @@ rec {
 
         # Inject the public key into manifest.json if provided
         ${lib.optionalString (extensionKey != null) ''
-                    if [ -f "$out/manifest.json" ]; then
-                      echo "Injecting extension key into manifest.json to lock the extension ID..."
-                      python3 -c '
-          import json, sys, re
-
-          manifest_path = sys.argv[1]
-          ext_key = sys.argv[2]
-
-          with open(manifest_path, "r", encoding="utf-8", errors="ignore") as f:
-              content = f.read()
-
-          # 1. Strip JS comments without corrupting URLs inside strings
-          pattern = r"(\"[^\"]*?\")|//.*?$|/\*.*?\*/"
-          clean = re.sub(pattern, lambda m: m.group(1) if m.group(1) else "", content, flags=re.DOTALL | re.MULTILINE)
-
-          # 2. Strip trailing commas in JSON objects/arrays
-          clean = re.sub(r",\s*([\]}])", r"\1", clean)
-
-          data = json.loads(clean)
-          data["key"] = ext_key
-
-          with open(manifest_path, "w", encoding="utf-8") as f:
-              json.dump(data, f, indent=2)
-          ' "$out/manifest.json" "${extensionKey}"
-                    else
-                      echo "Warning: No manifest.json found in $out to inject the key!" >&2
-                    fi
+          if [ -f "$out/manifest.json" ]; then
+            echo "Injecting extension key into manifest.json to lock the extension ID..."
+            python3 ${./inject_extension_key.py} "$out/manifest.json" "${extensionKey}"
+          else
+            echo "Warning: No manifest.json found in $out to inject the key!" >&2
+          fi
         ''}
 
         runHook postBuild
diff --git a/modules/web/chromium/patch_native_host.py b/modules/web/chromium/patch_native_host.py
new file mode 100644
index 0000000..38afb44
--- /dev/null
+++ b/modules/web/chromium/patch_native_host.py
@@ -0,0 +1,21 @@
+#!/usr/bin/env python3
+import argparse
+import json
+
+parser = argparse.ArgumentParser(
+    description="Set allowed_origins in a native messaging host manifest"
+)
+parser.add_argument("extension_id", help="Chrome extension ID")
+parser.add_argument("input", help="Path to the input JSON manifest")
+parser.add_argument("output", help="Path to write the patched JSON manifest")
+args = parser.parse_args()
+
+with open(args.input) as f:
+    manifest = json.load(f)
+
+origin = f"chrome-extension://{args.extension_id}/"
+manifest["allowed_origins"] = [origin]
+
+with open(args.output, "w") as f:
+    json.dump(manifest, f, indent=2)
+    f.write("\n")