From 0c31fb3494e3d2e5d7cc240769fba8c61fe23e31 Mon Sep 17 00:00:00 2001
From: Markus Katharina Brechtel <markus.katharina.brechtel@thengo.net>
Date: Thu, 25 Nov 2021 21:23:07 +0100
Subject: [PATCH] passwordless vnc with socket auth

---
 templates/workspaces/workspace.space.fish.j2 | 4 ++--
 vars/main.yaml                               | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/templates/workspaces/workspace.space.fish.j2 b/templates/workspaces/workspace.space.fish.j2
index 577f3cf..de5cd4c 100644
--- a/templates/workspaces/workspace.space.fish.j2
+++ b/templates/workspaces/workspace.space.fish.j2
@@ -7,7 +7,7 @@ exec urxvt -title tmux-workspace -e fish -c 'ssh -t {{workspaces[workspace].host
 
 {% elif "vncviewer" in workspaces[workspace].type %}
 
-{% if workspaces[workspace].fetch_vnc_passsword_file | default(true) %}
+{% if workspaces[workspace].fetch_vnc_passsword_file | default(false) %}
 if not test -d ~/.vnc/passwd.{{workspaces[workspace].host}}
   rsync {{workspaces[workspace].host}}:~/.vnc/passwd ~/.vnc/passwd.{{workspaces[workspace].host}}
 end
@@ -16,7 +16,7 @@ end
 {% if workspaces[workspace].type == "vncviewer-ssh-socket" %}
 
 socat "UNIX-LISTEN:.vnc/socket.anix,reuseaddr" EXEC:'ssh {{workspaces[workspace].host}} socat STDIO UNIX-CONNECT\:.vnc/socket' &
-exec xtigervncviewer .vnc/socket.{{workspaces[workspace].host}} -PasswordFile ~/.vnc/passwd.{{workspaces[workspace].host}}
+exec xtigervncviewer .vnc/socket.{{workspaces[workspace].host}}
 
 {% elif workspaces[workspace].type == "vncviewer-ssh-tcp" %}
 
diff --git a/vars/main.yaml b/vars/main.yaml
index 4141db5..2ade794 100644
--- a/vars/main.yaml
+++ b/vars/main.yaml
@@ -140,12 +140,11 @@ vncserver_options: |
   -geometry {{home_vncserver_geometry}}
   -depth 24
   -rfbwait 30000
-  -rfbauth %h/.vnc/passwd
   -rfbunixpath %h/.vnc/socket
   -nolisten tcp
   -pn
   -localhost
-  -SecurityTypes VncAuth
+  -SecurityTypes None
   {% if not home_vncserver_allow_resize %}
   -AcceptSetDesktopSize=0
   {% endif %}