[X2Go-Commits] [x2gobroker] 01/02: X2GoBroker.get_agent_query_mode(): Immediately return overridden query mode. Avoid logging of the configured query mode. Write the overridden query mode to the logger instance instead.
git-admin at x2go.org
git-admin at x2go.org
Wed Apr 1 06:12:07 CEST 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2gobroker.
commit 2cea844f02fcce41c2e805d4fa377e2b21ccac8d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Apr 1 06:09:41 2015 +0200
X2GoBroker.get_agent_query_mode(): Immediately return overridden query mode. Avoid logging of the configured query mode. Write the overridden query mode to the logger instance instead.
---
debian/changelog | 3 +++
x2gobroker/brokers/base_broker.py | 13 ++++++-------
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a5e8570..3bab090 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -290,6 +290,9 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
pubkeyauthorizer in a way that it replaces non-option keys with the
newly provided optionized/restricted pubkeys. (Fixes: #685).
- etc/x2gobroker.conf: Switch over to using dynamic auth cookies by default.
+ - X2GoBroker.get_agent_query_mode(): Immediately return overridden query
+ mode. Avoid logging of the configured query mode. Write the overridden
+ query mode to the logger instance instead.
* debian/control:
+ Provide separate bin:package for SSH brokerage: x2gobroker-ssh.
+ Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py
index 2c3fcde..d972f28 100644
--- a/x2gobroker/brokers/base_broker.py
+++ b/x2gobroker/brokers/base_broker.py
@@ -547,6 +547,11 @@ class X2GoBroker(object):
_backend_agent_query_mode = ""
_agent_query_mode = ""
+ # if the frontend overrides the agent query mode, immediately return it here...
+ if self._enforce_agent_query_mode(mode=_mode):
+ logger_broker.debug('base_broker.X2GoBroker.get_agent_query_mode(): broker frontend overrides configured agent query mode, using mode agent query mode "{mode}".'.format(mode=_agent_query_mode))
+ return self._enforce_agent_query_mode(mode=_mode)
+
_profile = self.get_profile_broker(profile_id)
if _profile and _profile.has_key(u'broker-agent-query-mode') and _profile['broker-agent-query-mode']:
_agent_query_mode = _profile[u'broker-agent-query-mode']
@@ -560,13 +565,7 @@ class X2GoBroker(object):
_default_agent_query_mode = self.config.get_value('global', 'default-agent-query-mode').lower()
logger_broker.debug('base_broker.X2GoBroker.get_agent_query_mode(): found default-agent-query-mode in global config section: {value}'.format(value=_default_agent_query_mode))
-
- _mode = unicode(_agent_query_mode) or unicode(_backend_agent_query_mode) or unicode(_default_agent_query_mode)
-
- if self._enforce_agent_query_mode(mode=_mode):
- return self._enforce_agent_query_mode(mode=_mode)
- else:
- return _mode
+ return unicode(_agent_query_mode) or unicode(_backend_agent_query_mode) or unicode(_default_agent_query_mode)
def get_session_autologin(self, profile_id):
"""\
--
Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
More information about the x2go-commits
mailing list