Commit 6b71853

Browse files
jasnelladuh95
jasnell
authored and
aduh95
committed
quic: add handshake timeout and default connection limits
Signed-off-by: James M Snell <jasnell@gmail.com> Assisted-by: Opencode:Opus 4.6 PR-URL: #63267 Backport-PR-URL: #64675 Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
1 parent 91e3c39 commit 6b71853

6 files changed

Lines changed: 31 additions & 11 deletions

File tree

‎lib/internal/quic/quic.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3944,8 +3944,8 @@ class QuicEndpoint {
39443944
const{
39453945
retryTokenExpiration,
39463946
tokenExpiration,
3947-
maxConnectionsPerHost =0,
3948-
maxConnectionsTotal =0,
3947+
maxConnectionsPerHost =100,
3948+
maxConnectionsTotal =10_000,
39493949
maxStatelessResetsPerHost,
39503950
disableStatelessReset,
39513951
addressLRUSize,

‎src/quic/endpoint.cc‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -979,7 +979,8 @@ void Endpoint::SendVersionNegotiation(const PathDescriptor& options) {
979979
};
980980

981981
if (exceeds_limits()) {
982-
Debug(this, "Version negotiation rate limit exceeded for %s",
982+
Debug(this,
983+
"Version negotiation rate limit exceeded for %s",
983984
options.remote_address);
984985
return;
985986
}
@@ -1048,7 +1049,8 @@ void Endpoint::SendImmediateConnectionClose(const PathDescriptor& options,
10481049
};
10491050

10501051
if (exceeds_limits()) {
1051-
Debug(this, "Immediate connection close rate limit exceeded for %s",
1052+
Debug(this,
1053+
"Immediate connection close rate limit exceeded for %s",
10521054
options.remote_address);
10531055
return;
10541056
}

‎src/quic/session.cc‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,12 @@ Session::Config::Config(Environment* env,
464464
settings.log_printf = ngtcp2_debug_log;
465465
}
466466

467-
settings.handshake_timeout = options.handshake_timeout;
467+
// The handshake_timeout option is in milliseconds; ngtcp2 expects
468+
// nanoseconds (ngtcp2_duration). UINT64_MAX means no timeout.
469+
settings.handshake_timeout =
470+
options.handshake_timeout == UINT64_MAX
471+
? UINT64_MAX
472+
: options.handshake_timeout * NGTCP2_MILLISECONDS;
468473
settings.max_stream_window = options.max_stream_window;
469474
settings.max_window = options.max_window;
470475
settings.ack_thresh = options.unacknowledged_packet_threshold;
@@ -3648,6 +3653,10 @@ void Session::InitPerContext(Realm* realm, Local<Object> target) {
36483653
NODE_DEFINE_CONSTANT(target, QUIC_PROTO_MAX);
36493654
NODE_DEFINE_CONSTANT(target, QUIC_PROTO_MIN);
36503655

3656+
staticconstexprautoDEFAULT_HANDSHAKE_TIMEOUT =
3657+
Session::Options::DEFAULT_HANDSHAKE_TIMEOUT;
3658+
NODE_DEFINE_CONSTANT(target, DEFAULT_HANDSHAKE_TIMEOUT);
3659+
36513660
NODE_DEFINE_STRING_CONSTANT(
36523661
target, "DEFAULT_CIPHERS", TLSContext::DEFAULT_CIPHERS);
36533662
NODE_DEFINE_STRING_CONSTANT(

‎src/quic/session.h‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,15 @@ class Session final : public AsyncWrap, private SessionTicket::AppData::Source {
153153
bool qlog = false;
154154

155155
// The amount of time (in milliseconds) that the endpoint will wait for the
156-
// completion of the tls handshake.
157-
uint64_t handshake_timeout = UINT64_MAX;
156+
// completion of the TLS handshake. If the handshake does not complete
157+
// within this time, the session is closed. This prevents a peer from
158+
// holding a session open indefinitely in the handshake state, consuming
159+
// server resources (ngtcp2 connection, TLS state, JS objects) without
160+
// ever completing the connection. The default of 10 seconds is generous
161+
// enough to accommodate slow networks with retransmissions while still
162+
// bounding resource exposure. Set to UINT64_MAX to disable.
163+
staticconstexpruint64_tDEFAULT_HANDSHAKE_TIMEOUT = 10'000;
164+
uint64_t handshake_timeout = DEFAULT_HANDSHAKE_TIMEOUT;
158165

159166
// The keep-alive timeout in milliseconds. When set to a non-zero value,
160167
// ngtcp2 will automatically send PING frames to keep the connection alive

‎test/parallel/test-quic-connection-limits.mjs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@ const endpoint = new QuicEndpoint({ maxConnectionsTotal: 1 });
2727

2828
// Verify the limits are readable and mutable.
2929
strictEqual(endpoint.maxConnectionsTotal,1);
30-
strictEqual(endpoint.maxConnectionsPerHost,0);
31-
endpoint.maxConnectionsPerHost=100;
30+
// The default maxConnectionsPerHost is 100 — a non-zero default that
31+
// prevents a single host from exhausting server resources.
3232
strictEqual(endpoint.maxConnectionsPerHost,100);
33+
endpoint.maxConnectionsPerHost=50;
34+
strictEqual(endpoint.maxConnectionsPerHost,50);
3335
endpoint.maxConnectionsPerHost=0;
3436

3537
letsessionCount=0;

‎test/parallel/test-quic-internal-endpoint-stats-state.mjs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ const {
4343
isListening: false,
4444
isClosing: false,
4545
isBusy: false,
46-
maxConnectionsPerHost: 0,
47-
maxConnectionsTotal: 0,
46+
maxConnectionsPerHost: 100,
47+
maxConnectionsTotal: 10_000,
4848
pendingCallbacks: '0',
4949
});
5050

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Commit 6b71853
Browse files
jasnelladuh95
jasnell
authored and
aduh95
committed
quic: add handshake timeout and default connection limits
Signed-off-by: James M Snell <jasnell@gmail.com>
Assisted-by: Opencode:Opus 4.6
PR-URL: #63267
Backport-PR-URL: #64675
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
1 parent 91e3c39 commit 6b71853
6 files changed
Lines changed: 31 additions & 11 deletions
File tree
‎lib/internal/quic/quic.js‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3944,8 +3944,8 @@ class QuicEndpoint {
39443944
const{
39453945
 retryTokenExpiration,
39463946
 tokenExpiration,
3947-
 maxConnectionsPerHost =0,
3948-
 maxConnectionsTotal =0,
3947+
 maxConnectionsPerHost =100,
3948+
 maxConnectionsTotal =10_000,
39493949
 maxStatelessResetsPerHost,
39503950
 disableStatelessReset,
39513951
 addressLRUSize,
‎src/quic/endpoint.cc‎
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -979,7 +979,8 @@ void Endpoint::SendVersionNegotiation(const PathDescriptor& options) {
979979
 };
980980

981981
if (exceeds_limits()) {
982-
Debug(this, "Version negotiation rate limit exceeded for %s",
982+
Debug(this,
983+
"Version negotiation rate limit exceeded for %s",
983984
 options.remote_address);
984985
return;
985986
 }
@@ -1048,7 +1049,8 @@ void Endpoint::SendImmediateConnectionClose(const PathDescriptor& options,
10481049
 };
10491050

10501051
if (exceeds_limits()) {
1051-
Debug(this, "Immediate connection close rate limit exceeded for %s",
1052+
Debug(this,
1053+
"Immediate connection close rate limit exceeded for %s",
10521054
 options.remote_address);
10531055
return;
10541056
 }
‎src/quic/session.cc‎
Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,12 @@ Session::Config::Config(Environment* env,
464464
 settings.log_printf = ngtcp2_debug_log;
465465
 }
466466

467-
 settings.handshake_timeout = options.handshake_timeout;
467+
// The handshake_timeout option is in milliseconds; ngtcp2 expects
468+
// nanoseconds (ngtcp2_duration). UINT64_MAX means no timeout.
469+
 settings.handshake_timeout =
470+
 options.handshake_timeout == UINT64_MAX
471+
 ? UINT64_MAX
472+
 : options.handshake_timeout * NGTCP2_MILLISECONDS;
468473
 settings.max_stream_window = options.max_stream_window;
469474
 settings.max_window = options.max_window;
470475
 settings.ack_thresh = options.unacknowledged_packet_threshold;
@@ -3648,6 +3653,10 @@ void Session::InitPerContext(Realm* realm, Local<Object> target) {
36483653
NODE_DEFINE_CONSTANT(target, QUIC_PROTO_MAX);
36493654
NODE_DEFINE_CONSTANT(target, QUIC_PROTO_MIN);
36503655

3656+
staticconstexprautoDEFAULT_HANDSHAKE_TIMEOUT =
3657+
 Session::Options::DEFAULT_HANDSHAKE_TIMEOUT;
3658+
NODE_DEFINE_CONSTANT(target, DEFAULT_HANDSHAKE_TIMEOUT);
3659+
36513660
NODE_DEFINE_STRING_CONSTANT(
36523661
 target, "DEFAULT_CIPHERS", TLSContext::DEFAULT_CIPHERS);
36533662
NODE_DEFINE_STRING_CONSTANT(
‎src/quic/session.h‎
Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,15 @@ class Session final : public AsyncWrap, private SessionTicket::AppData::Source {
153153
bool qlog = false;
154154

155155
// The amount of time (in milliseconds) that the endpoint will wait for the
156-
// completion of the tls handshake.
157-
uint64_t handshake_timeout = UINT64_MAX;
156+
// completion of the TLS handshake. If the handshake does not complete
157+
// within this time, the session is closed. This prevents a peer from
158+
// holding a session open indefinitely in the handshake state, consuming
159+
// server resources (ngtcp2 connection, TLS state, JS objects) without
160+
// ever completing the connection. The default of 10 seconds is generous
161+
// enough to accommodate slow networks with retransmissions while still
162+
// bounding resource exposure. Set to UINT64_MAX to disable.
163+
staticconstexpruint64_tDEFAULT_HANDSHAKE_TIMEOUT = 10'000;
164+
uint64_t handshake_timeout = DEFAULT_HANDSHAKE_TIMEOUT;
158165

159166
// The keep-alive timeout in milliseconds. When set to a non-zero value,
160167
// ngtcp2 will automatically send PING frames to keep the connection alive
‎test/parallel/test-quic-connection-limits.mjs‎
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@ const endpoint = new QuicEndpoint({ maxConnectionsTotal: 1 });
2727

2828
// Verify the limits are readable and mutable.
2929
strictEqual(endpoint.maxConnectionsTotal,1);
30-
strictEqual(endpoint.maxConnectionsPerHost,0);
31-
endpoint.maxConnectionsPerHost=100;
30+
// The default maxConnectionsPerHost is 100 — a non-zero default that
31+
// prevents a single host from exhausting server resources.
3232
strictEqual(endpoint.maxConnectionsPerHost,100);
33+
endpoint.maxConnectionsPerHost=50;
34+
strictEqual(endpoint.maxConnectionsPerHost,50);
3335
endpoint.maxConnectionsPerHost=0;
3436

3537
letsessionCount=0;
‎test/parallel/test-quic-internal-endpoint-stats-state.mjs‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ const {
4343
isListening: false,
4444
isClosing: false,
4545
isBusy: false,
46-
maxConnectionsPerHost: 0,
47-
maxConnectionsTotal: 0,
46+
maxConnectionsPerHost: 100,
47+
maxConnectionsTotal: 10_000,
4848
pendingCallbacks: '0',
4949
});
5050

0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 6b71853
Browse files
jasnelladuh95
jasnell
authored and
aduh95
committed
quic: add handshake timeout and default connection limits
Signed-off-by: James M Snell <jasnell@gmail.com>
Assisted-by: Opencode:Opus 4.6
PR-URL: #63267
Backport-PR-URL: #64675
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
1 parent 91e3c39 commit 6b71853
6 files changed
Lines changed: 31 additions & 11 deletions
File tree
‎lib/internal/quic/quic.js‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3944,8 +3944,8 @@ class QuicEndpoint {
39443944
const{
39453945
 retryTokenExpiration,
39463946
 tokenExpiration,
3947-
 maxConnectionsPerHost =0,
3948-
 maxConnectionsTotal =0,
3947+
 maxConnectionsPerHost =100,
3948+
 maxConnectionsTotal =10_000,
39493949
 maxStatelessResetsPerHost,
39503950
 disableStatelessReset,
39513951
 addressLRUSize,
‎src/quic/endpoint.cc‎
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -979,7 +979,8 @@ void Endpoint::SendVersionNegotiation(const PathDescriptor& options) {
979979
 };
980980

981981
if (exceeds_limits()) {
982-
Debug(this, "Version negotiation rate limit exceeded for %s",
982+
Debug(this,
983+
"Version negotiation rate limit exceeded for %s",
983984
 options.remote_address);
984985
return;
985986
 }
@@ -1048,7 +1049,8 @@ void Endpoint::SendImmediateConnectionClose(const PathDescriptor& options,
10481049
 };
10491050

10501051
if (exceeds_limits()) {
1051-
Debug(this, "Immediate connection close rate limit exceeded for %s",
1052+
Debug(this,
1053+
"Immediate connection close rate limit exceeded for %s",
10521054
 options.remote_address);
10531055
return;
10541056
 }
‎src/quic/session.cc‎
Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,12 @@ Session::Config::Config(Environment* env,
464464
 settings.log_printf = ngtcp2_debug_log;
465465
 }
466466

467-
 settings.handshake_timeout = options.handshake_timeout;
467+
// The handshake_timeout option is in milliseconds; ngtcp2 expects
468+
// nanoseconds (ngtcp2_duration). UINT64_MAX means no timeout.
469+
 settings.handshake_timeout =
470+
 options.handshake_timeout == UINT64_MAX
471+
 ? UINT64_MAX
472+
 : options.handshake_timeout * NGTCP2_MILLISECONDS;
468473
 settings.max_stream_window = options.max_stream_window;
469474
 settings.max_window = options.max_window;
470475
 settings.ack_thresh = options.unacknowledged_packet_threshold;
@@ -3648,6 +3653,10 @@ void Session::InitPerContext(Realm* realm, Local<Object> target) {
36483653
NODE_DEFINE_CONSTANT(target, QUIC_PROTO_MAX);
36493654
NODE_DEFINE_CONSTANT(target, QUIC_PROTO_MIN);
36503655

3656+
staticconstexprautoDEFAULT_HANDSHAKE_TIMEOUT =
3657+
 Session::Options::DEFAULT_HANDSHAKE_TIMEOUT;
3658+
NODE_DEFINE_CONSTANT(target, DEFAULT_HANDSHAKE_TIMEOUT);
3659+
36513660
NODE_DEFINE_STRING_CONSTANT(
36523661
 target, "DEFAULT_CIPHERS", TLSContext::DEFAULT_CIPHERS);
36533662
NODE_DEFINE_STRING_CONSTANT(
‎src/quic/session.h‎
Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,15 @@ class Session final : public AsyncWrap, private SessionTicket::AppData::Source {
153153
bool qlog = false;
154154

155155
// The amount of time (in milliseconds) that the endpoint will wait for the
156-
// completion of the tls handshake.
157-
uint64_t handshake_timeout = UINT64_MAX;
156+
// completion of the TLS handshake. If the handshake does not complete
157+
// within this time, the session is closed. This prevents a peer from
158+
// holding a session open indefinitely in the handshake state, consuming
159+
// server resources (ngtcp2 connection, TLS state, JS objects) without
160+
// ever completing the connection. The default of 10 seconds is generous
161+
// enough to accommodate slow networks with retransmissions while still
162+
// bounding resource exposure. Set to UINT64_MAX to disable.
163+
staticconstexpruint64_tDEFAULT_HANDSHAKE_TIMEOUT = 10'000;
164+
uint64_t handshake_timeout = DEFAULT_HANDSHAKE_TIMEOUT;
158165

159166
// The keep-alive timeout in milliseconds. When set to a non-zero value,
160167
// ngtcp2 will automatically send PING frames to keep the connection alive
‎test/parallel/test-quic-connection-limits.mjs‎
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@ const endpoint = new QuicEndpoint({ maxConnectionsTotal: 1 });
2727

2828
// Verify the limits are readable and mutable.
2929
strictEqual(endpoint.maxConnectionsTotal,1);
30-
strictEqual(endpoint.maxConnectionsPerHost,0);
31-
endpoint.maxConnectionsPerHost=100;
30+
// The default maxConnectionsPerHost is 100 — a non-zero default that
31+
// prevents a single host from exhausting server resources.
3232
strictEqual(endpoint.maxConnectionsPerHost,100);
33+
endpoint.maxConnectionsPerHost=50;
34+
strictEqual(endpoint.maxConnectionsPerHost,50);
3335
endpoint.maxConnectionsPerHost=0;
3436

3537
letsessionCount=0;
‎test/parallel/test-quic-internal-endpoint-stats-state.mjs‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ const {
4343
isListening: false,
4444
isClosing: false,
4545
isBusy: false,
46-
maxConnectionsPerHost: 0,
47-
maxConnectionsTotal: 0,
46+
maxConnectionsPerHost: 100,
47+
maxConnectionsTotal: 10_000,
4848
pendingCallbacks: '0',
4949
});
5050

0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 6b71853
Browse files
jasnelladuh95
jasnell
authored and
aduh95
committed
quic: add handshake timeout and default connection limits
Signed-off-by: James M Snell <jasnell@gmail.com>
Assisted-by: Opencode:Opus 4.6
PR-URL: #63267
Backport-PR-URL: #64675
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
1 parent 91e3c39 commit 6b71853
6 files changed
Lines changed: 31 additions & 11 deletions
File tree
‎lib/internal/quic/quic.js‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3944,8 +3944,8 @@ class QuicEndpoint {
39443944
const{
39453945
 retryTokenExpiration,
39463946
 tokenExpiration,
3947-
 maxConnectionsPerHost =0,
3948-
 maxConnectionsTotal =0,
3947+
 maxConnectionsPerHost =100,
3948+
 maxConnectionsTotal =10_000,
39493949
 maxStatelessResetsPerHost,
39503950
 disableStatelessReset,
39513951
 addressLRUSize,
‎src/quic/endpoint.cc‎
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -979,7 +979,8 @@ void Endpoint::SendVersionNegotiation(const PathDescriptor& options) {
979979
 };
980980

981981
if (exceeds_limits()) {
982-
Debug(this, "Version negotiation rate limit exceeded for %s",
982+
Debug(this,
983+
"Version negotiation rate limit exceeded for %s",
983984
 options.remote_address);
984985
return;
985986
 }
@@ -1048,7 +1049,8 @@ void Endpoint::SendImmediateConnectionClose(const PathDescriptor& options,
10481049
 };
10491050

10501051
if (exceeds_limits()) {
1051-
Debug(this, "Immediate connection close rate limit exceeded for %s",
1052+
Debug(this,
1053+
"Immediate connection close rate limit exceeded for %s",
10521054
 options.remote_address);
10531055
return;
10541056
 }
‎src/quic/session.cc‎
Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,12 @@ Session::Config::Config(Environment* env,
464464
 settings.log_printf = ngtcp2_debug_log;
465465
 }
466466

467-
 settings.handshake_timeout = options.handshake_timeout;
467+
// The handshake_timeout option is in milliseconds; ngtcp2 expects
468+
// nanoseconds (ngtcp2_duration). UINT64_MAX means no timeout.
469+
 settings.handshake_timeout =
470+
 options.handshake_timeout == UINT64_MAX
471+
 ? UINT64_MAX
472+
 : options.handshake_timeout * NGTCP2_MILLISECONDS;
468473
 settings.max_stream_window = options.max_stream_window;
469474
 settings.max_window = options.max_window;
470475
 settings.ack_thresh = options.unacknowledged_packet_threshold;
@@ -3648,6 +3653,10 @@ void Session::InitPerContext(Realm* realm, Local<Object> target) {
36483653
NODE_DEFINE_CONSTANT(target, QUIC_PROTO_MAX);
36493654
NODE_DEFINE_CONSTANT(target, QUIC_PROTO_MIN);
36503655

3656+
staticconstexprautoDEFAULT_HANDSHAKE_TIMEOUT =
3657+
 Session::Options::DEFAULT_HANDSHAKE_TIMEOUT;
3658+
NODE_DEFINE_CONSTANT(target, DEFAULT_HANDSHAKE_TIMEOUT);
3659+
36513660
NODE_DEFINE_STRING_CONSTANT(
36523661
 target, "DEFAULT_CIPHERS", TLSContext::DEFAULT_CIPHERS);
36533662
NODE_DEFINE_STRING_CONSTANT(
‎src/quic/session.h‎
Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,15 @@ class Session final : public AsyncWrap, private SessionTicket::AppData::Source {
153153
bool qlog = false;
154154

155155
// The amount of time (in milliseconds) that the endpoint will wait for the
156-
// completion of the tls handshake.
157-
uint64_t handshake_timeout = UINT64_MAX;
156+
// completion of the TLS handshake. If the handshake does not complete
157+
// within this time, the session is closed. This prevents a peer from
158+
// holding a session open indefinitely in the handshake state, consuming
159+
// server resources (ngtcp2 connection, TLS state, JS objects) without
160+
// ever completing the connection. The default of 10 seconds is generous
161+
// enough to accommodate slow networks with retransmissions while still
162+
// bounding resource exposure. Set to UINT64_MAX to disable.
163+
staticconstexpruint64_tDEFAULT_HANDSHAKE_TIMEOUT = 10'000;
164+
uint64_t handshake_timeout = DEFAULT_HANDSHAKE_TIMEOUT;
158165

159166
// The keep-alive timeout in milliseconds. When set to a non-zero value,
160167
// ngtcp2 will automatically send PING frames to keep the connection alive
‎test/parallel/test-quic-connection-limits.mjs‎
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@ const endpoint = new QuicEndpoint({ maxConnectionsTotal: 1 });
2727

2828
// Verify the limits are readable and mutable.
2929
strictEqual(endpoint.maxConnectionsTotal,1);
30-
strictEqual(endpoint.maxConnectionsPerHost,0);
31-
endpoint.maxConnectionsPerHost=100;
30+
// The default maxConnectionsPerHost is 100 — a non-zero default that
31+
// prevents a single host from exhausting server resources.
3232
strictEqual(endpoint.maxConnectionsPerHost,100);
33+
endpoint.maxConnectionsPerHost=50;
34+
strictEqual(endpoint.maxConnectionsPerHost,50);
3335
endpoint.maxConnectionsPerHost=0;
3436

3537
letsessionCount=0;
‎test/parallel/test-quic-internal-endpoint-stats-state.mjs‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ const {
4343
isListening: false,
4444
isClosing: false,
4545
isBusy: false,
46-
maxConnectionsPerHost: 0,
47-
maxConnectionsTotal: 0,
46+
maxConnectionsPerHost: 100,
47+
maxConnectionsTotal: 10_000,
4848
pendingCallbacks: '0',
4949
});
5050

0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Commit 6b71853
Browse files
jasnelladuh95
jasnell
authored and
aduh95
committed
quic: add handshake timeout and default connection limits
Signed-off-by: James M Snell <jasnell@gmail.com>
Assisted-by: Opencode:Opus 4.6
PR-URL: #63267
Backport-PR-URL: #64675
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
1 parent 91e3c39 commit 6b71853
6 files changed
Lines changed: 31 additions & 11 deletions
File tree
‎lib/internal/quic/quic.js‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3944,8 +3944,8 @@ class QuicEndpoint {
39443944
const{
39453945
 retryTokenExpiration,
39463946
 tokenExpiration,
3947-
 maxConnectionsPerHost =0,
3948-
 maxConnectionsTotal =0,
3947+
 maxConnectionsPerHost =100,
3948+
 maxConnectionsTotal =10_000,
39493949
 maxStatelessResetsPerHost,
39503950
 disableStatelessReset,
39513951
 addressLRUSize,
‎src/quic/endpoint.cc‎
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -979,7 +979,8 @@ void Endpoint::SendVersionNegotiation(const PathDescriptor& options) {
979979
 };
980980

981981
if (exceeds_limits()) {
982-
Debug(this, "Version negotiation rate limit exceeded for %s",
982+
Debug(this,
983+
"Version negotiation rate limit exceeded for %s",
983984
 options.remote_address);
984985
return;
985986
 }
@@ -1048,7 +1049,8 @@ void Endpoint::SendImmediateConnectionClose(const PathDescriptor& options,
10481049
 };
10491050

10501051
if (exceeds_limits()) {
1051-
Debug(this, "Immediate connection close rate limit exceeded for %s",
1052+
Debug(this,
1053+
"Immediate connection close rate limit exceeded for %s",
10521054
 options.remote_address);
10531055
return;
10541056
 }
‎src/quic/session.cc‎
Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,12 @@ Session::Config::Config(Environment* env,
464464
 settings.log_printf = ngtcp2_debug_log;
465465
 }
466466

467-
 settings.handshake_timeout = options.handshake_timeout;
467+
// The handshake_timeout option is in milliseconds; ngtcp2 expects
468+
// nanoseconds (ngtcp2_duration). UINT64_MAX means no timeout.
469+
 settings.handshake_timeout =
470+
 options.handshake_timeout == UINT64_MAX
471+
 ? UINT64_MAX
472+
 : options.handshake_timeout * NGTCP2_MILLISECONDS;
468473
 settings.max_stream_window = options.max_stream_window;
469474
 settings.max_window = options.max_window;
470475
 settings.ack_thresh = options.unacknowledged_packet_threshold;
@@ -3648,6 +3653,10 @@ void Session::InitPerContext(Realm* realm, Local<Object> target) {
36483653
NODE_DEFINE_CONSTANT(target, QUIC_PROTO_MAX);
36493654
NODE_DEFINE_CONSTANT(target, QUIC_PROTO_MIN);
36503655

3656+
staticconstexprautoDEFAULT_HANDSHAKE_TIMEOUT =
3657+
 Session::Options::DEFAULT_HANDSHAKE_TIMEOUT;
3658+
NODE_DEFINE_CONSTANT(target, DEFAULT_HANDSHAKE_TIMEOUT);
3659+
36513660
NODE_DEFINE_STRING_CONSTANT(
36523661
 target, "DEFAULT_CIPHERS", TLSContext::DEFAULT_CIPHERS);
36533662
NODE_DEFINE_STRING_CONSTANT(
‎src/quic/session.h‎
Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,15 @@ class Session final : public AsyncWrap, private SessionTicket::AppData::Source {
153153
bool qlog = false;
154154

155155
// The amount of time (in milliseconds) that the endpoint will wait for the
156-
// completion of the tls handshake.
157-
uint64_t handshake_timeout = UINT64_MAX;
156+
// completion of the TLS handshake. If the handshake does not complete
157+
// within this time, the session is closed. This prevents a peer from
158+
// holding a session open indefinitely in the handshake state, consuming
159+
// server resources (ngtcp2 connection, TLS state, JS objects) without
160+
// ever completing the connection. The default of 10 seconds is generous
161+
// enough to accommodate slow networks with retransmissions while still
162+
// bounding resource exposure. Set to UINT64_MAX to disable.
163+
staticconstexpruint64_tDEFAULT_HANDSHAKE_TIMEOUT = 10'000;
164+
uint64_t handshake_timeout = DEFAULT_HANDSHAKE_TIMEOUT;
158165

159166
// The keep-alive timeout in milliseconds. When set to a non-zero value,
160167
// ngtcp2 will automatically send PING frames to keep the connection alive
‎test/parallel/test-quic-connection-limits.mjs‎
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@ const endpoint = new QuicEndpoint({ maxConnectionsTotal: 1 });
2727

2828
// Verify the limits are readable and mutable.
2929
strictEqual(endpoint.maxConnectionsTotal,1);
30-
strictEqual(endpoint.maxConnectionsPerHost,0);
31-
endpoint.maxConnectionsPerHost=100;
30+
// The default maxConnectionsPerHost is 100 — a non-zero default that
31+
// prevents a single host from exhausting server resources.
3232
strictEqual(endpoint.maxConnectionsPerHost,100);
33+
endpoint.maxConnectionsPerHost=50;
34+
strictEqual(endpoint.maxConnectionsPerHost,50);
3335
endpoint.maxConnectionsPerHost=0;
3436

3537
letsessionCount=0;
‎test/parallel/test-quic-internal-endpoint-stats-state.mjs‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ const {
4343
isListening: false,
4444
isClosing: false,
4545
isBusy: false,
46-
maxConnectionsPerHost: 0,
47-
maxConnectionsTotal: 0,
46+
maxConnectionsPerHost: 100,
47+
maxConnectionsTotal: 10_000,
4848
pendingCallbacks: '0',
4949
});
5050

0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 6b71853
Browse files
jasnelladuh95
jasnell
authored and
aduh95
committed
quic: add handshake timeout and default connection limits
Signed-off-by: James M Snell <jasnell@gmail.com>
Assisted-by: Opencode:Opus 4.6
PR-URL: #63267
Backport-PR-URL: #64675
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
1 parent 91e3c39 commit 6b71853
6 files changed
Lines changed: 31 additions & 11 deletions
File tree
‎lib/internal/quic/quic.js‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3944,8 +3944,8 @@ class QuicEndpoint {
39443944
const{
39453945
 retryTokenExpiration,
39463946
 tokenExpiration,
3947-
 maxConnectionsPerHost =0,
3948-
 maxConnectionsTotal =0,
3947+
 maxConnectionsPerHost =100,
3948+
 maxConnectionsTotal =10_000,
39493949
 maxStatelessResetsPerHost,
39503950
 disableStatelessReset,
39513951
 addressLRUSize,
‎src/quic/endpoint.cc‎
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -979,7 +979,8 @@ void Endpoint::SendVersionNegotiation(const PathDescriptor& options) {
979979
 };
980980

981981
if (exceeds_limits()) {
982-
Debug(this, "Version negotiation rate limit exceeded for %s",
982+
Debug(this,
983+
"Version negotiation rate limit exceeded for %s",
983984
 options.remote_address);
984985
return;
985986
 }
@@ -1048,7 +1049,8 @@ void Endpoint::SendImmediateConnectionClose(const PathDescriptor& options,
10481049
 };
10491050

10501051
if (exceeds_limits()) {
1051-
Debug(this, "Immediate connection close rate limit exceeded for %s",
1052+
Debug(this,
1053+
"Immediate connection close rate limit exceeded for %s",
10521054
 options.remote_address);
10531055
return;
10541056
 }
‎src/quic/session.cc‎
Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,12 @@ Session::Config::Config(Environment* env,
464464
 settings.log_printf = ngtcp2_debug_log;
465465
 }
466466

467-
 settings.handshake_timeout = options.handshake_timeout;
467+
// The handshake_timeout option is in milliseconds; ngtcp2 expects
468+
// nanoseconds (ngtcp2_duration). UINT64_MAX means no timeout.
469+
 settings.handshake_timeout =
470+
 options.handshake_timeout == UINT64_MAX
471+
 ? UINT64_MAX
472+
 : options.handshake_timeout * NGTCP2_MILLISECONDS;
468473
 settings.max_stream_window = options.max_stream_window;
469474
 settings.max_window = options.max_window;
470475
 settings.ack_thresh = options.unacknowledged_packet_threshold;
@@ -3648,6 +3653,10 @@ void Session::InitPerContext(Realm* realm, Local<Object> target) {
36483653
NODE_DEFINE_CONSTANT(target, QUIC_PROTO_MAX);
36493654
NODE_DEFINE_CONSTANT(target, QUIC_PROTO_MIN);
36503655

3656+
staticconstexprautoDEFAULT_HANDSHAKE_TIMEOUT =
3657+
 Session::Options::DEFAULT_HANDSHAKE_TIMEOUT;
3658+
NODE_DEFINE_CONSTANT(target, DEFAULT_HANDSHAKE_TIMEOUT);
3659+
36513660
NODE_DEFINE_STRING_CONSTANT(
36523661
 target, "DEFAULT_CIPHERS", TLSContext::DEFAULT_CIPHERS);
36533662
NODE_DEFINE_STRING_CONSTANT(
‎src/quic/session.h‎
Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,15 @@ class Session final : public AsyncWrap, private SessionTicket::AppData::Source {
153153
bool qlog = false;
154154

155155
// The amount of time (in milliseconds) that the endpoint will wait for the
156-
// completion of the tls handshake.
157-
uint64_t handshake_timeout = UINT64_MAX;
156+
// completion of the TLS handshake. If the handshake does not complete
157+
// within this time, the session is closed. This prevents a peer from
158+
// holding a session open indefinitely in the handshake state, consuming
159+
// server resources (ngtcp2 connection, TLS state, JS objects) without
160+
// ever completing the connection. The default of 10 seconds is generous
161+
// enough to accommodate slow networks with retransmissions while still
162+
// bounding resource exposure. Set to UINT64_MAX to disable.
163+
staticconstexpruint64_tDEFAULT_HANDSHAKE_TIMEOUT = 10'000;
164+
uint64_t handshake_timeout = DEFAULT_HANDSHAKE_TIMEOUT;
158165

159166
// The keep-alive timeout in milliseconds. When set to a non-zero value,
160167
// ngtcp2 will automatically send PING frames to keep the connection alive
‎test/parallel/test-quic-connection-limits.mjs‎
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@ const endpoint = new QuicEndpoint({ maxConnectionsTotal: 1 });
2727

2828
// Verify the limits are readable and mutable.
2929
strictEqual(endpoint.maxConnectionsTotal,1);
30-
strictEqual(endpoint.maxConnectionsPerHost,0);
31-
endpoint.maxConnectionsPerHost=100;
30+
// The default maxConnectionsPerHost is 100 — a non-zero default that
31+
// prevents a single host from exhausting server resources.
3232
strictEqual(endpoint.maxConnectionsPerHost,100);
33+
endpoint.maxConnectionsPerHost=50;
34+
strictEqual(endpoint.maxConnectionsPerHost,50);
3335
endpoint.maxConnectionsPerHost=0;
3436

3537
letsessionCount=0;
‎test/parallel/test-quic-internal-endpoint-stats-state.mjs‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ const {
4343
isListening: false,
4444
isClosing: false,
4545
isBusy: false,
46-
maxConnectionsPerHost: 0,
47-
maxConnectionsTotal: 0,
46+
maxConnectionsPerHost: 100,
47+
maxConnectionsTotal: 10_000,
4848
pendingCallbacks: '0',
4949
});
5050

0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 6b71853
Browse files
jasnelladuh95
jasnell
authored and
aduh95
committed
quic: add handshake timeout and default connection limits
Signed-off-by: James M Snell <jasnell@gmail.com>
Assisted-by: Opencode:Opus 4.6
PR-URL: #63267
Backport-PR-URL: #64675
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
1 parent 91e3c39 commit 6b71853
6 files changed
Lines changed: 31 additions & 11 deletions
File tree
‎lib/internal/quic/quic.js‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3944,8 +3944,8 @@ class QuicEndpoint {
39443944
const{
39453945
 retryTokenExpiration,
39463946
 tokenExpiration,
3947-
 maxConnectionsPerHost =0,
3948-
 maxConnectionsTotal =0,
3947+
 maxConnectionsPerHost =100,
3948+
 maxConnectionsTotal =10_000,
39493949
 maxStatelessResetsPerHost,
39503950
 disableStatelessReset,
39513951
 addressLRUSize,
‎src/quic/endpoint.cc‎
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -979,7 +979,8 @@ void Endpoint::SendVersionNegotiation(const PathDescriptor& options) {
979979
 };
980980

981981
if (exceeds_limits()) {
982-
Debug(this, "Version negotiation rate limit exceeded for %s",
982+
Debug(this,
983+
"Version negotiation rate limit exceeded for %s",
983984
 options.remote_address);
984985
return;
985986
 }
@@ -1048,7 +1049,8 @@ void Endpoint::SendImmediateConnectionClose(const PathDescriptor& options,
10481049
 };
10491050

10501051
if (exceeds_limits()) {
1051-
Debug(this, "Immediate connection close rate limit exceeded for %s",
1052+
Debug(this,
1053+
"Immediate connection close rate limit exceeded for %s",
10521054
 options.remote_address);
10531055
return;
10541056
 }
‎src/quic/session.cc‎
Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,12 @@ Session::Config::Config(Environment* env,
464464
 settings.log_printf = ngtcp2_debug_log;
465465
 }
466466

467-
 settings.handshake_timeout = options.handshake_timeout;
467+
// The handshake_timeout option is in milliseconds; ngtcp2 expects
468+
// nanoseconds (ngtcp2_duration). UINT64_MAX means no timeout.
469+
 settings.handshake_timeout =
470+
 options.handshake_timeout == UINT64_MAX
471+
 ? UINT64_MAX
472+
 : options.handshake_timeout * NGTCP2_MILLISECONDS;
468473
 settings.max_stream_window = options.max_stream_window;
469474
 settings.max_window = options.max_window;
470475
 settings.ack_thresh = options.unacknowledged_packet_threshold;
@@ -3648,6 +3653,10 @@ void Session::InitPerContext(Realm* realm, Local<Object> target) {
36483653
NODE_DEFINE_CONSTANT(target, QUIC_PROTO_MAX);
36493654
NODE_DEFINE_CONSTANT(target, QUIC_PROTO_MIN);
36503655

3656+
staticconstexprautoDEFAULT_HANDSHAKE_TIMEOUT =
3657+
 Session::Options::DEFAULT_HANDSHAKE_TIMEOUT;
3658+
NODE_DEFINE_CONSTANT(target, DEFAULT_HANDSHAKE_TIMEOUT);
3659+
36513660
NODE_DEFINE_STRING_CONSTANT(
36523661
 target, "DEFAULT_CIPHERS", TLSContext::DEFAULT_CIPHERS);
36533662
NODE_DEFINE_STRING_CONSTANT(
‎src/quic/session.h‎
Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,15 @@ class Session final : public AsyncWrap, private SessionTicket::AppData::Source {
153153
bool qlog = false;
154154

155155
// The amount of time (in milliseconds) that the endpoint will wait for the
156-
// completion of the tls handshake.
157-
uint64_t handshake_timeout = UINT64_MAX;
156+
// completion of the TLS handshake. If the handshake does not complete
157+
// within this time, the session is closed. This prevents a peer from
158+
// holding a session open indefinitely in the handshake state, consuming
159+
// server resources (ngtcp2 connection, TLS state, JS objects) without
160+
// ever completing the connection. The default of 10 seconds is generous
161+
// enough to accommodate slow networks with retransmissions while still
162+
// bounding resource exposure. Set to UINT64_MAX to disable.
163+
staticconstexpruint64_tDEFAULT_HANDSHAKE_TIMEOUT = 10'000;
164+
uint64_t handshake_timeout = DEFAULT_HANDSHAKE_TIMEOUT;
158165

159166
// The keep-alive timeout in milliseconds. When set to a non-zero value,
160167
// ngtcp2 will automatically send PING frames to keep the connection alive
‎test/parallel/test-quic-connection-limits.mjs‎
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@ const endpoint = new QuicEndpoint({ maxConnectionsTotal: 1 });
2727

2828
// Verify the limits are readable and mutable.
2929
strictEqual(endpoint.maxConnectionsTotal,1);
30-
strictEqual(endpoint.maxConnectionsPerHost,0);
31-
endpoint.maxConnectionsPerHost=100;
30+
// The default maxConnectionsPerHost is 100 — a non-zero default that
31+
// prevents a single host from exhausting server resources.
3232
strictEqual(endpoint.maxConnectionsPerHost,100);
33+
endpoint.maxConnectionsPerHost=50;
34+
strictEqual(endpoint.maxConnectionsPerHost,50);
3335
endpoint.maxConnectionsPerHost=0;
3436

3537
letsessionCount=0;
‎test/parallel/test-quic-internal-endpoint-stats-state.mjs‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ const {
4343
isListening: false,
4444
isClosing: false,
4545
isBusy: false,
46-
maxConnectionsPerHost: 0,
47-
maxConnectionsTotal: 0,
46+
maxConnectionsPerHost: 100,
47+
maxConnectionsTotal: 10_000,
4848
pendingCallbacks: '0',
4949
});
5050

0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Commit 6b71853
Browse files
jasnelladuh95
jasnell
authored and
aduh95
committed
quic: add handshake timeout and default connection limits
Signed-off-by: James M Snell <jasnell@gmail.com>
Assisted-by: Opencode:Opus 4.6
PR-URL: #63267
Backport-PR-URL: #64675
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
1 parent 91e3c39 commit 6b71853
6 files changed
Lines changed: 31 additions & 11 deletions
File tree
‎lib/internal/quic/quic.js‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3944,8 +3944,8 @@ class QuicEndpoint {
39443944
const{
39453945
 retryTokenExpiration,
39463946
 tokenExpiration,
3947-
 maxConnectionsPerHost =0,
3948-
 maxConnectionsTotal =0,
3947+
 maxConnectionsPerHost =100,
3948+
 maxConnectionsTotal =10_000,
39493949
 maxStatelessResetsPerHost,
39503950
 disableStatelessReset,
39513951
 addressLRUSize,
‎src/quic/endpoint.cc‎
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -979,7 +979,8 @@ void Endpoint::SendVersionNegotiation(const PathDescriptor& options) {
979979
 };
980980

981981
if (exceeds_limits()) {
982-
Debug(this, "Version negotiation rate limit exceeded for %s",
982+
Debug(this,
983+
"Version negotiation rate limit exceeded for %s",
983984
 options.remote_address);
984985
return;
985986
 }
@@ -1048,7 +1049,8 @@ void Endpoint::SendImmediateConnectionClose(const PathDescriptor& options,
10481049
 };
10491050

10501051
if (exceeds_limits()) {
1051-
Debug(this, "Immediate connection close rate limit exceeded for %s",
1052+
Debug(this,
1053+
"Immediate connection close rate limit exceeded for %s",
10521054
 options.remote_address);
10531055
return;
10541056
 }
‎src/quic/session.cc‎
Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,12 @@ Session::Config::Config(Environment* env,
464464
 settings.log_printf = ngtcp2_debug_log;
465465
 }
466466

467-
 settings.handshake_timeout = options.handshake_timeout;
467+
// The handshake_timeout option is in milliseconds; ngtcp2 expects
468+
// nanoseconds (ngtcp2_duration). UINT64_MAX means no timeout.
469+
 settings.handshake_timeout =
470+
 options.handshake_timeout == UINT64_MAX
471+
 ? UINT64_MAX
472+
 : options.handshake_timeout * NGTCP2_MILLISECONDS;
468473
 settings.max_stream_window = options.max_stream_window;
469474
 settings.max_window = options.max_window;
470475
 settings.ack_thresh = options.unacknowledged_packet_threshold;
@@ -3648,6 +3653,10 @@ void Session::InitPerContext(Realm* realm, Local<Object> target) {
36483653
NODE_DEFINE_CONSTANT(target, QUIC_PROTO_MAX);
36493654
NODE_DEFINE_CONSTANT(target, QUIC_PROTO_MIN);
36503655

3656+
staticconstexprautoDEFAULT_HANDSHAKE_TIMEOUT =
3657+
 Session::Options::DEFAULT_HANDSHAKE_TIMEOUT;
3658+
NODE_DEFINE_CONSTANT(target, DEFAULT_HANDSHAKE_TIMEOUT);
3659+
36513660
NODE_DEFINE_STRING_CONSTANT(
36523661
 target, "DEFAULT_CIPHERS", TLSContext::DEFAULT_CIPHERS);
36533662
NODE_DEFINE_STRING_CONSTANT(
‎src/quic/session.h‎
Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,15 @@ class Session final : public AsyncWrap, private SessionTicket::AppData::Source {
153153
bool qlog = false;
154154

155155
// The amount of time (in milliseconds) that the endpoint will wait for the
156-
// completion of the tls handshake.
157-
uint64_t handshake_timeout = UINT64_MAX;
156+
// completion of the TLS handshake. If the handshake does not complete
157+
// within this time, the session is closed. This prevents a peer from
158+
// holding a session open indefinitely in the handshake state, consuming
159+
// server resources (ngtcp2 connection, TLS state, JS objects) without
160+
// ever completing the connection. The default of 10 seconds is generous
161+
// enough to accommodate slow networks with retransmissions while still
162+
// bounding resource exposure. Set to UINT64_MAX to disable.
163+
staticconstexpruint64_tDEFAULT_HANDSHAKE_TIMEOUT = 10'000;
164+
uint64_t handshake_timeout = DEFAULT_HANDSHAKE_TIMEOUT;
158165

159166
// The keep-alive timeout in milliseconds. When set to a non-zero value,
160167
// ngtcp2 will automatically send PING frames to keep the connection alive
‎test/parallel/test-quic-connection-limits.mjs‎
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@ const endpoint = new QuicEndpoint({ maxConnectionsTotal: 1 });
2727

2828
// Verify the limits are readable and mutable.
2929
strictEqual(endpoint.maxConnectionsTotal,1);
30-
strictEqual(endpoint.maxConnectionsPerHost,0);
31-
endpoint.maxConnectionsPerHost=100;
30+
// The default maxConnectionsPerHost is 100 — a non-zero default that
31+
// prevents a single host from exhausting server resources.
3232
strictEqual(endpoint.maxConnectionsPerHost,100);
33+
endpoint.maxConnectionsPerHost=50;
34+
strictEqual(endpoint.maxConnectionsPerHost,50);
3335
endpoint.maxConnectionsPerHost=0;
3436

3537
letsessionCount=0;
‎test/parallel/test-quic-internal-endpoint-stats-state.mjs‎
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ const {
4343
isListening: false,
4444
isClosing: false,
4545
isBusy: false,
46-
maxConnectionsPerHost: 0,
47-
maxConnectionsTotal: 0,
46+
maxConnectionsPerHost: 100,
47+
maxConnectionsTotal: 10_000,
4848
pendingCallbacks: '0',
4949
});
5050

0 commit comments
Comments
 (0)