Skip to content

Commit

Permalink
refactor: co-locate code for tiger's unix socket initialization
Browse files Browse the repository at this point in the history
No change, just relocates code.
  • Loading branch information
consideRatio committed Mar 30, 2024
1 parent 4219727 commit 7797912
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions jupyter_remote_desktop_proxy/setup_websockify.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,12 @@


def setup_websockify():
# make a secure temporary directory for sockets
# This is only readable, writeable & searchable by our uid
sockets_dir = tempfile.mkdtemp()
sockets_path = os.path.join(sockets_dir, 'vnc-socket')
vncserver = which('vncserver')

if not vncserver:
raise RuntimeError(
"vncserver executable not found, please install a VNC server"
)

# TigerVNC provides the option to connect a Unix socket. TurboVNC does not.
# TurboVNC and TigerVNC share the same origin and both use a Perl script
# as the executable vncserver. We can determine if vncserver is TigerVNC
# by searching tigervnc string in the Perl script.
Expand All @@ -34,6 +28,12 @@ def setup_websockify():
is_tigervnc = "tigervnc" in vncserver_file.read().casefold()

if is_tigervnc:
# Make a secure temporary directory for sockets that is only readable,
# writeable, and searchable by our uid - TigerVNC can listen to a Unix
# socket!
sockets_dir = tempfile.mkdtemp()
sockets_path = os.path.join(sockets_dir, 'vnc-socket')

websockify_args = ['--unix-target', sockets_path]
vnc_args = [vncserver, '-rfbunixpath', sockets_path]
else:
Expand Down

0 comments on commit 7797912

Please sign in to comment.