[X2Go-Commits] [x2gobroker] 01/01: Add run-optional-script support to SSH broker.
git-admin at x2go.org
git-admin at x2go.org
Thu Apr 2 06:30:38 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 8dcbce9c7a1c709494809ed668133292928552a7
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Apr 2 06:30:30 2015 +0200
Add run-optional-script support to SSH broker.
---
debian/changelog | 1 +
x2gobroker/client/plain.py | 6 ++++++
2 files changed, 7 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index ced1bd8..3d4759e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -311,6 +311,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
- Don't hard-define session DPI value. This allows X2Go Client to
auto-detect the client-side DPI value and use that for the X2Go session.
(Fixes: #834).
+ - Add run-optional-script support to SSH broker.
* 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/client/plain.py b/x2gobroker/client/plain.py
index 9e4d7d1..aa68bd1 100644
--- a/x2gobroker/client/plain.py
+++ b/x2gobroker/client/plain.py
@@ -67,7 +67,10 @@ class X2GoBrokerClient(object):
broker_backend._do_authenticate = _override_do_authenticate
+ username, password, task, profile_id, ip, cookie, authed, server = broker_backend.run_optional_script(script_type='pre_auth_scripts', username=username, password="SSH", task=task, profile_id=profile_id, ip=ip, cookie=cookie)
access, next_cookie = broker_backend.check_access(username=username, ip=ip, cookie=cookie, override_password_auth=True)
+ username, password, task, profile_id, ip, cookie, authed, server = broker_backend.run_optional_script(script_type='post_auth_scripts', username=username, password="SSH", task=task, profile_id=profile_id, ip=ip, cookie=cookie, authed=access)
+
if access:
logger_broker.debug ('username: {username}, task: {task}, profile_id: {profile_id}'.format(username=username, task=task, profile_id=profile_id))
@@ -122,6 +125,9 @@ class X2GoBrokerClient(object):
if profile_id:
profile_info = broker_backend.select_session(profile_id=profile_id, username=username)
+
+ username, password, task, profile_id, ip, cookie, authed, server = broker_backend.run_optional_script(script_type='select_session_scripts', username=username, password="SSH", task=task, profile_id=profile_id, ip=ip, cookie=cookie, authed=access, server=profile_info['server'])
+
if profile_info.has_key('server'):
output += "SERVER:"
output += profile_info['server']
--
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