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

Jump to bottom

fix(server): clean up vestigial code from proxy #3640

Merged
merged 2 commits into from Jun 1, 2021
Merged

fix(server): clean up vestigial code from proxy #3640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a05774e
fix(server/proxy): clean up unused logic
Jan 28, 2021
3556ebd
fix(server): clean up vestigial code from proxy
May 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 7 additions & 11 deletions lib/middleware/proxy.js
View file
Open in desktop
Expand Up @@ -34,20 +34,16 @@ function parseProxyConfig (proxies, config) {

const hostname = proxyDetails.hostname || config.hostname
const protocol = proxyDetails.protocol || config.protocol
const https = proxyDetails.protocol === 'https:'
let port
if (proxyDetails.port) {
port = proxyDetails.port
} else if (proxyDetails.protocol) {
port = https ? '443' : '80'
} else {
port = config.port
const defaultPorts = {
'http:': '80',
'https:': '443'
}
const port = proxyDetails.port || defaultPorts[proxyDetails.protocol] || config.port
const changeOrigin = proxyConfiguration.changeOrigin || false
const Agent = https ? httpsAgent : httpAgent
const Agent = protocol === 'https:' ? httpsAgent : httpAgent
const agent = new Agent({ keepAlive: true })
const proxy = httpProxy.createProxyServer({
target: { host: hostname, port, https, protocol },
target: { host: hostname, port, protocol },
xfwd: true,
changeOrigin: changeOrigin,
secure: config.proxyValidateSSL,
Expand All @@ -71,7 +67,7 @@ function parseProxyConfig (proxies, config) {
res.destroy()
})

return { path: proxyPath, baseUrl: pathname, host: hostname, port, https, proxy, agent }
return { path: proxyPath, baseUrl: pathname, host: hostname, port, proxy, agent }
}), 'path').reverse()
}

Expand Down
60 changes: 34 additions & 26 deletions test/unit/middleware/proxy.spec.js
View file
Open in desktop
Expand Up @@ -146,10 +146,16 @@ describe('middleware.proxy', () => {
host: 'localhost',
port: '8000',
baseUrl: '/',
path: '/base/',
https: false
path: '/base/'
})
expect(parsedProxyConfig[0].proxy).to.exist
expect(parsedProxyConfig[0].proxy).to.containSubset({
options: {
target: {
protocol: 'http:'
}
}
})
})

it('should set default http port', () => {
Expand All @@ -160,10 +166,16 @@ describe('middleware.proxy', () => {
host: 'localhost',
port: '80',
baseUrl: '/',
path: '/base/',
https: false
path: '/base/'
})
expect(parsedProxyConfig[0].proxy).to.exist
expect(parsedProxyConfig[0].proxy).to.containSubset({
options: {
target: {
protocol: 'http:'
}
}
})
})

it('should set default https port', () => {
Expand All @@ -174,8 +186,7 @@ describe('middleware.proxy', () => {
host: 'localhost',
port: '443',
baseUrl: '/',
path: '/base/',
https: true
path: '/base/'
})
expect(parsedProxyConfig[0].proxy).to.exist
expect(parsedProxyConfig[0].proxy).to.containSubset({
Expand All @@ -195,10 +206,16 @@ describe('middleware.proxy', () => {
host: 'localhost',
port: '8000',
baseUrl: '/proxy',
path: '/base',
https: false
path: '/base'
})
expect(parsedProxyConfig[0].proxy).to.exist
expect(parsedProxyConfig[0].proxy).to.containSubset({
options: {
target: {
protocol: 'http:'
}
}
})
})

it('should determine protocol', () => {
Expand All @@ -209,8 +226,7 @@ describe('middleware.proxy', () => {
host: 'localhost',
port: '8000',
baseUrl: '',
path: '/base',
https: true
path: '/base'
})
expect(parsedProxyConfig[0].proxy).to.exist
expect(parsedProxyConfig[0].proxy).to.containSubset({
Expand All @@ -231,8 +247,7 @@ describe('middleware.proxy', () => {
host: 'localhost',
port: 9877,
baseUrl: '/proxy/test',
path: '/base',
https: false
path: '/base'
})
expect(parsedProxyConfig[0].proxy).to.exist
})
Expand All @@ -246,8 +261,7 @@ describe('middleware.proxy', () => {
host: 'localhost',
port: 9877,
baseUrl: '/proxy/test/',
path: '/base/',
https: false
path: '/base/'
})
expect(parsedProxyConfig[0].proxy).to.exist
})
Expand All @@ -261,8 +275,7 @@ describe('middleware.proxy', () => {
host: 'krinkle.dev',
port: '80',
baseUrl: '/w',
path: '/w',
https: false
path: '/w'
})
expect(parsedProxyConfig[0].proxy).to.exist
})
Expand All @@ -276,8 +289,7 @@ describe('middleware.proxy', () => {
host: 'krinkle.dev',
port: '443',
baseUrl: '/w',
path: '/w',
https: true
path: '/w'
})
expect(parsedProxyConfig[0].proxy).to.exist
})
Expand All @@ -290,8 +302,7 @@ describe('middleware.proxy', () => {
host: 'localhost',
port: '8000',
baseUrl: '/proxy/test/',
path: '/base/',
https: false
path: '/base/'
})
expect(parsedProxyConfig[0].proxy).to.exist
})
Expand All @@ -307,16 +318,14 @@ describe('middleware.proxy', () => {
host: 'gstatic.com',
port: '80',
baseUrl: '/something',
path: '/sub/some',
https: false
path: '/sub/some'
})
expect(parsedProxyConfig[0].proxy).to.exist
expect(parsedProxyConfig[1]).to.containSubset({
host: 'localhost',
port: '9000',
baseUrl: '',
path: '/sub',
https: false
path: '/sub'
})
expect(parsedProxyConfig[1].proxy).to.exist
})
Expand All @@ -331,8 +340,7 @@ describe('middleware.proxy', () => {
host: 'localhost',
port: '8000',
baseUrl: '/',
path: '/base/',
https: false
path: '/base/'
})
expect(parsedProxyConfig[0].proxy).to.exist
})
Expand Down