Added a new feature that saves the full connection URL as a server-si…

…de variable so applications/plugins can access that info without having to send a request to the client (which means they can have that info earlier on in the process of initializing things and opening terminals). It can be accessed from any application or plugin via self.ws.full_url
liftoff · Nov 25, 2017 · 6ae1d01 · 6ae1d01
1 parent 6efc0d4
commit 6ae1d01
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/gateone/__init__.py b/gateone/__init__.py
@@ -3,7 +3,7 @@
 __version_info__ = (1, 2, 0)
 __license__ = "AGPLv3" # ...or proprietary (see LICENSE.txt)
 __author__ = 'Dan McDougall <daniel.mcdougall@liftoffsoftware.com>'
-__commit__ = "20171125153159" # Gets replaced by git (holds the date/time)
+__commit__ = "20171125154235" # Gets replaced by git (holds the date/time)
 
 import os
 GATEONE_DIR = os.path.dirname(os.path.abspath(__file__))

diff --git a/gateone/core/server.py b/gateone/core/server.py
@@ -19,7 +19,7 @@
     }
 }
 __author__ = 'Dan McDougall <daniel.mcdougall@liftoffsoftware.com>'
-__commit__ = "20171125153159" # Gets replaced by git (holds the date/time)
+__commit__ = "20171125154235" # Gets replaced by git (holds the date/time)
 
 # NOTE: Docstring includes reStructuredText markup for use with Sphinx.
 __doc__ = '''\
@@ -2083,8 +2083,12 @@ def authenticate(self, settings):
                 port=port,
                 url_prefix=parsed.path)
             if orig_base_url != self.base_url:
-                self.logger.info(_(
+                self.auth_log.info(_(
                     "Proxy in use: Client URL differs from server."))
+        self.full_url = settings.get('href', None) # In case we need all of it
+        # NOTE: The full URL is only logged via debug() because it could contain
+        #       sensitive info.
+        self.auth_log.debug(_("Client URL: {}".format(self.full_url)))
         auth_method = self.settings.get('auth', None)
         if auth_method and auth_method != 'api':
             # Regular, non-API authentication

diff --git a/gateone/static/gateone.js b/gateone/static/gateone.js