fix(chrome-extension): keep background.mjs a text file (#1969)

A stray NUL byte in the candidate key's separator made git classify
background.mjs as binary, so it shipped in #1967 with no readable diff. The
review bot said as much, having to anchor a comment about that file onto an
unrelated test line because a binary diff accepts none. The separator is now
written as an escape, which is the same character without the file-level
consequence.

Also scope the tile-template brace restoration in serviceUrlParameter to the
kinds that use `{z}/{x}/{y}`. Rewriting `%7B`/`%7D` for every kind would turn a
brace that a WMS or ArcGIS URL legitimately encodes, in a signed parameter or
token, into a literal the server never sent.

Author: giswqs

apps/geolibre-desktop/src/lib/data-url.ts

@@ -24,11 +24,21 @@ export interface ServiceUrlParameter {
   styleUrl: string | null;
 }
 
+/** The service kinds addressed by a `{z}/{x}/{y}` tile template. */
+const TILE_TEMPLATE_KINDS = new Set(["xyz", "wmts", "ogc-vector-tiles"]);
+
 export function serviceUrlParameter(search: string): ServiceUrlParameter | null {
   const params = new URLSearchParams(search);
   const kind = params.get("add");
   const rawUrl = params.get("serviceUrl");
-  const url = httpUrl(rawUrl)?.replace(/%7B/gi, "{").replace(/%7D/gi, "}") ?? null;
+  // Only a tile template carries braces to restore. Rewriting them for every
+  // kind would corrupt a WMS or ArcGIS URL whose query legitimately encodes a
+  // brace, in a signed parameter or token, into one the server never sent.
+  const parsed = httpUrl(rawUrl);
+  const url =
+    parsed && kind && TILE_TEMPLATE_KINDS.has(kind)
+      ? parsed.replace(/%7B/gi, "{").replace(/%7D/gi, "}")
+      : parsed;
   if (!kind || !SERVICE_KINDS.has(kind) || !url) return null;
   return {
     kind,

extensions/geolibre-chrome/background.mjs

@@ -54,6 +54,23 @@ describe("serviceUrlParameter", () => {
     );
   });
 
+  it("restores tile-template braces only for the kinds that use them", () => {
+    // A WMS token that legitimately encodes a brace must reach the server as it
+    // was signed, not as a literal brace.
+    assert.equal(
+      serviceUrlParameter(
+        "?add=wms&serviceUrl=https%3A%2F%2Fmaps.example.com%2Fwms%3Ftoken%3Da%257Bb%257Dc",
+      )?.url,
+      "https://maps.example.com/wms?token=a%7Bb%7Dc",
+    );
+    assert.equal(
+      serviceUrlParameter(
+        "?add=wmts&serviceUrl=https%3A%2F%2Ftiles.example.com%2Fwmts%3FTileMatrix%3D%257Bz%257D",
+      )?.url,
+      "https://tiles.example.com/wmts?TileMatrix={z}",
+    );
+  });
+
   it("ignores a blank layer and a non-web style link", () => {
     assert.deepEqual(
       serviceUrlParameter(