-
-
Notifications
You must be signed in to change notification settings - Fork 36.7k
http: match subdomains for plain NO_PROXY entries #65617
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.
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
base: main
Are you sure you want to change the base?
Changes from 1 commit
b19633f
734e21b
4be1662
15fa397
09d37d4
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -163,9 +163,10 @@ class ProxyConfig { | |
| if (entry === '*') return false; // * bypasses all hosts. | ||
| if (entry === host || entry === hostWithPort) return false; // Matching host and host:port | ||
|
|
||
| // Follow curl's behavior: strip leading dot before matching suffixes. | ||
| if (entry[0] === '.') { | ||
| const suffix = entry.substring(1); | ||
| // Strip a leading "." if present, then match as a suffix with a | ||
| // label boundary. "*.example.com" is handled below (subdomains only). | ||
| if (!entry.startsWith('*.')) { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could we limit suffix matching to domain entries?
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Sure, will look into that
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Updated in the latest fixup to keep the change scoped to plain entries:
Existing leading-dot and wildcard behavior is unchanged. Both cases are |
||
| const suffix = entry[0] === '.' ? entry.substring(1) : entry; | ||
| if (host === suffix || (host.endsWith(suffix) && host[host.length - suffix.length - 1] === '.')) return false; | ||
| } | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,7 +10,7 @@ import { runProxiedRequest } from '../common/proxy-server.js'; | |
| const server = http.createServer(common.mustCall((req, res) => { | ||
| res.writeHead(200, { 'Content-Type': 'text/plain' }); | ||
| res.end('Hello World\n'); | ||
| }, 5)); | ||
| }, 7)); | ||
| server.on('error', common.mustNotCall((err) => { console.error('Server error', err); })); | ||
| server.listen(0, '127.0.0.1'); | ||
| await once(server, 'listening'); | ||
|
|
@@ -78,6 +78,43 @@ await once(proxy, 'listening'); | |
| assert.strictEqual(signal, null); | ||
| } | ||
|
|
||
| { | ||
| // Test NO_PROXY with a plain domain also matching subdomains. | ||
| const { code, signal, stderr, stdout } = await runProxiedRequest({ | ||
| NODE_USE_ENV_PROXY: 1, | ||
| REQUEST_URL: `http://test.example.com:${server.address().port}/test`, | ||
| HTTP_PROXY: `http://localhost:${proxy.address().port}`, | ||
| RESOLVE_TO_LOCALHOST: 'test.example.com', | ||
| NO_PROXY: 'example.com', | ||
| }); | ||
|
|
||
| // The request should succeed and bypass proxy. | ||
| assert.match(stdout, /Status Code: 200/); | ||
| assert.match(stdout, /Hello World/); | ||
| assert.match(stdout, /Resolving lookup for test\.example\.com/); | ||
| assert.strictEqual(stderr.trim(), ''); | ||
| assert.strictEqual(code, 0); | ||
| assert.strictEqual(signal, null); | ||
| } | ||
|
|
||
| { | ||
| // Test NO_PROXY with a plain domain should NOT match partial domain names. | ||
| const { code, signal, stderr, stdout } = await runProxiedRequest({ | ||
| NODE_USE_ENV_PROXY: 1, | ||
| REQUEST_URL: `http://badexample.com:${server.address().port}/test`, | ||
| HTTP_PROXY: `http://localhost:${server.address().port}`, | ||
| RESOLVE_TO_LOCALHOST: 'badexample.com', | ||
| NO_PROXY: 'example.com', | ||
| }); | ||
|
|
||
| // The request should go through the proxy (not bypass it), | ||
| // because badexample.com is not a subdomain of example.com. | ||
| assert.match(stdout, /Status Code: 200/); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This test seems to pass whether the proxy is used or bypassed, since both paths reach the same server. Could we also assert that the custom lookup for
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nice catch, will fix
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added it to all three negative blocks |
||
| assert.strictEqual(stderr.trim(), ''); | ||
| assert.strictEqual(code, 0); | ||
| assert.strictEqual(signal, null); | ||
| } | ||
|
|
||
| // Test NO_PROXY with leading-dot entry should NOT match partial domain names. | ||
| // Regression test: .example.com must not match notexample.com or badexample.com. | ||
| { | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This would make
example.comand.example.commatch. This does not seem something we might want to do