Skip to content

tls: use RegExp.escape to better escape servername #60805

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

Closed
aduh95 wants to merge 2 commits into from
Closed

tls: use RegExp.escape to better escape servername #60805

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e02b81
tls: use `RegExp.escape` to better escape servername
aduh95 Nov 21, 2025
3ab5c5d
fixup! tls: use `RegExp.escape` to better escape servername
aduh95 Nov 21, 2025
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
9 changes: 4 additions & 5 deletions lib/internal/tls/wrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ const {
ObjectSetPrototypeOf,
ReflectApply,
RegExp,
RegExpEscape,
Symbol,
SymbolFor,
} = primordials;
Expand Down Expand Up @@ -110,6 +111,8 @@ const kPskIdentityHint = Symbol('pskidentityhint');
const kPendingSession = Symbol('pendingSession');
const kIsVerified = Symbol('verified');

const kRegExpEscapedStar = RegExpEscape('*');

const noop = () => {};

let tlsTracingWarned = false;
Expand Down Expand Up @@ -1541,11 +1544,7 @@ Server.prototype.addContext = function(servername, context) {
throw new ERR_TLS_REQUIRED_SERVER_NAME();
}

const re = new RegExp(`^${
servername
.replace(/([.^$+?\-\\[\]{}])/g, '\\$1')
.replaceAll('*', '[^.]*')
}$`);
const re = new RegExp(`^${RegExpEscape(servername).replaceAll(kRegExpEscapedStar, '[^.]+')}$`);

const secureContext =
context instanceof common.SecureContext ? context : tls.createSecureContext(context);
Expand Down
Loading