NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(xo-server/callProxyMethod): use stored address before XAPI ones

Browse Source
This commit is contained in:
Julien Fontanet 2022-07-25 17:56:30 +02:00
parent 22ea1c0e2a
commit 051bbf9449
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
packages/xo-server/src/xo-mixins/proxies.mjs
View File

@ -33,16 +33,6 @@ const synchronizedWrite = synchronized()
const log = createLogger('xo:proxy') const log = createLogger('xo:proxy')
const assertProxyAddress = (proxy, address) => {
if (address !== undefined) {
return address
}
const error = new Error('cannot get the proxy address')
error.proxy = omit(proxy, 'authenticationToken')
throw error
}
function addProxyUrl(proxy) { function addProxyUrl(proxy) {
const url = new URL('https://localhost') const url = new URL('https://localhost')
url.username = proxy.authenticationToken url.username = proxy.authenticationToken
@ -415,14 +405,20 @@ export default class Proxy {
timeout: this._app.config.getDuration('xo-proxy.callTimeout'), timeout: this._app.config.getDuration('xo-proxy.callTimeout'),
} }
if (proxy.vmUuid !== undefined) { if (proxy.address !== undefined) {
request.host = proxy.address
} else {
const vm = this._app.getXapi(proxy.vmUuid).getObjectByUuid(proxy.vmUuid) const vm = this._app.getXapi(proxy.vmUuid).getObjectByUuid(proxy.vmUuid)
const address = extractIpFromVmNetworks(vm.$guest_metrics?.networks)
if (address === undefined) {
const error = new Error('cannot get the proxy address')
error.proxy = omit(proxy, 'authenticationToken')
throw error
}
// use hostname field to avoid issues with IPv6 addresses // use hostname field to avoid issues with IPv6 addresses
request.hostname = assertProxyAddress(proxy, extractIpFromVmNetworks(vm.$guest_metrics?.networks)) request.hostname = address
} else {
// use host field so that ports can be passed
request.host = assertProxyAddress(proxy, proxy.address)
} }
const response = await hrp(request) const response = await hrp(request)