x2go-commits October 2013

x2go-commits@lists.x2go.org

2 participants
100 discussions

x2gobroker.git - master (branch) updated: 0.0.2.3-45-g50a8252
by git-admin＠x2go.org 02 Oct '13

02 Oct '13

The branch, master has been updated via 50a8252b21cdca1ddfd64a6ff2f0991717de9cb7 (commit) from f7b96154cd92b53dbbd02201bff37964391b2889 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 50a8252b21cdca1ddfd64a6ff2f0991717de9cb7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 2 13:00:38 2013 +0200 Catch RequestHandler errors and write them to the error log channel. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2gobroker/web/extras.py | 8 +++++++- x2gobroker/web/plain.py | 8 +++++++- x2gobroker/web/uccs.py | 7 ++++++- 4 files changed, 21 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2772c85..f999f4c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,7 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low - Let an ICMP ping request precede the SSH ping command. This notably reduces timeout duration if the host running the queried broker agent is down). + - Catch RequestHandler errors and write them to the error log channel. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. * /debian/x2gobroker-agent.dirs: diff --git a/x2gobroker/web/extras.py b/x2gobroker/web/extras.py index 6bce172..1ff31ae 100644 --- a/x2gobroker/web/extras.py +++ b/x2gobroker/web/extras.py @@ -30,7 +30,13 @@ x2gobroker._paramiko.monkey_patch_paramiko() import x2gobroker.defaults -class X2GoBrokerPubKeyService(tornado.web.RequestHandler): + +class _RequestHandler(tornado.web.RequestHandler): + def _handle_request_exception(self, e): + logger_error.error('HTTP request error: {error_msg}'.format(error_msg=unicode(e))) + + +class X2GoBrokerPubKeyService(_RequestHandler): http_header_items = { 'Content-Type': 'text/plain; charset=utf-8', diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py index 39ab7a8..0ef2564 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/web/plain.py @@ -30,7 +30,13 @@ import x2gobroker.defaults from x2gobroker.loggers import logger_broker, logger_error -class X2GoBrokerWeb(tornado.web.RequestHandler): + +class _RequestHandler(tornado.web.RequestHandler): + def _handle_request_exception(self, e): + logger_error.error('HTTP request error: {error_msg}'.format(error_msg=unicode(e))) + + +class X2GoBrokerWeb(_RequestHandler): http_header_items = { 'Content-Type': 'text/plain; charset=utf-8', diff --git a/x2gobroker/web/uccs.py b/x2gobroker/web/uccs.py index 2f5864b..b2a17d0 100644 --- a/x2gobroker/web/uccs.py +++ b/x2gobroker/web/uccs.py @@ -50,7 +50,12 @@ def credentials_validate(username, password): return username, access -class X2GoBrokerWeb(tornado.web.RequestHandler): +class _RequestHandler(tornado.web.RequestHandler): + def _handle_request_exception(self, e): + logger_error.error('HTTP request error: {error_msg}'.format(error_msg=unicode(e))) + + +class X2GoBrokerWeb(_RequestHandler): def get(self, path): if x2gobroker.defaults.X2GOBROKER_DEBUG: hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-44-gf7b9615
by git-admin＠x2go.org 02 Oct '13

02 Oct '13

The branch, master has been updated via f7b96154cd92b53dbbd02201bff37964391b2889 (commit) from f5b9abf8162a1d05791533844f0b8bddc4678dfe (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f7b96154cd92b53dbbd02201bff37964391b2889 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 2 12:57:54 2013 +0200 less dramatic error message on raised exceptions ----------------------------------------------------------------------- Summary of changes: x2gobroker/x2gobroker_exceptions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2gobroker/x2gobroker_exceptions.py b/x2gobroker/x2gobroker_exceptions.py index 6e68147..f0999d9 100644 --- a/x2gobroker/x2gobroker_exceptions.py +++ b/x2gobroker/x2gobroker_exceptions.py @@ -23,7 +23,7 @@ from loggers import logger_error class X2GoBrokerBaseException(BaseException): def __init__(self, *args, **kwargs): BaseException.__init__(self, *args, **kwargs) - logger_error.error('An exceptional problem occurred: {exception}("{msg}")'.format(exception=type(self).__name__, msg=str(self))) + logger_error.error('exception raised: {exception}("{msg}")'.format(exception=type(self).__name__, msg=str(self))) class X2GoBrokerAgentException(X2GoBrokerBaseException): pass class X2GoBrokerProfileException(X2GoBrokerBaseException): pass hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-41-g70cd5e2
by git-admin＠x2go.org 02 Oct '13

02 Oct '13

The branch, master has been updated via 70cd5e294a5c10f36c68496ed534ffbecafbb087 (commit) from 8b05efa873080d23c6c7a38c05d6af79406daac7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 70cd5e294a5c10f36c68496ed534ffbecafbb087 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 2 10:56:55 2013 +0200 fix for last two commits ----------------------------------------------------------------------- Summary of changes: x2gobroker/agent.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index 431ebda..e46c99e 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -64,11 +64,11 @@ def has_remote_broker_agent_setup(): """ home = os.path.expanduser("~") - if os.path.exists(os.path.join(home, '.ssh', 'id_rsa'): + if os.path.exists(os.path.join(home, '.ssh', 'id_rsa')): return True - elif os.path.exists(os.path.join(home, '.ssh', 'id_dsa'): + elif os.path.exists(os.path.join(home, '.ssh', 'id_dsa')): return True - elif os.path.exists(os.path.join(home, '.ssh', 'id_ecdsa'): + elif os.path.exists(os.path.join(home, '.ssh', 'id_ecdsa')): return True def call_local_broker_agent(username, mode, cmdline_args=[]): hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-42-gd149ad7
by git-admin＠x2go.org 02 Oct '13

02 Oct '13

The branch, master has been updated via d149ad7c51dcedacf68fea315ef281b0a543ffa4 (commit) from 70cd5e294a5c10f36c68496ed534ffbecafbb087 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d149ad7c51dcedacf68fea315ef281b0a543ffa4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 2 11:03:25 2013 +0200 Let an ICMP ping request precede the SSH ping command. This notably reduces timeout duration if the host running the queried broker agent is down). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ x2gobroker/agent.py | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6d392a6..2772c85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,9 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low - Provide a test function that checks if the basic broker agent setup (SSH private/public key pair) is available. If not, no SSH broker usage will be attempted. + - Let an ICMP ping request precede the SSH ping command. This notably + reduces timeout duration if the host running the queried broker agent + is down). * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. * /debian/x2gobroker-agent.dirs: diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index e46c99e..be7b0e5 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -54,6 +54,7 @@ class delayed_execution(threading.Thread): self.agent_func(**self.kwargs) + def has_remote_broker_agent_setup(): """\ Peform some integrity checks that may indicate that a remote @@ -162,6 +163,35 @@ def call_remote_broker_agent(username, mode, cmdline_args=[], remote_agent=None) raise x2gobroker.x2gobroker_exceptions.X2GoBrokerAgentException('Query to remote X2Go Broker Agent (user: {user}, hostname: {hostname}, port: {port}) failed'.format(user=remote_username, hostname=remote_hostname, port=remote_port)) +def icmp_ping(hostname): + """\ + Perform an ICMP ping to the requested hostname. + + param hostname: name of the host that shall be pinged + type hostname: C{unicode} + + @raise X2GoBrokerAgentException: raised if host is down or unresolvable via DNS. + + """ + # Detect the IP protocol version... + try: + dns_query = socket.getaddrinfo(hostname, None, socket.AF_INET6) + ping_cmd = "ping6" + except socket.gaierror: + try: + dns_query = socket.getaddrinfo(hostname, None, socket.AF_INET) + ping_cmd = "ping" + except socket.gaierror: + # we can't find a valid address for this host, so returning a failure... + return False + + # do the actual ping... + if os.system(ping_cmd + " -c 1 -w2 " + hostname + " > /dev/null 2>&1") != 0: + return False + + return True + + def ping(query_mode='LOCAL', remote_agent=None): """\ Ping X2Go Broker Agent. @@ -176,7 +206,9 @@ def ping(query_mode='LOCAL', remote_agent=None): if unicode(query_mode).upper() == u'LOCAL': return call_local_broker_agent(username, mode='ping') else: - return call_remote_broker_agent(username, mode='ping', remote_agent=remote_agent) + return remote_agent is not None and \ + icmp_ping(remote_agent['hostname']) and \ + call_remote_broker_agent(username, mode='ping', remote_agent=remote_agent) def list_sessions(username, query_mode='LOCAL', remote_agent=None): hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-40-g8b05efa
by git-admin＠x2go.org 02 Oct '13

02 Oct '13

The branch, master has been updated via 8b05efa873080d23c6c7a38c05d6af79406daac7 (commit) from 9a830df0f3147d0d85b682bf87c49eb949bbf364 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8b05efa873080d23c6c7a38c05d6af79406daac7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 2 10:30:28 2013 +0200 fix for last commit ----------------------------------------------------------------------- Summary of changes: x2gobroker/agent.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index 7ae1520..431ebda 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -64,11 +64,11 @@ def has_remote_broker_agent_setup(): """ home = os.path.expanduser("~") - if os.path.exists(os.path.join(home, '.ssh', 'id_rsa') + if os.path.exists(os.path.join(home, '.ssh', 'id_rsa'): return True - elsif os.path.exists(os.path.join(home, '.ssh', 'id_dsa') + elif os.path.exists(os.path.join(home, '.ssh', 'id_dsa'): return True - elsif os.path.exists(os.path.join(home, '.ssh', 'id_ecdsa') + elif os.path.exists(os.path.join(home, '.ssh', 'id_ecdsa'): return True def call_local_broker_agent(username, mode, cmdline_args=[]): hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-39-g9a830df
by git-admin＠x2go.org 02 Oct '13

02 Oct '13

The branch, master has been updated via 9a830df0f3147d0d85b682bf87c49eb949bbf364 (commit) from 470d10d15b4783be8f46a480527afa11ea05a89f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9a830df0f3147d0d85b682bf87c49eb949bbf364 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 2 08:40:23 2013 +0200 Provide a test function that checks if the basic broker agent setup (SSH private/public key pair) is available. If not, no SSH broker usage will be attempted. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ x2gobroker/agent.py | 18 ++++++++++++++++++ x2gobroker/brokers/base_broker.py | 2 +- 3 files changed, 22 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 780dc54..6d392a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,9 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low - Fix Python2'isms in three exceptions. Thanks to Mathias Ewald for spotting. - Make test_suite callable via setup.py. + - Provide a test function that checks if the basic broker agent setup + (SSH private/public key pair) is available. If not, no SSH broker + usage will be attempted. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. * /debian/x2gobroker-agent.dirs: diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index 639afd3..7ae1520 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -19,6 +19,7 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +import os.path import subprocess import paramiko import cStringIO @@ -53,6 +54,23 @@ class delayed_execution(threading.Thread): self.agent_func(**self.kwargs) +def has_remote_broker_agent_setup(): + """\ + Peform some integrity checks that may indicate that a remote + broker agent setup is available. + + - Check for available SSH private keys. + - Nothing else, so far... + + """ + home = os.path.expanduser("~") + if os.path.exists(os.path.join(home, '.ssh', 'id_rsa') + return True + elsif os.path.exists(os.path.join(home, '.ssh', 'id_dsa') + return True + elsif os.path.exists(os.path.join(home, '.ssh', 'id_ecdsa') + return True + def call_local_broker_agent(username, mode, cmdline_args=[]): """\ Launch X2Go Broker Agent locally and process its output. diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 7d39f43..6196f4d 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -810,7 +810,7 @@ class X2GoBroker(object): remote_agent = None agent_query_mode = self.get_agent_query_mode(profile_id).upper() - if agent_query_mode == u'SSH': + if agent_query_mode == u'SSH' and x2gobroker.agent.has_remote_broker_agent_setup(): profile = self.get_profile(profile_id) server_list = profile[u'host'] hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-36-gb7475b7
by git-admin＠x2go.org 01 Oct '13

01 Oct '13

The branch, master has been updated via b7475b79b0a5a52ced74b919767240f5faf05115 (commit) from f92e46470950844b11135ac506f7b719f8ca2304 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b7475b79b0a5a52ced74b919767240f5faf05115 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Oct 1 19:07:54 2013 +0200 remove unneeded shebang ----------------------------------------------------------------------- Summary of changes: x2gobroker/client/plain.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2gobroker/client/plain.py b/x2gobroker/client/plain.py index f6df4b6..804d058 100644 --- a/x2gobroker/client/plain.py +++ b/x2gobroker/client/plain.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +# -*- coding: utf-8 -*- # This file is part of the X2Go Project - http://www.x2go.org # Copyright (C) 2011-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-38-g470d10d
by git-admin＠x2go.org 01 Oct '13

01 Oct '13

The branch, master has been updated via 470d10d15b4783be8f46a480527afa11ea05a89f (commit) from 56b1c6d8ed8b6e1812ff0310c3f72c78c232bf4e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 470d10d15b4783be8f46a480527afa11ea05a89f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Oct 1 19:42:43 2013 +0200 Make test_suite callable via setup.py. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + setup.py | 1 + x2gobroker/tests/runalltests.py | 22 +++++++++++++--------- 3 files changed, 15 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8bcced1..780dc54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,7 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low - Rename base broker's use_session_autologin to get_session_autologin. - Fix Python2'isms in three exceptions. Thanks to Mathias Ewald for spotting. + - Make test_suite callable via setup.py. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. * /debian/x2gobroker-agent.dirs: diff --git a/setup.py b/setup.py index a5eb5f8..928ef07 100755 --- a/setup.py +++ b/setup.py @@ -44,4 +44,5 @@ setup( packages = find_packages('.'), package_dir = {'': '.'}, test_suite = "x2gobroker.tests.runalltests", + use_2to3 = True, ) diff --git a/x2gobroker/tests/runalltests.py b/x2gobroker/tests/runalltests.py index f0156db..35d978b 100644 --- a/x2gobroker/tests/runalltests.py +++ b/x2gobroker/tests/runalltests.py @@ -26,12 +26,17 @@ fine for any kind of Python unit testing---as we do here for Python X2GoBroker. import os import sys -base = os.path.join(os.path.split(os.path.split(os.getcwd())[0])[0]) - -try: - import x2gobroker -except ImportError: - sys.path.insert(0, os.path.join(os.getcwd(), '../..')) +if os.path.exists('runalltests.py'): + # test is evoked via test.py + pass +else: + # test is evoked via setup.py + os.environ.update({'X2GOBROKER_DEBUG': "1"}) + os.environ.update({'X2GOBROKER_TESTSUITE': "1"}) + os.chdir(os.path.join('x2gobroker', 'tests',)) + +base = os.getcwd() +sys.path.insert(0, os.path.join(os.path.split(os.path.split(os.getcwd())[0])[0])) # prepend the X2GoBroker path (useful for building new packages) sys.path = [os.path.normpath(base)] + sys.path @@ -40,7 +45,7 @@ import unittest TestRunner = unittest.TextTestRunner suite = unittest.TestSuite() -tests = os.listdir(os.curdir) +tests = os.listdir(base) tests = [n[:-3] for n in tests if n.startswith('test') and n.endswith('.py')] for test in tests: @@ -48,5 +53,4 @@ for test in tests: if hasattr(m, 'test_suite'): suite.addTest(m.test_suite()) -if __name__ == '__main__': - TestRunner().run(suite) +TestRunner().run(suite) hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-37-g56b1c6d
by git-admin＠x2go.org 01 Oct '13

01 Oct '13

The branch, master has been updated via 56b1c6d8ed8b6e1812ff0310c3f72c78c232bf4e (commit) from b7475b79b0a5a52ced74b919767240f5faf05115 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 56b1c6d8ed8b6e1812ff0310c3f72c78c232bf4e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Oct 1 19:12:48 2013 +0200 finalize default inifile backend session profiles (incl. test) ----------------------------------------------------------------------- Summary of changes: etc/broker/x2gobroker-sessionprofiles.conf | 44 ++++++++++++++-------------- setup.py | 1 + x2gobroker/tests/test_broker_inifile.py | 4 +-- 3 files changed, 25 insertions(+), 24 deletions(-) The diff of changes is: diff --git a/etc/broker/x2gobroker-sessionprofiles.conf b/etc/broker/x2gobroker-sessionprofiles.conf index a2faac9..dccfcf8 100644 --- a/etc/broker/x2gobroker-sessionprofiles.conf +++ b/etc/broker/x2gobroker-sessionprofiles.conf @@ -147,18 +147,18 @@ command=MATE ## in front of one of the admin client machines. ## -[pool-B-server-D-LXDE] -user= -host=server-d (server-d.domain.internet) -name=LXDE - srv-D -command=LXDE -rootless=false -acl-groups-allow=admins -acl-groups-deny=ALL +#[pool-B-server-D-LXDE] +#user= +#host=server-d (server-d.domain.internet) +#name=LXDE - srv-D +#command=LXDE +#rootless=false +#acl-groups-allow=admins +#acl-groups-deny=ALL ## make sure hostnames in client ACLs are resolvable via libnss!!! #acl-clients-deny=ALL #acl-clients-allow=admin-machine1.domain.local, admin-machine2.domain.local, admin-machine3.domain.local -acl-any-order=deny-allow +#acl-any-order=deny-allow ## ## EXAMPLE: pool-C (REAL LOAD BALANCING!!!) @@ -184,17 +184,17 @@ acl-any-order=deny-allow ## DB backend. ## -[pool-C-XFCE] -user= -host=s-E1 (10.0.2.11),s-E2 (10.0.2.12),s-E3 (10.0.2.13),s-E4 (10.0.2.14),s-E5 (10.0.2.15) -name=XFCE - pool-C -command=XFCE -rootless=false -acl-users-allow=testuser-A,testuser-B -acl-users-deny=ALL -acl-groups-allow=students,admins -acl-groups-deny=ALL -acl-any-order=deny-allow +#[pool-C-XFCE] +#user= +#host=s-E1 (10.0.2.11),s-E2 (10.0.2.12),s-E3 (10.0.2.13),s-E4 (10.0.2.14),s-E5 (10.0.2.15) +#name=XFCE - pool-C +#command=XFCE +#rootless=false +#acl-users-allow=testuser-A,testuser-B +#acl-users-deny=ALL +#acl-groups-allow=students,admins +#acl-groups-deny=ALL +#acl-any-order=deny-allow # this server pool has a special broker setup for SSH authorized_keys -broker-session-autologin=true -broker-authorized-keys=/var/lib/x2gobroker/ssh/%u/authorized_keys +#broker-session-autologin=true +#broker-authorized-keys=/var/lib/x2gobroker/ssh/%u/authorized_keys diff --git a/setup.py b/setup.py index 9fa7ca1..a5eb5f8 100755 --- a/setup.py +++ b/setup.py @@ -43,4 +43,5 @@ setup( url = 'http://www.x2go.org', packages = find_packages('.'), package_dir = {'': '.'}, + test_suite = "x2gobroker.tests.runalltests", ) diff --git a/x2gobroker/tests/test_broker_inifile.py b/x2gobroker/tests/test_broker_inifile.py index 809dc7a..45879cd 100644 --- a/x2gobroker/tests/test_broker_inifile.py +++ b/x2gobroker/tests/test_broker_inifile.py @@ -32,8 +32,8 @@ class TestX2GoBrokerBackendInifile(unittest.TestCase): def test_getprofileids(self): inifile_backend = inifile.X2GoBroker(profile_config_file='../../etc/broker/x2gobroker-sessionprofiles.conf') _profile_ids = inifile_backend.get_profile_ids() - self.assertEqual(len(_profile_ids), 5) - _expected_profile_ids = ['pool-A-server-A', 'pool-A-server-B', 'pool-A-server-C', 'pool-B-server-D-LXDE', 'pool-C-XFCE', ] + self.assertEqual(len(_profile_ids), 2) + _expected_profile_ids = [ "localhost-kde", "localhost-mate", ] for _id in _profile_ids: self.assertTrue( ( _id in _expected_profile_ids ) ) for _id in _expected_profile_ids: hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-35-gf92e464
by git-admin＠x2go.org 01 Oct '13

01 Oct '13

The branch, master has been updated via f92e46470950844b11135ac506f7b719f8ca2304 (commit) from ae5433d8653adaa364329001aa10f55d76f15a65 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f92e46470950844b11135ac506f7b719f8ca2304 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Oct 1 18:46:49 2013 +0200 Fix Python2'isms in three exceptions. Thanks to Mathias Ewald for spotting. ----------------------------------------------------------------------- Summary of changes: bin/x2gobroker | 2 +- debian/changelog | 2 ++ x2gobroker/brokers/base_broker.py | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/bin/x2gobroker b/bin/x2gobroker index 46c5103..b23f1ad 100755 --- a/bin/x2gobroker +++ b/bin/x2gobroker @@ -206,7 +206,7 @@ if __name__ == "__main__": http_server = tornado.httpserver.HTTPServer(application) http_server.listen(bind_port, address=bind_address) tornado.ioloop.IOLoop.instance().start() - except socket.error, e: + except socket.error as e: print (e) elif cmdline_args.mode.upper() == 'SSH': diff --git a/debian/changelog b/debian/changelog index 4ae73c2..8bcced1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low - New broker session profile parameter: broker-agent-query-mode. Define agent query methods per session profile. - Rename base broker's use_session_autologin to get_session_autologin. + - Fix Python2'isms in three exceptions. Thanks to Mathias Ewald for + spotting. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. * /debian/x2gobroker-agent.dirs: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index f98f984..7d39f43 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -335,9 +335,9 @@ class X2GoBroker(object): try: _allow_address_set = netaddr.IPSet(_acls_clients_allow) _deny_address_set = netaddr.IPSet(_acls_clients_deny) - except netaddr.core.AddrFormatError, e: + except netaddr.core.AddrFormatError as e: logger_error.error('base_broker.X2GoBroker.check_acls(): netaddr.core.AddrFormatError - {why}'.format(why=str(e))) - except ValueError, e: + except ValueError as e: logger_error.error('base_broker.X2GoBroker.check_acls(): ValueError - {why}'.format(why=str(e))) _allow_client = self._client_address in _allow_address_set 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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits October 2013