[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 0.0.0.1-34-g176c5d6

X2Go dev team git-admin at x2go.org
Sun May 19 13:03:12 CEST 2013


The branch, build-main has been updated
       via  176c5d672d301ed401172f23f5dac5d765d7f2f6 (commit)
      from  bb450a2ea118c06895c26080e1a2fed06ceec5ae (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 x2gobroker/brokers/base_broker.py |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py
index 6bbb227..be8b4e8 100644
--- a/x2gobroker/brokers/base_broker.py
+++ b/x2gobroker/brokers/base_broker.py
@@ -61,9 +61,10 @@ class X2GoBroker(object):
         X2Go Client with an intermediate session broker.
 
         """
-        if config_file is None: config_file = x2gobroker.defaults.X2GOBROKER_CONFIG
+        self.config_file = config_file
+        if self.config_file is None: self.config_file = x2gobroker.defaults.X2GOBROKER_CONFIG
         if config_defaults is None: config_defaults = x2gobroker.defaults.X2GOBROKER_CONFIG_DEFAULTS
-        self.config = x2gobroker.config.X2GoBrokerConfigFile(config_files=config_file, defaults=config_defaults)
+        self.config = x2gobroker.config.X2GoBrokerConfigFile(config_files=self.config_file, defaults=config_defaults)
 
         self._dynamic_authid_map = {}
         self._client_address = None
@@ -617,6 +618,7 @@ class X2GoBroker(object):
         ### This is handled through the config file, normally /etc/x2go/x2gobroker.conf
 
         if not self.config.get_value('global', 'check-credentials'):
+            logger_broker.debug('base_broker.X2GoBroker.check_access(): access is granted without checking credentials, prevent this in {configfile}'.format(configfile=self.config_file))
             return True
 
         ### IMPLEMENT YOUR AUTHENTICATION LOGIC IN THE self._do_authenticate(**kwargs) METHOD
@@ -624,6 +626,7 @@ class X2GoBroker(object):
 
         access = False
         access = self._do_authenticate(username=username, password=password)
+        logger_broker.debug('base_broker.X2GoBroker.check_access(): result of authentication check is: {access}'.format(access=access))
 
         ### HANDLING OF DYNAMIC AUTHENTICATION ID HASHES
 


hooks/post-receive
-- 
x2gobroker.git (HTTP(S) Session broker for X2Go)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).




More information about the x2go-commits mailing list