This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gobroker. from f1382f4 Revert "Allow switching to dynamic cookie auth, after the connection has been successfully established by a first successful user+password authentication." new 62c04e6 Handle selectsessions calls with a non-existent profile ID gracefully. new af5bd9d the JSON webUI also accepts profile-id (instead of sid) for task selectsession The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 1 + x2gobroker/brokers/base_broker.py | 6 +++++- x2gobroker/web/json.py | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 62c04e6ace0f23f2ffcdca2a952958625223f364 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Mar 10 15:27:27 2014 +0100 Handle selectsessions calls with a non-existent profile ID gracefully. --- debian/changelog | 1 + x2gobroker/brokers/base_broker.py | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1a88420..b9eb459 100644 --- a/debian/changelog +++ b/debian/changelog @@ -95,6 +95,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low top level to the JSON output tree. - Store cookies in /var/lib/x2gobroker (path is more appropriate than previously suggested path /var/log/x2gobroker). + - Handle selectsessions calls with a non-existent profile ID gracefully. * debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + Fix SYNOPSIS texts. diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index f8445a3..c3383f5 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -37,6 +37,7 @@ import os.path import x2gobroker.config import x2gobroker.defaults import x2gobroker.agent +import x2gobroker.x2gobroker_exceptions from x2gobroker.loggers import logger_broker, logger_error @@ -956,7 +957,10 @@ class X2GoBroker(object): @type username: C{unicode} """ - profile = self.get_profile(profile_id) + try: + profile = self.get_profile(profile_id) + except x2gobroker.x2gobroker_exceptions.X2GoBrokerProfileException: + return {} # if we have more than one server, pick one server randomly for X2Go Broker Agent queries server_list = profile[u'host'] -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit af5bd9d87fb69fb90399a97f07b4d5b725f2a5cc Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Mar 10 15:27:57 2014 +0100 the JSON webUI also accepts profile-id (instead of sid) for task selectsession --- x2gobroker/web/json.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/x2gobroker/web/json.py b/x2gobroker/web/json.py index 807672e..5d2d295 100644 --- a/x2gobroker/web/json.py +++ b/x2gobroker/web/json.py @@ -113,10 +113,12 @@ class X2GoBrokerWeb(_RequestHandler): password = self.get_argument('password', default='') cookie = self.get_argument('authid', default='') task = self.get_argument('task', default='') - profile_id = self.get_argument('sid', default='') + profile_id = self.get_argument('profile-id', default='') new_password = self.get_argument('newpass', default='') + # compat stuff if task == 'listsessions': task = 'listprofiles' + profile_id = self.get_argument('sid', default=profile_id) payload = { 'task': task, -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
-
git-admin＠x2go.org