Fix proxying to unix socket:

- no need to add request's url to the request path. This already exists and leads to duplication.
- fix custom error routes with unix socket by setting target hostname to localhost.

Author: dometto

lib/configproxy.js

@@ -388,15 +388,14 @@ export class ConfigurableProxy extends EventEmitter {
     });
   }
 
-  proxyOptsForTarget(target, reqUrl) {
+  proxyOptsForTarget(target) {
     var proxyOptions = { target };
 
     if (target.protocol.startsWith("unix")) {
       // No need for agents for unix sockets
       // No support for https for unix sockets
       proxyOptions.secure = false;
       proxyOptions.target.socketPath = decodeURIComponent(target.host);
-      proxyOptions.target.pathname = (target.pathname ? target.pathname + "/" : "") + reqUrl;
     } else if (target.protocol.startsWith("https")) {
       proxyOptions.secure = true;
       proxyOptions.agent = this.httpsAgent;
@@ -495,17 +494,24 @@ export class ConfigurableProxy extends EventEmitter {
       return;
     }
     if (this.errorTarget) {
-      var urlSpec = new URL(this.errorTarget);
       // error request is $errorTarget/$code?url=$requestUrl
-      urlSpec.searchParams.set("url", req.url);
-      urlSpec.pathname = urlSpec.pathname + code.toString();
-      var url = urlSpec.toString();
-      this.log.debug("Requesting custom error page: %s", url);
+      var options = this.proxyOptsForTarget(new URL(this.errorTarget));
 
-      var options = this.proxyOptsForTarget(urlSpec, req.url);
       options.method = "GET";
 
-      var errorRequest = (options.secure ? https : http).request(url, options, (upstream) => {
+      options.target.searchParams.set("url", req.url);
+      options.target.pathname = options.target.pathname + code.toString()
+
+      if (options.target.socketPath) {
+        options.target.hostname = 'localhost'        
+        var url = options.target.toString().substring(5) // chop off unix+
+      } else {
+        var url = options.target.toString()
+      }
+
+      this.log.debug("Requesting custom error page: %s", url);
+
+      var errorRequest = (options.secure ? https : http).request(url, options.target, (upstream) => {
         if (res.writableEnded) {
           // response already done
           // make sure to consume upstream;
@@ -588,7 +594,7 @@ export class ConfigurableProxy extends EventEmitter {
         }
 
         target = new URL(target);
-        var proxyOptions = this.proxyOptsForTarget(target, req.url);
+        var proxyOptions = this.proxyOptsForTarget(target);
 
         args.push(proxyOptions);
 

lib/testutil.js

@@ -5,6 +5,7 @@ import https from "node:https";
 import { WebSocketServer } from "ws";
 import { ConfigurableProxy } from "./configproxy.js";
 import { defaultLogger } from "./log.js";
+import { error } from "node:console";
 
 var servers = [];
 
@@ -102,7 +103,7 @@ export function addTargets(proxy, paths, port) {
 export function setupProxy(port, options, paths) {
   options = options || {};
   options.authToken = "secret";
-  options.log = defaultLogger({ level: "error" });
+  //options.log = defaultLogger({ level: "error" });
 
   var proxy = new ConfigurableProxy(options);
   proxy._setup_timestamp = new Date(new Date().getTime() - 60000);
@@ -133,7 +134,12 @@ export function setupProxy(port, options, paths) {
     });
     errorServer.on("listening", onlisten);
     const errorUrl = new URL(options.errorTarget);
-    errorServer.listen(errorUrl.port, ip);
+    if (errorUrl.href.startsWith("unix+")) {
+      console.log(decodeURIComponent(errorUrl.hostname));
+      errorServer.listen(decodeURIComponent(errorUrl.hostname));
+    } else {
+      errorServer.listen(errorUrl.port, ip);
+    }
     servers.push(errorServer);
   }
 

test/proxy_spec.js

@@ -513,14 +513,30 @@ describe("Proxy Tests", function () {
       .then(done);
   });
 
+  it("custom error target with unix socket", function (done) {
+    var proxyPort = 55550;
+    util
+      .setupProxy(proxyPort, { errorTarget: "unix+http://%2Ftmp%2Ftest.sock" }, [])
+      .then(() => fetch("http://127.0.0.1:" + proxyPort + "/foo/bar"))
+      .then((res) => {
+        expect(res.status).toEqual(404);
+        expect(res.headers.get("content-type")).toEqual("text/plain");
+        return res.text();
+      })
+      .then((body) => {
+        expect(body).toEqual("/foo/bar");
+      })
+      .then(done);
+  });
+
   it("proxy to unix socket test", function (done) {
     var proxyPort = 55557;
     var unixSocketUri = "%2Ftmp%2Ftest.sock";
 
     util
       .setupProxy(proxyPort, {}, [])
       .then((proxy) => util.addTarget(proxy, "/unix", 0, false, null, null, unixSocketUri))
-      .then(() => fetch("http://127.0.0.1:" + proxyPort + "/unix"))
+      .then(() => fetch("http://127.0.0.1:" + proxyPort + "/unix/foo"))
       .then((res) => {
         expect(res.status).toEqual(200);
       })