x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

x2gobroker.git - uccsoutput (branch) updated: 0.0.1.0-72-g85ffd94
by git-admin＠x2go.org 19 Apr '13

19 Apr '13

The branch, uccsoutput has been updated via 85ffd94dae231162d20c38c9c7a2c7dab99b6e0c (commit) via ad71a6de92eb31ef0f3a3aae4aec16067573c35b (commit) via 81642aaf1a9a448bb00906fc6d57d2a324ae5a59 (commit) via 31a93ead8a1fada72e134a8f9e48e6f8c30beb05 (commit) via 87e42dc92a6aa376c672c903ccaa59284718d0e9 (commit) via 9472cbc3b80ab0349feb5a020756c8bce9489be1 (commit) via 2a8a92b9a806b0bddee8893db10871941d0d3827 (commit) via c03f569500958547e14dc7f17b3fed546be79777 (commit) via 4595a5dc63ae5a80d2c210ba4469390acb11fd2f (commit) from 23c88c33da8d3294bb74e854bc6f883ea63b7c9a (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 85ffd94dae231162d20c38c9c7a2c7dab99b6e0c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Apr 19 14:45:18 2013 +0200 make --debug cmdline option work in x2gobroker-testauth commit ad71a6de92eb31ef0f3a3aae4aec16067573c35b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Apr 19 14:44:04 2013 +0200 fix exception call, add debug message when authentication is requested commit 81642aaf1a9a448bb00906fc6d57d2a324ae5a59 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Apr 19 14:43:19 2013 +0200 return 405 instead of 404 if method is not allowed (plaintext webui) commit 31a93ead8a1fada72e134a8f9e48e6f8c30beb05 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Apr 19 14:42:59 2013 +0200 return 405 instead of 404 if method is not allowed (html webui) commit 87e42dc92a6aa376c672c903ccaa59284718d0e9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Apr 19 14:42:17 2013 +0200 mark missing log output with a FIXME in authservice.py commit 9472cbc3b80ab0349feb5a020756c8bce9489be1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Apr 19 14:41:51 2013 +0200 import pwd and grp classes in x2gobroker-authservice commit 2a8a92b9a806b0bddee8893db10871941d0d3827 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Apr 19 14:40:57 2013 +0200 add man page for x2gobroker-testauth commit c03f569500958547e14dc7f17b3fed546be79777 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Apr 19 14:31:47 2013 +0200 fix comment text commit 4595a5dc63ae5a80d2c210ba4469390acb11fd2f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Apr 19 14:01:03 2013 +0200 mention Tornado instead of Web.py in x2gobroker man page ----------------------------------------------------------------------- Summary of changes: bin/x2gobroker-testauth | 12 +++++-- debian/x2gobroker.manpages | 1 + man/man8/x2gobroker-testauth.8 | 64 +++++++++++++++++++++++++++++++++++++ man/man8/x2gobroker.8 | 2 +- sbin/x2gobroker-authservice | 3 ++ x2gobroker/authservice.py | 1 + x2gobroker/brokers/base_broker.py | 3 +- x2gobroker/defaults.py | 2 +- x2gobroker/web/html.py | 5 +-- x2gobroker/web/plain.py | 5 +-- 10 files changed, 88 insertions(+), 10 deletions(-) create mode 100644 man/man8/x2gobroker-testauth.8 The diff of changes is: diff --git a/bin/x2gobroker-testauth b/bin/x2gobroker-testauth index fd8a5a7..d8ef295 100755 --- a/bin/x2gobroker-testauth +++ b/bin/x2gobroker-testauth @@ -24,6 +24,7 @@ import os import sys import setproctitle import argparse +import logging # perform an authentication against the authentication mechanism configured for WSGI try: @@ -31,6 +32,7 @@ try: except ImportError: sys.path.insert(0, os.path.join(os.getcwd(), '..')) import x2gobroker.defaults +import x2gobroker.loggers PROG_NAME = os.path.basename(sys.argv[0]) PROG_OPTIONS = sys.argv[1:] @@ -78,12 +80,16 @@ if __name__ == "__main__": if cmdline_args.config_file is not None: x2gobroker.defaults.X2GOBROKER_CONFIG = cmdline_args.config_file - x2gobroker.defaults.X2GOBROKER_DEBUG = cmdline_args.debug + if cmdline_args.debug: + x2gobroker.defaults.X2GOBROKER_DEBUG = cmdline_args.debug + # raise log level to DEBUG if requested... + if x2gobroker.defaults.X2GOBROKER_DEBUG and not x2gobroker.defaults.X2GOBROKER_TESTSUITE: + x2gobroker.loggers.logger_broker.setLevel(logging.DEBUG) + x2gobroker.loggers.logger_error.setLevel(logging.DEBUG) + username = cmdline_args.username password = cmdline_args.password -import x2gobroker.config - config_file = x2gobroker.defaults.X2GOBROKER_CONFIG config_defaults = x2gobroker.defaults.X2GOBROKER_CONFIG_DEFAULTS diff --git a/debian/x2gobroker.manpages b/debian/x2gobroker.manpages index 569dc33..71c3e08 100644 --- a/debian/x2gobroker.manpages +++ b/debian/x2gobroker.manpages @@ -1,2 +1,3 @@ man/man8/x2gobroker.8 man/man8/x2gobroker-keygen.8 +man/man8/x2gobroker-testauth.8 diff --git a/man/man8/x2gobroker-testauth.8 b/man/man8/x2gobroker-testauth.8 new file mode 100644 index 0000000..b7e2278 --- /dev/null +++ b/man/man8/x2gobroker-testauth.8 @@ -0,0 +1,64 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$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" +.SH NAME +x2gobroker-testauth \- Session Broker for X2Go (Authentication Test Utility) +.SH SYNOPSIS +'nh +.fi +.ad l +\fBx2gobroker-testauth\fR \kx +.if (\nx>(\n(.l/2)) .nr x (\n(.l/5) +'in \n(.iu+\nxu +[ +\fIoptions\fR +] +'in \n(.iu-\nxu +.ad b +'hy +.SH DESCRIPTION +\fBx2gobroker-testauth\fR is an authentication test utility for X2Go Session Broker. +.PP +WARNING: please know that the credentials you use for testing broker authentication will +get revealed in your shell's history file (e.g. ~/.bash_history). +.SH COMMON OPTIONS +\fBx2gobroker-testauth\fR displays some help on command line options: +.TP +\*(T<\fB\-h, \-\-help\fR\*(T> +Display a help with all available command line options and exit. +.SH REQUIRED OPTIONS +For any other operation than the help text, the two options below are required. +.TP +\*(T<\fB\-u, \-\-user, \-\-username\fR\*(T> +Username part of the credentials you want to test. +.TP +\*(T<\fB\-p, \-\-password\fR\*(T> +Password part of the credentials (be sure you want to reveal those on the command line before doing it!!!) +.SH MISC OPTIONS +\fBx2gobroker-testauth\fR also accepts the following miscellaneous options: +.TP +\*(T<\fB\-d, \-\-debug\fR\*(T> +Enable debugging code. +.TP +\*(T<\fB\-C, \-\-config FILENAME\fR\*(T> +Specify an alternative configuration file name, default is: \fI/etc/x2go/x2gobroker.conf\fR. +.TP +\*(T<\fB\-b, \-\-backend BACKEND\fR\*(T> +Specify another configured/enabled backend configuration to test authentication against, default is: the \fIzeroconf\fR backend. +.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) +.PP +/var/log/x2gobroker/* (log files of X2Go Session Broker) +.SH "SEE ALSO" +\fB/usr/share/doc/x2gobroker\fR +.SH AUTHOR +This manual has been written for the X2Go project by +Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>. diff --git a/man/man8/x2gobroker.8 b/man/man8/x2gobroker.8 index 8811c2b..ec5ac10 100644 --- a/man/man8/x2gobroker.8 +++ b/man/man8/x2gobroker.8 @@ -22,7 +22,7 @@ x2gobroker \- Session Broker for X2Go .ad b 'hy .SH DESCRIPTION -\fBx2gobroker\fR is a Web.py based implementation of the X2Go Session Broker API. +\fBx2gobroker\fR is a Python Tornado based implementation of the X2Go Session Broker API. .PP This command is normally executed either through an init script or via the WSGI module in your httpd server. .PP diff --git a/sbin/x2gobroker-authservice b/sbin/x2gobroker-authservice index 534a532..28084fd 100755 --- a/sbin/x2gobroker-authservice +++ b/sbin/x2gobroker-authservice @@ -31,6 +31,9 @@ import socket import getpass import logging.config +from pwd import getpwnam +from grp import getgrnam + PROG_NAME = os.path.basename(sys.argv[0]) PROG_OPTIONS = sys.argv[1:] setproctitle.setproctitle("%s %s" % (PROG_NAME, " ".join(PROG_OPTIONS))) diff --git a/x2gobroker/authservice.py b/x2gobroker/authservice.py index ae1518a..26c841e 100644 --- a/x2gobroker/authservice.py +++ b/x2gobroker/authservice.py @@ -62,6 +62,7 @@ def authenticate(username, password, service="x2gobroker"): s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) logger_broker.debug('connecting to authentication service socket {socket}'.format(socket=x2gobroker.defaults.X2GOBROKER_AUTHSERVICE_SOCKET)) s.connect(x2gobroker.defaults.X2GOBROKER_AUTHSERVICE_SOCKET) + # FIXME: somehow logging output disappears after we have connected to the socket file... logger_broker.debug('sending username={username}, password=<hidden>, service={service} to authentication service'.format(username=username, service=service)) s.send('{username} {password} {service}\n'.format(username=username, password=password, service=service)) result = s.recv(1024) diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 365ce0b..43e4d79 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -417,6 +417,7 @@ class X2GoBroker(object): def _do_authenticate(self, username='', password=''): if self._import_authmech_module(mech=self.get_authentication_mechanism()): + logger_broker.debug('base_broker.X2GoBroker._do_authenticate(): authenticating user={username} with password=<hidden> against backend={backend}.'.format(username=username, backend=self.backend_name)) return self.authmech_module.X2GoBrokerAuthMech().authenticate(username, password) else: return False @@ -850,7 +851,7 @@ class X2GoBroker(object): try: busy_servers = x2gobroker.agent.find_busy_servers(username=username, query_mode=agent_query_mode, remote_agent=remote_agent) - except x2gobroker.X2GoBrokerAgentException: + except x2gobroker.x2gobroker_exceptions.X2GoBrokerAgentException: logger_broker.warning('base_broker.X2GoBroker.select_session(): failed to query broker agent (quey-mode: {query_mode}, remote_agent: {remote_agent})'.format(query_mode=agent_query_mode, remote_agent=remote_agent)) if agent_query_mode.upper() == u'SSH': diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index d734cc6..f46e1b8 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -56,7 +56,7 @@ else: if X2GOBROKER_USER != X2GOBROKER_DAEMON_USER: X2GOBROKER_DEBUG = True -# drop og level to CRITICAL if we are running the unittests... +# raise log levels to CRITICAL if we are running the unittests... if X2GOBROKER_TESTSUITE: logger_broker.setLevel(logging.CRITICAL) logger_access.setLevel(logging.CRITICAL) diff --git a/x2gobroker/web/html.py b/x2gobroker/web/html.py index 0e1988f..0cfb97e 100644 --- a/x2gobroker/web/html.py +++ b/x2gobroker/web/html.py @@ -65,11 +65,12 @@ $output self.set_header(http_header_item, self.http_header_items[http_header_item]) def get(self, backend): - self._gen_http_header() return self.post(backend) def post(self, backend): + self._gen_http_header() + if not backend: backend = _X2GOBROKER_DEFAULT_BACKEND else: @@ -83,7 +84,7 @@ $output 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) + raise tornado.web.HTTPError(405) global_config = broker_backend.get_global_config() backend_config = broker_backend.get_backend_config(backend) diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py index 8487e43..ca041df 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/web/plain.py @@ -44,13 +44,14 @@ class X2GoBrokerWeb(tornado.web.RequestHandler): def get(self, backend): if x2gobroker.defaults.X2GOBROKER_DEBUG: - self._gen_http_header() logger_broker.warn('GET http request detected, if unwanted: disable X2GOBROKER_DEBUG') return self.post(backend) - raise tornado.web.HTTPError(404) + raise tornado.web.HTTPError(405) def post(self, backend): + self._gen_http_header() + if not backend: backend = x2gobroker.defaults.X2GOBROKER_DEFAULT_BACKEND else: 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.1.0-31-gd9edb50
by git-admin＠x2go.org 19 Apr '13

19 Apr '13

The branch, master has been updated via d9edb503e4b28793fb7b7a3848d24bd6df97fa7f (commit) from 27257d282bf6be8bc7d511824283725df634e045 (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 d9edb503e4b28793fb7b7a3848d24bd6df97fa7f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Apr 19 13:57:46 2013 +0200 some nice cosmetics on x2gobroker-testauth ----------------------------------------------------------------------- Summary of changes: bin/x2gobroker-testauth | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/bin/x2gobroker-testauth b/bin/x2gobroker-testauth index 12db7da..fd8a5a7 100755 --- a/bin/x2gobroker-testauth +++ b/bin/x2gobroker-testauth @@ -50,10 +50,10 @@ if __name__ == "__main__": ] misc_options = [ {'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','--backend'], 'default': 'zeroconf', 'metavar': 'BACKEND', 'help': 'Use this specific backend for testing authentication, see x2gobroker.conf for a list of configured backends', }, + {'args':['-b','--backend'], 'default': 'zeroconf', 'metavar': 'BACKEND', 'help': 'Use this specific backend for testing authentication, see x2gobroker.conf for a list of configured and enabled backends', }, {'args':['-d','--debug'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code', }, ] - p = argparse.ArgumentParser(description='X2Go Session Broker (Authservice Test Utility)',\ + p = argparse.ArgumentParser(description='X2Go Session Broker (Authentication Test Utility)',\ epilog="WARNING: Using this utility from the command line is not recommended!!!\nYour credentials will get revealed in your shells history file.",\ formatter_class=argparse.RawDescriptionHelpFormatter, \ add_help=True, argument_default=None) @@ -92,17 +92,24 @@ try: except ImportError: p.print_help() print - print "*** No such backend: {backend} or backend not enabled... ***".format(backend=cmdline_args.backend) + print "*** No such backend: {backend} ***".format(backend=cmdline_args.backend) print - sys.exit(-1) + sys.exit(-2) +broker = _backend.X2GoBroker(config_file=config_file, config_defaults=config_defaults) +if not broker.is_enabled(): + p.print_help() + print + print "*** Backend not enabled: {backend} ***".format(backend=cmdline_args.backend) + print + sys.exit(-3) -def check_password(environ, username, password): - return _backend.X2GoBroker(config_file=config_file, config_defaults=config_defaults)._do_authenticate(username=username, password=password) +def check_password(username, password): + return broker._do_authenticate(username=username, password=password) if __name__ == "__main__": - if check_password(os.environ, username, password): + if check_password(username, password): print "authentication succeeded" sys.exit(0) else: 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 - uccsoutput (branch) updated: 0.0.1.0-63-g23c88c3
by git-admin＠x2go.org 19 Apr '13

19 Apr '13

The branch, uccsoutput has been updated via 23c88c33da8d3294bb74e854bc6f883ea63b7c9a (commit) from ad4f3af5a457d985aba08002d37bc3941528eba9 (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 23c88c33da8d3294bb74e854bc6f883ea63b7c9a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Apr 19 13:57:46 2013 +0200 some nice cosmetics on x2gobroker-testauth ----------------------------------------------------------------------- Summary of changes: bin/x2gobroker-testauth | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/bin/x2gobroker-testauth b/bin/x2gobroker-testauth index 12db7da..fd8a5a7 100755 --- a/bin/x2gobroker-testauth +++ b/bin/x2gobroker-testauth @@ -50,10 +50,10 @@ if __name__ == "__main__": ] misc_options = [ {'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','--backend'], 'default': 'zeroconf', 'metavar': 'BACKEND', 'help': 'Use this specific backend for testing authentication, see x2gobroker.conf for a list of configured backends', }, + {'args':['-b','--backend'], 'default': 'zeroconf', 'metavar': 'BACKEND', 'help': 'Use this specific backend for testing authentication, see x2gobroker.conf for a list of configured and enabled backends', }, {'args':['-d','--debug'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code', }, ] - p = argparse.ArgumentParser(description='X2Go Session Broker (Authservice Test Utility)',\ + p = argparse.ArgumentParser(description='X2Go Session Broker (Authentication Test Utility)',\ epilog="WARNING: Using this utility from the command line is not recommended!!!\nYour credentials will get revealed in your shells history file.",\ formatter_class=argparse.RawDescriptionHelpFormatter, \ add_help=True, argument_default=None) @@ -92,17 +92,24 @@ try: except ImportError: p.print_help() print - print "*** No such backend: {backend} or backend not enabled... ***".format(backend=cmdline_args.backend) + print "*** No such backend: {backend} ***".format(backend=cmdline_args.backend) print - sys.exit(-1) + sys.exit(-2) +broker = _backend.X2GoBroker(config_file=config_file, config_defaults=config_defaults) +if not broker.is_enabled(): + p.print_help() + print + print "*** Backend not enabled: {backend} ***".format(backend=cmdline_args.backend) + print + sys.exit(-3) -def check_password(environ, username, password): - return _backend.X2GoBroker(config_file=config_file, config_defaults=config_defaults)._do_authenticate(username=username, password=password) +def check_password(username, password): + return broker._do_authenticate(username=username, password=password) if __name__ == "__main__": - if check_password(os.environ, username, password): + if check_password(username, password): print "authentication succeeded" sys.exit(0) else: 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 - uccsoutput (branch) updated: 0.0.1.0-62-gad4f3af
by git-admin＠x2go.org 19 Apr '13

19 Apr '13

The branch, uccsoutput has been updated via ad4f3af5a457d985aba08002d37bc3941528eba9 (commit) from f179ced3058fdf13019f66c3a2123025800f9dbd (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 ad4f3af5a457d985aba08002d37bc3941528eba9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Apr 19 13:48:27 2013 +0200 Add script: x2gobroker-testauth. ----------------------------------------------------------------------- Summary of changes: bin/x2gobroker-testauth | 110 +++++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 1 + debian/x2gobroker.install | 3 +- 3 files changed, 113 insertions(+), 1 deletion(-) create mode 100755 bin/x2gobroker-testauth The diff of changes is: diff --git a/bin/x2gobroker-testauth b/bin/x2gobroker-testauth new file mode 100755 index 0000000..12db7da --- /dev/null +++ b/bin/x2gobroker-testauth @@ -0,0 +1,110 @@ +#!/usr/bin/env python + +# This file is part of the X2Go Project - http://www.x2go.org +# Copyright (C) 2011-2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# +# X2Go Session Broker is free software; you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# X2Go Session Broker is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +import os +import sys +import setproctitle +import argparse + +# perform an authentication against the authentication mechanism configured for WSGI +try: + import x2gobroker.defaults +except ImportError: + sys.path.insert(0, os.path.join(os.getcwd(), '..')) + import x2gobroker.defaults + +PROG_NAME = os.path.basename(sys.argv[0]) +PROG_OPTIONS = sys.argv[1:] +try: + _password_index = PROG_OPTIONS.index('--password')+1 + PROG_OPTIONS[_password_index] = "XXXXXXXX" +except ValueError: + # ignore if --password option is not specified + pass +setproctitle.setproctitle("%s %s" % (PROG_NAME, " ".join(PROG_OPTIONS))) + +if __name__ == "__main__": + + auth_options = [ + {'args':['-u','--username', '--user'], 'default': None, 'metavar': 'USERNAME', 'help': 'Test authentication for the account with this username', }, + {'args':['-p', '--password'], 'default': None, 'metavar': 'PASSWORD', 'help': 'Test authentication using this password', }, + ] + misc_options = [ + {'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','--backend'], 'default': 'zeroconf', 'metavar': 'BACKEND', 'help': 'Use this specific backend for testing authentication, see x2gobroker.conf for a list of configured backends', }, + {'args':['-d','--debug'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code', }, + ] + p = argparse.ArgumentParser(description='X2Go Session Broker (Authservice Test Utility)',\ + epilog="WARNING: Using this utility from the command line is not recommended!!!\nYour credentials will get revealed in your shells history file.",\ + formatter_class=argparse.RawDescriptionHelpFormatter, \ + add_help=True, argument_default=None) + p_auth = p.add_argument_group('authentication parameters') + p_misc = p.add_argument_group('miscellaneous parameters') + + for (p_group, opts) in ( (p_auth, auth_options), (p_misc, misc_options), ): + for opt in opts: + args = opt['args'] + del opt['args'] + p_group.add_argument(*args, **opt) + + cmdline_args = p.parse_args() + + if cmdline_args.username is None or cmdline_args.password is None: + p.print_help() + print + print "*** Cannot continue without username and password... ***" + print + sys.exit(-1) + + if cmdline_args.config_file is not None: + x2gobroker.defaults.X2GOBROKER_CONFIG = cmdline_args.config_file + + x2gobroker.defaults.X2GOBROKER_DEBUG = cmdline_args.debug + username = cmdline_args.username + password = cmdline_args.password + +import x2gobroker.config + +config_file = x2gobroker.defaults.X2GOBROKER_CONFIG +config_defaults = x2gobroker.defaults.X2GOBROKER_CONFIG_DEFAULTS + +try: + exec("import x2gobroker.brokers.{backend}_broker as _backend".format(backend=cmdline_args.backend)) +except ImportError: + p.print_help() + print + print "*** No such backend: {backend} or backend not enabled... ***".format(backend=cmdline_args.backend) + print + sys.exit(-1) + + +def check_password(environ, username, password): + return _backend.X2GoBroker(config_file=config_file, config_defaults=config_defaults)._do_authenticate(username=username, password=password) + +if __name__ == "__main__": + + if check_password(os.environ, username, password): + print "authentication succeeded" + sys.exit(0) + else: + print "authentication failed" + sys.exit(-1) diff --git a/debian/changelog b/debian/changelog index 8195e1e..17b3755 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ x2gobroker (0.0.1.1-0~x2go1) UNRELEASED; urgency=low - Move AuthService server code fully into x2gobroker-authservice daemon script. - Add forgotten file: x2gobroker-authservice-logger.conf. (Fixes: #180). + - Add script: x2gobroker-testauth. * /debian/control: + Fix --root parameter in DEB_PYTHON_INSTALL_ARGS. + Let bin:package x2gobroker-authservice depend on python-x2gobroker (of the diff --git a/debian/x2gobroker.install b/debian/x2gobroker.install index 693dad3..adad505 100644 --- a/debian/x2gobroker.install +++ b/debian/x2gobroker.install @@ -1,2 +1,3 @@ +bin/x2gobroker-testauth usr/bin/ sbin/x2gobroker usr/sbin/ -sbin/x2gobroker-keygen usr/sbin/ \ No newline at end of file +sbin/x2gobroker-keygen usr/sbin/ 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.1.0-30-g27257d2
by git-admin＠x2go.org 19 Apr '13

19 Apr '13

The branch, master has been updated via 27257d282bf6be8bc7d511824283725df634e045 (commit) via ace673b6219a685077cc15370395190190ba94c1 (commit) from a007b3e4f9a645c500c033cf6517542d76d6ad0b (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 27257d282bf6be8bc7d511824283725df634e045 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Apr 19 13:48:27 2013 +0200 Add script: x2gobroker-testauth. commit ace673b6219a685077cc15370395190190ba94c1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Apr 19 13:26:37 2013 +0200 allow trailing slash in /pubkeys/ URL ----------------------------------------------------------------------- Summary of changes: bin/x2gobroker-testauth | 110 +++++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 1 + debian/x2gobroker.install | 3 +- sbin/x2gobroker | 2 +- 4 files changed, 114 insertions(+), 2 deletions(-) create mode 100755 bin/x2gobroker-testauth The diff of changes is: diff --git a/bin/x2gobroker-testauth b/bin/x2gobroker-testauth new file mode 100755 index 0000000..12db7da --- /dev/null +++ b/bin/x2gobroker-testauth @@ -0,0 +1,110 @@ +#!/usr/bin/env python + +# This file is part of the X2Go Project - http://www.x2go.org +# Copyright (C) 2011-2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# +# X2Go Session Broker is free software; you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# X2Go Session Broker is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +import os +import sys +import setproctitle +import argparse + +# perform an authentication against the authentication mechanism configured for WSGI +try: + import x2gobroker.defaults +except ImportError: + sys.path.insert(0, os.path.join(os.getcwd(), '..')) + import x2gobroker.defaults + +PROG_NAME = os.path.basename(sys.argv[0]) +PROG_OPTIONS = sys.argv[1:] +try: + _password_index = PROG_OPTIONS.index('--password')+1 + PROG_OPTIONS[_password_index] = "XXXXXXXX" +except ValueError: + # ignore if --password option is not specified + pass +setproctitle.setproctitle("%s %s" % (PROG_NAME, " ".join(PROG_OPTIONS))) + +if __name__ == "__main__": + + auth_options = [ + {'args':['-u','--username', '--user'], 'default': None, 'metavar': 'USERNAME', 'help': 'Test authentication for the account with this username', }, + {'args':['-p', '--password'], 'default': None, 'metavar': 'PASSWORD', 'help': 'Test authentication using this password', }, + ] + misc_options = [ + {'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','--backend'], 'default': 'zeroconf', 'metavar': 'BACKEND', 'help': 'Use this specific backend for testing authentication, see x2gobroker.conf for a list of configured backends', }, + {'args':['-d','--debug'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code', }, + ] + p = argparse.ArgumentParser(description='X2Go Session Broker (Authservice Test Utility)',\ + epilog="WARNING: Using this utility from the command line is not recommended!!!\nYour credentials will get revealed in your shells history file.",\ + formatter_class=argparse.RawDescriptionHelpFormatter, \ + add_help=True, argument_default=None) + p_auth = p.add_argument_group('authentication parameters') + p_misc = p.add_argument_group('miscellaneous parameters') + + for (p_group, opts) in ( (p_auth, auth_options), (p_misc, misc_options), ): + for opt in opts: + args = opt['args'] + del opt['args'] + p_group.add_argument(*args, **opt) + + cmdline_args = p.parse_args() + + if cmdline_args.username is None or cmdline_args.password is None: + p.print_help() + print + print "*** Cannot continue without username and password... ***" + print + sys.exit(-1) + + if cmdline_args.config_file is not None: + x2gobroker.defaults.X2GOBROKER_CONFIG = cmdline_args.config_file + + x2gobroker.defaults.X2GOBROKER_DEBUG = cmdline_args.debug + username = cmdline_args.username + password = cmdline_args.password + +import x2gobroker.config + +config_file = x2gobroker.defaults.X2GOBROKER_CONFIG +config_defaults = x2gobroker.defaults.X2GOBROKER_CONFIG_DEFAULTS + +try: + exec("import x2gobroker.brokers.{backend}_broker as _backend".format(backend=cmdline_args.backend)) +except ImportError: + p.print_help() + print + print "*** No such backend: {backend} or backend not enabled... ***".format(backend=cmdline_args.backend) + print + sys.exit(-1) + + +def check_password(environ, username, password): + return _backend.X2GoBroker(config_file=config_file, config_defaults=config_defaults)._do_authenticate(username=username, password=password) + +if __name__ == "__main__": + + if check_password(os.environ, username, password): + print "authentication succeeded" + sys.exit(0) + else: + print "authentication failed" + sys.exit(-1) diff --git a/debian/changelog b/debian/changelog index b988850..79326c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ x2gobroker (0.0.1.1-0~x2go1) UNRELEASED; urgency=low - Move AuthService server code fully into x2gobroker-authservice daemon script. - Add forgotten file: x2gobroker-authservice-logger.conf. (Fixes: #180). + - Add script: x2gobroker-testauth. * /debian/control: + Fix --root parameter in DEB_PYTHON_INSTALL_ARGS. + Let bin:package x2gobroker-authservice depend on python-x2gobroker (of the diff --git a/debian/x2gobroker.install b/debian/x2gobroker.install index 693dad3..adad505 100644 --- a/debian/x2gobroker.install +++ b/debian/x2gobroker.install @@ -1,2 +1,3 @@ +bin/x2gobroker-testauth usr/bin/ sbin/x2gobroker usr/sbin/ -sbin/x2gobroker-keygen usr/sbin/ \ No newline at end of file +sbin/x2gobroker-keygen usr/sbin/ diff --git a/sbin/x2gobroker b/sbin/x2gobroker index a092172..c23e195 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -115,7 +115,7 @@ import x2gobroker.web.extras urls = ( ('/plain/(.*)', x2gobroker.web.plain.X2GoBrokerWeb,), # ('/json/(.*)', x2gobroker.web.json.X2GoBrokerWeb,), # ('/html/(.*)', x2gobroker.web.html.X2GoBrokerWeb,), - ('/pubkeys/', x2gobroker.web.extras.X2GoBrokerPubKeyService,), + ('/pubkeys(|/)$', x2gobroker.web.extras.X2GoBrokerPubKeyService,), ) settings = { 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 - uccsoutput (branch) updated: 0.0.1.0-61-gf179ced
by git-admin＠x2go.org 19 Apr '13

19 Apr '13

The branch, uccsoutput has been updated via f179ced3058fdf13019f66c3a2123025800f9dbd (commit) from 0e636fb79ad5035c932a21fa52c5223d31aee9b5 (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 f179ced3058fdf13019f66c3a2123025800f9dbd Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Apr 19 13:26:37 2013 +0200 allow trailing slash in /pubkeys/ URL ----------------------------------------------------------------------- Summary of changes: sbin/x2gobroker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/sbin/x2gobroker b/sbin/x2gobroker index 5abd86d..aff9f8d 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -117,7 +117,7 @@ urls = ( ('/plain/(.*)', x2gobroker.web.plain.X2GoBrokerWeb,), ('/uccs/(.*)', x2gobroker.web.uccs.X2GoBrokerWeb,), # ('/json/(.*)', x2gobroker.web.json.X2GoBrokerWeb,), # ('/html/(.*)', x2gobroker.web.html.X2GoBrokerWeb,), - ('/pubkeys/', x2gobroker.web.extras.X2GoBrokerPubKeyService,), + ('/pubkeys(|/)$', x2gobroker.web.extras.X2GoBrokerPubKeyService,), ) settings = { 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

page changed: doc:installation:x2goserver
by wiki-admin＠x2go.org 19 Apr '13

19 Apr '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/04/19 11:18 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:18.0) Gecko/20100101 Firefox/18.0 Iceweasel/18.0.1 IP-Address : 46.115.72.47 Hostname : 46.115.72.47 Old Revision: http://wiki.x2go.org/doku.php/doc:installation:x2goserver?rev=1363365523 New Revision: http://wiki.x2go.org/doku.php/doc:installation:x2goserver Edit Summary: User : sunweaver @@ -77,7 +77,6 @@ <code bash> sudo yum install x2goserver </code> - **Warning:** Note that currently the server must be in runlevel 5 to accept connections. -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

x2gobroker.git - master (branch) updated: 0.0.1.0-28-ga007b3e
by git-admin＠x2go.org 19 Apr '13

19 Apr '13

The branch, master has been updated via a007b3e4f9a645c500c033cf6517542d76d6ad0b (commit) via d459b5ba3c9024cdc56f3af809f364e27ae8453d (commit) from cd4bad34085b1f22461b25d3590e93b9d77961b1 (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 a007b3e4f9a645c500c033cf6517542d76d6ad0b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Apr 17 21:11:36 2013 +0200 add dependency on adduser for x2gobroker-authservice commit d459b5ba3c9024cdc56f3af809f364e27ae8453d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Apr 19 13:09:54 2013 +0200 avoid binaries-have-file-conflict lintian issue ----------------------------------------------------------------------- Summary of changes: debian/control | 1 + debian/python-x2gobroker.install | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/control b/debian/control index a493d8a..2425279 100644 --- a/debian/control +++ b/debian/control @@ -87,6 +87,7 @@ Architecture: all Depends: ${python:Depends}, ${misc:Depends}, + adduser, python, python-argparse, python-setproctitle, diff --git a/debian/python-x2gobroker.install b/debian/python-x2gobroker.install index c8bd09a..edbea88 100644 --- a/debian/python-x2gobroker.install +++ b/debian/python-x2gobroker.install @@ -1,4 +1,5 @@ etc/x2gobroker.conf etc/x2go/ -etc/broker etc/x2go/ +etc/broker/x2gobroker-sessionprofiles.conf etc/x2go/broker/ +etc/broker/x2gobroker-loggers.conf etc/x2go/broker/ pam/x2gobroker etc/pam.d/ usr/ 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 - uccsoutput (branch) updated: 0.0.1.0-60-g0e636fb
by git-admin＠x2go.org 19 Apr '13

19 Apr '13

The branch, uccsoutput has been updated via 0e636fb79ad5035c932a21fa52c5223d31aee9b5 (commit) from b4c67f1174da40d1ed53b64f994a866de1de7606 (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 0e636fb79ad5035c932a21fa52c5223d31aee9b5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Apr 19 13:09:54 2013 +0200 avoid binaries-have-file-conflict lintian issue ----------------------------------------------------------------------- Summary of changes: debian/python-x2gobroker.install | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/python-x2gobroker.install b/debian/python-x2gobroker.install index c8bd09a..edbea88 100644 --- a/debian/python-x2gobroker.install +++ b/debian/python-x2gobroker.install @@ -1,4 +1,5 @@ etc/x2gobroker.conf etc/x2go/ -etc/broker etc/x2go/ +etc/broker/x2gobroker-sessionprofiles.conf etc/x2go/broker/ +etc/broker/x2gobroker-loggers.conf etc/x2go/broker/ pam/x2gobroker etc/pam.d/ usr/ 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.1.0-26-gcd4bad3
by git-admin＠x2go.org 19 Apr '13

19 Apr '13

The branch, master has been updated via cd4bad34085b1f22461b25d3590e93b9d77961b1 (commit) from 087c7780d2eeed2810160c79da7cc3a8c62526b8 (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 cd4bad34085b1f22461b25d3590e93b9d77961b1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Apr 19 12:57:46 2013 +0200 install x2gobroker-authservice-logger.conf into x2gobroker-authservice package ----------------------------------------------------------------------- Summary of changes: debian/x2gobroker-authservice.install | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/x2gobroker-authservice.install b/debian/x2gobroker-authservice.install index 8d466ac..00e5a97 100644 --- a/debian/x2gobroker-authservice.install +++ b/debian/x2gobroker-authservice.install @@ -1,2 +1,3 @@ sbin/x2gobroker-authservice usr/sbin/ -logrotate/x2gobroker-authservice etc/logrotate.d/ \ No newline at end of file +logrotate/x2gobroker-authservice etc/logrotate.d/ +etc/broker/x2gobroker-authservice-logger.conf etc/x2go/broker \ No newline at end of file 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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits