remove css urls, add missing socketio requirements, fix cookie import, and rearrange socketiod connetion

console/novncd

@@ -17,7 +17,8 @@ django.setup()
 
 import re
 import socket
-from six.moves import http_cookies as Cookie
+#from six.moves import http_cookies as Cookie
+from http import cookies as Cookie
 from webvirtcloud.settings import WS_PORT, WS_HOST, WS_CERT
 from vrtManager.connection import CONN_SSH, CONN_SOCKET
 from console.sshtunnels import SSHTunnels

console/socketiod

@@ -32,7 +32,8 @@ import tty
 import termios
 import libvirt
 
-from six.moves import http_cookies as Cookie
+#from six.moves import http_cookies as Cookie
+from http import cookies as Cookie
 from webvirtcloud.settings import SOCKETIO_PORT, SOCKETIO_HOST
 from vrtManager.connection import CONN_SSH, CONN_SOCKET
 from optparse import OptionParser
@@ -79,7 +80,7 @@ else:
     logging.basicConfig(level=logging.WARNING, format=FORMAT)
 
 async_mode = "eventlet"
-sio = socketio.Server(async_mode=async_mode, cors_allowed_origins="https://vmm.cyborgside.net")
+sio = socketio.Server(async_mode=async_mode, cors_allowed_origins=[])
 
 fd = None
 child_pid = None
@@ -171,7 +172,8 @@ def connect(sid, environ):
         (instance, conn) = get_connection_infos(token)
         uuid = conn.get_uuid() 
         uri = conn.wvm.getURI()
-        subprocess.run(["/srv/webvirtcloud/venv/bin/python3", "/srv/webvirtcloud/venv/bin/consolecallback", uri, uuid])
+        
+        subprocess.run(['conf/daemon/consolecallback', uri, uuid])
     else:
         # this is the parent process fork.
         sio.start_background_task(target=read_and_forward_pty_output)

console/templates/console-xterm.html

@@ -4,28 +4,45 @@
 
 {% block head %}
 <title>WebVirtCloud - XTerm</title>
-<link rel="stylesheet" href="https://unpkg.com/xterm@3.6.0/dist/xterm.css" />
-<script src="https://unpkg.com/xterm@3.6.0/dist/xterm.js"></script>
-<script src="https://unpkg.com/xterm@3.6.0/dist/addons/fit/fit.js"></script>
-<script src="https://unpkg.com/xterm@3.6.0/dist/addons/fullscreen/fullscreen.js"></script>
+<link rel="stylesheet" href="{% static 'css/xterm.css' %}"/>
+<script src="{% static 'js/xterm@3.6.0/xterm.js' %}"></script>
+<script src="{% static 'js/xterm@3.6.0/addons/fit/fit.js' %}"></script>
+<script src="{% static 'js/xterm@3.6.0/addons/fullscreen/fullscreen.js' %}"></script>
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.5.0/socket.io.js"></script>
+<script src="{% static 'js/socket.io.js' %}"></script>
 
 {% endblock %}
 {% block content %}
 <div style="background: white; padding-bottom: 5px;">
     <span style="font-size: small;">Status: <span style="font-size: small;" id="status">connecting...</span></span>
-    <button id="button"; type="button"; onclick="myFunction()";>Connect</button>
+    <button id="button" type="button" onclick="myFunction();">Connect</button>
 </div>
 
 <div style="width: 100%; height:100%;" id="terminal"></div>
 <script crossorigin="anonymous">
-	Terminal.applyAddon(fit)
+	    Terminal.applyAddon(fit);
 
-        var socket = io.connect({transports: ["websocket", "polling"]});
+        let host = readQueryVariable('host', '{{ socketio_host }}');
+        let port = readQueryVariable('port', '{{ socketio_port }}');
+        let path = readQueryVariable('path', '{{ socketio_path }}');
+      
 
-        const status = document.getElementById("status")
-        const button = document.getElementById("button")
+        // Build the websocket URL used to connect
+        let url;
+        if (window.location.protocol === "https:") {
+            url = 'wss';
+        } else {
+            url = 'ws';
+        }
+        url += '://' + host;
+        if (port) {
+            url += ':' + port;
+        }
+
+        var socket = io.connect(url, {transports: ["websocket", "polling"]});
+
+        const status = document.getElementById("status");
+        const button = document.getElementById("button");
 
         var term = new Terminal({
             cursorBlink: true,
@@ -44,14 +61,13 @@
         })
 
         socket.on("connect", () => {
-        status.innerHTML = '<span style="background-color: lightgreen;">connected</span>'
-        button.innerHTML = 'Disconnect'
+            status.innerHTML = '<span style="background-color: lightgreen;">connected</span>'
+            button.innerHTML = 'Disconnect'
         })
 
         socket.on("disconnect", () => {
-        status.innerHTML =  '<span style="background-color: #ff8383;">disconnected</span>'
-        button.innerHTML = 'Connect'
-
+            status.innerHTML =  '<span style="background-color: #ff8383;">disconnected</span>'
+            button.innerHTML = 'Connect'
         })
 
         function myFunction(){
@@ -69,6 +85,26 @@
             socket.emit("resize", {"cols": term.cols, "rows": term.rows})
         }
 
+        // This function extracts the value of one variable from the
+        // query string. If the variable isn't defined in the URL
+        // it returns the default value instead.
+        function readQueryVariable(name, defaultValue) {
+        // A URL with a query parameter can look like this:
+        // https://www.example.com?myqueryparam=myvalue
+        //
+        // Note that we use location.href instead of location.search
+        // because Firefox < 53 has a bug w.r.t location.search
+        const re = new RegExp('.*[?&]' + name + '=([^&#]*)'),
+            match = document.location.href.match(re);
+
+        if (match) {
+            // We have to decode the URL since want the cleartext value
+            return decodeURIComponent(match[1]);
+        }
+
+        return defaultValue;
+    }
+
         window.onresize = resize
         window.onload = resize
 </script>

console/views.py

@@ -15,6 +15,9 @@ from webvirtcloud.settings import (
     WS_PUBLIC_HOST,
     WS_PUBLIC_PATH,
     WS_PUBLIC_PORT,
+    SOCKETIO_PUBLIC_HOST,
+    SOCKETIO_PUBLIC_PORT,
+    SOCKETIO_PUBLIC_PATH
 )
 
 
@@ -80,6 +83,13 @@ def console(request):
         console_page = "console-" + console_type + "-" + view_type + ".html"
         response = render(request, console_page, locals())
     elif console_type == "pty":
+        socketio_host = SOCKETIO_PUBLIC_HOST if SOCKETIO_PUBLIC_HOST else request.get_host()
+        socketio_port = SOCKETIO_PUBLIC_PORT if SOCKETIO_PUBLIC_PORT else 6081
+        socketio_path = SOCKETIO_PUBLIC_PATH if SOCKETIO_PUBLIC_PATH else "/"
+
+        if ":" in socketio_host:
+            socketio_host = re.sub(":[0-9]+", "", socketio_host)
+
         response = render(request, "console-xterm.html", locals())
     else:
         if console_type is None: