Skip to content

fix(web-incoming): use isSSL regex for consistent https/wss protocol checks #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pi0 merged 2 commits into from
Mar 25, 2026
Merged

fix(web-incoming): use isSSL regex for consistent https/wss protocol checks #123

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14c79d7
fix(web-incoming): use `isSSL` regex for consistent https/wss protoco…
pi0 Mar 25, 2026
538499b
Apply suggestion from @pi0
pi0 Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/middleware/web-incoming.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { ClientRequest, IncomingMessage, ServerResponse } from "node:http";
import type { ProxyTargetDetailed } from "../types.ts";
import nodeHTTP from "node:http";
import nodeHTTPS from "node:https";
import { getPort, hasEncryptedConnection, setupOutgoing } from "../_utils.ts";
import { getPort, hasEncryptedConnection, isSSL, setupOutgoing } from "../_utils.ts";
import { webOutgoingMiddleware } from "./web-outgoing.ts";
import { type ProxyMiddleware, defineProxyMiddleware } from "./_utils.ts";

Expand Down Expand Up @@ -78,7 +78,7 @@ export const stream = defineProxyMiddleware((req, res, options, server, head, ca

if (options.forward) {
// If forward enable, so just pipe the request
const forwardReq = (options.forward.protocol === "https:" ? https : http).request(
const forwardReq = (isSSL.test(options.forward.protocol || "http") ? https : http).request(
setupOutgoing(options.ssl || {}, options, req, "forward"),
);

Expand All @@ -96,7 +96,7 @@ export const stream = defineProxyMiddleware((req, res, options, server, head, ca
}

// Request initalization
const proxyReq = (options.target.protocol === "https:" ? https : http).request(
const proxyReq = (isSSL.test(options.target.protocol || "http") ? https : http).request(
setupOutgoing(options.ssl || {}, options, req),
);

Expand Down Expand Up @@ -186,7 +186,7 @@ export const stream = defineProxyMiddleware((req, res, options, server, head, ca
const preserveMethod = statusCode === 307 || statusCode === 308;
const redirectMethod = preserveMethod ? req.method || "GET" : "GET";

const isHTTPS = location.protocol === "https:";
const isHTTPS = isSSL.test(location.protocol);
const agent = isHTTPS ? https : http;

// Build headers from original request
Expand Down
Loading