x2go-commits June 2013

x2go-commits@lists.x2go.org

1 participants
1546 discussions

x2gobroker.git - statusflag (branch) updated: 0.0.0.1-44-g6267590
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag has been updated via 62675904dff3890b3cd24cc9d819d4040bd38530 (commit) from 7009b45598b63ddc76192f7fc87bc9a80b15e8bc (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: lib/x2gobroker-agent.pl | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) The diff of changes is: diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl index 481de06..3155837 100755 --- a/lib/x2gobroker-agent.pl +++ b/lib/x2gobroker-agent.pl @@ -121,36 +121,28 @@ if( ($mode eq 'findbusyservers_by_sessionstats') || ($mode eq 'findbusyservers') InitX2GoUser($uid, $uidNumber, $gidNumber, $home); print "OK\n"; - my $session_list = `/bin/su - -c \"x2golistsessions_root --all-servers\"`; my $busy_servers = `/bin/su - $uid -c \"x2gogetservers\"`; - my $amount_sessions = 0; - # initialize server_load hash my %server_load = (); + my $num_sessions = 0; foreach (split('\n', $busy_servers)) { - $server_load{$_} = 0; - } - - # count sessions per server - my @session_list = split(/\n/, $session_list); - foreach (@session_list) - { - my ($apid, $sid, $disp, $hostname, $stat, $dcreated, $cookie, $gport, $sndport, $dsusp, $username, $fsport) = split('\\|', $_); - $amount_sessions++; - $server_load{$hostname} += 1; + my ($hostname, $num_users) = split(' ', $_); + $server_load{$hostname} = $num_users; + $num_sessions += $num_users; } # render the output result my @result; for my $hostname ( keys %server_load ) { - my $available = $server_load{$hostname}/$amount_sessions*100; + my $available = $server_load{$hostname}/$num_sessions*100; push @result, sprintf '%1$d:%2$s', $available, $hostname; } - print join('\n', sort @result); + print join("\n", sort @result); print "\n"; } + if($mode eq 'getservers') { InitX2GoUser($uid, $uidNumber, $gidNumber, $home); 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 - statusflag (branch) updated: 0.0.0.1-43-g7009b45
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag has been updated via 7009b45598b63ddc76192f7fc87bc9a80b15e8bc (commit) from 0be15373a8d8833277f8dcdb7274f2e4d425721a (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2gobroker/agent.py | 6 +++--- x2gobroker/brokers/base_broker.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index 3fe9feb..1192063 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -103,7 +103,7 @@ def list_sessions(username, query_mode='LOCAL', remote_agent=None): @type remote_agent: C{dict} """ - if query_mode == 'LOCAL': + if query_mode.upper() == u'LOCAL': return call_local_broker_agent(username, mode='listsessions') else: return call_remote_broker_agent(username, mode='listsessions', remote_agent=remote_agent) @@ -124,7 +124,7 @@ def find_busy_servers(username, query_mode='LOCAL', remote_agent=None): @type remote_agent: C{dict} """ - if query_mode == 'LOCAL': + if query_mode.upper() == u'LOCAL': server_list = call_local_broker_agent(username, mode='findbusyservers') else: server_list = call_remote_broker_agent(username, mode='findbusyservers', remote_agent=remote_agent) @@ -152,7 +152,7 @@ def get_servers(username, query_mode='LOCAL', remote_agent=None): @type remote_agent: C{dict} """ - if query_mode == 'LOCAL': + if query_mode.upper() == u'LOCAL': return call_local_broker_agent(username, mode='getservers') else: return call_local_broker_agent(username, mode='getservers', remote_agent=remote_agent) diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 13235cb..54d68e6 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -736,7 +736,7 @@ class X2GoBroker(object): if len(server_list) >= 2: remote_agent = None - if agent_query_mode == 'SSH': + if agent_query_mode.upper() == u'SSH': random.shuffle(server_list) remote_agent_server = server_list[0] remote_agent_port = profile[u'sshport'] @@ -765,7 +765,7 @@ class X2GoBroker(object): # do some load balancing if more than one server is configured if len(server_list) >= 2 and username: - session_list = x2gobroker.agent.list_sessions(username=username) + session_list = x2gobroker.agent.list_sessions(username=username, query_mode=agent_query_mode, remote_agent=remote_agent) if session_list: # if resuming, always select the first session in the list, there should only be one suspended session 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 - statusflag (branch) updated: 0.0.0.1-42-g0be1537
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag has been updated via 0be15373a8d8833277f8dcdb7274f2e4d425721a (commit) from 9ed3a78cd49d01e4c056b8d93ae8b2f3709a00c4 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/x2gobroker-authservice.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/x2gobroker-authservice.init b/debian/x2gobroker-authservice.init index d531f78..c00c800 100755 --- a/debian/x2gobroker-authservice.init +++ b/debian/x2gobroker-authservice.init @@ -84,7 +84,7 @@ case "${1:-}" in ;; stop) if [ -f $PIDFILE_AUTHSERVICE ] ; then - log_daemon_msg "X2Go Broker Authentication Service" "$(basename $AUTHSERVICE)" + log_daemon_msg "Stopping X2Go Broker Authentication Service" "$(basename $AUTHSERVICE)" set +e start-stop-daemon -K -p $PIDFILE_AUTHSERVICE rm -f $PIDFILE_AUTHSERVICE 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 - statusflag (branch) updated: 0.0.0.1-45-gf703bae
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag has been updated via f703baeb847d1ac9c877faee34f93e08e0af22d6 (commit) from 62675904dff3890b3cd24cc9d819d4040bd38530 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2gobroker/agent.py | 4 +++- x2gobroker/brokers/base_broker.py | 2 +- x2gobroker/web/plain.py | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index 1192063..d055079 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -50,7 +50,9 @@ def call_local_broker_agent(username, mode): shell=False, ) - return agent_process.stdout.read().split('\n') + result = agent_process.stdout.read().split('\n') + if result[0].startswith('OK'): + return result[1:] def call_remote_broker_agent(username, mode, remote_agent): """\ diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 54d68e6..9e811c0 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -770,7 +770,7 @@ class X2GoBroker(object): # if resuming, always select the first session in the list, there should only be one suspended session server_name = session_list[0].split('|')[3] - session_info = session_list[0].split('|')[1] + session_info = session_list[0] selected_session.update({ 'server': server_name, diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py index 70ce4a6..2e88de9 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/web/plain.py @@ -156,8 +156,8 @@ class X2GoBrokerWebPlain: if profile_info.has_key('authentication_key'): output += "" if profile_info.has_key('session_info'): - output += "SESSION_INFOS:\n" - output += "\n".join(profile_info['session_info']) + "\n" + output += "SESSION_INFO:" + output += profile_info['session_info'] + "\n" return output 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 - statusflag (branch) updated: 0.0.0.1-41-g9ed3a78
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag has been updated via 9ed3a78cd49d01e4c056b8d93ae8b2f3709a00c4 (commit) from 169a3bb77b455408af57f65ab47ed1ea63df4287 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/control | 1 + debian/python-x2gobroker.postinst | 47 ------------------------------------- debian/x2gobroker-daemon.postinst | 5 ++++ debian/x2gobroker-daemon.postrm | 4 ++++ 4 files changed, 10 insertions(+), 47 deletions(-) delete mode 100755 debian/python-x2gobroker.postinst The diff of changes is: diff --git a/debian/control b/debian/control index 833c10f..769975d 100644 --- a/debian/control +++ b/debian/control @@ -84,6 +84,7 @@ Architecture: all Depends: ${misc:Depends}, ${python:Depends}, + adduser, x2gobroker (>= ${source:Version}), x2gobroker (<< ${source:Version}.1~), Recommends: x2gobroker-authservice, diff --git a/debian/python-x2gobroker.postinst b/debian/python-x2gobroker.postinst deleted file mode 100755 index 6299aea..0000000 --- a/debian/python-x2gobroker.postinst +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -# postinst script for python-x2gobroker -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * <postinst> `configure' <most-recently-configured-version> -# * <old-postinst> `abort-upgrade' <new version> -# * <conflictor's-postinst> `abort-remove' `in-favour' <package> -# <new-version> -# * <postinst> `abort-remove' -# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' -# <failed-install-package> <version> `removing' -# <conflicting-package> <version> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - configure) - - # the python-x2gobroker needs special permissions on its log directory - if ! dpkg-statoverride --list /var/log/x2gobroker >/dev/null; then - dpkg-statoverride --add --update x2gobroker adm 2750 /var/log/x2gobroker - fi - - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff --git a/debian/x2gobroker-daemon.postinst b/debian/x2gobroker-daemon.postinst index fca14ca..dea98bc 100755 --- a/debian/x2gobroker-daemon.postinst +++ b/debian/x2gobroker-daemon.postinst @@ -40,6 +40,11 @@ case "$1" in echo "User x2gobroker already exists." >&2 fi + # the x2gobroker-daemon needs special permissions on its log directory + if ! dpkg-statoverride --list /var/log/x2gobroker >/dev/null; then + dpkg-statoverride --add --update x2gobroker adm 2750 /var/log/x2gobroker + fi + ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/x2gobroker-daemon.postrm b/debian/x2gobroker-daemon.postrm index 678bbb9..a8ebd42 100755 --- a/debian/x2gobroker-daemon.postrm +++ b/debian/x2gobroker-daemon.postrm @@ -19,6 +19,10 @@ set -e case "$1" in purge) + if dpkg-statoverride --list /var/log/x2gobroker >/dev/null; then + dpkg-statoverride --remove /var/log/x2gobroker + fi + if [ ! -d /usr/share/doc/x2gobroker-agent ]; then # remove user/group x2gobroker from system (only if not in use by x2gobroker-agent getent passwd x2gobroker >/dev/null && deluser x2gobroker 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 - statusflag (branch) updated: 0.0.0.1-47-g9999ded
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag has been updated via 9999ded2eb06bb37af92e788dc4396d4885e9006 (commit) from e1e748e3c3b804f4ddccce138ee12069004e816b (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2gobroker/agent.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index 3beeaff..c9d2489 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -52,7 +52,7 @@ def call_local_broker_agent(username, mode): result = agent_process.stdout.read().split('\n') if result[0].startswith('OK'): - return result[1:] + return [ r for r in result[1:] if r ] def call_remote_broker_agent(username, mode, remote_agent): """\ 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 - statusflag (branch) updated: 0.0.0.1-48-ga2812b2
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag has been updated via a2812b2002642d90235c96462e993f6d5d667642 (commit) from 9999ded2eb06bb37af92e788dc4396d4885e9006 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: etc/broker/x2gobroker-loggers.conf | 8 ++++---- x2gobroker/loggers.py | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) The diff of changes is: diff --git a/etc/broker/x2gobroker-loggers.conf b/etc/broker/x2gobroker-loggers.conf index 4c395a2..87d7dca 100644 --- a/etc/broker/x2gobroker-loggers.conf +++ b/etc/broker/x2gobroker-loggers.conf @@ -25,17 +25,17 @@ keys=root,broker,authservice,access,error [logger_root] level=NOTSET -handlers=stdoutHandler +handlers=stderrHandler [handlers] -keys=stdoutHandler,brokerFileHandler,authserviceFileHandler,accessFileHandler,errorFileHandler +keys=stderrHandler,brokerFileHandler,authserviceFileHandler,accessFileHandler,errorFileHandler [formatters] keys=brokerFormatter,authserviceFormatter,accessFormatter,errorFormatter -[handler_stdoutHandler] +[handler_stderrHandler] class=StreamHandler -args=(sys.stdout,) +args=(sys.stderr,) [logger_broker] level=DEBUG diff --git a/x2gobroker/loggers.py b/x2gobroker/loggers.py index 2dd9178..303e2b9 100644 --- a/x2gobroker/loggers.py +++ b/x2gobroker/loggers.py @@ -49,24 +49,24 @@ if getpass.getuser() == X2GOBROKER_DAEMON_USER: else: logger_root = logging.getLogger() - stdout_handler = logging.StreamHandler(sys.stdout) - stdout_handler.setFormatter(logging.Formatter(fmt='%(asctime)s - %(name)s - %(levelname)s - %(message)s', datefmt='')) + stderr_handler = logging.StreamHandler(sys.stderr) + stderr_handler.setFormatter(logging.Formatter(fmt='%(asctime)s - %(name)s - %(levelname)s - %(message)s', datefmt='')) - # all loggers stream to stdout... - logger_root.addHandler(stdout_handler) + # all loggers stream to stderr... + logger_root.addHandler(stderr_handler) logger_broker = logging.getLogger('broker') - logger_broker.addHandler(stdout_handler) + logger_broker.addHandler(stderr_handler) logger_broker.propagate = 0 logger_authservice = logging.getLogger('authservice') - logger_authservice.addHandler(stdout_handler) + logger_authservice.addHandler(stderr_handler) logger_authservice.propagate = 0 logger_access = logging.getLogger('access') - logger_access.addHandler(stdout_handler) + logger_access.addHandler(stderr_handler) logger_access.propagate = 0 logger_error = logging.getLogger('error') - logger_error.addHandler(stdout_handler) + logger_error.addHandler(stderr_handler) logger_error.propagate = 0 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 - statusflag (branch) updated: 0.0.0.1-46-ge1e748e
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag has been updated via e1e748e3c3b804f4ddccce138ee12069004e816b (commit) from f703baeb847d1ac9c877faee34f93e08e0af22d6 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2gobroker/agent.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index d055079..3beeaff 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -134,9 +134,10 @@ def find_busy_servers(username, query_mode='LOCAL', remote_agent=None): server_usage = {} if server_list: - for server_item in server_list.split('\n'): - usage, server = server_item.split(':') - server_usage.update({ server: int(usage) }) + for server_item in server_list: + if ':' in server_item: + usage, server = server_item.split(':') + server_usage.update({ server: int(usage) }) return server_usage 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 - statusflag (branch) updated: 0.0.0.1-35-gd9c17a2
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag has been updated via d9c17a236357d7939415afae5b420917f0e2f212 (commit) from 176c5d672d301ed401172f23f5dac5d765d7f2f6 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 + debian/x2gobroker-daemon.default | 28 ++++++++---- debian/x2gobroker-daemon.init | 51 ++++++++++++++++----- debian/x2gobroker.install | 1 + sbin/x2gobroker | 2 + sbin/x2gobroker-authservice | 67 +++++++++++++++++++++++++++ x2gobroker/authmechs/pam_authmech.py | 4 +- x2gobroker/authservice.py | 84 ++++++++++++++++++++++++++++++++++ x2gobroker/defaults.py | 6 +++ 9 files changed, 223 insertions(+), 22 deletions(-) create mode 100755 sbin/x2gobroker-authservice create mode 100644 x2gobroker/authservice.py The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ad2e00c..ebbbbd3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ x2gobroker (0.0.0.2-0~x2go1) UNRELEASED; urgency=low - Make sure the unprivileged daemon user (x2gobroker) has access to the PID file directory. - Set log level to CRITICAL if running unit tests. + - Perform PAM authentication via an authentication service (the broker + runs as non-privileged user, the authentication service as root). * /debian/control: + Add bin:package x2gobroker-agent. * /debian/x2gobroker-daemon.init: diff --git a/debian/x2gobroker-daemon.default b/debian/x2gobroker-daemon.default index ff315d5..f3c5bc0 100644 --- a/debian/x2gobroker-daemon.default +++ b/debian/x2gobroker-daemon.default @@ -1,35 +1,47 @@ # X2Go Session Broker configuration for Debian # Uncomment to enable the X2Go Session Broker standalone daemon -START_DAEMON=true +START_BROKER=true -# the posix user ID the broker runs under (do not change!) +# For PAM authentication the X2Go Session Broker needs its authentication +# service. The session broker itself runs as a non-privileged user (see below) +# whereas the authentication service must run as super-user root. +# +# If you do not use PAM as authentication mechanism with the X2Go Session Broker, +# you can disable the authentication service here. +START_AUTHSERVICE=true + +# The posix user ID the broker runs under (do not change!) # if you change it nonetheless, make sure that the log file # directory (default: /var/log/x2gobroker) and files in there are # writable by that user #X2GOBROKER_DAEMON_USER=x2gobroker -# run X2Go Session Broker in debug mode, this will make the broker +# Run X2Go Session Broker in debug mode, this will make the broker # available through http GET method calls (otherwise: POST method # only) and you will be able to test the broker through your web # browser (0=disable, 1=enable). #X2GOBROKER_DEBUG=0 -# bind standalone daemon to this address:port +# Bind standalone daemon to this address:port #DAEMON_BIND_ADDRESS=127.0.0.1:8080 -# default X2Go Session Broker backend (available: zeroconf, inifile) +# Default X2Go Session Broker backend (available: zeroconf, inifile) #X2GOBROKER_DEFAULT_BACKEND=zeroconf -# path to the X2Go Session Broker's configuration file +# Path to the X2Go Session Broker's configuration file #X2GOBROKER_CONFIG=/etc/x2go/x2gobroker.conf -# path to the X2Go Session Broker's session profiles file (when using the inifile backend) +# Path to the X2Go Session Broker's session profiles file (when using the inifile backend) #X2GOBROKER_SESSIONPROFILES=/etc/x2go/broker/x2gobroker-sessionprofiles.conf -# path to the X2Go Session Broker's agent command +# 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 + + ########################################################## ### ### ### Enable SSL Support ### diff --git a/debian/x2gobroker-daemon.init b/debian/x2gobroker-daemon.init index fba7672..67276e4 100755 --- a/debian/x2gobroker-daemon.init +++ b/debian/x2gobroker-daemon.init @@ -19,13 +19,16 @@ set -eu DAEMON=/usr/sbin/x2gobroker +AUTHSERVICE=/usr/sbin/x2gobroker-authservice test -d /run && RUNDIR=/run || RUNDIR=/var/run -PIDFILE=$RUNDIR/x2gobroker/x2gobroker-daemon.pid +PIDFILE_BROKER=$RUNDIR/x2gobroker/x2gobroker-daemon.pid +PIDFILE_AUTHSERVICE=$RUNDIR/x2gobroker/x2gobroker-authservice.pid DEBIANCONFIG=/etc/default/x2gobroker-daemon test -x "$DAEMON" || exit 0 -START_DAEMON=false +START_BROKER=false +START_AUTHSERVICE=false DAEMON_BIND_ADDRESS=127.0.0.1:8080 X2GOBROKER_DEBUG=0 X2GOBROKER_DAEMON_USER='x2gobroker' @@ -33,6 +36,7 @@ X2GOBROKER_DEFAULT_BACKEND="zeroconf" X2GOBROKER_CONFIG="/etc/x2go/x2gobroker.conf" X2GOBROKER_SESSIONPROFILES="/etc/x2go/broker/x2gobroker-sessionprofiles.conf" X2GOBROKER_AGENT_CMD="/usr/lib/x2go/x2gobroker-agent" +X2GOBROKER_AUTHSERVICE_SOCKET="$RUNDIR/x2gobroker/x2gobroker-authservice.socket" X2GOBROKER_SSL_CERTFILE= X2GOBROKER_SSL_KEYFILE= test -f $DEBIANCONFIG && . $DEBIANCONFIG @@ -57,6 +61,7 @@ export X2GOBROKER_CONFIG export X2GOBROKER_DEFAULT_BACKEND export X2GOBROKER_SESSIONPROFILES export X2GOBROKER_AGENT_CMD +export X2GOBROKER_AUTHSERVICE_SOCKET export X2GOBROKER_SSL_CERTFILE export X2GOBROKER_SSL_KEYFILE @@ -72,28 +77,50 @@ is_true() case "${1:-}" in start) - if [ -e $PIDFILE ]; then + if [ -e $PIDFILE_BROKER ]; then if ps -u $X2GOBROKER_DAEMON_USER | grep $(basename $DAEMON) 1>/dev/null 2>/dev/null; then log_warning_msg "X2Go Session Broker already running" else - log_warning_msg "X2Go Session Broker: stale PID file ($PIDFILE). Delete it manually!" + log_warning_msg "X2Go Session Broker: stale PID file ($PIDFILE_BROKER). Delete it manually!" fi - START_DAEMON=no + START_BROKER=no fi - if is_true $START_DAEMON; then - log_daemon_msg "Starting X2Go Session Broker standalone daemon" $(basename $DAEMON) + 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 -x $DAEMON -- -b $DAEMON_BIND_ADDRESS + start-stop-daemon --chuid $X2GOBROKER_DAEMON_USER -b -m -S -p $PIDFILE_BROKER -x $DAEMON -- -b $DAEMON_BIND_ADDRESS log_end_msg $? set -e + if [ -e $PIDFILE_AUTHSERVICE ]; then + if ps -u root | grep $(basename $AUTHSERVICE) 1>/dev/null 2>/dev/null; then + log_warning_msg "X2Go Broker Authentication Service already running" + else + log_warning_msg "X2Go Broker Authentication Service: stale PID file ($PIDFILE_AUTHSERVICE). Delete it manually!" + fi + START_AUTHSERVICE=no + fi + if is_true $START_AUTHSERVICE; then + set +e + log_daemon_msg "Starting X2Go Broker Authentication Service" "$(basename $AUTHSERVICE)" + start-stop-daemon -b -m -S -p $PIDFILE_AUTHSERVICE -x $AUTHSERVICE -- -s $X2GOBROKER_AUTHSERVICE_SOCKET + set -e + fi fi ;; stop) - if [ -f $PIDFILE ] ; then - log_daemon_msg "Stopping X2Go Session Broker standalone daemon" "x2gobroker" + if [ -f $PIDFILE_BROKER ] ; then + log_daemon_msg "Stopping X2Go Session Broker standalone daemon" "$(basename $DAEMON)" + set +e + start-stop-daemon -K -p $PIDFILE_BROKER + rm -f $PIDFILE_BROKER + log_end_msg $? + set -e + fi + if [ -f $PIDFILE_AUTHSERVICE ] ; then + log_daemon_msg "X2Go Broker Authentication Service" "$(basename $AUTHSERVICE)" set +e - start-stop-daemon -K -p $PIDFILE - rm -f $PIDFILE + start-stop-daemon -K -p $PIDFILE_AUTHSERVICE + rm -f $PIDFILE_AUTHSERVICE log_end_msg $? set -e fi diff --git a/debian/x2gobroker.install b/debian/x2gobroker.install index fac20e4..29dc1c0 100644 --- a/debian/x2gobroker.install +++ b/debian/x2gobroker.install @@ -1 +1,2 @@ sbin/x2gobroker usr/sbin/ +sbin/x2gobroker-authservice usr/sbin/ \ No newline at end of file diff --git a/sbin/x2gobroker b/sbin/x2gobroker index da91b0e..bb52019 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -1,5 +1,7 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- + # 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> diff --git a/sbin/x2gobroker-authservice b/sbin/x2gobroker-authservice new file mode 100755 index 0000000..12974f8 --- /dev/null +++ b/sbin/x2gobroker-authservice @@ -0,0 +1,67 @@ +#!/usr/bin/env python + +# -*- coding: utf-8 -*- + +# 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 + +try: + import x2gobroker.authservice +except ImportError: + sys.path.insert(0, os.path.join(os.getcwd(), '..')) + import x2gobroker.authservice + +PROG_NAME = os.path.basename(sys.argv[0]) +PROG_OPTIONS = sys.argv[1:] +setproctitle.setproctitle("%s %s" % (PROG_NAME, " ".join(PROG_OPTIONS))) + +if __name__ == '__main__': + + common_options = [ + {'args':['-s','--socket-file'], 'default': x2gobroker.defaults.X2GOBROKER_AUTHSERVICE_SOCKET, 'metavar': 'AUTHSOCKET', 'help': 'socket file for AuthService communication', }, + {'args':['-d','--debug'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code', }, + ] + p = argparse.ArgumentParser(description='X2Go Session Broker (PAM Auth Service)',\ + formatter_class=argparse.RawDescriptionHelpFormatter, \ + add_help=True, argument_default=None) + p_common = p.add_argument_group('common parameters') + + for (p_group, opts) in ( (p_common, common_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.debug: + x2gobroker.defaults.X2GOBROKER_DEBUG = cmdline_args.debug + + socket_file = cmdline_args.socket_file + x2gobroker.authservice.AuthService(socket_file) + try: + x2gobroker.authservice.loop() + except KeyboardInterrupt: + pass diff --git a/x2gobroker/authmechs/pam_authmech.py b/x2gobroker/authmechs/pam_authmech.py index fca5ec0..b46d1a2 100644 --- a/x2gobroker/authmechs/pam_authmech.py +++ b/x2gobroker/authmechs/pam_authmech.py @@ -18,7 +18,7 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -import pam +import x2gobroker.authservice class X2GoBrokerAuthMech(object): @@ -26,7 +26,7 @@ class X2GoBrokerAuthMech(object): # do a simple PAM authentication against the PAM service ,,x2gobroker'' if username and password: - if pam.authenticate(username, password, service="x2gobroker"): + if x2gobroker.authservice.authenticate(username, password, service="x2gobroker"): return True return False diff --git a/x2gobroker/authservice.py b/x2gobroker/authservice.py new file mode 100644 index 0000000..018be90 --- /dev/null +++ b/x2gobroker/authservice.py @@ -0,0 +1,84 @@ +# -*- coding: utf-8 -*- + +# 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 asyncore +import pam +import socket + +import x2gobroker.defaults + +class AuthClient(asyncore.dispatcher_with_send): + + def __init__(self, sock): + asyncore.dispatcher_with_send.__init__(self, sock) + self._buf = '' + + def handle_read(self): + data = self._buf + self.recv(1024) + if not data: + self.close() + return + reqs, data = data.rsplit('\n', 1) + self._buf = data + for req in reqs.split('\n'): + try: + user, passwd, service = req.split() + except: + self.send('bad\n') + else: + if pam.authenticate(user, passwd, service): + self.send('ok\n') + else: + self.send('fail\n') + + def handle_close(self): + self.close() + + +class AuthService(asyncore.dispatcher_with_send): + + def __init__(self, socketfile): + asyncore.dispatcher_with_send.__init__(self) + self.create_socket(socket.AF_UNIX, socket.SOCK_STREAM) + self.set_reuse_addr() + self.bind(socketfile) + self.listen(1) + + def handle_accept(self): + conn, _ = self.accept() + AuthClient(conn) + + +def loop(): + asyncore.loop() + + +def authenticate(username, password, service="x2gobroker"): + s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + s.connect(x2gobroker.defaults.X2GOBROKER_AUTHSERVICE_SOCKET) + + s.send('{username} {password} {service}\n'.format(username=username, password=password, service=service)) + result = s.recv(1024) + s.close() + if result.startswith('ok'): + return True + return False diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index 4e90837..c02ce43 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -84,6 +84,12 @@ else: X2GOBROKER_AGENT_CMD = "/usr/lib/x2go/x2gobroker-agent" logger_broker.info(' X2GOBROKER_AGENT_CMD: {value}'.format(value=X2GOBROKER_AGENT_CMD)) +if os.environ.has_key('X2GOBROKER_AUTHSERVICE_SOCKET'): + X2GOBROKER_AUTHSERVICE_SOCKET=os.environ['X2GOBROKER_AUTHSERVICE_SOCKET'] +else: + X2GOBROKER_AUTHSERVICE_SOCKET="/var/run/x2gobroker-authservice.socket" +logger_broker.info(' X2GOBROKER_AUTHSERVICE_SOCKET: {value}'.format(value=X2GOBROKER_AUTHSERVICE_SOCKET)) + if os.environ.has_key('X2GOBROKER_DEFAULT_BACKEND'): X2GOBROKER_DEFAULT_BACKEND = os.environ['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 - statusflag (branch) updated: 0.0.0.1-34-g176c5d6
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag has been updated via 176c5d672d301ed401172f23f5dac5d765d7f2f6 (commit) from bb450a2ea118c06895c26080e1a2fed06ceec5ae (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2gobroker/brokers/base_broker.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 6bbb227..be8b4e8 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -61,9 +61,10 @@ class X2GoBroker(object): X2Go Client with an intermediate session broker. """ - if config_file is None: config_file = x2gobroker.defaults.X2GOBROKER_CONFIG + self.config_file = config_file + if self.config_file is None: self.config_file = x2gobroker.defaults.X2GOBROKER_CONFIG if config_defaults is None: config_defaults = x2gobroker.defaults.X2GOBROKER_CONFIG_DEFAULTS - self.config = x2gobroker.config.X2GoBrokerConfigFile(config_files=config_file, defaults=config_defaults) + self.config = x2gobroker.config.X2GoBrokerConfigFile(config_files=self.config_file, defaults=config_defaults) self._dynamic_authid_map = {} self._client_address = None @@ -617,6 +618,7 @@ class X2GoBroker(object): ### This is handled through the config file, normally /etc/x2go/x2gobroker.conf if not self.config.get_value('global', 'check-credentials'): + logger_broker.debug('base_broker.X2GoBroker.check_access(): access is granted without checking credentials, prevent this in {configfile}'.format(configfile=self.config_file)) return True ### IMPLEMENT YOUR AUTHENTICATION LOGIC IN THE self._do_authenticate(**kwargs) METHOD @@ -624,6 +626,7 @@ class X2GoBroker(object): 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)) ### HANDLING OF DYNAMIC AUTHENTICATION ID HASHES 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:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits June 2013