Merge branch 'users' into packages_and_multiuser_passwd

kasmweb/core/rfb.js

@@ -1068,14 +1068,7 @@ export default class RFB extends EventTargetMixin {
     _negotiate_std_vnc_auth() {
         if (this._sock.rQwait("auth challenge", 16)) { return false; }
 
-        /* Empty passwords are allowed in VNC and since we use HTTPS basic auth, wich is superior, lets allow the bypass of the vnc password
-        if (!this._rfb_credentials.password) {
-            this.dispatchEvent(new CustomEvent(
-                "credentialsrequired",
-                { detail: { types: ["password"] } }));
-            return false;
-        }
-        */
+        // KasmVNC uses basic Auth, clear the VNC password, which is not used
         this._rfb_credentials.password = "";
 
         // TODO(directxman12): make genDES not require an Array
@@ -1353,7 +1346,7 @@ export default class RFB extends EventTargetMixin {
         */
         if (!this.enableWebP)
             return false;
-        // It's not possible to check for webp synchronously, and hacking promises 
+        // It's not possible to check for webp synchronously, and hacking promises
         // into everything would be too time-consuming. So test for FF and Chrome.
         var uagent = navigator.userAgent.toLowerCase();
         var match = uagent.match(/firefox\/([0-9]+)\./);

kasmweb/vnc.html

@@ -71,9 +71,19 @@
             loader.src = "vendor/browser-es-module-loader/dist/browser-es-module-loader.js";
             document.head.appendChild(loader);
         });
-        window.addEventListener("load", function() {
-            document.getElementById("noVNC_connect_button").click();
-        });
+
+        let isInsideKasmVDI = false;
+        try {
+            isInsideKasmVDI = (window.self !== window.top);
+        } catch (e) {
+            isInsideKasmVDI = true;
+        }
+
+        if (!isInsideKasmVDI) {
+            window.addEventListener("load", function() {
+                document.getElementById("noVNC_connect_button").click();
+            });
+        }
     </script>
     <!-- actual script modules -->
     <script type="module" crossorigin='use-credentials' src="app/ui.js"></script>