Update README.md

Please review changes to the INI file. Legacy format is still supported, but format must be changed if you wish to use multiple clusters.

README.md

@@ -2,15 +2,65 @@
 
 This project's focus is to create a simple VDI client intended for mass deployment. This VDI client connects directly to Proxmox VE and allows users to connect (via Spice) to any VMs they have permission to access.
 
+Defining multiple Proxmox clusters is possible and can allow end users to easily select which 'server group' they wish to connect to:
+
 ![Login Screen](screenshots/login.png)
 
 ![Login Screen with OTP](screenshots/login-totp.png)
 
 ![VDI View](screenshots/vdiview.png)
 
+## Configuration File
+
+PVE VDI Client **REQUIRES** a configuration file to function. The client searches for this file in the following locations unless overridden with [command line options](#command-line-usage):
+
+* Windows
+    * %APPDATA%\VDIClient\vdiclient.ini
+    * %PROGRAMFILES%\VDIClient\vdiclient.ini
+* Linux
+    * ~/.config/VDIClient/vdiclient.ini
+    * /etc/vdiclient/vdiclient.ini
+    * /usr/local/etc/vdiclient/vdiclient.ini
+
+Please refer to [vdiclient.ini.example](https://github.com/joshpatten/PVE-VDIClient/blob/main/vdiclient.ini.example) for all available config file options
+
+If you encounter any issues feel free to submit an issue report.
+
+## Proxmox Permission Requirements
+
+Users that are accessing VDI instances need to have the following permissions assigned for each VM they access:
+
+* VM.PowerMgmt
+* VM.Console
+* VM.Audit
+
+## Command Line Usage
+
+No command line options are required for default behavior. The following command line options are available:
+
+    usage: vdiclient.py [-h] [--list_themes] [--config_type {file,http}] [--config_location CONFIG_LOCATION]
+                        [--config_username CONFIG_USERNAME] [--config_password CONFIG_PASSWORD] [--ignore_ssl]
+    
+    Proxmox VDI Client
+    
+    options:
+      -h, --help            show this help message and exit
+      --list_themes         List all available themes
+      --config_type {file,http}
+                            Select config type (default: file)
+      --config_location CONFIG_LOCATION
+                            Specify the config location (default: search for config file)
+      --config_username CONFIG_USERNAME
+                            HTTP basic authentication username (default: None)
+      --config_password CONFIG_PASSWORD
+                            HTTP basic authentication password (default: None)
+      --ignore_ssl          HTTPS ignore SSL certificate errors (default: False)
+
+If `--config_type http` is selected, pass the URL in the `--config_location` parameter
+
 ## Windows Installation
 
-You **MUST** install virt-viewer prior to using PVE VDI client, you may download it from the [official Virtual Machine Manager](https://virt-manager.org/download/) site.
+You **MUST** install virt-viewer prior to using PVE VDI client, you may download it from the [official Virtual Machine Manager](https://virt-manager.org/download.html) site.
 
 Please visit the [releases](https://github.com/joshpatten/PVE-VDIClient/releases) section to download a prebuilt MSI package
 
@@ -24,32 +74,24 @@ you will need to download the latest 3.10 python release, and run the following
 
 Run the following commands on a Debian/Ubuntu Linux system to install the appropriate prerequisites
 
-    apt install python3-pip virt-viewer
+    apt install python3-pip python3-tk virt-viewer git
+    git clone https://github.com/joshpatten/PVE-VDIClient.git
+    cd ./PVE-VDIClient/
     chmod +x requirements.sh
     ./requirements.sh
     cp vdiclient.py /usr/local/bin
     chmod +x /usr/local/bin/vdiclient.py
 
-## Configuration File
+## Build Debian/Ubuntu Linux Binary
 
-PVE VDI Client **REQUIRES** a configuration file to function. The client searches for this file in the following locations unless **--config** is specified on the commmand line:
+Run the following commands if you wish to build a binary on a Debian/Ubuntu Linux system
 
-* Windows
-    * %APPDATA%\VDIClient\vdiclient.ini
-    * %PROGRAMFILES%\VDIClient\vdiclient.ini
-* Linux
-    * ~/.config/VDIClient/vdiclient.ini
-    * /etc/vdiclient/vdiclient.ini
-    * /usr/local/etc/vdiclient/vdiclient.ini
+    apt install python3-pip python3-tk virt-viewer git
+    git clone https://github.com/joshpatten/PVE-VDIClient.git
+    cd ./PVE-VDIClient/
+    chmod +x requirements.sh
+    ./requirements.sh
+    pip3 install pyinstaller
+    pyinstaller --onefile --noconsole --noconfirm --hidden-import proxmoxer.backends --hidden-import proxmoxer.backends.https --hidden-import proxmoxer.backends.https.AuthenticationError --hidden-import proxmoxer.core --hidden-import proxmoxer.core.ResourceException --hidden-import subprocess.TimeoutExpired --hidden-import subprocess.CalledProcessError --hidden-import requests.exceptions --hidden-import requests.exceptions.ReadTimeout --hidden-import requests.exceptions.ConnectTimeout --hidden-import requests.exceptions.ConnectionError vdiclient.py
 
-Please refer to **vdiclient.ini.example** for all available config file options
-
-If you encounter any issues feel free to submit an issue report.
-
-## Proxmox Permission Requirements
-
-Users that are accessing VDI instances need to have the following permissions assigned for each VM they access:
-
-* VM.PowerMgmt
-* VM.Console
-* VM.Audit
+Once pyinstaller has finished your binary will be located in dist/vdiclient

dist/createmsi.py

@@ -304,7 +304,8 @@ class PackageGenerator:
 			})
 
 	def path_to_id(self, pathname):
-			return pathname.replace('\\', '_').replace('/', '_').replace('#', '_').replace('-', '_')																								   
+			return pathname.replace('\\', '_').replace('/', '_').replace('#', '_').replace('-', '_').replace("+", "__")
+	
 	def create_xml(self, nodes, current_dir, parent_xml_node, staging_dir):
 		cur_node = nodes[current_dir]
 		if cur_node.files:
@@ -327,7 +328,7 @@ class PackageGenerator:
 				})
 			self.component_num += 1
 			for f in cur_node.files:
-				file_id = self.path_to_id(os.path.join(current_dir, f)).replace("+", "__")
+				file_id = self.path_to_id(os.path.join(current_dir, f))
 				ET.SubElement(comp_xml_node, 'File', {
 					'Id': file_id,
 					'Name': f,
@@ -335,7 +336,7 @@ class PackageGenerator:
 				})
 
 		for dirname in cur_node.dirs:
-			dir_id = os.path.join(current_dir, dirname).replace('\\', '_').replace('/', '_')
+			dir_id = self.path_to_id(os.path.join(current_dir, dirname))
 			dir_node = ET.SubElement(parent_xml_node, 'Directory', {
 				'Id': dir_id,
 				'Name': dirname,

dist/vdiclient.json

@@ -1,10 +1,11 @@
 {
 	"upgrade_guid" : "46cbad92-353e-4b28-9bee-83950991dad8",
-	"version" : "1.0.7",
+	"version" : "2.0.1",
 	"product_name" : "VDI Client",
 	"manufacturer" : "Josh Patten",
 	"name" : "VDI Client",
 	"name_base" : "vdiclient",
+	"arch": 64,
 	"comments" : "This is the Proxmox VDI client. This client interfaces with Proxmox requires that virt-viewer be installed.",
 	"installdir" : "VDIClient",
 	"installscope" : "perMachine",

requirements.bat

@@ -1,6 +1,6 @@
 @echo off
 pip install pyinstaller
 pip install proxmoxer
-pip install PySimpleGUIQt
+pip install PySimpleGUI
 pip install requests
 pip install pywin32

requirements.sh

@@ -1,6 +1,4 @@
 #!/bin/bash
 pip3 install proxmoxer
-pip3 install PySimpleGUIQt
-# If PySimpleGUIQt fails, VDIClient will fall back to PySimpleGUI
 pip3 install PySimpleGUI
 pip3 install requests

vdiclient.ini.example

@@ -1,7 +1,7 @@
 [General]
 # This is the title that is diplayed to the user
 title = VDI Login
-# This is the PySimpleGui Theme that is used. Run pvevdi.py with flag `--list_themes` for a list of themes
+# This is the PySimpleGui Theme that is used. Run vdiclient.py with flag `--list_themes` for a list of themes
 theme = LightBlue
 # Program Icon
 icon = vdiicon.ico
@@ -11,28 +11,75 @@ logo = vdiclient.png
 kiosk = False
 # Enable/Disable Fullscreen mode (not applicable in Kiosk mode)
 fullscreen = True
+# Disable viewer_kiosk mode if kiosk is set to true, this allows overriding remote_viewer kiosk mode
+#viewer_kiosk = False
 # Enable displaying SPICE ini file before opening virt-viewer
 inidebug = False
+# Select which guest types to display. Acceptable values: both, lxc, qemu
+guest_type = both
+# Show VM option for resetting VM
+#show_reset = True
+# Set Window Dimensions. Only use if window isn't sizing properly
+#window_width = 800
+#window_height = 600
 
-
-[Authentication]
+# PVE-VDIClient supports multiple clusters. Define them with sections that start with Hosts. followed by the name
+# you wish to display to your end users. This example is Hosts.PVE which would display PVE to your users
+[Hosts.PVE]
+# JSON dictionary of servers in the cluster
+# Format is 'IP/FQDN': PORT
+# NOTE: MAKE SURE THAT ALL LINES ARE INDENTED
+hostpool = {
+               "10.10.10.100" : 8006,
+               "10.10.10.111" : 8006,
+               "pve1.example.com" : 8006
+           }
 # This is the authentication backend that will be used to authenticate
 auth_backend = pve
 # If enabled, 2FA TOTP entry dialog will show
 auth_totp = false
 # If disabled, TLS certificate will not be checked
 tls_verify = false
-# User name
+# User name (if using token)
+# NOTE: If only one cluster is defined, this will auto-login
+# If user, token_name, and token_value are set
 #user = user
 # API Token Name
 #token_name = dvi
-#API Token Value
+# API Token Value
 #token_value = xxx-x-x-x-xxx
+# Password Reset Command Launch. Has to be full executable Command
+#pwresetcmd = start chrome --app=http://pwreset.example.com
+# Automatically connect to a VMID upon authentication
+#auto_vmid = 100
+
+# An additional cluster definition
+#[Hosts.PVE2]
+# JSON dictionary of servers in the cluster
+# Format is 'IP/FQDN': PORT
+#hostpool = {
+#               "10.10.10.100" : 8006,
+#               "10.10.10.111" : 8006,
+#               "pve1.example.com" : 8006
+#           }
+# This is the authentication backend that will be used to authenticate
+#auth_backend = pve
+# If enabled, 2FA TOTP entry dialog will show
+#auth_totp = false
+# If disabled, TLS certificate will not be checked
+#tls_verify = false
+# User name (if using token)
+# NOTE: If only one cluster is defined, this will auto-login
+#user = user
+# API Token Name
+#token_name = dvi
+# API Token Value
+#token_value = xxx-x-x-x-xxx
+# Password Reset Command Launch. Has to be full executable Command
+#pwresetcmd = start chrome --app=http://pwreset.example.com
+# Automatically connect to a VMID upon authentication
+#auto_vmid = 100
 
-[Hosts]
-# Hosts are entered as `IP/FQDN = Port`
-10.10.10.100 = 8006
-pve1.example.com = 8006
 
 [SpiceProxyRedirect]
 # The Spice Proxy provided by the Proxmox API may need to have its host/port rewritten

vdiclient.py

@@ -1,16 +1,15 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 import proxmoxer # pip install proxmoxer
-try:
-	import PySimpleGUIQt as sg # pip install PySimpleGUIQt
-	gui = 'QT'
-except ImportError:
-	import PySimpleGUI as sg # pip install PySimpleGUI
-	gui = 'TK'
+import PySimpleGUI as sg # pip install PySimpleGUI
+gui = 'TK'
 import requests
+from datetime import datetime
 from configparser import ConfigParser
+import argparse
 import random
 import sys
 import os
+import json
 import subprocess
 from time import sleep
 from io import StringIO
@@ -18,83 +17,78 @@ from io import StringIO
 
 
 class G:
-	hostpool = []
 	spiceproxy_conv = {}
 	proxmox = None
+	icon = None
 	vvcmd = None
 	scaling = 1
 	#########
-	title = 'VDI Login'
-	backend = 'pve'
-	user = ""
-	token_name = None
-	token_value = None
-	totp = False
-	imagefile = None
-	kiosk = False
-	fullscreen = True
-	verify_ssl = True
-	icon = None
 	inidebug = False
 	addl_params = None
+	imagefile = None
+	kiosk = False
+	viewer_kiosk = True
+	fullscreen = True
+	show_reset = False
+	show_hibernate = False
+	current_hostset = 'DEFAULT'
+	title = 'VDI Login'
+	hosts = {}
 	theme = 'LightBlue'
+	guest_type = 'both'
+	width = None
+	height = None
 
-def get_dpi():
-	import ctypes
-	import win32api # pip install pywin32
-	shcore = ctypes.windll.shcore
-	monitors = win32api.EnumDisplayMonitors()
-	hresult = shcore.SetProcessDpiAwareness(2)
-	assert hresult == 0
-	dpiX = ctypes.c_uint()
-	dpiY = ctypes.c_uint()
-	for i, monitor in enumerate(monitors):
-		shcore.GetDpiForMonitor(
-			monitor[0].handle,
-			0,
-			ctypes.byref(dpiX),
-			ctypes.byref(dpiY)
-		)
-		return dpiX.value/96
 
-def loadconfig(config_location = None):
-	if config_location:
-		config = ConfigParser(delimiters='=')
-		try:
-			config.read(config_location)
-		except Exception as e:
-			win_popup_button(f'Unable to read supplied configuration:\n{e!r}', 'OK')
-			config_location = None
-	if not config_location:
-		if os.name == 'nt': # Windows
-			config_location = f'{os.getenv("APPDATA")}\\VDIClient\\vdiclient.ini'
-			if not os.path.exists(config_location):
-				config_location = f'{os.getenv("PROGRAMFILES")}\\VDIClient\\vdiclient.ini'
-			if not os.path.exists(config_location):
-				config_location = f'{os.getenv("PROGRAMFILES(x86)")}\\VDIClient\\vdiclient.ini'
-			if not os.path.exists(config_location):
-				# Last ditch effort
-				config_location = 'C:\\Program Files\\VDIClient\\vdiclient.ini'
-			if not os.path.exists(config_location):
-				win_popup_button(f'Unable to read supplied configuration from any location!', 'OK')
+def loadconfig(config_location = None, config_type='file', config_username = None, config_password = None, ssl_verify = True):
+	config = ConfigParser(delimiters='=')
+	if config_type == 'file':
+		if config_location:
+			if not os.path.isfile(config_location):
+				win_popup_button(f'Unable to read supplied configuration:\n{config_location} does not exist!', 'OK')
 				return False
-		elif os.name == 'posix': #Linux
-			config_location = os.path.expanduser('~/.config/VDIClient/vdiclient.ini')
-			if not os.path.exists(config_location):
-				config_location = '/etc/vdiclient/vdiclient.ini'
-			if not os.path.exists(config_location):
-				config_location = '/usr/local/etc/vdiclient/vdiclient.ini'
-			if not os.path.exists(config_location):
-				win_popup_button(f'Unable to read supplied configuration from any location!', 'OK')
-				return False
-		config = ConfigParser(delimiters='=')
+		else:
+			if os.name == 'nt': # Windows
+				config_list = [
+					f'{os.getenv("APPDATA")}\\VDIClient\\vdiclient.ini',
+					f'{os.getenv("PROGRAMFILES")}\\VDIClient\\vdiclient.ini',
+					f'{os.getenv("PROGRAMFILES(x86)")}\\VDIClient\\vdiclient.ini',
+					'C:\\Program Files\\VDIClient\\vdiclient.ini'
+				]
+				
+			elif os.name == 'posix': #Linux
+				config_list = [
+					os.path.expanduser('~/.config/VDIClient/vdiclient.ini'),
+					'/etc/vdiclient/vdiclient.ini',
+					'/usr/local/etc/vdiclient/vdiclient.ini'
+				]
+		for location in config_list:
+			if os.path.exists(location):
+				config_location = location
+				break
+		if not config_location:
+			win_popup_button(f'Unable to read supplied configuration from any location!', 'OK')
+			return False
 		try:
 			config.read(config_location)
 		except Exception as e:
 			win_popup_button(f'Unable to read configuration file:\n{e!r}', 'OK')
-			config_location = None
+			return False
+	elif config_type == 'http':
+		if not config_location:
+			win_popup_button('--config_type http defined, yet no URL provided in --config_location parameter!', 'OK')
+			return False
+		try:
+			if config_username and config_password:
+				r = requests.get(url=config_location, auth=(config_username, config_password), verify = ssl_verify)
+			else:
+				r = requests.get(url=config_location, verify = ssl_verify)
+			config.read_string(r.text)
+		except Exception as e:
+			win_popup_button(f"Unable to read configuration from URL!\n{e}", "OK")
+			return False
 	if not 'General' in config:
-		win_popup_button(f'Unable to read supplied configuration:\nNo `General` section defined!', 'OK')
+		win_popup_button('Unable to read supplied configuration:\nNo `General` section defined!', 'OK')
 		return False
 	else:
 		if 'title' in config['General']:
@@ -109,35 +103,113 @@ def loadconfig(config_location = None):
 				G.imagefile = config['General']['logo']
 		if 'kiosk' in config['General']:
 			G.kiosk = config['General'].getboolean('kiosk')
+		if 'viewer_kiosk' in config['General']:
+			G.viewer_kiosk = config['General'].getboolean('viewer_kiosk')
 		if 'fullscreen' in config['General']:
 			G.fullscreen = config['General'].getboolean('fullscreen')
 		if 'inidebug' in config['General']:
 			G.inidebug = config['General'].getboolean('inidebug')
-	if not 'Authentication' in config:
-		win_popup_button(f'Unable to read supplied configuration:\nNo `Authentication` section defined!', 'OK')
-		return False
-	else:
-		if 'auth_backend' in config['Authentication']:
-			G.backend = config['Authentication']['auth_backend']
-		if 'auth_totp' in config['Authentication']:
-			G.totp = config['Authentication'].getboolean('auth_totp')
-		if 'tls_verify' in config['Authentication']:
-			G.verify_ssl = config['Authentication'].getboolean('tls_verify')
-		if 'user' in config['Authentication']:
-				G.user = config['Authentication']['user']
-		if 'token_name' in config['Authentication']:
-				G.token_name = config['Authentication']['token_name']
-		if 'token_value' in config['Authentication']:
-				G.token_value = config['Authentication']['token_value']
-	if not 'Hosts' in config:
-		win_popup_button(f'Unable to read supplied configuration:\nNo `Hosts` section defined!', 'OK')
-		return False
-	else:
+		if 'guest_type' in config['General']:
+			G.guest_type = config['General']['guest_type']
+		if 'show_reset' in config['General']:
+			G.show_reset = config['General'].getboolean('show_reset')
+		if 'window_width' in config['General']:
+			G.width = config['General'].getint('window_width')
+		if 'window_height' in config['General']:
+			G.height = config['General'].getint('window_height')
+	if 'Authentication' in config: #Legacy configuration
+		G.hosts['DEFAULT'] = {
+			'hostpool' : [],
+			'backend' : 'pve',
+			'user' : "",
+			'token_name' : None,
+			'token_value' : None,
+			'totp' : False,
+			'verify_ssl' : True,
+			'pwresetcmd' : None,
+			'auto_vmid' : None,
+			'knock_seq': []
+		}
+		if not 'Hosts' in config:
+			win_popup_button(f'Unable to read supplied configuration:\nNo `Hosts` section defined!', 'OK')
+			return False
 		for key in config['Hosts']:
-			G.hostpool.append({
+			G.hosts['DEFAULT']['hostpool'].append({
 				'host': key,
 				'port': int(config['Hosts'][key])
 			})
+		if 'auth_backend' in config['Authentication']:
+			G.hosts['DEFAULT']['backend'] = config['Authentication']['auth_backend']
+		if 'user' in config['Authentication']:
+			G.hosts['DEFAULT']['user'] = config['Authentication']['user']
+		if 'token_name' in config['Authentication']:
+			G.hosts['DEFAULT']['token_name'] = config['Authentication']['token_name']
+		if 'token_value' in config['Authentication']:
+			G.hosts['DEFAULT']['token_value'] = config['Authentication']['token_value']
+		if 'auth_totp' in config['Authentication']:
+			G.hosts['DEFAULT']['totp'] = config['Authentication'].getboolean('auth_totp')
+		if 'tls_verify' in config['Authentication']:
+			G.hosts['DEFAULT']['verify_ssl'] = config['Authentication'].getboolean('tls_verify')
+		if 'pwresetcmd' in config['Authentication']:
+			G.hosts['DEFAULT']['pwresetcmd'] = config['Authentication']['pwresetcmd']
+		if 'auto_vmid' in config['Authentication']:
+			G.hosts['DEFAULT']['auto_vmid'] = config['Authentication'].getint('auto_vmid')
+		if 'knock_seq' in config['Authentication']:
+			try:
+				G.hosts['DEFAULT']['knock_seq'] = json.loads(config['Authentication']['knock_seq'])
+			except Exception as e:
+				win_popup_button(f'Knock sequence not valid JSON, skipping!\n{e!r}', 'OK')
+	else: # New style config
+		i = 0
+		for section in config.sections():
+			if section.startswith('Hosts.'):
+				_, group = section.split('.', 1)
+				if i == 0:
+					G.current_hostset = group
+				G.hosts[group] = {
+					'hostpool' : [],
+					'backend' : 'pve',
+					'user' : "",
+					'token_name' : None,
+					'token_value' : None,
+					'totp' : False,
+					'verify_ssl' : True,
+					'pwresetcmd' : None,
+					'auto_vmid' : None,
+					'knock_seq': []
+				}
+				try:
+					hostjson = json.loads(config[section]['hostpool'])
+				except Exception as e:
+					win_popup_button(f"Error: could not parse hostpool in section {section}:\n{e!r}", "OK")
+					return False
+				for key, value in hostjson.items():
+					G.hosts[group]['hostpool'].append({
+						'host': key,
+						'port': int(value)
+					})
+				if 'auth_backend' in config[section]:
+					G.hosts[group]['backend'] = config[section]['auth_backend']
+				if 'user' in config[section]:
+					G.hosts[group]['user'] = config[section]['user']
+				if 'token_name' in config[section]:
+					G.hosts[group]['token_name'] = config[section]['token_name']
+				if 'token_value' in config[section]:
+					G.hosts[group]['token_value'] = config[section]['token_value']
+				if 'auth_totp' in config[section]:
+					G.hosts[group]['totp'] = config[section].getboolean('auth_totp')
+				if 'tls_verify' in config[section]:
+					G.hosts[group]['verify_ssl'] = config[section].getboolean('tls_verify')
+				if 'pwresetcmd' in config[section]:
+					G.hosts[group]['pwresetcmd'] = config[section]['pwresetcmd']
+				if 'auto_vmid' in config[section]:
+					G.hosts[group]['auto_vmid'] = config[section].getint('auto_vmid')
+				if 'knock_seq' in config[section]:
+					try:
+						G.hosts[group]['knock_seq'] = json.loads(config[section]['knock_seq'])
+					except Exception as e:
+						win_popup_button(f'Knock sequence not valid JSON, skipping!\n{e!r}', 'OK')
+				i += 1
 	if 'SpiceProxyRedirect' in config:
 		for key in config['SpiceProxyRedirect']:
 			G.spiceproxy_conv[key] = config['SpiceProxyRedirect'][key]
@@ -148,9 +220,15 @@ def loadconfig(config_location = None):
 	return True
 
 def win_popup(message):
-	layout = [[sg.Text(message)]]
-	window = sg.Window('Message', layout, no_titlebar=True, keep_on_top=True, finalize=True)
+	layout = [
+		[sg.Text(message, key='-TXT-')]
+	]
+	window = sg.Window('Message', layout, return_keyboard_events=True, no_titlebar=True, keep_on_top=True, finalize=True, )
 	window.bring_to_front()
+	_, _ = window.read(timeout=10) # Fixes a black screen bug
+	window['-TXT-'].update(message)
+	sleep(.15)
+	window['-TXT-'].update(message)
 	return window
 	
 def win_popup_button(message, button):
@@ -167,27 +245,225 @@ def win_popup_button(message, button):
 			return
 
 def setmainlayout():
+	readonly = False
+	if G.hosts[G.current_hostset]['user'] and G.hosts[G.current_hostset]['token_name'] and G.hosts[G.current_hostset]['token_value']:
+		readonly = True
 	layout = []
 	if G.imagefile:
-		layout.append([sg.Image(G.imagefile), sg.Text(G.title, size =(18*G.scaling, 1*G.scaling), justification='c', font=["Helvetica", 18])])
+		layout.append(
+			[
+				sg.Image(G.imagefile),
+				sg.Text(
+					G.title,
+					size = (
+						18*G.scaling,
+						1*G.scaling
+					),
+					justification = 'c',
+					font = [
+						"Helvetica", 
+						18
+					]
+				)
+			]
+		)
 	else:
-		layout.append([sg.Text(G.title, size =(30*G.scaling, 1*G.scaling), justification='c', font=["Helvetica", 18])])
-	layout.append([sg.Text("Username", size =(12*G.scaling, 1*G.scaling), font=["Helvetica", 12]), sg.InputText(default_text=G.user,key='-username-', font=["Helvetica", 12])])
-	layout.append([sg.Text("Password", size =(12*G.scaling, 1*G.scaling),font=["Helvetica", 12]), sg.InputText(key='-password-', password_char='*', font=["Helvetica", 12])])
+		layout.append(
+			[
+				sg.Text(
+					G.title,
+					size = (
+						30*G.scaling,
+						1*G.scaling
+					),
+					justification='c',
+					font = [
+						"Helvetica", 
+						18
+					]
+				)
+			]
+		)
 	
-	if G.totp:
-		layout.append([sg.Text("OTP Key", size =(12*G.scaling, 1), font=["Helvetica", 12]), sg.InputText(key='-totp-', font=["Helvetica", 12])])
+	if len(G.hosts) > 1:
+		groups = []
+		for key, _ in G.hosts.items():
+			groups.append(key)
+		layout.append(
+			[
+				sg.Text(
+					"Server Group:",
+					size = (
+						12*G.scaling,
+						1*G.scaling
+					),
+					font = [
+						"Helvetica",
+						12
+					]
+				),
+				sg.Combo(
+					groups,
+					G.current_hostset,
+					key = '-group-',
+					font = [
+						"Helvetica",
+						12
+					],
+					readonly = True,
+					enable_events = True
+				)
+			]
+		)
+
+	layout.append(
+		[
+			sg.Text(
+				"Username",
+				size = (
+					12*G.scaling,
+					1*G.scaling
+				),
+				font = [
+					"Helvetica",
+					12
+				]
+			),
+			sg.InputText(
+				default_text = G.hosts[G.current_hostset]['user'],
+				key = '-username-',
+				font = [
+					"Helvetica",
+					12
+				],
+				readonly = readonly
+			)
+		]
+	)
+	layout.append(
+		[
+			sg.Text(
+				"Password",
+				size = (
+					12*G.scaling,
+					1*G.scaling
+				),
+				font = [
+					"Helvetica",
+					12
+				]
+			),
+			sg.InputText(
+				key='-password-',
+				password_char='*',
+				font = [
+					"Helvetica",
+					12
+				],
+				readonly = readonly
+			)
+		]
+	)
+	
+	if G.hosts[G.current_hostset]['totp']:
+		layout.append(
+			[
+				sg.Text(
+					"OTP Key",
+					size = (
+						12*G.scaling,
+						1
+					),
+					font = [
+						"Helvetica",
+						12
+					]
+				),
+				sg.InputText(
+					key = '-totp-',
+					font = [
+						"Helvetica",
+						12
+					]
+				)
+			]
+		)
 	if G.kiosk:
-		layout.append([sg.Button("Log In", font=["Helvetica", 14])])
+		layout.append(
+			[
+				sg.Button(
+					"Log In",
+					font = [
+						"Helvetica",
+						14
+					],
+					bind_return_key=True
+				)
+			]
+		)
 	else:
-		layout.append([sg.Button("Log In", font=["Helvetica", 14]), sg.Button("Cancel", font=["Helvetica", 14])])
+		layout.append(
+			[
+				sg.Button(
+					"Log In",
+					font = [
+						"Helvetica",
+						14
+					],
+					bind_return_key=True
+				),
+				sg.Button(
+					"Cancel",
+					font = [
+						"Helvetica",
+						14
+					]
+				)
+			]
+		)
+	if G.hosts[G.current_hostset]['pwresetcmd']:
+		layout[-1].append(
+			sg.Button(
+				'Password Reset',
+				font = [
+					"Helvetica",
+					14
+				]
+			)
+		)
 	return layout
 
-def getvms():
+def getvms(listonly = False):
 	vms = []
-	for vm in G.proxmox.cluster.resources.get(type='vm'):
-		vms.append(vm)
-	return vms
+	try:
+		nodes = []
+		for node in G.proxmox.cluster.resources.get(type='node'):
+			if node['status'] == 'online':
+				nodes.append(node['node'])
+
+		for vm in G.proxmox.cluster.resources.get(type='vm'):
+			if vm['node'] not in nodes:
+				continue
+			if 'template' in vm and vm['template']:
+				continue
+			if G.guest_type == 'both' or G.guest_type == vm['type']:
+				if listonly:
+					vms.append(
+						{
+							'vmid': vm['vmid'],
+							'name': vm['name'],
+							'node': vm['node']
+						}
+					)
+				else:
+					vms.append(vm)
+		return vms
+	except proxmoxer.core.ResourceException as e:
+		win_popup_button(f"Unable to display list of VMs:\n {e!r}", 'OK')
+		return False
+	except requests.exceptions.ConnectionError as e:
+		print(f"Encountered error when querying proxmox: {e!r}")
+		return False
 
 def setvmlayout(vms):
 	layout = []
@@ -199,11 +475,38 @@ def setvmlayout(vms):
 	layoutcolumn = []
 	for vm in vms:
 		if not vm["status"] == "unknown":
+			vmkeyname = f'-VM|{vm["vmid"]}-'
 			connkeyname = f'-CONN|{vm["vmid"]}-'
-			layoutcolumn.append([sg.Text(vm['name'], font=["Helvetica", 14]), sg.Button('Connect', font=["Helvetica", 14], key=connkeyname)])
+			resetkeyname = f'-RESET|{vm["vmid"]}-'
+			hiberkeyname = f'-HIBER|{vm["vmid"]}-'
+			state = 'stopped'
+			connbutton = sg.Button('Connect', font=["Helvetica", 14], key=connkeyname)
+			if vm['status'] == 'running':
+				if 'lock' in vm:
+					state = vm['lock']
+					if state in ('suspending', 'suspended'):
+						if state == 'suspended':
+							state = 'starting'
+						connbutton = sg.Button('Connect', font=["Helvetica", 14], key=connkeyname, disabled=True)
+				else:
+					state = vm['status']
+			tmplayout =	[
+				sg.Text(vm['name'], font=["Helvetica", 14], size=(22*G.scaling, 1*G.scaling)),
+				sg.Text(f"State: {state}", font=["Helvetica", 0], size=(22*G.scaling, 1*G.scaling), key=vmkeyname),
+				connbutton
+			]
+			if G.show_reset:
+				tmplayout.append(
+					sg.Button('Reset', font=["Helvetica", 14], key=resetkeyname)
+				)
+			if G.show_hibernate:
+				tmplayout.append(
+					sg.Button('Hibernate', font=["Helvetica", 14], key=hiberkeyname)
+				)
+			layoutcolumn.append(tmplayout)
 			layoutcolumn.append([sg.HorizontalSeparator()])
 	if len(vms) > 5: # We need a scrollbar
-		layout.append([sg.Column(layoutcolumn, scrollable = True, size = [450*G.scaling, None] )])
+		layout.append([sg.Column(layoutcolumn, scrollable = True, size = [None, None] )])
 	else:
 		for row in layoutcolumn:
 			layout.append(row)
@@ -222,14 +525,56 @@ def iniwin(inistring):
 	iniwindow.close()
 	return True
 
-def vmaction(vmnode, vmid, vmtype):
+def vmaction(vmnode, vmid, vmtype, action='connect'):
 	status = False
 	if vmtype == 'qemu':
 		vmstatus = G.proxmox.nodes(vmnode).qemu(str(vmid)).status.get('current')
 	else: # Not sure this is even a thing, but here it is...
 		vmstatus = G.proxmox.nodes(vmnode).lxc(str(vmid)).status.get('current')
+	if action == 'reload':
+		stoppop = win_popup(f'Stopping {vmstatus["name"]}...')
+		sleep(.1)
+		try:
+			if vmtype == 'qemu':
+				jobid = G.proxmox.nodes(vmnode).qemu(str(vmid)).status.stop.post(timeout=28)
+			else: # Not sure this is even a thing, but here it is...
+				jobid = G.proxmox.nodes(vmnode).lxc(str(vmid)).status.stop.post(timeout=28)
+		except proxmoxer.core.ResourceException as e:
+			stoppop.close()
+			win_popup_button(f"Unable to stop VM, please provide your system administrator with the following error:\n {e!r}", 'OK')
+			return False
+		running = True
+		i = 0
+		while running and i < 30:
+			try:
+				jobstatus = G.proxmox.nodes(vmnode).tasks(jobid).status.get()
+			except Exception:
+				# We ran into a query issue here, going to skip this round and try again
+				jobstatus = {}
+			if 'exitstatus' in jobstatus:
+				stoppop.close()
+				stoppop = None
+				if jobstatus['exitstatus'] != 'OK':
+					win_popup_button('Unable to stop VM, please contact your system administrator for assistance', 'OK')
+					return False
+				else:
+					running = False
+					status = True
+			sleep(1)
+			i += 1
+		if not status:
+			if stoppop:
+				stoppop.close()
+			return status
+	status = False
+	if vmtype == 'qemu':
+		vmstatus = G.proxmox.nodes(vmnode).qemu(str(vmid)).status.get('current')
+	else: # Not sure this is even a thing, but here it is...
+		vmstatus = G.proxmox.nodes(vmnode).lxc(str(vmid)).status.get('current')
+	sleep(.2)
 	if vmstatus['status'] != 'running':
 		startpop = win_popup(f'Starting {vmstatus["name"]}...')
+		sleep(.1)
 		try:
 			if vmtype == 'qemu':
 				jobid = G.proxmox.nodes(vmnode).qemu(str(vmid)).status.start.post(timeout=28)
@@ -262,10 +607,16 @@ def vmaction(vmnode, vmid, vmtype):
 			if startpop:
 				startpop.close()
 			return status
-	if vmtype == 'qemu':
-		spiceconfig = G.proxmox.nodes(vmnode).qemu(str(vmid)).spiceproxy.post()
-	else: # Not sure this is even a thing, but here it is...
-		spiceconfig = G.proxmox.nodes(vmnode).lxc(str(vmid)).spiceproxy.post()
+	if action == 'reload':
+		return
+	try:
+		if vmtype == 'qemu':
+			spiceconfig = G.proxmox.nodes(vmnode).qemu(str(vmid)).spiceproxy.post()
+		else: # Not sure this is even a thing, but here it is...
+			spiceconfig = G.proxmox.nodes(vmnode).lxc(str(vmid)).spiceproxy.post()
+	except proxmoxer.core.ResourceException as e:
+		win_popup_button(f"Unable to connect to VM {vmid}:\n{e!r}\nIs SPICE display configured for your VM?", 'OK')
+		return False
 	confignode = ConfigParser()
 	confignode['virt-viewer'] = {}
 	for key, value in spiceconfig.items():
@@ -288,7 +639,7 @@ def vmaction(vmnode, vmid, vmtype):
 		closed = iniwin(inistring)
 	connpop = win_popup(f'Connecting to {vmstatus["name"]}...')
 	pcmd = [G.vvcmd]
-	if G.kiosk:
+	if G.kiosk and G.viewer_kiosk:
 		pcmd.append('--kiosk')
 		pcmd.append('--kiosk-quit')
 		pcmd.append('on-disconnect')
@@ -328,10 +679,10 @@ def setcmd():
 			win_popup_button('Installation of virt-viewer missing, please install using `apt install virt-viewer`', 'OK')
 		sys.exit()
 
-def pveauth(username, passwd, totp):
-	random.shuffle(G.hostpool)
+def pveauth(username, passwd=None, totp=None):
+	random.shuffle(G.hosts[G.current_hostset]['hostpool'])
 	err = None
-	for hostinfo in G.hostpool:
+	for hostinfo in G.hosts[G.current_hostset]['hostpool']:
 		host = hostinfo['host']
 		if 'port' in hostinfo:
 			port = hostinfo['port']
@@ -341,12 +692,32 @@ def pveauth(username, passwd, totp):
 		authenticated = False
 		if not connected and not authenticated:
 			try:
-				if G.token_name and G.token_value:
-					G.proxmox = proxmoxer.ProxmoxAPI(host, user=f'{username}@{G.backend}',token_name=G.token_name,token_value=G.token_value, verify_ssl=G.verify_ssl, port=port)
+				if G.hosts[G.current_hostset]['token_name'] and G.hosts[G.current_hostset]['token_value']:
+					G.proxmox = proxmoxer.ProxmoxAPI(
+						host,
+						user=f"{username}@{G.hosts[G.current_hostset]['backend']}",
+						token_name=G.hosts[G.current_hostset]['token_name'],
+						token_value=G.hosts[G.current_hostset]['token_value'],
+						verify_ssl=G.hosts[G.current_hostset]['verify_ssl'], 
+						port=port
+					)
 				elif totp:
-					G.proxmox = proxmoxer.ProxmoxAPI(host, user=f'{username}@{G.backend}', otp=totp, password=passwd, verify_ssl=G.verify_ssl, port=port)
+					G.proxmox = proxmoxer.ProxmoxAPI(
+						host,
+						user=f"{username}@{G.hosts[G.current_hostset]['backend']}",
+						otp=totp,
+						password=passwd,
+						verify_ssl=G.hosts[G.current_hostset]['verify_ssl'],
+						port=port
+					)
 				else:
-					G.proxmox = proxmoxer.ProxmoxAPI(host, user=f'{username}@{G.backend}', password=passwd, verify_ssl=G.verify_ssl, port=port)
+					G.proxmox = proxmoxer.ProxmoxAPI(
+						host,
+						user=f"{username}@{G.hosts[G.current_hostset]['backend']}",
+						password=passwd,
+						verify_ssl=G.hosts[G.current_hostset]['verify_ssl'],
+						port=port
+					)
 				connected = True
 				authenticated = True
 				return connected, authenticated, err
@@ -361,47 +732,111 @@ def pveauth(username, passwd, totp):
 
 def loginwindow():
 	layout = setmainlayout()
-	if G.icon:
-		window = sg.Window(G.title, layout, return_keyboard_events=True, resizable=False, no_titlebar=G.kiosk, icon=G.icon)
+	if G.hosts[G.current_hostset]['user'] and G.hosts[G.current_hostset]['token_name'] and G.hosts[G.current_hostset]['token_value'] and len(G.hosts) == 1: # We need to skip the login
+		popwin = win_popup("Please wait, authenticating...")
+		connected, authenticated, error = pveauth(G.hosts[G.current_hostset]['user'])
+		popwin.close()
+		if not connected:
+			win_popup_button(f'Unable to connect to any VDI server, are you connected to the Internet?\nError Info: {error}', 'OK')
+			return False, False
+		elif connected and not authenticated:
+			win_popup_button('Invalid username and/or password, please try again!', 'OK')
+			return False, False
+		elif connected and authenticated:
+			return True, False
 	else:
-		window = sg.Window(G.title, layout, return_keyboard_events=True, resizable=False, no_titlebar=G.kiosk)
-	while True:
-		event, values = window.read()
-		if event == 'Cancel' or event == sg.WIN_CLOSED:
-			window.close()
-			return False
+		if G.icon:
+			window = sg.Window(G.title, layout, return_keyboard_events=True, resizable=False, no_titlebar=G.kiosk, icon=G.icon)
 		else:
-			if event in ('Log In', '\r', 'special 16777220', 'special 16777221'):
-				popwin = win_popup("Please wait, authenticating...")
-				user = values['-username-']
-				passwd = values['-password-']
-				totp = None
-				if '-totp-' in values:
-					if values['-totp-'] not in (None, ''):
-						totp = values['-totp-']
-				connected, authenticated, error = pveauth(user, passwd, totp)
-				popwin.close()
-				if not connected:
-					win_popup_button(f'Unable to connect to any VDI server, are you connected to the Internet?\nError Info: {error}', 'OK')
-				elif connected and not authenticated:
-					win_popup_button('Invalid username and/or password, please try again!', 'OK')
-				elif connected and authenticated:
-					window.close()
-					return True
-				#break
+			window = sg.Window(G.title, layout, return_keyboard_events=True, resizable=False, no_titlebar=G.kiosk)
+		while True:
+			event, values = window.read()
+			if event == '-group-' and values['-group-'] != G.current_hostset:
+				#Switch cluster
+				G.current_hostset = values['-group-']
+				window.close()
+				return False, True
+			if event == 'Cancel' or event == sg.WIN_CLOSED:
+				window.close()
+				return False, False
+			elif event == 'Password Reset':
+				try:
+					subprocess.check_call(G.hosts[G.current_hostset]['pwresetcmd'], shell=True)
+				except Exception as e:
+					win_popup_button(f'Unable to open password reset command.\n\nError Info:\n{e}', 'OK')
+			else:
+				if event in ('Log In', '\r', 'special 16777220', 'special 16777221'):
+					popwin = win_popup("Please wait, authenticating...")
+					user = values['-username-']
+					passwd = values['-password-']
+					totp = None
+					if '-totp-' in values:
+						if values['-totp-'] not in (None, ''):
+							totp = values['-totp-']
+					connected, authenticated, error = pveauth(user, passwd=passwd, totp=totp)
+					popwin.close()
+					if not connected:
+						win_popup_button(f'Unable to connect to any VDI server, are you connected to the Internet?\nError Info: {error}', 'OK')
+					elif connected and not authenticated:
+						win_popup_button('Invalid username and/or password, please try again!', 'OK')
+					elif connected and authenticated:
+						window.close()
+						return True, False
+					#break
 
 def showvms():
 	vms = getvms()
+	vmlist = getvms(listonly=True)
+	newvmlist = vmlist.copy()
+	if vms == False:
+		return False
 	if len(vms) < 1:
 		win_popup_button('No desktop instances found, please consult with your system administrator', 'OK')
 		return False
 	layout = setvmlayout(vms)
 	if G.icon:
-		window = sg.Window(G.title, layout, return_keyboard_events=True, resizable=False, no_titlebar=G.kiosk, icon=G.icon)
+		window = sg.Window(G.title, layout, return_keyboard_events=True, finalize=True, resizable=False, no_titlebar=G.kiosk, size=(G.width, G.height), icon=G.icon)
 	else:
-		window = sg.Window(G.title, layout, return_keyboard_events=True, resizable=False, no_titlebar=G.kiosk)
+		window = sg.Window(G.title, layout, return_keyboard_events=True, finalize=True, resizable=False, size=(G.width, G.height), no_titlebar=G.kiosk)
+	timer = datetime.now()
 	while True:
-		event, values = window.read()
+		if (datetime.now() - timer).total_seconds() > 5:
+			timer = datetime.now()
+			newvmlist = getvms(listonly = True)
+			if newvmlist:
+				if vmlist != newvmlist:
+					vmlist = newvmlist.copy()
+					vms = getvms()
+					if vms:
+						layout = setvmlayout(vms)
+						window.close()
+						if G.icon:
+							window = sg.Window(G.title, layout, return_keyboard_events=True, finalize=True, resizable=False, no_titlebar=G.kiosk, size=(G.width, G.height), icon=G.icon)
+						else:
+							window = sg.Window(G.title, layout, return_keyboard_events=True,finalize=True, resizable=False, no_titlebar=G.kiosk, size=(G.width, G.height))
+					window.bring_to_front()
+				else: # Refresh existing vm status
+					newvms = getvms()
+					if newvms:
+						for vm in newvms:
+							vmkeyname = f'-VM|{vm["vmid"]}-'
+							connkeyname = f'-CONN|{vm["vmid"]}-'
+							state = 'stopped'
+							if vm['status'] == 'running':
+								if 'lock' in vm:
+									state = vm['lock']
+									if state in ('suspending', 'suspended'):
+										window[connkeyname].update(disabled=True)
+										if state == 'suspended':
+											state = 'starting'
+								else:
+									state = vm['status']
+									window[connkeyname].update(disabled=False)
+							else:
+								window[connkeyname].update(disabled=False)
+							window[vmkeyname].update(f"State: {state}")
+
+		event, values = window.read(timeout = 1000)
 		if event in ('Logout', None):
 			window.close()
 			return False
@@ -415,42 +850,62 @@ def showvms():
 					vmaction(vm['node'], vmid, vm['type'])
 			if not found:
 				win_popup_button(f'VM {vm["name"]} no longer availble, please contact your system administrator', 'OK')
+		elif event.startswith('-RESET'):
+			eventparams = event.split('|')
+			vmid = eventparams[1][:-1]
+			found = False
+			for vm in vms:
+				if str(vm['vmid']) == vmid:
+					found = True
+					vmaction(vm['node'], vmid, vm['type'], action='reload')
+			if not found:
+				win_popup_button(f'VM {vm["name"]} no longer availble, please contact your system administrator', 'OK')
 	return True
 
 def main():
-	if os.name == 'nt' and gui == 'QT':
-		G.scaling = get_dpi()
-	else:
-		if gui == 'QT':
-			G.scaling = 1.0 #TODO FIXME: Figure out scaling on Linux
-		else:
-			G.scaling = 1 # TKinter requires integers
-	config_location = None
-	if len(sys.argv) > 1:
-		if sys.argv[1] == '--list_themes':
-			sg.preview_all_look_and_feel_themes()
-			return
-		if sys.argv[1] == '--config':
-			if len(sys.argv) < 3:
-				win_popup_button('No config file provided with `--config` parameter.\nPlease provide location of config file!', 'OK')
-				return
-			else:
-				config_location = sys.argv[2]
+	G.scaling = 1 # TKinter requires integers
+	parser = argparse.ArgumentParser(description='Proxmox VDI Client')
+	parser.add_argument('--list_themes', help='List all available themes', action='store_true')
+	parser.add_argument('--config_type', help='Select config type (default: file)', choices=['file', 'http'], default='file')
+	parser.add_argument('--config_location', help='Specify the config location (default: search for config file)', default=None)
+	parser.add_argument('--config_username', help="HTTP basic authentication username (default: None)", default=None)
+	parser.add_argument('--config_password', help="HTTP basic authentication password (default: None)", default=None)
+	parser.add_argument('--ignore_ssl', help="HTTPS ignore SSL certificate errors (default: False)", action='store_false', default=True)
+	args = parser.parse_args()
+	if args.list_themes:
+		sg.preview_all_look_and_feel_themes()
+		return
 	setcmd()
-	if not loadconfig(config_location):
+	if not loadconfig(config_location=args.config_location, config_type=args.config_type, config_username=args.config_username, config_password=args.config_password, ssl_verify=args.ignore_ssl):
 		return False
 	sg.theme(G.theme)
 	loggedin = False
+	switching = False
 	while True:
 		if not loggedin:
-			loggedin = loginwindow()
-			if not loggedin:
+			loggedin, switching = loginwindow()
+			if not loggedin and not switching:
+				if G.hosts[G.current_hostset]['user'] and G.hosts[G.current_hostset]['token_name'] and G.hosts[G.current_hostset]['token_value']: # This means if we don't exit we'll be in an infinite loop
+					return 1
 				break
+			elif not loggedin and switching:
+				pass
 			else:
+				if G.hosts[G.current_hostset]['auto_vmid']:
+					vms = getvms()
+					for row in vms:
+						if row['vmid'] == G.hosts[G.current_hostset]['auto_vmid']:
+							vmaction(row['node'], row['vmid'], row['type'], action='connect')
+							return 0
+					win_popup_button(f"No VDI instance with ID {G.hosts[G.current_hostset]['auto_vmid']} found!", 'OK')
 				vmstat = showvms()
 				if not vmstat:
 					G.proxmox = None
 					loggedin = False
+					if G.hosts[G.current_hostset]['user'] and G.hosts[G.current_hostset]['token_name'] and G.hosts[G.current_hostset]['token_value'] and len(G.hosts) == 1: # This means if we don't exit we'll be in an infinite loop
+						return 0
 				else:
 					return
-sys.exit(main())
+
+if __name__ == '__main__':
+	sys.exit(main())