x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

x2gobroker.git - build-main (branch) updated: 0.0.0.1-6-g5231ba4
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 5231ba48183cc603a5193400884dd01b360491ba (commit) from 716736e53b9bf284d5bc196b708bc3b2362b50a4 (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 | 1 + lib/x2gobroker-agent.pl | 37 ++++++++++++++ x2gobroker/agent.py | 87 +++++++++++++++++++++++++++++++++ x2gobroker/brokers/base_broker.py | 32 ++++++++++-- x2gobroker/brokers/zeroconf_broker.py | 2 +- x2gobroker/web/plain.py | 2 +- 6 files changed, 156 insertions(+), 5 deletions(-) create mode 100644 x2gobroker/agent.py The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 025cc4c..0984633 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ x2gobroker (0.0.0.2-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.0.0.2): - Make CC, CFLAGS and LDFLAGS configurable through build system. - Make host session option a list, not string. + - Add load balancing support. * /debian/control: + Add bin:package x2gobroker-agent. diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl index 6a64bbf..74e0751 100755 --- a/lib/x2gobroker-agent.pl +++ b/lib/x2gobroker-agent.pl @@ -98,6 +98,43 @@ if($mode eq 'listsessions') exec ("/bin/su - $uid -c \"x2golistsessions --all-servers\""); } +if($mode eq 'findbestserver_by_sessionstats') || ($mode eq 'findbestserver') +{ + InitX2GoUser($uid, $uidNumber, $gidNumber, $home); + print "OK\n"; + my $session_list = `/bin/su - -c \"x2golistsessions_root --all-servers\"`; + my $avail_servers = `/bin/su - $uid -c \"x2gogetservers\"`; + my $amount_sessions = 0; + + # initialize server_load hash + my %server_load = (); + foreach (split('\n', $avail_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; + } + + # render the output result + my @result; + for my $hostname ( keys %server_load ) { + my $available = 100-$server_load{$hostname}/$amount_sessions*100; + if ($available eq 0) { + $available = 100; + } + push @result, sprintf '%1$d:%2$s', $available, $hostname; + } + print join('\n', sort @result); + print "\n"; +} + if($mode eq 'getservers') { diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py new file mode 100644 index 0000000..3e7cdc6 --- /dev/null +++ b/x2gobroker/agent.py @@ -0,0 +1,87 @@ +# -*- coding: utf-8 -*- + +# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.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 subprocess + +# X2Go Broker modules +import x2gobroker.defaults + +def call_x2gobroker_agent(username, mode): + """\ + Launch X2Go Broker Agent and process its output. + + @param username: run the broker agent for this user + @type username: C{unicode} + @param mode: execution mode of the broker (listsessions, getservers, etc.) + @type mode: C{unicode} + + """ + cmdline = [ + '{x2gobroker_agent_binary}'.format(x2gobroker_agent_binary=x2gobroker.defaults.X2GOBROKER_AGENT_CMD), + '{username}'.format(username=username), + '{mode}'.format(mode=mode), + ] + + subprocess.Popen(cmd_line, + stdin=None, + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, + shell=False, + ) + + return subprocess.stdout.read() + +def list_sessions(username): + """\ + Query X2Go Broker Agent for a session list for a given username. + + @param username: username for who to query a session list + @type username: C{unicode} + + """ + return call_broker_agent(username, mode='listsessions') + +def find_best_server(username=None): + """\ + Query X2Go Broker Agent for the best server for the given user. + In many cases the username does not have an effect on the + detection of an optimal server. + + @param username: username for who to query a session list + @type username: C{unicode} + + """ + server_list = call_broker_agent(username, mode='findbestserver') + server_list.sort(reverse=True) + return server_list[0].split(':')[1] + +def get_servers(username=None): + """\ + Query X2Go Broker Agent for the list of available servers + for the given user. In many cases the username does not + have an effect on the list of available servers. + + @param username: username for who to query a session list + @type username: C{unicode} + + """ + return call_broker_agent(username, mode='getservers') + diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index c06dfa6..9c710b3 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -29,10 +29,12 @@ import types import copy import uuid import netaddr +import random # X2Go Broker modules import x2gobroker.config import x2gobroker.defaults +import x2gobroker.agent class X2GoBroker(object): """\ @@ -685,7 +687,7 @@ class X2GoBroker(object): return list_of_profiles - def select_session(self, profile_id): + def select_session(self, profile_id, username=None): """\ Start/resume a session by selecting a profile name offered by the X2Go client. @@ -693,16 +695,40 @@ class X2GoBroker(object): broker. @param profile_id: the selected profile ID. This matches one of the dictionary keys offered by the C{list_profiles} method - @type profile_id: C{dict} + @type profile_id: C{unicode} + @param username: specify username that this operation runs for + @type username: C{unicode} """ profile = self.get_profile(profile_id) + # if we have more than one server, pick one server randomly for X2Go Broker Agent queries + server_list = profile[u'host'] + random.shuffle(server_list) + agent_query_server = server_list[0] + + best_server = x2gobroker.agent.find_best_server() + selected_session = { - 'server': profile[u'host'][0], + 'server': best_server, 'port': profile[u'sshport'], } + # do some load balancing if more than one server is configured + if len(server_list) >= 1 and username: + + session_list = x2gobroker.agent.list_sessions(username=username) + if session_list: + + # 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] + + selected_session.update({ + 'server': server_name, + 'session_info': session_info, + }) + return selected_session def change_password(self, new='', old=''): diff --git a/x2gobroker/brokers/zeroconf_broker.py b/x2gobroker/brokers/zeroconf_broker.py index ad21567..5970659 100644 --- a/x2gobroker/brokers/zeroconf_broker.py +++ b/x2gobroker/brokers/zeroconf_broker.py @@ -76,7 +76,7 @@ class X2GoBroker(base.X2GoBroker): } return list_of_profiles - def select_session(self, profile_id): + def select_session(self, profile_id, username=None): selectprofile_output = { 'server': 'localhost', diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py index b6c5f83..e25b5c0 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/web/plain.py @@ -142,7 +142,7 @@ class X2GoBrokerWebPlain: if profile_id: - profile_info = broker_backend.select_session(profile_id=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'] 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 - build-main (branch) updated: 0.0.0.1-14-gb5df92c
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via b5df92c61e0c84ec314b29acc60e635d43f3b7b0 (commit) from 5ef433db9f943afd56b15351cceb2021184ed43e (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/defaults.py | 74 ++++++++++++++++++++++++++++++++---------------- x2gobroker/loggers.py | 32 +++++++++++++++++---- 2 files changed, 76 insertions(+), 30 deletions(-) The diff of changes is: diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index b85a296..1f250c2 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -22,50 +22,76 @@ # modules import os import uuid +import getpass -# the home directory of the user that the daemon/cgi runs as -X2GOBROKER_HOME = os.path.normpath(os.path.expanduser('~')) +import logging +from loggers import logger_broker, logger_access, logger_error, X2GOBROKER_DAEMON_USER -if os.environ.has_key('X2GOBROKER_CONFIG'): - X2GOBROKER_CONFIG=os.environ['X2GOBROKER_CONFIG'] -else: - X2GOBROKER_CONFIG="/etc/x2go/x2gobroker.conf" +X2GOBROKER_USER = getpass.getuser() -if os.environ.has_key('X2GOBROKER_LOGCONFIG'): - X2GOBROKER_LOGCONFIG=os.environ['X2GOBROKER_LOGCONFIG'] -else: - X2GOBROKER_LOGCONFIG="/etc/x2go/broker/x2gobroker-loggers.conf" +### +### dynamic default values, influencable through os.environ... +### -if os.environ.has_key('X2GOBROKER_SESSIONPROFILES'): - X2GOBROKER_SESSIONPROFILES=os.environ['X2GOBROKER_SESSIONPROFILES'] +if os.environ.has_key('X2GOBROKER_DEBUG'): + X2GOBROKER_DEBUG = ( os.environ['X2GOBROKER_DEBUG'].lower() in ('1', 'on', 'true', 'yes', ) ) else: - X2GOBROKER_SESSIONPROFILES="/etc/x2go/broker/x2gobroker-sessionprofiles.conf" + X2GOBROKER_DEBUG = False +if X2GOBROKER_USER != X2GOBROKER_DAEMON_USER: + X2GOBROKER_DEBUG = True -if os.environ.has_key('X2GOBROKER_DEBUG'): - X2GOBROKER_DEBUG=( os.environ['X2GOBROKER_DEBUG'].lower() in ('1', 'on', 'true', 'yes', ) ) +if X2GOBROKER_DEBUG: + logger_broker.setLevel(logging.DEBUG) + logger_access.setLevel(logging.DEBUG) + logger_error.setLevel(logging.DEBUG) + +if X2GOBROKER_USER != X2GOBROKER_DAEMON_USER: + logger_broker.warn('X2Go Session Broker has been started interactively by user {username}, better run as user {daemon_username}.'.format(username=X2GOBROKER_USER, daemon_username=X2GOBROKER_DAEMON_USER)) + logger_broker.info('Automatically switching to DEBUG mode due to interactive launch of this application.') +logger_broker.info('Setting up the broker\'s environment...') +logger_broker.info(' X2GOBROKER_DEBUG: {value}'.format(value=X2GOBROKER_DEBUG)) + +if os.environ.has_key('X2GOBROKER_CONFIG'): + X2GOBROKER_CONFIG = os.environ['X2GOBROKER_CONFIG'] else: - X2GOBROKER_DEBUG=False + X2GOBROKER_CONFIG = "/etc/x2go/x2gobroker.conf" +logger_broker.info(' X2GOBROKER_CONFIG: {value}'.format(value=X2GOBROKER_CONFIG)) + +X2GOBROKER_SESSIONPROFILES = "/etc/x2go/broker/x2gobroker-sessionprofiles.conf" if os.environ.has_key('X2GOBROKER_AGENT_CMD'): - X2GOBROKER_AGENT_CMD=os.environ['X2GOBROKER_AGENT_CMD'] + X2GOBROKER_AGENT_CMD = os.environ['X2GOBROKER_AGENT_CMD'] else: - X2GOBROKER_AGENT_CMD="/usr/lib/x2go/x2gobroker-agent" + 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_DEFAULT_BACKEND'): - X2GOBROKER_DEFAULT_BACKEND=os.environ['X2GOBROKER_DEFAULT_BACKEND'] + X2GOBROKER_DEFAULT_BACKEND = os.environ['X2GOBROKER_DEFAULT_BACKEND'] else: - X2GOBROKER_DEFAULT_BACKEND="zeroconf" + X2GOBROKER_DEFAULT_BACKEND = "zeroconf" +logger_broker.info(' X2GOBROKER_DEFAULT_BACKEND: {value}'.format(value=X2GOBROKER_DEFAULT_BACKEND)) if os.environ.has_key('X2GOBROKER_SSL_CERTFILE'): - X2GOBROKER_SSL_CERTFILE=os.environ['X2GOBROKER_SSL_CERTFILE'] + X2GOBROKER_SSL_CERTFILE = os.environ['X2GOBROKER_SSL_CERTFILE'] else: - X2GOBROKER_SSL_CERTFILE="" + X2GOBROKER_SSL_CERTFILE = "" +logger_broker.info(' X2GOBROKER_SSL_CERTFILE: {value}'.format(value=X2GOBROKER_SSL_CERTFILE)) if os.environ.has_key('X2GOBROKER_SSL_KEYFILE'): - X2GOBROKER_SSL_KEYFILE=os.environ['X2GOBROKER_SSL_KEYFILE'] + X2GOBROKER_SSL_KEYFILE = os.environ['X2GOBROKER_SSL_KEYFILE'] else: - X2GOBROKER_SSL_KEYFILE="" + X2GOBROKER_SSL_KEYFILE = "" +logger_broker.info(' X2GOBROKER_SSL_KEYFILE: {value}'.format(value=X2GOBROKER_SSL_KEYFILE)) + +### +### static / hard-coded defaults +### + +X2GOBROKER_SESSIONPROFILES = "/etc/x2go/broker/x2gobroker-sessionprofiles.conf" + +# the home directory of the user that the daemon/cgi runs as +X2GOBROKER_HOME = os.path.normpath(os.path.expanduser('~')) # defaults for X2Go Sessino Broker configuration file X2GOBROKER_CONFIG_DEFAULTS = { diff --git a/x2gobroker/loggers.py b/x2gobroker/loggers.py index 7151fd5..e35a9a7 100644 --- a/x2gobroker/loggers.py +++ b/x2gobroker/loggers.py @@ -19,14 +19,22 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +import os import sys import getpass import logging import logging.config -from x2gobroker.defaults import X2GOBROKER_LOGCONFIG as _X2GOBROKER_LOGCONFIG +X2GOBROKER_DAEMON_USER = 'x2gobroker' -if getpass.getuser() == "x2gobroker": +# normally this would go into defaults.py, however, we do not want to create a dependency loop between loggers.py and defaults.py... +if os.environ.has_key('X2GOBROKER_LOGCONFIG'): + X2GOBROKER_LOGCONFIG=os.environ['X2GOBROKER_LOGCONFIG'] +else: + X2GOBROKER_LOGCONFIG="/etc/x2go/broker/x2gobroker-loggers.conf" + +# standalone daemon mode (x2gobroker-daemon) or interactive mode (called from the cmdline)? +if getpass.getuser() == X2GOBROKER_DAEMON_USER: # we run in standalone daemon mode, so let's use the system configuration for logging logging.config.fileConfig(_X2GOBROKER_LOGCONFIG) @@ -38,9 +46,21 @@ if getpass.getuser() == "x2gobroker": else: logger_root = logging.getLogger() - logger_root.addHandler(logging.StreamHandler(sys.stdout)) + stdout_handler = logging.StreamHandler(sys.stdout) + stdout_handler.setFormatter(logging.Formatter(fmt='%(asctime)s - %(name)s - %(levelname)s - %(message)s', datefmt='')) + + # all loggers stream to stdout... + logger_root.addHandler(stdout_handler) + + logger_broker = logging.getLogger('broker') + logger_broker.addHandler(stdout_handler) + logger_broker.propagate = 0 + + logger_access = logging.getLogger('access') + logger_access.addHandler(stdout_handler) + logger_access.propagate = 0 - logger_broker = logger_root - logger_access = logger_root - logger_error = logger_root + logger_error = logging.getLogger('error') + logger_error.addHandler(stdout_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 - build-main (branch) updated: 0.0.0.1-8-gbbe2c8a
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via bbe2c8ab570f8f3e4b0e54a79117b9d93488de40 (commit) from fe7f06c112518bbac361c7e9f80ed721379a0e3b (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 | 1 + debian/python-x2gobroker.dirs | 3 +- ...r-agent.postinst => python-x2gobroker.postinst} | 27 +------ ...roker-agent.postrm => python-x2gobroker.postrm} | 11 +-- etc/broker/x2gobroker-loggers.conf | 81 ++++++++++++++++++++ x2gobroker/defaults.py | 5 ++ x2gobroker/{brokers/ldap_broker.py => loggers.py} | 20 ++--- 7 files changed, 107 insertions(+), 41 deletions(-) copy debian/{x2gobroker-agent.postinst => python-x2gobroker.postinst} (51%) copy debian/{x2gobroker-agent.postrm => python-x2gobroker.postrm} (70%) create mode 100644 etc/broker/x2gobroker-loggers.conf copy x2gobroker/{brokers/ldap_broker.py => loggers.py} (68%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0984633..c8ec285 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ x2gobroker (0.0.0.2-0~x2go1) UNRELEASED; urgency=low - Make CC, CFLAGS and LDFLAGS configurable through build system. - Make host session option a list, not string. - Add load balancing support. + - Add foundation for logging support. * /debian/control: + Add bin:package x2gobroker-agent. diff --git a/debian/python-x2gobroker.dirs b/debian/python-x2gobroker.dirs index 2fd303e..2396e1d 100644 --- a/debian/python-x2gobroker.dirs +++ b/debian/python-x2gobroker.dirs @@ -1,2 +1,3 @@ /etc/x2go -/etc/pam.d \ No newline at end of file +/etc/pam.d +/var/log/x2gobroker \ No newline at end of file diff --git a/debian/x2gobroker-agent.postinst b/debian/python-x2gobroker.postinst similarity index 51% copy from debian/x2gobroker-agent.postinst copy to debian/python-x2gobroker.postinst index 95faece..861b3e0 100755 --- a/debian/x2gobroker-agent.postinst +++ b/debian/python-x2gobroker.postinst @@ -1,13 +1,10 @@ #!/bin/sh -# postinst script for x2gobroker-agent +# postinst script for python-x2gobroker # # see: dh_installdeb(1) set -e -# Source debconf library. -. /usr/share/debconf/confmodule - # summary of how this script can be called: # * <postinst> `configure' <most-recently-configured-version> # * <old-postinst> `abort-upgrade' <new version> @@ -24,25 +21,9 @@ set -e case "$1" in configure) - # setup user/group x2gobroker - if ! getent group x2gobroker >/dev/null; then - echo "Creating x2gobroker group." >&2 - addgroup --system x2gobroker - else - echo "Group x2gobroker already exists." >&2 - fi - if ! getent passwd x2gobroker >/dev/null; then - echo "Creating x2gobroker user." >&2 - adduser --system --no-create-home \ - --disabled-password --disabled-login \ - --shell /bin/false --group --home /dev/null x2gobroker - else - echo "User x2gobroker already exists." >&2 - fi - - # the x2gobroker-agent has to be installed setuid root - if ! dpkg-statoverride --list /usr/lib/x2go/x2gobroker-agent >/dev/null; then - dpkg-statoverride --add --update root x2gobroker 4750 /usr/lib/x2go/x2gobroker-agent + # 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 0750 /var/log/x2gobroker fi ;; diff --git a/debian/x2gobroker-agent.postrm b/debian/python-x2gobroker.postrm similarity index 70% copy from debian/x2gobroker-agent.postrm copy to debian/python-x2gobroker.postrm index d703d32..22abe93 100755 --- a/debian/x2gobroker-agent.postrm +++ b/debian/python-x2gobroker.postrm @@ -18,15 +18,10 @@ set -e case "$1" in purge) - if dpkg-statoverride --list /usr/lib/x2go/x2gobroker-agent >/dev/null; then - dpkg-statoverride --remove /usr/lib/x2go/x2gobroker-agent + if dpkg-statoverride --list /var/log/x2gobroker >/dev/null; then + dpkg-statoverride --remove /var/log/x2gobroker fi - # remove user/group x2gobroker from system - getent passwd x2gobroker >/dev/null && deluser x2gobroker - getent group x2gobroker >/dev/null && delgroup x2gobroker - getent group x2gobroker >/dev/null && delgroup x2gobroker - ;; remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;; @@ -41,4 +36,4 @@ esac #DEBHELPER# -exit 0 \ No newline at end of file +exit 0 diff --git a/etc/broker/x2gobroker-loggers.conf b/etc/broker/x2gobroker-loggers.conf new file mode 100644 index 0000000..36d5e3e --- /dev/null +++ b/etc/broker/x2gobroker-loggers.conf @@ -0,0 +1,81 @@ +# 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. + +[loggers] +keys=root,broker,access,error + +[logger_root] +level=NOTSET +handlers=stdoutHandler + +[handlers] +keys=stdoutHandler,brokerFileHandler,accessFileHandler,errorFileHandler + +[formatters] +keys=brokerFormatter,accessFormatter,errorFormatter + +[handler_stdoutHandler] +class=StreamHandler +args=(sys.stdout,) + +[logger_broker] +level=DEBUG +handlers=brokerFileHandler +qualname=broker +propagate=0 + +[handler_brokerFileHandler] +class=FileHandler +formatter=brokerFormatter +args=('/var/log/x2gobroker/broker.log',) + +[formatter_brokerFormatter] +format=%(asctime)s - %(name)s - %(levelname)s - %(message)s +datefmt= + +[logger_access] +level=DEBUG +handlers=accessFileHandler +qualname=access +propagate=0 + +[handler_accessFileHandler] +class=FileHandler +formatter=accessFormatter +args=('/var/log/x2gobroker/access.log',) + +[formatter_accessFormatter] +format=%(asctime)s - %(name)s - %(levelname)s - %(message)s +datefmt= + +[logger_error] +level=DEBUG +handlers=errorFileHandler +qualname=error +propagate=0 + +[handler_errorFileHandler] +class=FileHandler +formatter=accessFormatter +args=('/var/log/x2gobroker/error.log',) + +[formatter_errorFormatter] +format=%(asctime)s - %(name)s - %(levelname)s - %(message)s +datefmt= diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index 48b61d8..b85a296 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -31,6 +31,11 @@ if os.environ.has_key('X2GOBROKER_CONFIG'): else: X2GOBROKER_CONFIG="/etc/x2go/x2gobroker.conf" +if os.environ.has_key('X2GOBROKER_LOGCONFIG'): + X2GOBROKER_LOGCONFIG=os.environ['X2GOBROKER_LOGCONFIG'] +else: + X2GOBROKER_LOGCONFIG="/etc/x2go/broker/x2gobroker-loggers.conf" + if os.environ.has_key('X2GOBROKER_SESSIONPROFILES'): X2GOBROKER_SESSIONPROFILES=os.environ['X2GOBROKER_SESSIONPROFILES'] else: diff --git a/x2gobroker/brokers/ldap_broker.py b/x2gobroker/loggers.py similarity index 68% copy from x2gobroker/brokers/ldap_broker.py copy to x2gobroker/loggers.py index 61857d8..4493091 100644 --- a/x2gobroker/brokers/ldap_broker.py +++ b/x2gobroker/loggers.py @@ -2,6 +2,7 @@ # Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.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 @@ -18,16 +19,17 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -"""\ -L{ldap.X2GoBroker} class - a production X2GoBroker implementations that uses LDAP as configuration backend +import logging +import logging.config -""" -__NAME__ = 'x2gobroker-pylib' +from x2gobroker.defaults import X2GOBROKER_LOGCONFIG as _X2GOBROKER_LOGCONFIG -# modules -import x2gobroker.base_broker as base +logging.config.fileConfig(_X2GOBROKER_LOGCONFIG) -class X2GoBroker(x2gobroker.base.X2GoBroker): - """\ +print dir(logging.config) + +# create loggers +logger_broker = logging.getLogger('broker') +logger_access = logging.getLogger('access') +logger_error = logging.getLogger('error') - """ 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 - build-main (branch) updated: 0.0.0.1-7-gfe7f06c
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via fe7f06c112518bbac361c7e9f80ed721379a0e3b (commit) from 5231ba48183cc603a5193400884dd01b360491ba (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-daemon.default | 9 ++++++++- debian/x2gobroker-daemon.init | 6 +++--- etc/x2gobroker.conf | 2 +- sbin/x2gobroker | 3 +++ 4 files changed, 15 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/x2gobroker-daemon.default b/debian/x2gobroker-daemon.default index 47ccb43..452a75b 100644 --- a/debian/x2gobroker-daemon.default +++ b/debian/x2gobroker-daemon.default @@ -24,7 +24,14 @@ START_DAEMON=true # path to the X2Go Session Broker's agent command #X2GOBROKER_AGENT_CMD=/usr/lib/x2go/x2gobroker-agent -### enable SSL, you will have to create your own SSL certificates ### +########################################################## +### ### +### Enable SSL Support ### +### o You have to create your own SSL certificates ### +### o You have to actively uncomment the below SSL ### +### relevant line to enable https:// in x2gobroker ### +### ### +########################################################## # SSL certificate file #X2GOBROKER_SSL_CERTFILE=/etc/x2go/broker/ssl/broker.crt diff --git a/debian/x2gobroker-daemon.init b/debian/x2gobroker-daemon.init index 0ee9aed..d14bb8f 100644 --- a/debian/x2gobroker-daemon.init +++ b/debian/x2gobroker-daemon.init @@ -36,10 +36,10 @@ X2GOBROKER_SSL_CERTFILE= X2GOBROKER_SSL_KEYFILE= test -f $DEBIANCONFIG && . $DEBIANCONFIG -export X2GOBROKER_DEBUG=0 -export X2GOBROKER_CONFIG="/etc/x2go/x2gobroker.conf" +export X2GOBROKER_DEBUG +export X2GOBROKER_CONFIG export X2GOBROKER_DEFAULT_BACKEND -export X2GOBROKER_SESSIONPROFILES="/etc/x2go/broker/x2gobroker-sessionprofiles.conf" +export X2GOBROKER_SESSIONPROFILES export X2GOBROKER_AGENT_CMD export X2GOBROKER_SSL_CERTFILE export X2GOBROKER_SSL_KEYFILE diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf index 0999376..83f6bd8 100644 --- a/etc/x2gobroker.conf +++ b/etc/x2gobroker.conf @@ -88,7 +88,7 @@ # on large deployments it is recommended to ignore primary group memberships # traversing into all user accounts for primary group detection can be quite # CPU intensive on the X2Go Broker server. -#ignore-primary-group-memberships = True +#ignore-primary-group-memberships = true ### ### BACKEND section diff --git a/sbin/x2gobroker b/sbin/x2gobroker index 5c1fdd8..7ca11ce 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -61,6 +61,9 @@ if __name__ == "__main__": x2gobroker.defaults.X2GOBROKER_CONFIG = cmdline_args.config_file 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(':') + # import classes serving the different web.py URLs from x2gobroker.web.plain import * 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 - build-main (branch) updated: 0.0.0.1-3-gdc84423
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via dc84423e202eba6c1022821b24a25504ee1cab0c (commit) from 0e4b85183bd23e6561ba687bb693cf0f3612297d (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/rules | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) The diff of changes is: diff --git a/debian/rules b/debian/rules index 787fc72..997158b 100755 --- a/debian/rules +++ b/debian/rules @@ -21,8 +21,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_CFLAGS_MAINT_APPEND = -Wall include /usr/share/dpkg/buildflags.mk -#DEB_PERL_PACKAGES=libx2go-broker-perl -#DEB_PERL_CLEAN_TARGET=realclean -#include /usr/share/cdbs/1/class/perl-makemaker.mk include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/makefile.mk include /usr/share/cdbs/1/class/python-distutils.mk 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 - build-main (branch) updated: 7dfbf692abd457506ebf3f1372b8d0a11f3c9767
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 7dfbf692abd457506ebf3f1372b8d0a11f3c9767 (commit) from f4ee02eef0a15e605c4ff80641470f8267b5a06e (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/x2gobroker-daemon.default | 8 ++++++++ debian/x2gobroker-daemon.init | 7 +++++++ sbin/x2gobroker | 8 +++++++- x2gobroker/defaults.py | 11 +++++++++++ 5 files changed, 34 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/control b/debian/control index b70e569..3b222bc 100644 --- a/debian/control +++ b/debian/control @@ -113,6 +113,7 @@ Depends: ${python:Depends}, python-pampy, python-netaddr, + python-webpy (>= 1:0.37), Suggests: apache2 | httpd, Description: X2Go http(s) based session broker (Python modules) diff --git a/debian/x2gobroker-daemon.default b/debian/x2gobroker-daemon.default index d7466e6..47ccb43 100644 --- a/debian/x2gobroker-daemon.default +++ b/debian/x2gobroker-daemon.default @@ -23,3 +23,11 @@ START_DAEMON=true # path to the X2Go Session Broker's agent command #X2GOBROKER_AGENT_CMD=/usr/lib/x2go/x2gobroker-agent + +### enable SSL, you will have to create your own SSL certificates ### + +# SSL certificate file +#X2GOBROKER_SSL_CERTFILE=/etc/x2go/broker/ssl/broker.crt + +# SSL key file (ensure permissions are set to root:x2gobroker:0640) +#X2GOBROKER_SSL_CERTFILE=/etc/x2go/broker/ssl/broker.key diff --git a/debian/x2gobroker-daemon.init b/debian/x2gobroker-daemon.init index 2ee927a..0ee9aed 100644 --- a/debian/x2gobroker-daemon.init +++ b/debian/x2gobroker-daemon.init @@ -32,10 +32,17 @@ 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_SSL_CERTFILE= +X2GOBROKER_SSL_KEYFILE= test -f $DEBIANCONFIG && . $DEBIANCONFIG +export X2GOBROKER_DEBUG=0 +export X2GOBROKER_CONFIG="/etc/x2go/x2gobroker.conf" export X2GOBROKER_DEFAULT_BACKEND +export X2GOBROKER_SESSIONPROFILES="/etc/x2go/broker/x2gobroker-sessionprofiles.conf" export X2GOBROKER_AGENT_CMD +export X2GOBROKER_SSL_CERTFILE +export X2GOBROKER_SSL_KEYFILE . /lib/lsb/init-functions diff --git a/sbin/x2gobroker b/sbin/x2gobroker index 822f18d..5c1fdd8 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -22,9 +22,10 @@ import sys import os -import web import argparse import socket +import web +from web.wsgiserver import CherryPyWSGIServer try: import x2gobroker.defaults @@ -66,6 +67,11 @@ from x2gobroker.web.plain import * #from x2gobroker.web.json import * #from x2gobroker.web.html import * +# switch on https:// mode +if x2gobroker.defaults.X2GOBROKER_SSL_CERTFILE and x2gobroker.defaults.X2GOBROKER_SSL_KEYFILE: + CherryPyWSGIServer.ssl_certificate = x2gobroker.defaults.X2GOBROKER_SSL_CERTFILE + CherryPyWSGIServer.ssl_private_key = x2gobroker.defaults.X2GOBROKER_SSL_KEYFILE + # define the web.py URLs urls = ( '/plain/(.*)', 'X2GoBrokerWebPlain', # '/json/(.*)', 'X2GoBrokerWebJson', diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index cb1bf67..63bc254 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -51,6 +51,17 @@ if os.environ.has_key('X2GOBROKER_DEFAULT_BACKEND'): else: X2GOBROKER_DEFAULT_BACKEND="zeroconf" +if os.environ.has_key('X2GOBROKER_SSL_CERTFILE'): + X2GOBROKER_SSL_CERTFILE=os.environ['X2GOBROKER_SSL_CERTFILE'] +else: + X2GOBROKER_SSL_CERTFILE="" + +if os.environ.has_key('X2GOBROKER_SSL_KEYFILE'): + X2GOBROKER_SSL_KEYFILE=os.environ['X2GOBROKER_SSL_KEYFILE'] +else: + X2GOBROKER_SSL_KEYFILE="" + + # defaults for X2Go Sessino Broker configuration file X2GOBROKER_CONFIG_DEFAULTS = { 'global': { 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 - build-main (branch) updated: 0.0.0.1
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 6d343a60b4adb1041ba8cbef1839e8fd9ec09642 (commit) from 7dfbf692abd457506ebf3f1372b8d0a11f3c9767 (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 | 4 +-- debian/control | 94 +++++++++++++++++++++++++++--------------------------- 2 files changed, 49 insertions(+), 49 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f99aeb6..e040920 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -x2gobroker (0.0.0.1-0~x2go1) UNRELEASED; urgency=low +x2gobroker (0.0.0.1-0~x2go1) unstable; urgency=low * Initial upstream version. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 15 Sep 2012 17:30:24 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 12 Feb 2013 22:51:12 +0100 diff --git a/debian/control b/debian/control index 3b222bc..2789bf7 100644 --- a/debian/control +++ b/debian/control @@ -138,50 +138,50 @@ Description: X2Go http(s) based session broker (Python modules) This package contains common files needed by all X2Go session brokers being package for this distribution. -Package: x2gobroker-agent -Architecture: any -Depends: - ${shlibs:Depends}, - ${misc:Depends}, - perl, - adduser, - x2goserver, -Description: X2Go http(s) based session broker (common files) - X2Go is a server based computing environment with - - session resuming - - low bandwidth support - - LDAP support - - client side mass storage mounting support - - client side printing support - - audio support - - authentication by smartcard and USB stick - . - The session broker is a server tool for X2Go that - tells your X2Go Client application in a terminal - server cluster what servers and session types are - most appropriate for the user in front of the - X2Go terminal. - . - A session broker is most useful in load balanced - X2Go server farms. - . - This package contains a setuid agent command that - is required by the X2Go session broker. This package - has to be installed on all X2Go servers that shall get - managed via the X2Go session broker. - . - WARNING: This package installs a setuid wrapper - (/usr/lib/x2go/broker/x2gobroker-agent) on your system. - This setuid wrapper aims to be a secure replacement - for the deprecated suidperl exectuable that was removed - from Perl (>= 5.12). - . - This wrapper is only able to execute the Perl script - /usr/lib/x2go/broker/x2gobroker-agent.pl. For running - properly, x2gobroker-agent.pl needs setuid privileges. - . - If you hesitate to install this package, study the code - of the named wrapper and the named Perl script beforehand. - Note that the X2Go session broker will not work without this - x2gobroker-agent component installed on your to-be-managed - X2Go servers. +#Package: x2gobroker-agent +#Architecture: any +#Depends: +# ${shlibs:Depends}, +# ${misc:Depends}, +# perl, +# adduser, +# x2goserver, +#Description: X2Go http(s) based session broker (common files) +# X2Go is a server based computing environment with +# - session resuming +# - low bandwidth support +# - LDAP support +# - client side mass storage mounting support +# - client side printing support +# - audio support +# - authentication by smartcard and USB stick +# . +# The session broker is a server tool for X2Go that +# tells your X2Go Client application in a terminal +# server cluster what servers and session types are +# most appropriate for the user in front of the +# X2Go terminal. +# . +# A session broker is most useful in load balanced +# X2Go server farms. +# . +# This package contains a setuid agent command that +# is required by the X2Go session broker. This package +# has to be installed on all X2Go servers that shall get +# managed via the X2Go session broker. +# . +# WARNING: This package installs a setuid wrapper +# (/usr/lib/x2go/broker/x2gobroker-agent) on your system. +# This setuid wrapper aims to be a secure replacement +# for the deprecated suidperl exectuable that was removed +# from Perl (>= 5.12). +# . +# This wrapper is only able to execute the Perl script +# /usr/lib/x2go/broker/x2gobroker-agent.pl. For running +# properly, x2gobroker-agent.pl needs setuid privileges. +# . +# If you hesitate to install this package, study the code +# of the named wrapper and the named Perl script beforehand. +# Note that the X2Go session broker will not work without this +# x2gobroker-agent component installed on your to-be-managed +# X2Go servers. 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 - build-main (branch) updated: 0.0.0.1-2-g0e4b851
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 0e4b85183bd23e6561ba687bb693cf0f3612297d (commit) from fba2b53e36f84b12f7dfcdfe971149415cae3019 (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/control | 94 +++++++++++++++++++++++++++--------------------------- 2 files changed, 49 insertions(+), 47 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9c267c9..573259f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ x2gobroker (0.0.0.2-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.0.0.2): - Make CC, CFLAGS and LDFLAGS configurable through build system. + * /debian/control: + + Add bin:package x2gobroker-agent. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 13 Feb 2013 12:03:25 +0100 diff --git a/debian/control b/debian/control index 2789bf7..3b222bc 100644 --- a/debian/control +++ b/debian/control @@ -138,50 +138,50 @@ Description: X2Go http(s) based session broker (Python modules) This package contains common files needed by all X2Go session brokers being package for this distribution. -#Package: x2gobroker-agent -#Architecture: any -#Depends: -# ${shlibs:Depends}, -# ${misc:Depends}, -# perl, -# adduser, -# x2goserver, -#Description: X2Go http(s) based session broker (common files) -# X2Go is a server based computing environment with -# - session resuming -# - low bandwidth support -# - LDAP support -# - client side mass storage mounting support -# - client side printing support -# - audio support -# - authentication by smartcard and USB stick -# . -# The session broker is a server tool for X2Go that -# tells your X2Go Client application in a terminal -# server cluster what servers and session types are -# most appropriate for the user in front of the -# X2Go terminal. -# . -# A session broker is most useful in load balanced -# X2Go server farms. -# . -# This package contains a setuid agent command that -# is required by the X2Go session broker. This package -# has to be installed on all X2Go servers that shall get -# managed via the X2Go session broker. -# . -# WARNING: This package installs a setuid wrapper -# (/usr/lib/x2go/broker/x2gobroker-agent) on your system. -# This setuid wrapper aims to be a secure replacement -# for the deprecated suidperl exectuable that was removed -# from Perl (>= 5.12). -# . -# This wrapper is only able to execute the Perl script -# /usr/lib/x2go/broker/x2gobroker-agent.pl. For running -# properly, x2gobroker-agent.pl needs setuid privileges. -# . -# If you hesitate to install this package, study the code -# of the named wrapper and the named Perl script beforehand. -# Note that the X2Go session broker will not work without this -# x2gobroker-agent component installed on your to-be-managed -# X2Go servers. +Package: x2gobroker-agent +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + perl, + adduser, + x2goserver, +Description: X2Go http(s) based session broker (common files) + X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - LDAP support + - client side mass storage mounting support + - client side printing support + - audio support + - authentication by smartcard and USB stick + . + The session broker is a server tool for X2Go that + tells your X2Go Client application in a terminal + server cluster what servers and session types are + most appropriate for the user in front of the + X2Go terminal. + . + A session broker is most useful in load balanced + X2Go server farms. + . + This package contains a setuid agent command that + is required by the X2Go session broker. This package + has to be installed on all X2Go servers that shall get + managed via the X2Go session broker. + . + WARNING: This package installs a setuid wrapper + (/usr/lib/x2go/broker/x2gobroker-agent) on your system. + This setuid wrapper aims to be a secure replacement + for the deprecated suidperl exectuable that was removed + from Perl (>= 5.12). + . + This wrapper is only able to execute the Perl script + /usr/lib/x2go/broker/x2gobroker-agent.pl. For running + properly, x2gobroker-agent.pl needs setuid privileges. + . + If you hesitate to install this package, study the code + of the named wrapper and the named Perl script beforehand. + Note that the X2Go session broker will not work without this + x2gobroker-agent component installed on your to-be-managed + X2Go servers. 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 - build-main (branch) updated: 88bf826ab2efbc3f23da9a42280cad0ee8928aa1
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 88bf826ab2efbc3f23da9a42280cad0ee8928aa1 (commit) from f0df0578d48cb5eb91bfb1e482d68f4937817fce (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: README | 1 + debian/control | 1 + x2gobroker/brokers/base_broker.py | 79 ++++++- x2gobroker/tests/test_broker_base.py | 434 ++++++++++++++++++++++++++++++++++ x2gobroker/web/plain.py | 9 + 5 files changed, 521 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/README b/README index 03d87e4..4675864 100644 --- a/README +++ b/README @@ -11,6 +11,7 @@ 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 Available features: diff --git a/debian/control b/debian/control index 62e4fcf..b70e569 100644 --- a/debian/control +++ b/debian/control @@ -112,6 +112,7 @@ Depends: ${misc:Depends}, ${python:Depends}, python-pampy, + python-netaddr, Suggests: apache2 | httpd, Description: X2Go http(s) based session broker (Python modules) diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 85984d3..7da6336 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -28,6 +28,7 @@ __NAME__ = 'x2gobroker-pylib' import types import copy import uuid +import netaddr # X2Go Broker modules import x2gobroker.config @@ -61,6 +62,7 @@ class X2GoBroker(object): self.config = x2gobroker.config.X2GoBrokerConfigFile(config_files=config_file, defaults=config_defaults) self._dynamic_authid_map = {} + self._client_address = None def __del__(self): """\ @@ -76,6 +78,46 @@ class X2GoBroker(object): """ return self.config.get_value(self.backend_name, 'enable') + def set_client_address(self, address): + """\ + Set the client IP address. + + @param ip: the client IP + @type ip: C{unicode} + + """ + if netaddr.valid_ipv6(address): + pass + elif netaddr.valid_ipv4(address): + pass + else: + self._client_address = None + raise ValueError('address {address} is neither a valid IPv6 nor a valid IPv4 address'.format(address=address)) + self._client_address = netaddr.IPAddress(address) + + def get_client_address(self): + """\ + Get the client IP address (if set). + + @return the client IP (either IPv4 or IPv6) + @rtype ip: C{unicode} + + """ + if self._client_address: + return unicode(self._client_address) + else: + return None + + def get_client_address_type(self): + """\ + Get the client IP address type of the client address (if set). + + @return the client address type (4: IPv4, 6: IPv6) + @rtype ip: C{int} + + """ + return self._client_address.version + def get_global_config(self): """\ Get the global section of the configuration file. @@ -237,9 +279,40 @@ class X2GoBroker(object): ### clients access is granted first, if that fails then we return False here... - # FIXME: provide code for client based access control - if not _grant_availability[u'by_client']: - return False + if len( _acls[u'acl-clients-allow'] + _acls[u'acl-clients-deny'] ) > 0: + + _acls_clients_allow = copy.deepcopy(_acls[u'acl-clients-allow']) + _acls_clients_deny = copy.deepcopy(_acls[u'acl-clients-deny']) + + _addr = self.get_client_address() + _allow_client = False + _deny_client = False + + for idx, item in enumerate(_acls_clients_allow): + if unicode(item) == u'ALL': + _acls_clients_allow[idx] = '0.0.0.0/0' + _acls_clients_allow.insert(idx, '::/0') + for idx, item in enumerate(_acls_clients_deny): + if unicode(item) == u'ALL': + _acls_clients_deny[idx] = '0.0.0.0/0' + _acls_clients_deny.insert(idx, '::/0') + + _allow_address_set = netaddr.IPSet(_acls_clients_allow) + _deny_address_set = netaddr.IPSet(_acls_clients_deny) + + _allow_client = self._client_address in _allow_address_set + _deny_client = self._client_address in _deny_address_set + + if not (_allow_client or _deny_client): + # client was not in either of the rules, so we presume that the client is allowed to access + _grant_availability[u'by_client'] + if _order[u'clients'] == 'allow-deny': + _grant_availability[u'by_client'] = _allow_client and (not _deny_client) + else: + _grant_availability[u'by_client'] = (not _deny_client) or _allow_client + + if not _grant_availability[u'by_client']: + return False ### no user/group ACLs are in use, allow access then... diff --git a/x2gobroker/tests/test_broker_base.py b/x2gobroker/tests/test_broker_base.py index bde1538..057647d 100644 --- a/x2gobroker/tests/test_broker_base.py +++ b/x2gobroker/tests/test_broker_base.py @@ -738,6 +738,440 @@ enable = true self.assertEqual(base_backend.check_profile_acls(username_t, acls), True) self.assertEqual(base_backend.check_profile_acls(username_w, acls), False) + def test_clientaddress_recognition(self): + base_backend = self._init_base_backend() + ipv4_1 = '127.0.0.1' + ipv4_2 = '10.0.0.1' + ipv4_3 = '123.456.789.101' + ipv6_1 = '::1' + ipv6_2 = 'fe80::4f8:900:e5d:2' + ipv6_3 = 'fe80:0000:0000:0000:04f8:0900:0e5d:0002' + ipv6_4 = 'fe80:wxyz:0000:0000:04f8:0900:0e5d:0002' + base_backend.set_client_address(ipv4_1) + self.assertEqual(base_backend.get_client_address(), ipv4_1) + self.assertEqual(base_backend.get_client_address_type(), 4) + base_backend.set_client_address(ipv4_2) + self.assertEqual(base_backend.get_client_address(), ipv4_2) + self.assertEqual(base_backend.get_client_address_type(), 4) + self.assertRaises(ValueError, base_backend.set_client_address, ipv4_3) + base_backend.set_client_address(ipv6_1) + self.assertEqual(base_backend.get_client_address(), ipv6_1) + self.assertEqual(base_backend.get_client_address_type(), 6) + base_backend.set_client_address(ipv6_2) + self.assertEqual(base_backend.get_client_address(), ipv6_2) + self.assertEqual(base_backend.get_client_address_type(), 6) + base_backend.set_client_address(ipv6_3) + self.assertEqual(base_backend.get_client_address(), 'fe80::4f8:900:e5d:2') + self.assertEqual(base_backend.get_client_address_type(), 6) + self.assertRaises(ValueError, base_backend.set_client_address, (ipv6_4)) + + def test_checkprofileacls_clientipv4_simpletests(self): + base_backend = self._init_base_backend() + username = 'foo' + base_backend.set_client_address('10.0.2.14') + # no ACLs will grant access + acls = { + 'acl-clients-allow': [], + 'acl-clients-deny': [], + 'acl-clients-order': 'deny-allow', + } + self.assertEqual(base_backend.check_profile_acls(username, acls), True) + acls = { + 'acl-clients-allow': [], + 'acl-clients-deny': [], + 'acl-clients-order': 'allow-deny', + } + self.assertEqual(base_backend.check_profile_acls(username, acls), True) + acls = { + 'acl-clients-allow': ['ALL'], + 'acl-clients-deny': [], + 'acl-clients-order': 'deny-allow', + } + self.assertEqual(base_backend.check_profile_acls(username, acls), True) + acls = { + 'acl-clients-allow': ['ALL'], + 'acl-clients-deny': [], + 'acl-clients-order': 'allow-deny', + } + self.assertEqual(base_backend.check_profile_acls(username, acls), True) + acls = { + 'acl-clients-allow': ['10.0.2.14'], + 'acl-clients-deny': [], + 'acl-clients-order': 'deny-allow', + } + self.assertEqual(base_backend.check_profile_acls(username, acls), True) + acls = { + 'acl-clients-allow': ['10.0.2.14'], + 'acl-clients-deny': [], + 'acl-clients-order': 'allow-deny', + } + self.assertEqual(base_backend.check_profile_acls(username, acls), True) + acls = { + 'acl-clients-allow': [], + 'acl-clients-deny': ['ALL'], + 'acl-clients-order': 'deny-allow', + } + self.assertEqual(base_backend.check_profile_acls(username, acls), False) + acls = { + 'acl-clients-allow': [], + 'acl-clients-deny': ['ALL'], + 'acl-clients-order': 'allow-deny', + } + self.assertEqual(base_backend.check_profile_acls(username, acls), False) + acls = { + 'acl-clients-allow': [], + 'acl-clients-deny': ['10.0.2.14'], + 'acl-clients-order': 'deny-allow', + } + self.assertEqual(base_backend.check_profile_acls(username, acls), False) + acls = { + 'acl-clients-allow': [], + 'acl-clients-deny': ['10.0.2.14'], + 'acl-clients-order': 'allow-deny', + } + self.assertEqual(base_backend.check_profile_acls(username, acls), False) + + def test_checkprofileacls_clientipv4_combitests(self): + base_backend = self._init_base_backend() + username = 'foo' + ipv4_1 = '10.0.2.14' + ipv4_2 = '10.0.3.14' + ipv4_3 = '8.8.8.8' + + base_backend.set_client_address(ipv4_1) + # no ACLs will grant access + acls = { + 'acl-clients-allow': ['10.0.2.0/24'], + 'acl-clients-deny': ['ALL'], + 'acl-clients-order': 'deny-allow', + } + base_backend.set_client_address(ipv4_1) + self.assertEqual(base_backend.check_profile_acls(username, acls), True) + base_backend.set_client_address(ipv4_2) + self.assertEqual(base_backend.check_profile_acls(username, acls), False) + base_backend.set_client_address(ipv4_3) + self.assertEqual(base_backend.check_profile_acls(username, acls), False) + acls = { + 'acl-clients-allow': ['ALL'], + 'acl-clients-deny': ['10.0.2.0/24'], + 'acl-clients-order': 'allow-deny', + } + base_backend.set_client_address(ipv4_1) + self.assertEqual(base_backend.check_profile_acls(username, acls), False) + base_backend.set_client_address(ipv4_2) + self.assertEqual(base_backend.check_profile_acls(username, acls), True) + base_backend.set_client_address(ipv4_3) + self.assertEqual(base_backend.check_profile_acls(username, acls), True) + acls = { + 'acl-clients-allow': ['10.0.2.0/24'], + 'acl-clients-deny': ['10.0.0.0/16', '10.0.3.0/24'], + 'acl-clients-order': 'deny-allow', + } + base_backend.set_client_address(ipv4_1) + self.assertEqual(base_backend.check_profile_acls(username, acls), True) + base_backend.set_client_address(ipv4_2) + self.assertEqual(base_backend.check_profile_acls(username, acls), False) + base_backend.set_client_address(ipv4_3) + self.assertEqual(base_backend.check_profile_acls(username, acls), True) + acls = { + 'acl-clients-allow': ['10.0.0.0/16', '10.0.3.0/24'], + 'acl-clients-deny': ['10.0.2.0/24'], + 'acl-clients-order': 'allow-deny', + } + base_backend.set_client_address(ipv4_1) + self.assertEqual(base_backend.check_profile_acls(username, acls), False) + base_backend.set_client_address(ipv4_2) + self.assertEqual(base_backend.check_profile_acls(username, acls), True) + base_backend.set_client_address(ipv4_3) + self.assertEqual(base_backend.check_profile_acls(username, acls), False) + + def test_checkprofileacls_clientipv6_simpletests(self): + base_backend = self._init_base_backend() + username = 'foo' + base_backend.set_client_address('fe80::4f8:900:e5d:2') + # no ACLs will grant access + acls = { + 'acl-clients-allow': [], + 'acl-clients-deny': [], + 'acl-clients-order': 'deny-allow', + } + self.assertEqual(base_backend.check_profile_acls(username, acls), True) + acls = { + 'acl-clients-allow': [], + 'acl-clients-deny': [], + 'acl-clients-order': 'allow-deny', + } + self.assertEqual(base_backend.check_profile_acls(username, acls), True) + acls = { + 'acl-clients-allow': ['ALL'], + 'acl-clients-deny': [], + 'acl-clients-order': 'deny-allow', + } + self.assertEqual(base_backend.check_profile_acls(username, acls), True) + acls = { + 'acl-clients-allow': ['ALL'], + 'acl-clients-deny': [], + 'acl-clients-order': 'allow-deny', + } + self.assertEqual(base_backend.check_profile_acls(username, acls), True) + acls = { + 'acl-clients-allow': ['fe80::4f8:900:e5d:2'], + 'acl-clients-deny': [], + 'acl-clients-order': 'deny-allow', + } + self.assertEqual(base_backend.check_profile_acls(username, acls), True) + acls = { + 'acl-clients-allow': ['fe80::4f8:900:e5d:2'], + 'acl-clients-deny': [], + 'acl-clients-order': 'allow-deny', + } + self.assertEqual(base_backend.check_profile_acls(username, acls), True) + acls = { + 'acl-clients-allow': [], + 'acl-clients-deny': ['ALL'], + 'acl-clients-order': 'deny-allow', + } + self.assertEqual(base_backend.check_profile_acls(username, acls), False) + acls = { + 'acl-clients-allow': [], + 'acl-clients-deny': ['ALL'], + 'acl-clients-order': 'allow-deny', + } + self.assertEqual(base_backend.check_profile_acls(username, acls), False) + acls = { + 'acl-clients-allow': [], + 'acl-clients-deny': ['fe80::4f8:900:e5d:2'], + 'acl-clients-order': 'deny-allow', + } + self.assertEqual(base_backend.check_profile_acls(username, acls), False) + acls = { + 'acl-clients-allow': [], + 'acl-clients-deny': ['fe80::4f8:900:e5d:2'], + 'acl-clients-order': 'allow-deny', + } + self.assertEqual(base_backend.check_profile_acls(username, acls), False) + + def test_checkprofileacls_clientipv6_combitests(self): + base_backend = self._init_base_backend() + username = 'foo' + ipv6_1 = 'fe80::4f8:900:e5d:2' + ipv6_2 = 'fe80::1:4f8:900:e5d:2' + ipv6_3 = '2001:1af8:4050::2' + + base_backend.set_client_address(ipv6_1) + # no ACLs will grant access + acls = { + 'acl-clients-allow': ['fe80::/64'], + 'acl-clients-deny': ['ALL'], + 'acl-clients-order': 'deny-allow', + } + base_backend.set_client_address(ipv6_1) + self.assertEqual(base_backend.check_profile_acls(username, acls), True) + base_backend.set_client_address(ipv6_2) + self.assertEqual(base_backend.check_profile_acls(username, acls), False) + base_backend.set_client_address(ipv6_3) + self.assertEqual(base_backend.check_profile_acls(username, acls), False) + acls = { + 'acl-clients-allow': ['ALL'], + 'acl-clients-deny': ['fe80::/64'], + 'acl-clients-order': 'allow-deny', + } + base_backend.set_client_address(ipv6_1) + self.assertEqual(base_backend.check_profile_acls(username, acls), False) + base_backend.set_client_address(ipv6_2) + self.assertEqual(base_backend.check_profile_acls(username, acls), True) + base_backend.set_client_address(ipv6_3) + self.assertEqual(base_backend.check_profile_acls(username, acls), True) + acls = { + 'acl-clients-allow': ['fe80::/64'], + 'acl-clients-deny': ['fe80::/56','fe80:0:0:1::/64'], + 'acl-clients-order': 'deny-allow', + } + base_backend.set_client_address(ipv6_1) + self.assertEqual(base_backend.check_profile_acls(username, acls), True) + base_backend.set_client_address(ipv6_2) + self.assertEqual(base_backend.check_profile_acls(username, acls), False) + base_backend.set_client_address(ipv6_3) + self.assertEqual(base_backend.check_profile_acls(username, acls), True) + acls = { + 'acl-clients-allow': ['fe80::/56','fe80:0:0:1::/64'], + 'acl-clients-deny': ['fe80::/64'], + 'acl-clients-order': 'allow-deny', + } + base_backend.set_client_address(ipv6_1) + self.assertEqual(base_backend.check_profile_acls(username, acls), False) + base_backend.set_client_address(ipv6_2) + self.assertEqual(base_backend.check_profile_acls(username, acls), True) + base_backend.set_client_address(ipv6_3) + self.assertEqual(base_backend.check_profile_acls(username, acls), False) + + def test_checkprofileacls_userandgroupandclient_combitests(self): + _config_defaults = copy.deepcopy(x2gobroker.defaults.X2GOBROKER_CONFIG_DEFAULTS) + _config = """ +[global] +default-user-db = testsuite +default-group-db = testsuite + +[base] +enable = true +""" + tf = tempfile.NamedTemporaryFile() + print >> tf, _config + tf.seek(0) + base_backend = base.X2GoBroker(config_file=tf.name, config_defaults=_config_defaults) + username_f = 'flip' + username_k = 'kassandra' + username_m = 'maja' + username_t = 'thekla' + username_w = 'willi' + ipv4_1 = '10.0.2.14' + ipv4_2 = '10.0.3.14' + ipv4_3 = '8.8.8.8' + ipv6_1 = 'fe80::4f8:900:e5d:2' + ipv6_2 = 'fe80::1:4f8:900:e5d:2' + ipv6_3 = '2001:1af8:4050::2' + acls = { + 'acl-users-allow': ['flip'], + 'acl-users-deny': [], + 'acl-users-order': 'deny-allow', + 'acl-groups-allow': ['female','male'], + 'acl-groups-deny': ['spiders'], + 'acl-groups-order': 'deny-allow', + 'acl-clients-allow': ['fe80:0:0:1::/64','10.0.3.0/24'], + 'acl-clients-deny': ['ALL'], + 'acl-clients-order': 'deny-allow', + } + base_backend.set_client_address(ipv4_1) + self.assertEqual(base_backend.check_profile_acls(username_f, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_k, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_m, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_t, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_w, acls), False) + base_backend.set_client_address(ipv4_2) + self.assertEqual(base_backend.check_profile_acls(username_f, acls), True) + self.assertEqual(base_backend.check_profile_acls(username_k, acls), True) + self.assertEqual(base_backend.check_profile_acls(username_m, acls), True) + self.assertEqual(base_backend.check_profile_acls(username_t, acls), True) + self.assertEqual(base_backend.check_profile_acls(username_w, acls), True) + base_backend.set_client_address(ipv4_3) + self.assertEqual(base_backend.check_profile_acls(username_f, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_k, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_m, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_t, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_w, acls), False) + base_backend.set_client_address(ipv6_1) + self.assertEqual(base_backend.check_profile_acls(username_f, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_k, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_m, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_t, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_w, acls), False) + base_backend.set_client_address(ipv6_2) + self.assertEqual(base_backend.check_profile_acls(username_f, acls), True) + self.assertEqual(base_backend.check_profile_acls(username_k, acls), True) + self.assertEqual(base_backend.check_profile_acls(username_m, acls), True) + self.assertEqual(base_backend.check_profile_acls(username_t, acls), True) + self.assertEqual(base_backend.check_profile_acls(username_w, acls), True) + base_backend.set_client_address(ipv6_3) + self.assertEqual(base_backend.check_profile_acls(username_f, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_k, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_m, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_t, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_w, acls), False) + acls = { + 'acl-users-allow': ['flip'], + 'acl-users-deny': [], + 'acl-users-order': 'deny-allow', + 'acl-groups-allow': ['female','male'], + 'acl-groups-deny': ['spiders'], + 'acl-groups-order': 'allow-deny', + 'acl-clients-allow': ['fe80::/64','10.0.2.0/24'], + 'acl-clients-deny': ['ALL'], + 'acl-clients-order': 'deny-allow', + } + base_backend.set_client_address(ipv4_1) + self.assertEqual(base_backend.check_profile_acls(username_f, acls), True) + self.assertEqual(base_backend.check_profile_acls(username_k, acls), True) + self.assertEqual(base_backend.check_profile_acls(username_m, acls), True) + self.assertEqual(base_backend.check_profile_acls(username_t, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_w, acls), True) + base_backend.set_client_address(ipv4_2) + self.assertEqual(base_backend.check_profile_acls(username_f, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_k, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_m, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_t, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_w, acls), False) + base_backend.set_client_address(ipv4_3) + self.assertEqual(base_backend.check_profile_acls(username_f, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_k, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_m, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_t, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_w, acls), False) + base_backend.set_client_address(ipv6_1) + self.assertEqual(base_backend.check_profile_acls(username_f, acls), True) + self.assertEqual(base_backend.check_profile_acls(username_k, acls), True) + self.assertEqual(base_backend.check_profile_acls(username_m, acls), True) + self.assertEqual(base_backend.check_profile_acls(username_t, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_w, acls), True) + base_backend.set_client_address(ipv6_2) + self.assertEqual(base_backend.check_profile_acls(username_f, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_k, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_m, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_t, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_w, acls), False) + base_backend.set_client_address(ipv6_3) + self.assertEqual(base_backend.check_profile_acls(username_f, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_k, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_m, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_t, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_w, acls), False) + acls = { + 'acl-users-allow': [], + 'acl-users-deny': [], + 'acl-users-order': 'allow-deny', + 'acl-groups-allow': ['male','female'], + 'acl-groups-deny': ['spiders','grasshoppers'], + 'acl-groups-order': 'allow-deny', + 'acl-clients-allow': ['ALL'], + 'acl-clients-deny': ['fe80::/56','10.0.0.0/8'], + 'acl-clients-order': 'allow-deny', + } + base_backend.set_client_address(ipv4_1) + self.assertEqual(base_backend.check_profile_acls(username_f, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_k, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_m, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_t, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_w, acls), False) + base_backend.set_client_address(ipv4_2) + self.assertEqual(base_backend.check_profile_acls(username_f, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_k, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_m, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_t, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_w, acls), False) + base_backend.set_client_address(ipv4_3) + self.assertEqual(base_backend.check_profile_acls(username_f, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_k, acls), True) + self.assertEqual(base_backend.check_profile_acls(username_m, acls), True) + self.assertEqual(base_backend.check_profile_acls(username_t, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_w, acls), True) + base_backend.set_client_address(ipv6_1) + self.assertEqual(base_backend.check_profile_acls(username_f, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_k, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_m, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_t, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_w, acls), False) + base_backend.set_client_address(ipv6_2) + self.assertEqual(base_backend.check_profile_acls(username_f, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_k, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_m, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_t, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_w, acls), False) + base_backend.set_client_address(ipv6_3) + self.assertEqual(base_backend.check_profile_acls(username_f, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_k, acls), True) + self.assertEqual(base_backend.check_profile_acls(username_m, acls), True) + self.assertEqual(base_backend.check_profile_acls(username_t, acls), False) + self.assertEqual(base_backend.check_profile_acls(username_w, acls), True) + def test_suite(): from unittest import TestSuite, makeSuite diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py index 49d471e..b6c5f83 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/web/plain.py @@ -60,6 +60,15 @@ class X2GoBrokerWebPlain: global_config = broker_backend.get_global_config() backend_config = broker_backend.get_backend_config() + # set the client address for the broker backend + ip = web.ctx.env.get('HTTP_X_FORWARDED_FOR', web.ctx.get('ip', '')) + if ip: + broker_backend.set_client_address(ip) + elif not _X2GOBROKER_DEBUG: + # if the client IP is not set, we pretend to have nothing on offer + return web.notfound() + + # if the broker backend is disabled in the configuration, pretend to have nothing on offer if not broker_backend.is_enabled(): return web.notfound() 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 - build-main (branch) updated: 0.0.0.1-1-gfba2b53
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via fba2b53e36f84b12f7dfcdfe971149415cae3019 (commit) from 6d343a60b4adb1041ba8cbef1839e8fd9ec09642 (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: Makefile | 6 +++++- debian/changelog | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/Makefile b/Makefile index 1293dab..07428f6 100755 --- a/Makefile +++ b/Makefile @@ -27,6 +27,10 @@ INSTALL_DIR=install -d -o root -g root -m 755 INSTALL_FILE=install -o root -g root -m 644 INSTALL_PROGRAM=install -o root -g root -m 755 +CC ?= gcc +CFLAGS += -fPIE +LDFLAGS += -pie + RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty @@ -52,7 +56,7 @@ build: build-arch build-indep build-arch: build_setuidwrappers build_setuidwrappers: - gcc -fPIE -pie -o lib/x2gobroker-agent src/x2gobroker-agent.c + $(CC) $(CFLAGS) $(LDFLAGS) -o lib/x2gobroker-agent src/x2gobroker-agent.c build-indep: # run setup.py build+install somewhere here... diff --git a/debian/changelog b/debian/changelog index e040920..9c267c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +x2gobroker (0.0.0.2-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (0.0.0.2): + - Make CC, CFLAGS and LDFLAGS configurable through build system. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 13 Feb 2013 12:03:25 +0100 + x2gobroker (0.0.0.1-0~x2go1) unstable; urgency=low * Initial upstream version. 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