From 788f3f3566bea46a164ed8ed68b39f69344fc65e Mon Sep 17 00:00:00 2001
From: Alexandr Ilenko <AIlenko@IBS.RU>
Date: Mon, 22 Aug 2022 18:33:14 +0300
Subject: [SILABMC-280] Fix: use wsS only when httpS

---
 src/views/_sila/Operations/Kvm/KvmConsole.vue                    | 8 +++-----
 .../_sila/Operations/SerialOverLan/SerialOverLanConsole.vue      | 6 +++---
 src/views/_sila/Operations/VirtualMedia/VirtualMedia.vue         | 9 +++------
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/views/_sila/Operations/Kvm/KvmConsole.vue b/src/views/_sila/Operations/Kvm/KvmConsole.vue
index 603aa115..b4fddb9d 100644
--- a/src/views/_sila/Operations/Kvm/KvmConsole.vue
+++ b/src/views/_sila/Operations/Kvm/KvmConsole.vue
@@ -111,12 +111,10 @@ export default {
       this.rfb = null;
     },
     openTerminal() {
+      const url = new URL('/kvm/0', window.location.href);
+      url.protocol = url.protocol.replace('http', 'ws');
       const token = this.$store.getters['authentication/token'];
-      this.rfb = new RFB(
-        this.$refs.panel,
-        `wss://${window.location.host}/kvm/0`,
-        { wsProtocols: [token] }
-      );
+      this.rfb = new RFB(this.$refs.panel, url, { wsProtocols: [token] });
 
       this.rfb.scaleViewport = true;
       this.rfb.clipViewport = true;
diff --git a/src/views/_sila/Operations/SerialOverLan/SerialOverLanConsole.vue b/src/views/_sila/Operations/SerialOverLan/SerialOverLanConsole.vue
index b1087805..3b51fc56 100644
--- a/src/views/_sila/Operations/SerialOverLan/SerialOverLanConsole.vue
+++ b/src/views/_sila/Operations/SerialOverLan/SerialOverLanConsole.vue
@@ -91,9 +91,9 @@ export default {
     openTerminal() {
       const token = this.$store.getters['authentication/token'];
 
-      this.ws = new WebSocket(`wss://${window.location.host}/console0`, [
-        token,
-      ]);
+      const url = new URL('/console0', window.location.href);
+      url.protocol = url.protocol.replace('http', 'ws');
+      this.ws = new WebSocket(url, [token]);
 
       // Refer https://github.com/xtermjs/xterm.js/ for xterm implementation and addons.
 
diff --git a/src/views/_sila/Operations/VirtualMedia/VirtualMedia.vue b/src/views/_sila/Operations/VirtualMedia/VirtualMedia.vue
index be5e2ee9..4c3f4da0 100644
--- a/src/views/_sila/Operations/VirtualMedia/VirtualMedia.vue
+++ b/src/views/_sila/Operations/VirtualMedia/VirtualMedia.vue
@@ -152,12 +152,9 @@ export default {
   methods: {
     startVM(device) {
       const token = this.$store.getters['authentication/token'];
-      device.nbd = new NbdServer(
-        `wss://${window.location.host}${device.websocket}`,
-        device.file,
-        device.id,
-        token
-      );
+      const url = new URL(device.websocket, window.location.href);
+      url.protocol = url.protocol.replace('http', 'ws');
+      device.nbd = new NbdServer(url, device.file, device.id, token);
       device.nbd.socketStarted = () =>
         this.successToast(this.$t('pageVirtualMedia.toast.serverRunning'));
       device.nbd.errorReadingFile = () =>
-- 
cgit v1.2.3