API Token Login

Add full support for passwordless token-only login.

dist/vdiclient.json

@@ -1,6 +1,6 @@
 {
 	"upgrade_guid" : "46cbad92-353e-4b28-9bee-83950991dad8",
-	"version" : "1.0.6",
+	"version" : "1.0.8",
 	"product_name" : "VDI Client",
 	"manufacturer" : "Josh Patten",
 	"name" : "VDI Client",

vdiclient.ini.example

@@ -22,7 +22,7 @@ auth_backend = pve
 auth_totp = false
 # If disabled, TLS certificate will not be checked
 tls_verify = false
-# User name
+# User name (if using token)
 #user = user
 # API Token Name
 #token_name = dvi
@@ -35,8 +35,17 @@ tls_verify = false
 pve1.example.com = 8006
 
 [SpiceProxyRedirect]
-# The Spice Proxy provided by the Proxmox API may need to have it's host/port rewritten
+# The Spice Proxy provided by the Proxmox API may need to have its host/port rewritten
 # These rewrite rules are written `IP:port = IP:port`
 # 1. Use the inidebug and read the current proxy=pve1.example.com:3128
 # 2. Add your proxmox ip to the right side e.g. 123.123.123.123:6000
 pve1.example.com:3128 = 123.123.123.123:6000
+
+#[AdditionalParameters]
+# If you wish to define additional parameters to pass to virt-viewer you may define them here
+# More parameter definitions here: https://www.mankier.com/1/remote-viewer
+# Some Examples:
+# Enable USB passthrough
+#enable-usbredir = true
+# Enable auto USB device sharing
+#enable-usb-autoshare = true

vdiclient.py

@@ -36,6 +36,7 @@ class G:
 	verify_ssl = True
 	icon = None
 	inidebug = False
+	addl_params = None
 	theme = 'LightBlue'
 
 def get_dpi():
@@ -140,6 +141,10 @@ def loadconfig(config_location = None):
 	if 'SpiceProxyRedirect' in config:
 		for key in config['SpiceProxyRedirect']:
 			G.spiceproxy_conv[key] = config['SpiceProxyRedirect'][key]
+	if 'AdditionalParameters' in config:
+		G.addl_params = {}
+		for key in config['AdditionalParameters']:
+			G.addl_params[key] = config['AdditionalParameters'][key]
 	return True
 
 def win_popup(message):
@@ -180,9 +185,13 @@ def setmainlayout():
 
 def getvms():
 	vms = []
-	for vm in G.proxmox.cluster.resources.get(type='vm'):
-		vms.append(vm)
-	return vms
+	try:
+		for vm in G.proxmox.cluster.resources.get(type='vm'):
+			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
 
 def setvmlayout(vms):
 	layout = []
@@ -263,7 +272,7 @@ def vmaction(vmnode, vmid, vmtype):
 		spiceconfig = G.proxmox.nodes(vmnode).lxc(str(vmid)).spiceproxy.post()
 	confignode = ConfigParser()
 	confignode['virt-viewer'] = {}
-	for key,value in spiceconfig.items():
+	for key, value in spiceconfig.items():
 		if key == 'proxy':
 			val = value[7:].lower()
 			if val in G.spiceproxy_conv:
@@ -272,6 +281,9 @@ def vmaction(vmnode, vmid, vmtype):
 				confignode['virt-viewer'][key] = f'{value}'
 		else:
 			confignode['virt-viewer'][key] = f'{value}'
+	if G.addl_params:
+		for key, value in G.addl_params.items():
+			confignode['virt-viewer'][key] = f'{value}'
 	inifile = StringIO('')
 	confignode.write(inifile)
 	inifile.seek(0)
@@ -320,7 +332,7 @@ 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):
+def pveauth(username, passwd=None, totp=None):
 	random.shuffle(G.hostpool)
 	err = None
 	for hostinfo in G.hostpool:
@@ -353,37 +365,52 @@ 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)
-	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()
+	if G.user and G.token_name and G.token_value: # We need to skip the login
+		popwin = win_popup("Please wait, authenticating...")
+		connected, authenticated, error = pveauth(G.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
+		elif connected and not authenticated:
+			win_popup_button('Invalid username and/or password, please try again!', 'OK')
+			return False
+		elif connected and authenticated:
+			return True
+	else:
+		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 == 'Cancel' or event == sg.WIN_CLOSED:
+				window.close()
+				return False
+			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
+					#break
 
 def showvms():
 	vms = getvms()
+	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
@@ -437,12 +464,16 @@ def main():
 		if not loggedin:
 			loggedin = loginwindow()
 			if not loggedin:
+				if G.user and G.token_name and G.token_value: # This means if we don't exit we'll be in an infinite loop
+					return 1
 				break
 			else:
 				vmstat = showvms()
 				if not vmstat:
 					G.proxmox = None
 					loggedin = False
+					if G.user and G.token_name and G.token_value: # This means if we don't exit we'll be in an infinite loop
+						return 0
 				else:
 					return
 sys.exit(main())