add extra parameter

Author: jhgoebbert

jupyter_nestdesktop_proxy/__init__.py

@@ -31,12 +31,20 @@ def get_nestdesktop_executable(prog):
 
     raise FileNotFoundError(f'Could not find {prog} in PATH')
 
+def _nestdesktop_urlparams():
+
+    url_params = '?' + '&'.join([
+        'token=' + _nestsrv_token,
+    ])
+
+    return url_params
 
 def _nestdesktop_mappath(path):
 
     # always pass the url parameter
     if path in ('/', '/index.html', ):
-        path = '/index.html' 
+        url_params =  _nestdesktop_urlparams()
+        path = '/index.html' + url_params 
 
     return path
 
@@ -45,16 +53,50 @@ def setup_nestdesktop():
     """ Setup commands and and return a dictionary compatible
         with jupyter-server-proxy.
     """
+    from tempfile import mkstemp
+    from random import choice
+    from string import ascii_letters, digits
+
+    global _nestsrv_url, _nestsrv_token
+
+    # password generator
+    def _get_random_alphanumeric_string(length):
+        letters_and_digits = ascii_letters + digits
+        return (''.join((choice(letters_and_digits) for i in range(length))))
+
+    _nestsrv_token = _get_random_alphanumeric_string(16)
+    try:
+        fd_nestsrv_token, fpath_nestsrv_token = mkstemp()
+        logger.info('Created secure token file for NEST Server: ' + fpath_nestsrv_token)
+
+        with open(fd_nestsrv_token, 'w') as f:
+            f.write(_nestsrv_token)
+
+    except Exception:
+        logger.error("Passwd generation in temp file FAILED")
+        raise FileNotFoundError("Passwd generation in temp file FAILED")
 
     # launchers url file including url parameters
-    path_info = 'nestdesktop/index.html'
+    path_info = 'nestdesktop/index.html' + _nestdesktop_urlparams()
+
+    # check for a free port
+    #import socket
+    #s=socket.socket()
+    #s.bind(("", 0))
+    #nestsrv_port = s.getsockname()[1]
+    #s.close()
+    nestsrv_port = 52425
 
     # create command
     cmd = [
         get_nestdesktop_executable('nest-desktop'),
         'start',
         '-h', 'localhost',
         '-p', '{port}',
+        '--srv-start',
+        '--srv-auth', 'file:filename=' + fpath_nestsrv_token,
+        '--srv-port', str(nestsrv_port),
+        #    '--srv-log' nestsrv_logfile # default: /tmp/nest-server-$USER-$$.log
     ]
     logger.info('NEST Desktop command: ' + ' '.join(cmd))