support wss (#110)

Fixes #99
aerokube · Jun 2, 2018 · c9ee25e · c9ee25e
1 parent 06a67cf
commit c9ee25e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/web/src/components/Log/index.js b/web/src/components/Log/index.js
@@ -1,7 +1,8 @@
 import React, {Component} from "react";
 import {Terminal} from "xterm";
-import {Link} from "react-router-dom";
 import urlTo from "../../util/urlTo";
+import isSecure from "../../util/isSecure"
+
 import "xterm/dist/xterm.css";
 import "./style.scss";
 import colors from "ansi-256-colors";
@@ -49,7 +50,7 @@ export default class Log extends Component {
             .distinctUntilChanged((prev, {origin}) => prev.origin === origin)
             .map(({session}) => {
                 const wsProxyUrl = urlTo(window.location.href);
-                return `ws://${wsProxyUrl.host}/ws/logs/${session}`;
+                return `${isSecure(wsProxyUrl) ? 'wss' : 'ws'}://${wsProxyUrl.host}/ws/logs/${session}`;
             })
             .switchMap(ws => {
                 return Rx.Observable.defer(() => {

diff --git a/web/src/components/VncCard/VncScreen.js b/web/src/components/VncCard/VncScreen.js
@@ -1,6 +1,7 @@
 import React, {Component} from "react";
 import RFB from "@novnc/novnc/core/rfb";
 import urlTo from "../../util/urlTo"
+import isSecure from "../../util/isSecure"
 
 import "./style.scss";
 
@@ -39,7 +40,7 @@ export default class VncScreen extends Component {
             const port = VncScreen.defaultPort(link);
 
             this.disconnect(this.rfb);
-            this.rfb = this.createRFB(link, port, session);
+            this.rfb = this.createRFB(link, port, session, isSecure(link));
         }
     }
 
@@ -52,7 +53,7 @@ export default class VncScreen extends Component {
             const port = VncScreen.defaultPort(link);
 
             this.disconnect(this.rfb);
-            this.rfb = this.createRFB(link, port, session);
+            this.rfb = this.createRFB(link, port, session, isSecure(link));
         }
     }
 
@@ -62,10 +63,10 @@ export default class VncScreen extends Component {
         this.disconnect(this.rfb);
     }
 
-    createRFB(link, port, session) {
+    createRFB(link, port, session, secure) {
         const rfb = new RFB(
             this.canvas,
-            `ws://${link.hostname}:${port}/ws/vnc/${session}`,
+            `${secure ? 'wss' : 'ws'}://${link.hostname}:${port}/ws/vnc/${session}`,
             {
                 credentials: {
                     password: "selenoid"

diff --git a/web/src/util/isSecure.js b/web/src/util/isSecure.js
@@ -0,0 +1,3 @@
+export default function isSecure({protocol}) {
+    return protocol === "https:";
+}