x2go-commits August 2013

x2go-commits@lists.x2go.org

2 participants
2119 discussions

x2gobroker.git - master (branch) updated: 0.0.2.3-18-g31eea62
by git-admin＠x2go.org 19 Aug '13

19 Aug '13

The branch, master has been updated via 31eea62dbed1f9fdc5c270c178e7d947e6749ec9 (commit) from 412348110510de7c77fda9f76b039ddfd7a1b7f2 (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 ----------------------------------------------------------------- commit 31eea62dbed1f9fdc5c270c178e7d947e6749ec9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Aug 18 22:13:10 2013 +0200 Get the cookie based extra-authentication working for HTTP mode. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- x2gobroker/web/plain.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 64ee398..8b72caf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,8 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low - SSH broker: Only allow context change to another user for the magic user (default: x2gobroker). - Fix logrotate script: x2gobroker-wsgi. (Fixes: #275). - - Get the cookie based extra-authentication working. + - Get the cookie based extra-authentication working for SSH mode. + - Get the cookie based extra-authentication working for HTTP mode. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py index 6fdfffe..eb3daca 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/web/plain.py @@ -97,21 +97,21 @@ class X2GoBrokerWeb(tornado.web.RequestHandler): username = self.get_argument('user', default='') password = self.get_argument('password', default='') - cookie = self.get_argument('cookie', default='') + cookie = self.get_argument('authid', default='') task = self.get_argument('task', default='') profile_id = self.get_argument('sid', default='') new_password = self.get_argument('newpass', default='') output = '' - logger_broker.debug ('username: {username}, password: {password}, task: {task}, profile_id: {profile_id}'.format(username=username, password='XXXXX', task=task, profile_id=profile_id)) + logger_broker.debug ('username: {username}, password: {password}, task: {task}, profile_id: {profile_id}, cookie: {cookie}'.format(username=username, password='XXXXX', task=task, profile_id=profile_id, cookie=cookie)) if broker_backend.check_access(username=username, password=password, cookie=cookie): ### ### CONFIRM SUCCESSFUL AUTHENTICATION FIRST ### - if global_config['require-cookie-auth']: + if global_config['require-cookie-auth'] and not global_config['use-static-cookie']: ### FIXME: make up a nice protocol for this, disabled for now #output += "AUTHID: {authid} ".format(authid=broker_backend.get_next_authid(username=data.user)) 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).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-17-g4123481
by git-admin＠x2go.org 19 Aug '13

19 Aug '13

The branch, master has been updated via 412348110510de7c77fda9f76b039ddfd7a1b7f2 (commit) from 9176b71273c66f2e949f3229e498705ab1f84a6a (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 ----------------------------------------------------------------- commit 412348110510de7c77fda9f76b039ddfd7a1b7f2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Aug 18 21:53:09 2013 +0200 Get the cookie based extra-authentication working. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2gobroker/brokers/base_broker.py | 13 +++-- x2gobroker/client/plain.py | 113 +++++++++++++++++++------------------ 3 files changed, 69 insertions(+), 58 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 94431cc..64ee398 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low - SSH broker: Only allow context change to another user for the magic user (default: x2gobroker). - Fix logrotate script: x2gobroker-wsgi. (Fixes: #275). + - Get the cookie based extra-authentication working. * /debian/control: + 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 5431a99..3a7aa7a 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -706,7 +706,7 @@ class X2GoBroker(object): else: return [] - def check_access(self, username='', password='', cookie=None, ): + def check_access(self, username='', password='', cookie=None, cookie_only=False): """\ Check if a given user with a given password may gain access to the X2Go session broker. @@ -717,6 +717,8 @@ class X2GoBroker(object): @type password: C{unicode} @param cookie: an extra (static or dynamic) authentication token @type cookie: C{unicode} + @param cookie_only: do only check the auth_cookie, not username/password + @type cookie_only: C{bool} @return: returns C{True} if the authentication has been successful @rtype: C{bool} @@ -733,13 +735,16 @@ class X2GoBroker(object): ### when inheriting from the base.X2GoBroker class. 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)) + if cookie_only is 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)) + else: + access = True ### HANDLING OF DYNAMIC AUTHENTICATION ID HASHES # using cookie authentication as extra security? - if self.config.get_value('global', 'require-cookie-authentication'): + if self.config.get_value('global', 'require-cookie-auth'): if type(cookie) is types.StringType: cookie = unicode(cookie) diff --git a/x2gobroker/client/plain.py b/x2gobroker/client/plain.py index 73bc210..f6df4b6 100644 --- a/x2gobroker/client/plain.py +++ b/x2gobroker/client/plain.py @@ -66,75 +66,80 @@ class X2GoBrokerClient(object): output = '' - logger_broker.debug ('username: {username}, task: {task}, profile_id: {profile_id}'.format(username=username, task=task, profile_id=profile_id)) + if broker_backend.check_access(cookie=cookie, cookie_only=True): - ### - ### CONFIRM SUCCESSFUL AUTHENTICATION FIRST - ### + logger_broker.debug ('username: {username}, task: {task}, profile_id: {profile_id}'.format(username=username, task=task, profile_id=profile_id)) - if global_config['require-cookie-auth']: - - ### FIXME: make up a nice protocol for this, disabled for now - #output += "AUTHID: {authid} ".format(authid=broker_backend.get_next_authid(username=data.user)) - pass + ### + ### CONFIRM SUCCESSFUL AUTHENTICATION FIRST + ### - output += "Access granted\n" - ### - ### X2GO BROKER TASKS - ### + if global_config['require-cookie-auth'] and not global_config['use-static-cookie']: - # FIXME: the ,,testcon'' task can be object to DoS attacks... - if task == 'testcon': + ### FIXME: make up a nice protocol for this, disabled for now + #output += "AUTHID: {authid} ".format(authid=broker_backend.get_next_authid(username=data.user)) + pass + output += "Access granted\n" ### - ### TEST THE CONNECTION + ### X2GO BROKER TASKS ### - return broker_backend.test_connection() - - if task == 'listsessions': - - profiles = broker_backend.list_profiles(username) - if profiles: - output += "START_USER_SESSIONS\n\n" - profile_ids = profiles.keys() - profile_ids.sort() - for profile_id in profile_ids: - output += "[{profile_id}]\n".format(profile_id=profile_id) - for key in profiles[profile_id].keys(): - if key == u'user' and not profiles[profile_id][key]: - profiles[profile_id][key] = username - if type(profiles[profile_id][key]) in (types.UnicodeType, types.StringType): - output += "{key}={value}".format(key=key, value=unicode(profiles[profile_id][key])) - elif type(profiles[profile_id][key]) in (types.ListType, types.TupleType): - output += "{key}={value}".format(key=key, value=unicode(",".join(profiles[profile_id][key]))) - else: - output += "{key}={value}".format(key=key, value=unicode(int(profiles[profile_id][key]))) - + # FIXME: the ,,testcon'' task can be object to DoS attacks... + if task == 'testcon': + + ### + ### TEST THE CONNECTION + ### + + return broker_backend.test_connection() + + if task == 'listsessions': + + profiles = broker_backend.list_profiles(username) + if profiles: + output += "START_USER_SESSIONS\n\n" + profile_ids = profiles.keys() + profile_ids.sort() + for profile_id in profile_ids: + output += "[{profile_id}]\n".format(profile_id=profile_id) + for key in profiles[profile_id].keys(): + if key == u'user' and not profiles[profile_id][key]: + profiles[profile_id][key] = username + if type(profiles[profile_id][key]) in (types.UnicodeType, types.StringType): + output += "{key}={value}".format(key=key, value=unicode(profiles[profile_id][key])) + elif type(profiles[profile_id][key]) in (types.ListType, types.TupleType): + output += "{key}={value}".format(key=key, value=unicode(",".join(profiles[profile_id][key]))) + else: + output += "{key}={value}".format(key=key, value=unicode(int(profiles[profile_id][key]))) + + output += "\n" output += "\n" - output += "\n" - output += "END_USER_SESSIONS\n" + output += "END_USER_SESSIONS\n" - elif task == 'selectsession': + elif task == 'selectsession': - if profile_id: + if profile_id: - profile_info = broker_backend.select_session(profile_id=profile_id, username=username) - if profile_info.has_key('server'): - output += "SERVER:" - output += profile_info['server'] - if profile_info.has_key('port'): - output += ":{port}".format(port=profile_info['port']) - output += "\n" - if profile_info.has_key('authentication_privkey'): - output += profile_info['authentication_privkey'] - if profile_info.has_key('session_info'): - output += "SESSION_INFO:" - output += profile_info['session_info'] + "\n" + profile_info = broker_backend.select_session(profile_id=profile_id, username=username) + if profile_info.has_key('server'): + output += "SERVER:" + output += profile_info['server'] + if profile_info.has_key('port'): + output += ":{port}".format(port=profile_info['port']) + output += "\n" + if profile_info.has_key('authentication_privkey'): + output += profile_info['authentication_privkey'] + if profile_info.has_key('session_info'): + output += "SESSION_INFO:" + output += profile_info['session_info'] + "\n" + + else: + logger_broker.error ('cookie authentication failed') return output - logger_broker.warn ('broker backend ,,{backend}\'\' is disabled on this system'.format(backend=backend)) + logger_broker.error ('broker backend ,,{backend}\'\' is disabled on this system'.format(backend=backend)) 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).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-12-g5b10c97
by git-admin＠x2go.org 19 Aug '13

19 Aug '13

The branch, master has been updated via 5b10c97493111d76064747cdb6af64bcfc0b7b9d (commit) from 46fccb825b8826fc0209afb9968137f557302f03 (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 ----------------------------------------------------------------- commit 5b10c97493111d76064747cdb6af64bcfc0b7b9d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Aug 18 21:07:45 2013 +0200 another typo ----------------------------------------------------------------------- Summary of changes: bin/x2gobroker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/bin/x2gobroker b/bin/x2gobroker index 89df416..dd8e633 100755 --- a/bin/x2gobroker +++ b/bin/x2gobroker @@ -144,12 +144,12 @@ if __name__ == "__main__": bind_address = None bind_port = int(cmdline_args.bind) -url = () +urls = () settings = {} def prep_http_mode(): - global url + global urls global settings # import classes serving the different web.py URLs 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).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-8-gc90fbb1
by git-admin＠x2go.org 19 Aug '13

19 Aug '13

The branch, master has been updated via c90fbb1151fa1758da0c8b7f1cee92b1ae9ffc25 (commit) from 94002645899cdc22cf30dec255b04a24c30db692 (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 ----------------------------------------------------------------- commit c90fbb1151fa1758da0c8b7f1cee92b1ae9ffc25 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Aug 18 21:05:22 2013 +0200 static cookies will be the default for now ----------------------------------------------------------------------- Summary of changes: etc/x2gobroker.conf | 2 +- x2gobroker/defaults.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf index 2337f9d..3d26f10 100644 --- a/etc/x2gobroker.conf +++ b/etc/x2gobroker.conf @@ -33,7 +33,7 @@ #require-cookie-auth = false ### NOT-IN-USE-YET # X2Go supports two different cookie authentication modes (static and dynamic). -#use-static-cookie = false ### NOT-IN-USE-YET +#use-static-cookie = true ### NOT-IN-USE-YET # Every server-client communication (between X2Go Client and broker) has to be # accompanied by this initial authentication cookie. diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index 8348b47..ab9844e 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -115,7 +115,7 @@ X2GOBROKER_CONFIG_DEFAULTS = { u'backend': u'zeroconf', u'check-credentials': True, u'require-cookie-auth': False, - u'use-static-cookie': False, + u'use-static-cookie': True, u'my-cookie': uuid.uuid4(), u'enable-plain-output': True, u'enable-uccs-output': False, 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).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-9-gaa744c9
by git-admin＠x2go.org 19 Aug '13

19 Aug '13

The branch, master has been updated via aa744c9436ad489b2ef344d2e1c4a7df251617e1 (commit) from c90fbb1151fa1758da0c8b7f1cee92b1ae9ffc25 (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 ----------------------------------------------------------------- commit aa744c9436ad489b2ef344d2e1c4a7df251617e1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Aug 18 21:05:57 2013 +0200 move --task higher up in the help/usage text of x2gobroker, as it is a compulsory parameter ----------------------------------------------------------------------- Summary of changes: bin/x2gobroker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/bin/x2gobroker b/bin/x2gobroker index 81d59b2..590b102 100755 --- a/bin/x2gobroker +++ b/bin/x2gobroker @@ -79,9 +79,9 @@ if __name__ == "__main__": {'args':['-b', '--bind'], 'default': None, 'metavar': 'BIND_ADDRESS', 'help': 'The [address:]port that the web.py http-engine shall bind to (default: 127.0.0.1:8080)', }, ] sshbroker_options = [ + {'args':['--task'], 'default': None, 'metavar': 'BROKER_TASK', 'help': 'broker task (listsessions, selectsession, setpass, testcon', }, {'args':['--user'], 'default': None, 'metavar': 'USER_NAME', 'help': 'Operate on behalf of this user name', }, {'args':['--auth-cookie', '--authid', ], 'default': '127.0.0.1:8080', 'metavar': 'AUTH_ID', 'help': 'Pre-shared authentication ID', }, - {'args':['--task'], 'default': None, 'metavar': 'BROKER_TASK', 'help': 'broker task (listsessions, selectsession, setpass, testcon', }, {'args':['--profile-id', '--sid', ], 'default': None, 'metavar': 'PROFILE_ID', 'help': 'for task: the profile ID selected from the list of available session profiles', }, {'args':['--backend'], 'default': None, 'metavar': 'BROKER_BACKEND', 'help': 'select a non-default broker backend', }, ] 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).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-10-g739ad7f
by git-admin＠x2go.org 19 Aug '13

19 Aug '13

The branch, master has been updated via 739ad7f995a0f480af554584d329b7faca3f20ea (commit) from aa744c9436ad489b2ef344d2e1c4a7df251617e1 (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 ----------------------------------------------------------------- commit 739ad7f995a0f480af554584d329b7faca3f20ea Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Aug 18 21:06:18 2013 +0200 Update x2gobroker man page. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + man/man1/x2gobroker.1 | 47 +++++++++++++++++++++++++++++++++++++---------- 2 files changed, 38 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f94f27e..74167b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.0.3.0): - Add SSH support to X2Go Session Broker. (Fixes: #153). - Move x2gobroker executable to /usr/bin. + - Update x2gobroker man page. - Fix logrotate script: x2gobroker-wsgi. (Fixes: #275). * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. diff --git a/man/man1/x2gobroker.1 b/man/man1/x2gobroker.1 index bc1425e..8d09fce 100644 --- a/man/man1/x2gobroker.1 +++ b/man/man1/x2gobroker.1 @@ -27,28 +27,55 @@ x2gobroker \- Session Broker for X2Go This command is normally executed either through an init script or via the WSGI module in your httpd server. .PP See the included README and TODO for further information on \fBx2gobroker\fR. -.SH COMMON OPTIONS +.SH GENERAL OPTIONS \fBx2gobroker\fR accepts the following common options: .TP -\*(T<\fB\-h, \-\-help\fR\*(T> -Display a help with all available command line options and exit. +\*(T<\fB\-d, \-\-mode {HTTP|SSH}\fR\*(T> +Set X2Go Session Broker into HTTP or SSH mode. If this option is omitted, then SSH is the default mode.\fR. +.TP +\*(T<\fB\-d, \-\-config FILENAME\fR\*(T> +Specify an alternative configuration file name, default is: \fI/etc/x2go/x2gobroker.conf\fR. .TP \*(T<\fB\-d, \-\-debug\fR\*(T> Enable debugging code. This also makes http\'s POST method available as GET method, which then allows it to test the broker API through a normal web browser. .TP -\*(T<\fB\-d, \-\-config FILENAME\fR\*(T> -Specify an alternative configuration file name, default is: \fI/etc/x2go/x2gobroker.conf\fR. -.SH DAEMON OPTIONS -\fBx2gobroker\fR accepts the following daemon options: +\*(T<\fB\-h, \-\-help\fR\*(T> +Display a help with all available command line options and exit. +.SH SSH MODE COMMAND LINE OPTIONS +\fBx2gobroker\fR\-\-when run from the command line or via SSH\-\-accepts/requires these additional options: +.TP +\*(T<\fB\-\-task {listsessions, selectsession, setpass, testcon}\fR\*(T> +Specify the either of the known broker tasks (listsessions, selectsession, setpass, testcon). This parameter +is compulsory, the command execution will fail if it is omitted. +.TP +\*(T<\fB\-\-user USERNAME\fR\*(T> +If \fBx2gobroker\fR is run by the `magic' user (the x2gobroker account by default), then the x2gobroker +is allowed to change its user context and do queries on behalf of the user specified with this parameter. +.TP +\*(T<\fB\-\-auth-cookie, \-\-auth-id AUTHENTICATION_COOKIE\fR\*(T> +It is possible to enforce a stronger authentication via an additional pre\-shared authentication cookie. This authentication +cookie must be stored in a client-side file so that X2Go Client can access it and then pass it on to the X2Go +Session Broker (via the X2Go Client option \-\-auth-id=<fullpath-to-file>) while authenticating against the broker. + +The server-side cookie hash can be set in /etc/x2go/x2gobroker.conf (option: my-cookie). You have to set +the option require-cookie-auth to true to enable the additional cookie comparison in the X2Go Session Broker. +.TP +\*(T<\fB\-\-profile-id, \-\-sid SESSION_PROFILE_ID\fR\*(T> +For the \fIselectsession\fR task the session profile ID has to be given as an additional parameter. +.TP +\*(T<\fB\-\-backend BACKEND_NAME\fR\*(T> +Query another than the default broker backend. +.SH HTTP(S) DAEMON OPTIONS +\fBx2gobroker\fR in standalone HTTP(S) daemon mode accepts these additional options: .TP \*(T<\fB\-b, \-\-bind ADDRESS:PORT\fR\*(T> -The [address:]port that the Web.py http-engine will bind to (default: 127.0.0.1:8080). +The [address:]port that the Tornado http-engine will bind to (default: 127.0.0.1:8080). .SH "FILES" /etc/x2go/x2gobroker.conf, /etc/x2go/broker/* (configuration files) .PP -/etc/default/x2gobroker-daemon (environment for X2Go Session Broker when run -as standalone daemon) +/etc/default/python-x2gobroker, /etc/default/x2gobroker-daemon (environment for X2Go Session +Broker when run as a standalone daemon) .PP /var/log/x2gobroker/* (log files of X2Go Session Broker) .SH "SEE ALSO" 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).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-6-g476605f
by git-admin＠x2go.org 19 Aug '13

19 Aug '13

The branch, master has been updated via 476605f12aee58e407dba0f28e76e879b775e76a (commit) from 2c7e30c92dc63ee44792d10c260411aa6965102d (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 ----------------------------------------------------------------- commit 476605f12aee58e407dba0f28e76e879b775e76a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Aug 18 20:01:02 2013 +0200 Add SSH support to X2Go Session Broker. (Fixes: #153). ----------------------------------------------------------------------- Summary of changes: README | 26 ++- debian/changelog | 5 +- etc/x2gobroker.conf | 2 +- sbin/x2gobroker | 166 +++++++++++++------- x2gobroker/agent.py | 21 ++- x2gobroker/brokers/base_broker.py | 10 +- x2gobroker/brokers/inifile_broker.py | 9 +- x2gobroker/{authmechs => client}/__init__.py | 0 x2gobroker/{web => client}/plain.py | 101 ++++-------- x2gobroker/defaults.py | 2 +- x2gobroker/loggers.py | 2 +- ...web_plain_base.py => test_client_plain_base.py} | 84 +++++----- x2gobroker/x2gobroker_exceptions.py | 1 + 13 files changed, 236 insertions(+), 193 deletions(-) copy x2gobroker/{authmechs => client}/__init__.py (100%) copy x2gobroker/{web => client}/plain.py (59%) copy x2gobroker/tests/{test_web_plain_base.py => test_client_plain_base.py} (56%) The diff of changes is: diff --git a/README b/README index 4675864..71e43d0 100644 --- a/README +++ b/README @@ -1,8 +1,8 @@ README for X2Go Session Broker ============================== -X2Go Session Broker is a Web project that provides -session brokerage for X2Go via HTTP(S). +X2Go Session Broker is an X2Go component that provides +session brokerage for X2Go via HTTP(S) and/or SSH. Dependencies: @@ -11,7 +11,20 @@ Dependencies: * This version X2Go Session Broker works with X2Go Client (>= 4.0.0.0) and Python X2Go (>= 0.5.0.0, not yet available) as client. - * Python modules: python-pampy, python-netaddr + * Python modules: + - python-setuptools (build-dependency) + - python-argparse + - python-netaddr + - python-pampy + - python-paramiko + - python-setproctitle + - python-tornado + - python-wsgilog + +Extra Unittest Dependencies: + * Python modules: + - python-nose, + - python-paste, Available features: @@ -32,7 +45,7 @@ Available backends: Configuration files: - /etc/default/x2gobroker-daemon + /etc/default/{x2gobroker-daemon,python-x2gobroker,x2gobroker-authservice} /etc/x2go/x2gobroker.conf /etc/x2go/broker/** @@ -56,6 +69,9 @@ Environment variables (and their defaults): # path to the X2Go Session Broker's agent command X2GOBROKER_AGENT_CMD=/usr/lib/x2go/x2gobroker-agent + # The unix socket file for communication between the broker and the authentication service. + X2GOBROKER_AUTHSERVICE_SOCKET=/run/x2gobroker/x2gobroker-authservice.socket light+love, -Mike Gabriel, 20130129 +Mike Gabriel, 20130818 + diff --git a/debian/changelog b/debian/changelog index fc20c94..f4e87f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ -x2gobroker (0.0.2.4-0~x2go1) UNRELEASED; urgency=low +x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low - * New upstream version (0.0.2.4): + * New upstream version (0.0.3.0): + - Add SSH support to X2Go Session Broker. (Fixes: #153). - Fix logrotate script: x2gobroker-wsgi. (Fixes: #275). * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf index c98b6e1..2337f9d 100644 --- a/etc/x2gobroker.conf +++ b/etc/x2gobroker.conf @@ -157,7 +157,7 @@ # # The agent query mode can be configured on a per-broker-backend basis, the # below value is the default. -#default-agent-query-mode=LOCAL +#default-agent-query-mode=NONE ### ### BACKEND section diff --git a/sbin/x2gobroker b/sbin/x2gobroker index 0b130d4..99d4422 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -54,10 +54,10 @@ logger_broker.info(' X2GOBROKER_DEFAULT_BACKEND: {value}'.format(value=x2gobrok logger_broker.info(' X2GOBROKER_SSL_CERTFILE: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_SSL_CERTFILE)) logger_broker.info(' X2GOBROKER_SSL_KEYFILE: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_SSL_KEYFILE)) +interactive_mode_warning = False # check effective UID the broker runs as and complain appropriately... if x2gobroker.defaults.X2GOBROKER_USER != x2gobroker.defaults.X2GOBROKER_DAEMON_USER and os.geteuid() != 0: - logger_broker.warn('X2Go Session Broker has been started interactively by user {username}, better run as user {daemon_username}.'.format(username=x2gobroker.defaults.X2GOBROKER_USER, daemon_username=x2gobroker.defaults.X2GOBROKER_DAEMON_USER)) - logger_broker.info('Automatically switching to DEBUG mode due to interactive launch of this application.') + interactive_mode_warning = True elif x2gobroker.defaults.X2GOBROKER_DAEMON_USER != 'root' and os.geteuid() == 0: logger_broker.warn('X2Go Session Broker should not be run as root, better run as user {daemon_username}.'.format(daemon_username=x2gobroker.defaults.X2GOBROKER_DAEMON_USER)) elif os.geteuid() == 0: @@ -69,17 +69,29 @@ if __name__ == "__main__": import setproctitle setproctitle.setproctitle(os.path.basename(sys.argv[0])) - daemon_options = [ + general_options = [ + {'args':['-M','--mode'], 'default': 'SSH', 'metavar': 'BROKER_MODE', 'help': 'Mode of the X2Go Session Broker to run ins (available: SSH, HTTP)', }, {'args':['-C','--config-file'], 'default': None, 'metavar': 'CONFIG_FILE', 'help': 'Specify a special configuration file name, default is: {default}'.format(default=x2gobroker.defaults.X2GOBROKER_CONFIG), }, - {'args':['-b', '--bind'], 'default': '127.0.0.1:8080', 'metavar': 'BIND_ADDRESS', 'help': 'The [address:]port that the web.py http-engine shall bind to (default: 127.0.0.1:8080)', }, {'args':['-d','--debug'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code; also: allow testing in web browser (make http\'s POST method available as GET method, as well)', }, ] + daemon_options = [ + {'args':['-b', '--bind'], 'default': None, 'metavar': 'BIND_ADDRESS', 'help': 'The [address:]port that the web.py http-engine shall bind to (default: 127.0.0.1:8080)', }, + ] + sshbroker_options = [ + {'args':['--user'], 'default': None, 'metavar': 'USER_NAME', 'help': 'Operate on behalf of this user name', }, + {'args':['--auth-cookie', '--authid', ], 'default': '127.0.0.1:8080', 'metavar': 'AUTH_ID', 'help': 'Pre-shared authentication ID', }, + {'args':['--task'], 'default': None, 'metavar': 'BROKER_TASK', 'help': 'broker task (listsessions, selectsession, setpass, testcon', }, + {'args':['--profile-id', '--sid', ], 'default': None, 'metavar': 'PROFILE_ID', 'help': 'for task: the profile ID selected from the list of available session profiles', }, + {'args':['--backend'], 'default': None, 'metavar': 'BROKER_BACKEND', 'help': 'select a non-default broker backend', }, + ] p = argparse.ArgumentParser(description='X2Go Session Broker (Standalone Daemon)',\ formatter_class=argparse.RawDescriptionHelpFormatter, \ add_help=True, argument_default=None) - p_daemon = p.add_argument_group('standalone-daemon arguments') + p_general = p.add_argument_group('general arguments') + p_daemon = p.add_argument_group('arguments for standalone HTTP(s) daemon mode') + p_sshbroker = p.add_argument_group('arguments for command line SSH broker mode') - for (p_group, opts) in ( (p_daemon, daemon_options), ): + for (p_group, opts) in ( (p_general, general_options), (p_daemon, daemon_options), (p_sshbroker, sshbroker_options), ): for opt in opts: args = opt['args'] del opt['args'] @@ -94,58 +106,104 @@ if __name__ == "__main__": if cmdline_args.debug: x2gobroker.defaults.X2GOBROKER_DEBUG = cmdline_args.debug - # some people just give the port but prepend a colon, webpy does not like this, so we strip if off - cmdline_args.bind = cmdline_args.bind.lstrip('*') - cmdline_args.bind = cmdline_args.bind.lstrip(':') - - if ':' in cmdline_args.bind: - bind_address, bind_port = cmdline_args.bind.split(':')[0:2] - bind_port = int(bind_port) - else: - bind_address = None - bind_port = int(cmdline_args.bind) - -# import classes serving the different web.py URLs -import x2gobroker.web.plain -import x2gobroker.web.uccs -#import x2gobroker.web.json -#import x2gobroker.web.html -import x2gobroker.web.extras - -# define the web.py URLs -urls = ( ('/plain/(.*)', x2gobroker.web.plain.X2GoBrokerWeb,), - ('/uccs/[a-zA-Z]*(/*)$', x2gobroker.web.uccs.X2GoBrokerWeb,), - ('/uccs/(.*)/api/([0-9])(/*)$', x2gobroker.web.uccs.X2GoBrokerWebAPI,), - ('/pubkeys(/*)$', x2gobroker.web.extras.X2GoBrokerPubKeyService,), - ) - -settings = { - 'log_function': tornado_log_request, -} + if cmdline_args.mode.upper() not in ('SSH', 'HTTP'): + logger_broker.error('Invalid mode selected. Available: SSH or HTTP.') + sys.exit(-1) + elif cmdline_args.mode.upper() == 'SSH': + if cmdline_args.bind: logger_broker.warn('ignoring non-valid option --bind for broker mode SSH...') + if cmdline_args.profile_id and cmdline_args.task != 'selectsession': + logger_broker.warn('ignoring option --sid as it only has a meaning with ,,--task selectsession\'\'') + if cmdline_args.user is None: + cmdline_args.user = os.environ['LOGNAME'] + elif cmdine_args.mode.upper() == 'HTTP': + if interactive_mode_warning: + logger_broker.warn('X2Go Session Broker has been started interactively by user {username}, better run as user {daemon_username}.'.format(username=x2gobroker.defaults.X2GOBROKER_USER, daemon_username=x2gobroker.defaults.X2GOBROKER_DAEMON_USER)) + logger_broker.info('Automatically switching to DEBUG mode due to interactive launch of this application.') + if cmdline_args.bind is None: cmdline_args.bind = '127.0.0.1:8080' + if cmdline_args.user: logger_broker.warn('ignoring non-valid option --user for broker mode HTTP...') + if cmdline_args.auth_cookie: logger_broker.warn('ignoring non-valid option --auth-cookie for broker mode HTTP...') + if cmdline_args.task: logger_broker.warn('ignoring non-valid option --task for broker mode HTTP...') + if cmdline_args.profile_id: logger_broker.warn('ignoring non-valid option --profile-id for broker mode HTTP...') + + # some people just give the port but prepend a colon, webpy does not like this, so we strip if off + cmdline_args.bind = cmdline_args.bind.lstrip('*') + cmdline_args.bind = cmdline_args.bind.lstrip(':') + + if ':' in cmdline_args.bind: + bind_address, bind_port = cmdline_args.bind.split(':')[0:2] + bind_port = int(bind_port) + else: + bind_address = None + bind_port = int(cmdline_args.bind) + +url = () +settings = {} + +def prep_http_mode(): + + global url + global settings + + # import classes serving the different web.py URLs + import x2gobroker.web.plain + import x2gobroker.web.uccs + import x2gobroker.web.extras + + # define the web.py URLs + urls = ( ('/plain/(.*)', x2gobroker.web.plain.X2GoBrokerWeb,), + ('/uccs/[a-zA-Z]*(/*)$', x2gobroker.web.uccs.X2GoBrokerWeb,), + ('/uccs/(.*)/api/([0-9])(/*)$', x2gobroker.web.uccs.X2GoBrokerWebAPI,), + ('/pubkeys(/*)$', x2gobroker.web.extras.X2GoBrokerPubKeyService,), + ) + settings = { + 'log_function': tornado_log_request, + } # run the web.py standalone daemon... if __name__ == "__main__": - import tornado.web - import tornado.httpserver - import tornado.ioloop - application = tornado.web.Application(urls, **settings) - try: - if x2gobroker.defaults.X2GOBROKER_SSL_CERTFILE and x2gobroker.defaults.X2GOBROKER_SSL_KEYFILE: - # switch on https:// mode - http_server = tornado.httpserver.HTTPServer(application, - ssl_options={ - "certfile": x2gobroker.defaults.X2GOBROKER_SSL_CERTFILE, - "keyfile": x2gobroker.defaults.X2GOBROKER_SSL_KEYFILE, - }, - ) - else: - # run without https - http_server = tornado.httpserver.HTTPServer(application) - http_server.listen(bind_port, address=bind_address) - tornado.ioloop.IOLoop.instance().start() - except socket.error, e: - print (e) + + if cmdline_args.mode.upper() == 'HTTP': + + ### launch as standalone HTTP daemon ### + + prep_http_mode() + + import tornado.web + import tornado.httpserver + import tornado.ioloop + application = tornado.web.Application(urls, **settings) + try: + if x2gobroker.defaults.X2GOBROKER_SSL_CERTFILE and x2gobroker.defaults.X2GOBROKER_SSL_KEYFILE: + # switch on https:// mode + http_server = tornado.httpserver.HTTPServer(application, + ssl_options={ + "certfile": x2gobroker.defaults.X2GOBROKER_SSL_CERTFILE, + "keyfile": x2gobroker.defaults.X2GOBROKER_SSL_KEYFILE, + }, + ) + else: + # run without https + http_server = tornado.httpserver.HTTPServer(application) + http_server.listen(bind_port, address=bind_address) + tornado.ioloop.IOLoop.instance().start() + except socket.error, e: + print (e) + + elif cmdline_args.mode.upper() == 'SSH': + + ### run interactively from the command line (i.e. via SSH) ### + + import x2gobroker.client.plain + cmdline_client = x2gobroker.client.plain.X2GoBrokerClient() + output = cmdline_client.get(cmdline_args) + if output: print(output) + else: + + ### launch as WSGI application ### + + prep_http_mode() + import tornado.wsgi import wsgilog _tornado_application = tornado.wsgi.WSGIApplication(urls, **settings) diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index e88c805..639afd3 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -73,14 +73,19 @@ def call_local_broker_agent(username, mode, cmdline_args=[]): cmd_line.append('\'{arg}\''.format(arg=cmdline_arg)) logger_broker.debug('Executing agent command locally: {cmd}'.format(cmd=" ".join(cmd_line))) - agent_process = subprocess.Popen(cmd_line, - stdin=None, - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, - shell=False, - ) - - result = agent_process.stdout.read().split('\n') + result = ['FAILED'] + try: + agent_process = subprocess.Popen(cmd_line, + stdin=None, + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, + shell=False, + ) + + result = agent_process.stdout.read().split('\n') + except OSError: + pass + if result[0].startswith('OK'): return [ r for r in result[1:] if r ] diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 16919b1..8c25da7 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -859,10 +859,12 @@ class X2GoBroker(object): remote_agent = self.get_remote_agent(profile_id) agent_query_mode = ( remote_agent == u'LOCAL') and u'LOCAL' or u'SSH' if remote_agent: - running_sessions, suspended_sessions = x2gobroker.agent.has_sessions(username, query_mode=agent_query_mode, remote_agent=remote_agent) - - if set(profile['host']).intersection(set(running_sessions)): profile['status'] = u'R' - if set(profile['host']).intersection(set(suspended_sessions)): profile['status'] = u'S' + try: + running_sessions, suspended_sessions = x2gobroker.agent.has_sessions(username, query_mode=agent_query_mode, remote_agent=remote_agent) + if set(profile['host']).intersection(set(running_sessions)): profile['status'] = u'R' + if set(profile['host']).intersection(set(suspended_sessions)): profile['status'] = u'S' + except x2gobroker.x2gobroker_exceptions.X2GoBrokerAgentException: + pass profile['host'] = [profile['host'][0]] list_of_profiles.update({profile_id: profile, }) diff --git a/x2gobroker/brokers/inifile_broker.py b/x2gobroker/brokers/inifile_broker.py index a7c6537..e8113e6 100644 --- a/x2gobroker/brokers/inifile_broker.py +++ b/x2gobroker/brokers/inifile_broker.py @@ -34,6 +34,9 @@ import re import base_broker as base import x2gobroker.config import x2gobroker.defaults +import x2gobroker.x2gobroker_exceptions + +from ConfigParser import NoSectionError class X2GoBroker(base.X2GoBroker): @@ -67,7 +70,11 @@ class X2GoBroker(base.X2GoBroker): def get_profile(self, profile_id): - profile = self.session_profiles.get_section(profile_id) + try: + profile = self.session_profiles.get_section(profile_id) + except NoSectionError: + raise x2gobroker.x2gobroker_exceptions.X2GoBrokerProfileException('No such session profile ID: {profile_id}'.format(profile_id=profile_id)) + profile_defaults = self.get_profile_defaults() for key in profile_defaults.keys(): if key not in profile.keys(): diff --git a/x2gobroker/authmechs/__init__.py b/x2gobroker/client/__init__.py similarity index 100% copy from x2gobroker/authmechs/__init__.py copy to x2gobroker/client/__init__.py diff --git a/x2gobroker/web/plain.py b/x2gobroker/client/plain.py similarity index 59% copy from x2gobroker/web/plain.py copy to x2gobroker/client/plain.py index 6fdfffe..73bc210 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/client/plain.py @@ -21,91 +21,52 @@ # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # modules +import os import types -import tornado.web -from tornado.escape import native_str, parse_qs_bytes # Python X2Go Broker modules import x2gobroker.defaults from x2gobroker.loggers import logger_broker, logger_error -class X2GoBrokerWeb(tornado.web.RequestHandler): +class X2GoBrokerClient(object): - http_header_items = { - 'Content-Type': 'text/plain; charset=utf-8', - 'Expires': '+1h', - } - - def _gen_http_header(self): - - for http_header_item in self.http_header_items.keys(): - self.set_header(http_header_item, self.http_header_items[http_header_item]) - - def get(self, backend): - if x2gobroker.defaults.X2GOBROKER_DEBUG: - logger_broker.warn('GET http request detected, if unwanted: disable X2GOBROKER_DEBUG') - return self.post(backend) - raise tornado.web.HTTPError(405) - - def post(self, backend): - - self._gen_http_header() + def get(self, args): + backend = args.backend if not backend: backend = x2gobroker.defaults.X2GOBROKER_DEFAULT_BACKEND - else: - backend = backend.rstrip('/') - if '/' in backend: - backend = backend.split('/')[0] # silence pyflakes... broker_backend = None try: - # dynamically detect broker backend from given URL + # dynamically detect broker backend from given backend exec("import x2gobroker.brokers.{backend}_broker".format(backend=backend)) exec("broker_backend = x2gobroker.brokers.{backend}_broker.X2GoBroker()".format(backend=backend)) except ImportError: - # throw a 404 if the backend does not exist - raise tornado.web.HTTPError(404) - - global_config = broker_backend.get_global_config() - - # throw a 404 if the WebUI is not enabled - if not global_config['enable-plain-output']: - raise tornado.web.HTTPError(404) - - # if the broker backend is disabled in the configuration, pretend to have nothing on offer - if not broker_backend.is_enabled(): - raise tornado.web.HTTPError(404) - - # FIXME: this is to work around a bug in X2Go Client (http://bugs.x2go.org/138) - content_type = self.request.headers.get("Content-Type", "") - if not content_type.startswith("application/x-www-form-urlencoded"): - for name, values in parse_qs_bytes(native_str(self.request.body)).iteritems(): - self.request.arguments.setdefault(name, []).extend(values) - - # set the client address for the broker backend - ip = self.request.remote_ip - if ip: - logger_broker.info('client address is {address}'.format(address=ip)) - broker_backend.set_client_address(ip) - elif not x2gobroker.defaults.X2GOBROKER_DEBUG: - # if the client IP is not set, we pretend to have nothing on offer - logger_error.error('client could not provide an IP address, pretending: 404 Not Found') - raise tornado.web.HTTPError(404) - - username = self.get_argument('user', default='') - password = self.get_argument('password', default='') - cookie = self.get_argument('cookie', default='') - task = self.get_argument('task', default='') - profile_id = self.get_argument('sid', default='') - new_password = self.get_argument('newpass', default='') - - output = '' - - logger_broker.debug ('username: {username}, password: {password}, task: {task}, profile_id: {profile_id}'.format(username=username, password='XXXXX', task=task, profile_id=profile_id)) - if broker_backend.check_access(username=username, password=password, cookie=cookie): + logger_broker.error('unknown backend: {backend}'.format(backend=backend)) + + if broker_backend.is_enabled(): + + global_config = broker_backend.get_global_config() + + if os.environ.has_key('SSH_CLIENT'): + ip = os.environ['SSH_CLIENT'] + else: + ip = '127.0.0.1' + + if ip: + logger_broker.info('client address is {address}'.format(address=ip)) + broker_backend.set_client_address(ip) + + username = args.user + cookie = args.auth_cookie + task = args.task + profile_id = args.profile_id + + output = '' + + logger_broker.debug ('username: {username}, task: {task}, profile_id: {profile_id}'.format(username=username, task=task, profile_id=profile_id)) ### ### CONFIRM SUCCESSFUL AUTHENTICATION FIRST @@ -172,8 +133,8 @@ class X2GoBrokerWeb(tornado.web.RequestHandler): output += "SESSION_INFO:" output += profile_info['session_info'] + "\n" - self.write(output) - return + return output + + logger_broker.warn ('broker backend ,,{backend}\'\' is disabled on this system'.format(backend=backend)) - raise tornado.web.HTTPError(401) diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index 3ce7269..8348b47 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -128,7 +128,7 @@ X2GOBROKER_CONFIG_DEFAULTS = { u'ignore-primary-group-memberships': True, u'default-session-autologin': False, u'default-authorized-keys': u'%h/.x2go/authorized_keys', - u'default-agent-query-mode': u'LOCAL', + u'default-agent-query-mode': u'NONE', }, 'zeroconf': { u'enable': True, diff --git a/x2gobroker/loggers.py b/x2gobroker/loggers.py index 1600419..dd5e258 100644 --- a/x2gobroker/loggers.py +++ b/x2gobroker/loggers.py @@ -36,7 +36,7 @@ else: X2GOBROKER_LOGCONFIG="/etc/x2go/broker/x2gobroker-loggers.conf" # standalone daemon mode (x2gobroker-daemon) or interactive mode (called from the cmdline)? -if getpass.getuser() in (X2GOBROKER_DAEMON_USER, 'root'): +if getpass.getuser() in (X2GOBROKER_DAEMON_USER, 'root') and os.path.exists(X2GOBROKER_LOGCONFIG): # we run in standalone daemon mode, so let's use the system configuration for logging logging.config.fileConfig(X2GOBROKER_LOGCONFIG) diff --git a/x2gobroker/tests/test_web_plain_base.py b/x2gobroker/tests/test_client_plain_base.py similarity index 56% copy from x2gobroker/tests/test_web_plain_base.py copy to x2gobroker/tests/test_client_plain_base.py index 91f1928..6e64441 100644 --- a/x2gobroker/tests/test_web_plain_base.py +++ b/x2gobroker/tests/test_client_plain_base.py @@ -19,22 +19,31 @@ import unittest import tempfile -from paste.fixture import TestApp -from nose.tools import * -import tornado.wsgi # Python X2GoBroker modules import x2gobroker.defaults -import x2gobroker.web.plain +import x2gobroker.client.plain + +from nose.tools import * + +class args(): + def __init__(self): + self.user = None + self.auth_cookie = None + self.task = None + self.profile_id = None + self.backend = 'base' -urls = ( ('/plain/(.*)', x2gobroker.web.plain.X2GoBrokerWeb,) ,) -application = tornado.wsgi.WSGIApplication(urls) -class TestX2GoBrokerWebPlainBase(unittest.TestCase): +class TestX2GoBrokerClientPlainBase(unittest.TestCase): ### TEST RESPONSE: is enabled? def test_isenabled(self): + + _cf_bak = x2gobroker.defaults.X2GOBROKER_CONFIG + + a = args() _config = """ [base] enable = false @@ -42,11 +51,9 @@ enable = false tf = tempfile.NamedTemporaryFile() print >> tf, _config tf.seek(0) - _cf_bak = x2gobroker.defaults.X2GOBROKER_CONFIG x2gobroker.defaults.X2GOBROKER_CONFIG = tf.name - testApp = TestApp(application) - r = testApp.get('/plain/base/', expect_errors=True) - assert_equal(r.status, 404) + r = x2gobroker.client.plain.X2GoBrokerClient().get(a) + assert_equal(r, None) tf.close() _config = """ [base] @@ -55,57 +62,42 @@ enable = true tf = tempfile.NamedTemporaryFile() print >> tf, _config tf.seek(0) + _cf_bak = x2gobroker.defaults.X2GOBROKER_CONFIG x2gobroker.defaults.X2GOBROKER_CONFIG = tf.name - testApp = TestApp(application) - r = testApp.get('/plain/base/', expect_errors=True) - assert_equal(r.status, 401) + r = x2gobroker.client.plain.X2GoBrokerClient().get(a) + assert_equal(r, "Access granted\n") tf.close() + x2gobroker.defaults.X2GOBROKER_CONFIG = _cf_bak ### TEST RESPONSE: simple authentication (check_access) - def test_checkaccess(self): - testApp = TestApp(application) - r = testApp.get('/plain/base/', expect_errors=True) - assert_equal(r.status, 401) - _config = """ -[base] -enable = true -auth-mech = testsuite -""" - tf = tempfile.NamedTemporaryFile() - print >> tf, _config - tf.seek(0) - _cf_bak = x2gobroker.defaults.X2GOBROKER_CONFIG - x2gobroker.defaults.X2GOBROKER_CONFIG = tf.name - r = testApp.get('/plain/base/', params={'user': 'test', 'password': 'sweet', }, expect_errors=True) - assert_equal(r.status, 200) - r.mustcontain('Access granted') - x2gobroker.defaults.X2GOBROKER_CONFIG = _cf_bak - ### TEST TASK: listsessions (nothing should be returned for the base backend) def test_listsessions(self): + + _cf_bak = x2gobroker.defaults.X2GOBROKER_CONFIG + + a = args() _config = """ [base] enable = true -auth-mech = testsuite """ tf = tempfile.NamedTemporaryFile() print >> tf, _config tf.seek(0) - _cf_bak = x2gobroker.defaults.X2GOBROKER_CONFIG x2gobroker.defaults.X2GOBROKER_CONFIG = tf.name - testApp = TestApp(application) - r = testApp.get('/plain/base/', params={'user': 'test', 'password': 'sweet', 'task': 'listsessions', }, expect_errors=True) - assert_equal(r.status, 200) - r.mustcontain('Access granted') - r.mustcontain(no='START_USER_SESSIONS') - r.mustcontain(no='END_USER_SESSIONS') - r.mustcontain(no=' ',) - r.mustcontain(no=' ',) - r.mustcontain(no=' ', ) - r.mustcontain(no=' ', ) + + r = x2gobroker.client.plain.X2GoBrokerClient().get(a) + + assert_true('Access granted' in r) + assert_false('START_USER_SESSIONS' in r) + assert_false('END_USER_SESSIONS' in r) + assert_false(' ' in r) + assert_false(' ' in r) + assert_false(' ' in r) + assert_false(' ' in r) + x2gobroker.defaults.X2GOBROKER_CONFIG = _cf_bak @@ -113,5 +105,5 @@ auth-mech = testsuite def test_suite(): from unittest import TestSuite, makeSuite suite = TestSuite() - suite.addTest(makeSuite(TestX2GoBrokerWebPlainBase)) + suite.addTest(makeSuite(TestX2GoBrokerClientPlainBase)) return suite diff --git a/x2gobroker/x2gobroker_exceptions.py b/x2gobroker/x2gobroker_exceptions.py index 440b797..6e68147 100644 --- a/x2gobroker/x2gobroker_exceptions.py +++ b/x2gobroker/x2gobroker_exceptions.py @@ -26,3 +26,4 @@ class X2GoBrokerBaseException(BaseException): logger_error.error('An exceptional problem occurred: {exception}("{msg}")'.format(exception=type(self).__name__, msg=str(self))) class X2GoBrokerAgentException(X2GoBrokerBaseException): pass +class X2GoBrokerProfileException(X2GoBrokerBaseException): pass 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).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-7-g9400264
by git-admin＠x2go.org 19 Aug '13

19 Aug '13

The branch, master has been updated via 94002645899cdc22cf30dec255b04a24c30db692 (commit) from 476605f12aee58e407dba0f28e76e879b775e76a (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 ----------------------------------------------------------------- commit 94002645899cdc22cf30dec255b04a24c30db692 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Aug 18 20:37:13 2013 +0200 Move x2gobroker executable to /usr/bin. ----------------------------------------------------------------------- Summary of changes: Makefile | 42 ++++++++++---------- NEWS | 36 +++++++++++++---- {sbin => bin}/x2gobroker | 10 ++++- debian/changelog | 1 + debian/x2gobroker-wsgi.links | 2 +- debian/x2gobroker.install | 2 +- debian/x2gobroker.manpages | 4 +- etc/x2gobroker-wsgi.apache.conf | 4 +- etc/x2gobroker-wsgi.apache.vhost | 4 +- init/x2gobroker-daemon.init | 4 +- .../x2gobroker-testauth.1} | 2 +- man/{man8/x2gobroker.8 => man1/x2gobroker.1} | 2 +- man/man8/x2gobroker-authservice.8 | 2 +- man/man8/x2gobroker-keygen.8 | 2 +- man/man8/x2gobroker-pubkeyauthorizer.8 | 2 +- 15 files changed, 75 insertions(+), 44 deletions(-) rename {sbin => bin}/x2gobroker (96%) rename man/{man8/x2gobroker-testauth.8 => man1/x2gobroker-testauth.1} (96%) rename man/{man8/x2gobroker.8 => man1/x2gobroker.1} (96%) The diff of changes is: diff --git a/Makefile b/Makefile index cb6a1b8..ee09c35 100755 --- a/Makefile +++ b/Makefile @@ -73,61 +73,61 @@ test: install: mkdir -p "${DESTDIR}/var/lib/x2gobroker" \ - "${DESTDIR}/var/log/x2gobroker" + "${DESTDIR}/var/log/x2gobroker" # python-x2gobroker python setup.py install --prefix="${PREFIX}" $${DESTDIR+--root="${DESTDIR}"} mkdir -p "${DESTDIR}${ETCDIR}/broker" "${DESTDIR}/etc/pam.d" \ - "${DESTDIR}/etc/default" + "${DESTDIR}/etc/default" ${INSTALL_FILE} defaults/python-x2gobroker.default \ - "${DESTDIR}/etc/default/python-x2gobroker" + "${DESTDIR}/etc/default/python-x2gobroker" ${INSTALL_FILE} etc/x2gobroker.conf "${DESTDIR}${ETCDIR}/" ${INSTALL_FILE} etc/broker/x2gobroker-sessionprofiles.conf \ - etc/broker/x2gobroker-loggers.conf \ - "${DESTDIR}${ETCDIR}/broker/" + etc/broker/x2gobroker-loggers.conf \ + "${DESTDIR}${ETCDIR}/broker/" mkdir -p "${DESTDIR}/etc/pam.d" ${INSTALL_FILE} pam/x2gobroker "${DESTDIR}/etc/pam.d/" # x2gobroker-agent mkdir -p "${DESTDIR}${LIBDIR}" "${DESTDIR}${SBINDIR}" \ - "${DESTDIR}${MANDIR}/man8" + "${DESTDIR}${MANDIR}/man8" ${INSTALL_FILE} man/man8/x2gobroker-pubkeyauthorizer.8* \ - "${DESTDIR}${MANDIR}/man8" + "${DESTDIR}${MANDIR}/man8" ${INSTALL_PROGRAM} lib/x2gobroker-agent* "${DESTDIR}${LIBDIR}/" ${INSTALL_PROGRAM} sbin/x2gobroker-pubkeyauthorizer "${DESTDIR}${SBINDIR}/" # x2gobroker-authservice mkdir -p "${DESTDIR}${SBINDIR}" "${DESTDIR}/etc/logrotate.d" \ - "${DESTDIR}${ETCDIR}/broker" "${DESTDIR}/etc/default" \ - "${DESTDIR}${MANDIR}/man8" + "${DESTDIR}${ETCDIR}/broker" "${DESTDIR}/etc/default" \ + "${DESTDIR}${MANDIR}/man8" ${INSTALL_FILE} defaults/x2gobroker-authservice.default \ - "${DESTDIR}/etc/default/x2gobroker-authservice" + "${DESTDIR}/etc/default/x2gobroker-authservice" ${INSTALL_FILE} man/man8/x2gobroker-authservice.8* \ - "${DESTDIR}${MANDIR}/man8" + "${DESTDIR}${MANDIR}/man8" ${INSTALL_PROGRAM} sbin/x2gobroker-authservice "${DESTDIR}${SBINDIR}/" ${INSTALL_FILE} logrotate/x2gobroker-authservice \ - "${DESTDIR}/etc/logrotate.d/" + "${DESTDIR}/etc/logrotate.d/" ${INSTALL_FILE} etc/broker/x2gobroker-authservice-logger.conf \ - "${DESTDIR}${ETCDIR}/broker/" + "${DESTDIR}${ETCDIR}/broker/" # x2gobroker-daemon mkdir -p "${DESTDIR}/etc/logrotate.d/" "${DESTDIR}/etc/default" ${INSTALL_FILE} defaults/x2gobroker-daemon.default \ - "${DESTDIR}/etc/default/x2gobroker-daemon" + "${DESTDIR}/etc/default/x2gobroker-daemon" ${INSTALL_FILE} logrotate/x2gobroker-daemon \ - "${DESTDIR}/etc/logrotate.d/" + "${DESTDIR}/etc/logrotate.d/" # x2gobroker-wsgi mkdir -p "${DESTDIR}${ETCDIR}" "${DESTDIR}/etc/logrotate.d" ${INSTALL_FILE} etc/x2gobroker-wsgi.apache.{conf,vhost} \ - "${DESTDIR}${ETCDIR}/" + "${DESTDIR}${ETCDIR}/" ${INSTALL_FILE} logrotate/x2gobroker-wsgi "${DESTDIR}/etc/logrotate.d/" # x2gobroker mkdir -p "${DESTDIR}${BINDIR}" "${DESTDIR}${SBINDIR}" \ - "${DESTDIR}${MANDIR}/man8" + "${DESTDIR}${MANDIR}/man8" ${INSTALL_FILE} man/man8/x2gobroker{,-keygen,-testauth}.8* \ - "${DESTDIR}${MANDIR}/man8" - ${INSTALL_PROGRAM} bin/x2gobroker-testauth "${DESTDIR}${BINDIR}/" - ${INSTALL_PROGRAM} sbin/x2gobroker sbin/x2gobroker-keygen \ - "${DESTDIR}${SBINDIR}/" + "${DESTDIR}${MANDIR}/man8" + ${INSTALL_PROGRAM} bin/x2gobroker bin/x2gobroker-testauth \ + "${DESTDIR}${BINDIR}/" + ${INSTALL_PROGRAM} sbin/x2gobroker-keygen "${DESTDIR}${SBINDIR}/" diff --git a/NEWS b/NEWS index ec72a39..d1f4575 100644 --- a/NEWS +++ b/NEWS @@ -1,12 +1,34 @@ NEWS on X2Go Session Broker =========================== -X2Go Session Broker is a Web project that provides -session brokerage for X2Go via HTTP(S). +x2gobroker (0.0.3.0) -The framework was originally designed in Perl and has -been rewritten in Python using the web.py framework -in 2012/2013. + X2Go Session Broker can now also be used directly via SSH connection. + Over the SSH wire the x2gobroker executable simply gets called + as a command line tool. -light+love, -Mike Gabriel, 20121129 + x2goclient --broker-url=ssh://<user>@<host>/usr/bin/x2gobroker + + The default behaviour now actually is the SSH command line mode. + To enable HTTP(S) standalone daemon mode, you now have to explicit + add --mode HTTP as command line option. + + For those who package X2Go Session Broker for some GNU or BSD distribution, + please make sure that you add this new compulsory command line option + to the start section in your init script / service file. + + Furthermore, the x2gobroker executable now installs to /usr/bin (as + opposed to /usr/sbin like it used to be in earlier versions). + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, Sun, 18 Aug 2013 20:20:39 +0200 + +x2gobroker (0.0.0.1) + + X2Go Session Broker is a Web project that provides + session brokerage for X2Go via HTTP(S). + + The framework was originally designed in Perl and has + been rewritten in Python using the tornado.py framework + in 2012/2013. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, Xxx, 29 Nov 2012 18:00:00 +0100 diff --git a/sbin/x2gobroker b/bin/x2gobroker similarity index 96% rename from sbin/x2gobroker rename to bin/x2gobroker index 99d4422..81d59b2 100755 --- a/sbin/x2gobroker +++ b/bin/x2gobroker @@ -44,7 +44,8 @@ if x2gobroker.defaults.X2GOBROKER_DEBUG and not x2gobroker.defaults.X2GOBROKER_T logger_access.setLevel(logging.DEBUG) logger_error.setLevel(logging.DEBUG) -logger_broker.info('X2Go Session Broker ({version}), written by {author}'.format(version=__VERSION__, author=__AUTHOR__)) +logger_broker.info('X2Go Session Broker ({version}),'.format(version=__VERSION__)) +logger_broker.info(' written by {author}'.format(author=__AUTHOR__)) logger_broker.info('Setting up the broker\'s environment...') logger_broker.info(' X2GOBROKER_DEBUG: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_DEBUG)) logger_broker.info(' X2GOBROKER_CONFIG: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_CONFIG)) @@ -115,6 +116,13 @@ if __name__ == "__main__": logger_broker.warn('ignoring option --sid as it only has a meaning with ,,--task selectsession\'\'') if cmdline_args.user is None: cmdline_args.user = os.environ['LOGNAME'] + if cmdline_args.task is None: + print("") + p.print_usage() + print("No task specified, doing nothing..."); + print("") + sys.exit(-2) + elif cmdine_args.mode.upper() == 'HTTP': if interactive_mode_warning: logger_broker.warn('X2Go Session Broker has been started interactively by user {username}, better run as user {daemon_username}.'.format(username=x2gobroker.defaults.X2GOBROKER_USER, daemon_username=x2gobroker.defaults.X2GOBROKER_DAEMON_USER)) diff --git a/debian/changelog b/debian/changelog index f4e87f8..f94f27e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.0.3.0): - Add SSH support to X2Go Session Broker. (Fixes: #153). + - Move x2gobroker executable to /usr/bin. - Fix logrotate script: x2gobroker-wsgi. (Fixes: #275). * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. diff --git a/debian/x2gobroker-wsgi.links b/debian/x2gobroker-wsgi.links index e1659e5..cb9db8a 100644 --- a/debian/x2gobroker-wsgi.links +++ b/debian/x2gobroker-wsgi.links @@ -1,2 +1,2 @@ -/etc/x2go/x2gobroker-wsgi.apache.conf /etc/apache2/conf.d/x2gobroker-wsgi +/etc/x2go/x2gobroker-wsgi.apache.conf /etc/apache2/conf.d/x2gobroker-wsgi.conf /etc/x2go/x2gobroker-wsgi.apache.vhost /etc/apache2/sites-available/x2gobroker diff --git a/debian/x2gobroker.install b/debian/x2gobroker.install index adad505..bf0e5f5 100644 --- a/debian/x2gobroker.install +++ b/debian/x2gobroker.install @@ -1,3 +1,3 @@ +bin/x2gobroker usr/bin/ bin/x2gobroker-testauth usr/bin/ -sbin/x2gobroker usr/sbin/ sbin/x2gobroker-keygen usr/sbin/ diff --git a/debian/x2gobroker.manpages b/debian/x2gobroker.manpages index 71c3e08..2942f0c 100644 --- a/debian/x2gobroker.manpages +++ b/debian/x2gobroker.manpages @@ -1,3 +1,3 @@ -man/man8/x2gobroker.8 +man/man1/x2gobroker.1 +man/man1/x2gobroker-testauth.1 man/man8/x2gobroker-keygen.8 -man/man8/x2gobroker-testauth.8 diff --git a/etc/x2gobroker-wsgi.apache.conf b/etc/x2gobroker-wsgi.apache.conf index 63ba34a..6ac20a0 100644 --- a/etc/x2gobroker-wsgi.apache.conf +++ b/etc/x2gobroker-wsgi.apache.conf @@ -28,10 +28,10 @@ SetEnv X2GOBROKER_DEFAULT_BACKEND zeroconf # if you have to-be-statically-served files somewhere below the broker URL #Alias /x2gobroker/static /some/static/path/ -WSGIScriptAlias /x2gobroker /usr/sbin/x2gobroker +WSGIScriptAlias /x2gobroker /usr/bin/x2gobroker WSGIProcessGroup x2gobroker -<Directory /usr/sbin/x2gobroker> +<Directory /usr/bin/x2gobroker> Order deny,allow Deny from all diff --git a/etc/x2gobroker-wsgi.apache.vhost b/etc/x2gobroker-wsgi.apache.vhost index 931f7d2..4d024fe 100644 --- a/etc/x2gobroker-wsgi.apache.vhost +++ b/etc/x2gobroker-wsgi.apache.vhost @@ -42,10 +42,10 @@ # if you have to-be-statically-served files somewhere below the broker URL #Alias /x2gobroker/static /some/static/path/ - WSGIScriptAlias / /usr/sbin/x2gobroker + WSGIScriptAlias / /usr/bin/x2gobroker WSGIProcessGroup x2gobroker - <Directory /usr/sbin/x2gobroker> + <Directory /usr/bin/x2gobroker> Order deny,allow Deny from all diff --git a/init/x2gobroker-daemon.init b/init/x2gobroker-daemon.init index 0a8b90a..d049d0a 100755 --- a/init/x2gobroker-daemon.init +++ b/init/x2gobroker-daemon.init @@ -18,7 +18,7 @@ set -eu -DAEMON=/usr/sbin/x2gobroker +DAEMON=/usr/bin/x2gobroker test -d /run && RUNDIR=/run || RUNDIR=/var/run PIDFILE_BROKER=$RUNDIR/x2gobroker/x2gobroker-daemon.pid DEBIANCONFIG_COMMON=/etc/default/python-x2gobroker @@ -92,7 +92,7 @@ case "${1:-}" in if is_true $START_BROKER; then log_daemon_msg "Starting X2Go Session Broker standalone daemon" "$(basename $DAEMON)" set +e - start-stop-daemon --chuid $X2GOBROKER_DAEMON_USER -b -m -S -p $PIDFILE_BROKER -x $DAEMON -- -b $DAEMON_BIND_ADDRESS + start-stop-daemon --chuid $X2GOBROKER_DAEMON_USER -b -m -S -p $PIDFILE_BROKER -x $DAEMON -- --mode HTTP -b $DAEMON_BIND_ADDRESS log_end_msg $? set -e fi diff --git a/man/man8/x2gobroker-testauth.8 b/man/man1/x2gobroker-testauth.1 similarity index 96% rename from man/man8/x2gobroker-testauth.8 rename to man/man1/x2gobroker-testauth.1 index b7e2278..b9f41a2 100644 --- a/man/man8/x2gobroker-testauth.8 +++ b/man/man1/x2gobroker-testauth.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gobroker-testauth 8 "April 2013" "Version 0.0.1.y" "X2Go Session Broker" +.TH x2gobroker-testauth 1 "Aug 2013" "Version 0.0.3.x" "X2Go Session Broker" .SH NAME x2gobroker-testauth \- Session Broker for X2Go (Authentication Test Utility) .SH SYNOPSIS diff --git a/man/man8/x2gobroker.8 b/man/man1/x2gobroker.1 similarity index 96% rename from man/man8/x2gobroker.8 rename to man/man1/x2gobroker.1 index ec5ac10..bc1425e 100644 --- a/man/man8/x2gobroker.8 +++ b/man/man1/x2gobroker.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gobroker 8 "Feb 2013" "Version 0.0.1.y" "X2Go Session Broker" +.TH x2gobroker 1 "Aug 2013" "Version 0.0.3.x" "X2Go Session Broker" .SH NAME x2gobroker \- Session Broker for X2Go .SH SYNOPSIS diff --git a/man/man8/x2gobroker-authservice.8 b/man/man8/x2gobroker-authservice.8 index 59a3938..ee3b16d 100644 --- a/man/man8/x2gobroker-authservice.8 +++ b/man/man8/x2gobroker-authservice.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gobroker-authservice 8 "Feb 2013" "Version 0.0.1.y" "X2Go Session Broker" +.TH x2gobroker-authservice 8 "Aug 2013" "Version 0.0.3.x" "X2Go Session Broker" .SH NAME x2gobroker-authservice \- PAM authentication service for X2Go Session Broker .SH SYNOPSIS diff --git a/man/man8/x2gobroker-keygen.8 b/man/man8/x2gobroker-keygen.8 index b17b5d2..0ce9467 100644 --- a/man/man8/x2gobroker-keygen.8 +++ b/man/man8/x2gobroker-keygen.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gobroker-keygen 8 "Feb 2013" "Version 0.0.1.y" "X2Go Session Broker" +.TH x2gobroker-keygen 8 "Aug 2013" "Version 0.0.3.x" "X2Go Session Broker" .SH NAME x2gobroker-keygen \- Generate SSH keys for X2Go Session Broker .SH SYNOPSIS diff --git a/man/man8/x2gobroker-pubkeyauthorizer.8 b/man/man8/x2gobroker-pubkeyauthorizer.8 index 4602ce8..9e4693f 100644 --- a/man/man8/x2gobroker-pubkeyauthorizer.8 +++ b/man/man8/x2gobroker-pubkeyauthorizer.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gobroker-pubkeyauthorizer 8 "Feb 2013" "Version 0.0.1.y" "X2Go Session Broker" +.TH x2gobroker-pubkeyauthorizer 8 "Aug 2013" "Version 0.0.3.x" "X2Go Session Broker" .SH NAME x2gobroker-pubkeyauthorizer \- Retrieve public SSH keys from an X2Go Session Broker .SH SYNOPSIS 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).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-5-g2c7e30c
by git-admin＠x2go.org 19 Aug '13

19 Aug '13

The branch, master has been updated via 2c7e30c92dc63ee44792d10c260411aa6965102d (commit) from 057bb8fe547386895c12062b2c6b708583287bc1 (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 ----------------------------------------------------------------- commit 2c7e30c92dc63ee44792d10c260411aa6965102d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Aug 18 19:59:59 2013 +0200 increment upstream version ----------------------------------------------------------------------- Summary of changes: sbin/x2gobroker-pubkeyauthorizer | 2 +- x2gobroker/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/sbin/x2gobroker-pubkeyauthorizer b/sbin/x2gobroker-pubkeyauthorizer index 2d0315c..7596207 100755 --- a/sbin/x2gobroker-pubkeyauthorizer +++ b/sbin/x2gobroker-pubkeyauthorizer @@ -36,7 +36,7 @@ import logging.config from pwd import getpwnam from grp import getgrnam -__VERSION__ = '0.0.2.4' +__VERSION__ = '0.0.3.0' __AUTHOR__ = 'Mike Gabriel (X2Go Project) <mike.gabriel(a)das-netzwerkteam.de>' PROG_NAME = os.path.basename(sys.argv[0]) diff --git a/x2gobroker/__init__.py b/x2gobroker/__init__.py index 5cd8815..3a52cf3 100644 --- a/x2gobroker/__init__.py +++ b/x2gobroker/__init__.py @@ -18,5 +18,5 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.0.2.4' +__VERSION__ = '0.0.3.0' __AUTHOR__ = 'Mike Gabriel (X2Go Project) <mike.gabriel(a)das-netzwerkteam.de>' 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).

1 0

x2goclient.git - master (branch) updated: 4.0.1.0-45-g61958d4
by git-admin＠x2go.org 19 Aug '13

19 Aug '13

The branch, master has been updated via 61958d4701d4d9e567e116acaceca9333dde3737 (commit) from 2b2b554e4bc828ff2ded8fe9f64f157ac49c44cb (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 ----------------------------------------------------------------- commit 61958d4701d4d9e567e116acaceca9333dde3737 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Aug 18 19:59:14 2013 +0200 Make X2Go Client work in SSH broker mode without the need of a auth-id file. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ httpbrokerclient.cpp | 36 ++++++++++++++++++++++++++++-------- 2 files changed, 30 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 43d9efe..72a7201 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,8 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low (Fixes: #179). - Enable full access desktop sharing across user accounts. (Fixes: #222). - Make X2Go Client aware of the MATE desktop environment. + - Make X2Go Client work in SSH broker mode without the need of a auth-id + file. [ Heinrich Schuchardt ] * New upstream version (4.0.1.1): diff --git a/httpbrokerclient.cpp b/httpbrokerclient.cpp index 3093a48..35f87d0 100644 --- a/httpbrokerclient.cpp +++ b/httpbrokerclient.cpp @@ -243,8 +243,13 @@ void HttpBrokerClient::getUserSessions() createSshConnection(); return; } - sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --authid "+config->brokerUserId+ " --task listsessions", - this, SLOT ( slotListSessions ( bool, QString,int ) )); + if (config->brokerUserId.length() > 0) { + sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --authid "+config->brokerUserId+ " --task listsessions", + this, SLOT ( slotListSessions ( bool, QString,int ) )); + } else { + sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --task listsessions", + this, SLOT ( slotListSessions ( bool, QString,int ) )); + } } } @@ -270,8 +275,13 @@ void HttpBrokerClient::selectUserSession(const QString& session) } else { - sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --authid "+config->brokerUserId+ " --task selectsession --sid \\\""+session+"\\\"", - this,SLOT ( slotSelectSession(bool,QString,int))); + if (config->brokerUserId.length() > 0) { + sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --authid "+config->brokerUserId+ " --task selectsession --sid \\\""+session+"\\\"", + this,SLOT ( slotSelectSession(bool,QString,int))); + } else { + sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --task selectsession --sid \\\""+session+"\\\"", + this,SLOT ( slotSelectSession(bool,QString,int))); + } } } @@ -299,8 +309,13 @@ void HttpBrokerClient::changePassword(QString newPass) } else { - sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --authid "+config->brokerUserId+ " --task setpass --newpass "+newPass, this, - SLOT ( slotPassChanged(bool,QString,int))); + if (config->brokerUserId.length() > 0) { + sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --authid "+config->brokerUserId+ " --task setpass --newpass "+newPass, this, + SLOT ( slotPassChanged(bool,QString,int))); + } else { + sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --task setpass --newpass "+newPass, this, + SLOT ( slotPassChanged(bool,QString,int))); + } } } @@ -319,8 +334,13 @@ void HttpBrokerClient::testConnection() } else { - sshConnection->executeCommand(config->sshBrokerBin+" --authid "+config->brokerUserId+ " --task testcon", - this, SLOT ( slotSelectSession(bool,QString,int))); + if (config->brokerUserId.length() > 0) { + sshConnection->executeCommand(config->sshBrokerBin+" --authid "+config->brokerUserId+ " --task testcon", + this, SLOT ( slotSelectSession(bool,QString,int))); + } else { + sshConnection->executeCommand(config->sshBrokerBin+" --task testcon", + this, SLOT ( slotSelectSession(bool,QString,int))); + } } } hooks/post-receive -- x2goclient.git (X2Go Client) 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 "x2goclient.git" (X2Go Client).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits August 2013