Bug 93141 - Expand ~ to home directory when fixing up file URIs r=mak

Differential Revision: https://phabricator.services.mozilla.com/D185562
dothq · Aug 14, 2023 · 11bd76e · 11bd76e
1 parent 29d6bd6
commit 11bd76e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/docshell/base/URIFixup.sys.mjs b/docshell/base/URIFixup.sys.mjs
@@ -925,8 +925,8 @@ function fileURIFixup(uriString) {
       path = uriString.replace(/\//g, "\\");
     }
   } else {
-    // UNIX: Check if it starts with "/".
-    attemptFixup = uriString.startsWith("/");
+    // UNIX: Check if it starts with "/" or "~".
+    attemptFixup = /^[~/]/.test(uriString);
   }
   if (attemptFixup) {
     try {

diff --git a/docshell/test/unit/test_URIFixup_info.js b/docshell/test/unit/test_URIFixup_info.js
@@ -802,6 +802,18 @@ if (AppConstants.platform == "win") {
     affectedByDNSForSingleWordHosts: true,
   });
 } else {
+  const homeDir = Services.dirsvc.get("Home", Ci.nsIFile).path;
+
+  testcases.push({
+    input: "~",
+    fixedURI: `file://${homeDir}`,
+    protocolChange: true,
+  });
+  testcases.push({
+    input: "~/foo",
+    fixedURI: `file://${homeDir}/foo`,
+    protocolChange: true,
+  });
   testcases.push({
     input: "/some/file.txt",
     fixedURI: "file:///some/file.txt",