Skip to content
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

fix: set proxy from env vars based on truthiness #67

Merged
merged 1 commit into from
Oct 2, 2023
Merged

fix: set proxy from env vars based on truthiness #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 9 additions & 6 deletions lib/proxy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,17 @@ const isNoProxy = (url, noProxy) => {
})
}

const getProxy = (url, {
proxy = PROXY_ENV.https_proxy,
noProxy = PROXY_ENV.no_proxy,
}) => {
const getProxy = (url, { proxy, noProxy }) => {
url = urlify(url)

if (!proxy && url.protocol !== 'https:') {
proxy = PROXY_ENV.http_proxy || PROXY_ENV.proxy
if (!proxy) {
proxy = url.protocol === 'https:'
? PROXY_ENV.https_proxy
: PROXY_ENV.https_proxy || PROXY_ENV.http_proxy || PROXY_ENV.proxy
}

if (!noProxy) {
noProxy = PROXY_ENV.no_proxy
}

if (!proxy || isNoProxy(url, noProxy)) {
Expand Down
25 changes: 24 additions & 1 deletion test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,29 @@ t.test('getAgent', (t) => {
t.end()
})

t.test('respects proxy for http target if proxy=null is passed in', (t) => {
process.env.proxy = 'http://localhost'
t.teardown(() => {
delete process.env.proxy
})

const { getAgent: getEnvAgent, HttpAgent: EnvHttpAgent } = t.mock('../lib/index.js')

const agent = getEnvAgent('http://localhost')
t.type(agent, EnvHttpAgent)
t.hasStrict(agent, {
proxy: {
url: {
protocol: 'http:',
hostname: 'localhost',
port: '',
},
},
})

t.end()
})

t.test('ignores http_proxy for https target', (t) => {
process.env.http_proxy = 'http://localhost'
t.teardown(() => {
Expand All @@ -148,7 +171,7 @@ t.test('getAgent', (t) => {

const { getAgent: getEnvAgent, HttpsAgent: EnvHttpsAgent } = t.mock('../lib/index.js')

const agent = getEnvAgent('https://localhost')
const agent = getEnvAgent('https://localhost', { proxy: null })
t.type(agent, EnvHttpsAgent)
t.notOk(agent.proxy.url)

Expand Down