This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gobroker. from 7daedb7 x2gobroker-agent.pl: Fix detection of X2Go's library path (x2gopath lib). new f2cb22f Implement "not-set" value for X2Go Client parameters. If a parameter is set to "not-set", the parameter won't be handed over to X2Go Client. (Fixes: #836). new 268b566 agent.py: Fix missing "task" parameter for task "ping" against a local broker agent. new 79aec4b Fix task ping when tested via the x2gobroker-testagent script. The 3 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 | 6 ++++++ sbin/x2gobroker-testagent | 2 +- x2gobroker/agent.py | 6 ++++-- x2gobroker/brokers/base_broker.py | 6 +++++- 4 files changed, 16 insertions(+), 4 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2gobroker.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 f2cb22f54241117258fa4c01649d88759fc9573f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Apr 13 12:45:38 2015 +0200 Implement "not-set" value for X2Go Client parameters. If a parameter is set to "not-set", the parameter won't be handed over to X2Go Client. (Fixes: #836). --- debian/changelog | 3 +++ x2gobroker/brokers/base_broker.py | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 61bc3c9..4ea77f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -319,6 +319,9 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low $SSH_ORIGINAL_COMMAND environment var, make sure to strip-off "sh -c" from the command's beginning. - x2gobroker-agent.pl: Fix detection of X2Go's library path (x2gopath lib). + - Implement "not-set" value for X2Go Client parameters. If a parameter + is set to "not-set", the parameter won't be handed over to X2Go Client. + (Fixes: #836). * 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 6b10c78..d613109 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -1206,6 +1206,7 @@ class X2GoBroker(object): - drop internal host=<hostname> and sshport=<port> keys from the profile, broker clients cannot handle those + - drop keys with value "not-set" - replace BROKER_USER by the name of the authenticated user - test if autologin is possible - fix rootless session profile option for non-desktop sessions @@ -1230,7 +1231,7 @@ class X2GoBroker(object): acls = self.get_profile_acls(profile_id) if self.check_profile_acls(username, acls): - for key in profile.keys(): + for key in copy.deepcopy(profile).keys(): if key.startswith('host=') and broker_frontend != 'uccs': del profile[key] if key.startswith('sshport=') and broker_frontend != 'uccs': @@ -1238,6 +1239,9 @@ class X2GoBroker(object): if key == 'user' and profile[key] == 'BROKER_USER': profile[key] = unicode(username) + if profile[key] = "not-set": + del profile[key] + if self.get_session_autologin(profile_id): profile['autologin'] = True profile['key'] = u'<will-be-exchanged-during-session-selection>' -- Alioth's /srv/git/code.x2go.org/x2gobroker.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 268b56645099e7789867921cc20bb5b286ed815f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Apr 13 12:53:52 2015 +0200 agent.py: Fix missing "task" parameter for task "ping" against a local broker agent. --- debian/changelog | 2 ++ x2gobroker/agent.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4ea77f2..970a03c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -322,6 +322,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low - Implement "not-set" value for X2Go Client parameters. If a parameter is set to "not-set", the parameter won't be handed over to X2Go Client. (Fixes: #836). + - agent.py: Fix missing "task" parameter for task "ping" against a local + broker agent. * 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/agent.py b/x2gobroker/agent.py index ef6024a..760d2d2 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -279,7 +279,7 @@ def ping(remote_agent=None, logger=None, **kwargs): username='foo' if remote_agent is None: - return _call_local_broker_agent(username, logger=logger)[0] + return _call_local_broker_agent(username, task='ping', logger=logger)[0] else: return remote_agent is not None and \ (x2gobroker.utils.portscan(remote_agent['hostaddr'], remote_agent['port']) or x2gobroker.utils.portscan(remote_agent['hostname'], remote_agent['port'])) and \ -- Alioth's /srv/git/code.x2go.org/x2gobroker.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 79aec4b28abbd8055bface1eaf54a879e3cc6308 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Apr 13 12:55:34 2015 +0200 Fix task ping when tested via the x2gobroker-testagent script. --- debian/changelog | 1 + sbin/x2gobroker-testagent | 2 +- x2gobroker/agent.py | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 970a03c..2f872d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -324,6 +324,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low (Fixes: #836). - agent.py: Fix missing "task" parameter for task "ping" against a local broker agent. + - Fix task ping when tested via the x2gobroker-testagent script. * debian/control: + Provide separate bin:package for SSH brokerage: x2gobroker-ssh. + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. diff --git a/sbin/x2gobroker-testagent b/sbin/x2gobroker-testagent index 752b2c3..1480616 100755 --- a/sbin/x2gobroker-testagent +++ b/sbin/x2gobroker-testagent @@ -87,7 +87,7 @@ if __name__ == "__main__": print sys.exit(-1) - if cmdline_args.username is None and not cmdline_args.list_tasks: + if cmdline_args.username is None and not cmdline_args.list_tasks and cmdline_args.task not in ('ping', 'checkload'): p.print_help() print print "*** Cannot continue without username... ***" diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index 760d2d2..6545dcf 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -437,7 +437,9 @@ def check_load(remote_agent=None, logger=None, **kwargs): logger = logger_broker try: - _success, _load_params = call_broker_agent('foo', task='checkload', remote_agent=remote_agent, logger=logger, **kwargs) + if "username" in kwargs.keys(): + del kwargs["username"] + _success, _load_params = call_broker_agent(username='foo', task='checkload', remote_agent=remote_agent, logger=logger, **kwargs) except x2gobroker.x2gobroker_exceptions.X2GoBrokerAgentException, e: logger.error('querying remote agent on host {hostname} failed: {errmsg}'.format(hostname=remote_agent[u'hostname'], errmsg=str(e))) return "HOST-UNREACHABLE" -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
-
git-admin＠x2go.org