From 2fb99391b3a824e26370592f963f2f40f6ad6ad1 Mon Sep 17 00:00:00 2001 From: Jorge Miguel Lobo Escalona <47326048+jloboescalona2@users.noreply.github.com> Date: Mon, 10 May 2021 13:00:18 +0200 Subject: [PATCH] M #~: remove split by ? VMRC (#1197) Co-authored-by: Jorge Lobo --- .../server/routes/websockets/vmrc/index.js | 27 ++++++++++--------- src/fireedge/src/server/utils/opennebula.js | 1 + 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/fireedge/src/server/routes/websockets/vmrc/index.js b/src/fireedge/src/server/routes/websockets/vmrc/index.js index aed2683e01..fc424d89e3 100644 --- a/src/fireedge/src/server/routes/websockets/vmrc/index.js +++ b/src/fireedge/src/server/routes/websockets/vmrc/index.js @@ -12,6 +12,8 @@ /* See the License for the specific language governing permissions and */ /* limitations under the License. */ /* -------------------------------------------------------------------------- */ +// eslint-disable-next-line node/no-deprecated-api +const { parse } = require('url') const { createProxyMiddleware } = require('http-proxy-middleware') const { readFileSync } = require('fs-extra') const { getConfig } = require('server/utils/yml') @@ -43,18 +45,19 @@ const vmrcProxy = createProxyMiddleware(endpointVmrc, { // eslint-disable-next-line consistent-return router: req => { if (req && req.url) { - // Needs to be reviewed require('path') - const ticket = req.url.split('/')[3] - const filterTicket = ticket.split('?')[0] - try { - const esxi = readFileSync( - `${global.VMRC_TOKENS || ''}/${filterTicket}` - ).toString() - return esxi - } catch (error) { - config.type = error.message - config.message = 'Error read vmrc token: %s' - messageTerminal(config) + const parseURL = parse(req.url) + if (parseURL && parseURL.pathname) { + const ticket = parseURL.pathname.split('/')[3] + try { + const esxi = readFileSync( + `${global.VMRC_TOKENS || ''}/${ticket}` + ).toString() + return esxi + } catch (error) { + config.type = error.message + config.message = 'Error read vmrc token: %s' + messageTerminal(config) + } } } } diff --git a/src/fireedge/src/server/utils/opennebula.js b/src/fireedge/src/server/utils/opennebula.js index cd60dfbedd..efb80d82ed 100644 --- a/src/fireedge/src/server/utils/opennebula.js +++ b/src/fireedge/src/server/utils/opennebula.js @@ -14,6 +14,7 @@ /* -------------------------------------------------------------------------- */ const upcast = require('upcast') +// eslint-disable-next-line node/no-deprecated-api const { parse } = require('url') const rpc = require('xmlrpc') const xml2js = require('xml2js')