x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

x2gobroker.git - tmp (branch) updated: 0.0.0.1-11-gabebae8
by git-admin＠x2go.org 23 Apr '13

23 Apr '13

The branch, tmp has been updated via abebae8791274f6634adb39d930ae055feed5fbb (commit) from 2ce613977c17b31475dc3207652daa00a78f2537 (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/python-x2gobroker.postinst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/python-x2gobroker.postinst b/debian/python-x2gobroker.postinst index 861b3e0..6299aea 100755 --- a/debian/python-x2gobroker.postinst +++ b/debian/python-x2gobroker.postinst @@ -23,7 +23,7 @@ case "$1" in # 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 + dpkg-statoverride --add --update x2gobroker adm 2750 /var/log/x2gobroker fi ;; 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 - tmp (branch) updated: 0.0.0.1-8-gbbe2c8a
by git-admin＠x2go.org 23 Apr '13

23 Apr '13

The branch, tmp 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 - tmp (branch) updated: 0.0.0.1-10-g2ce6139
by git-admin＠x2go.org 23 Apr '13

23 Apr '13

The branch, tmp has been updated via 2ce613977c17b31475dc3207652daa00a78f2537 (commit) from d04c71a2781be037ebbb3bdc9441019409c9c2a8 (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/loggers.py | 2 -- 1 file changed, 2 deletions(-) The diff of changes is: diff --git a/x2gobroker/loggers.py b/x2gobroker/loggers.py index 4493091..01a659f 100644 --- a/x2gobroker/loggers.py +++ b/x2gobroker/loggers.py @@ -26,8 +26,6 @@ from x2gobroker.defaults import X2GOBROKER_LOGCONFIG as _X2GOBROKER_LOGCONFIG logging.config.fileConfig(_X2GOBROKER_LOGCONFIG) -print dir(logging.config) - # create loggers logger_broker = logging.getLogger('broker') logger_access = logging.getLogger('access') 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 - tmp (branch) updated: 0.0.0.1-1-gfba2b53
by git-admin＠x2go.org 23 Apr '13

23 Apr '13

The branch, tmp 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

x2gobroker.git - tmp (branch) updated: d705e7ba70e7866ce904a5f509158430db94def7
by git-admin＠x2go.org 23 Apr '13

23 Apr '13

The branch, tmp has been updated via d705e7ba70e7866ce904a5f509158430db94def7 (commit) from e96a2eb0f50a5fbd8afbe5644f328eaa34caf725 (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: test.py | 1 + 1 file changed, 1 insertion(+) The diff of changes is: diff --git a/test.py b/test.py index 5dce707..353cd16 100755 --- a/test.py +++ b/test.py @@ -24,5 +24,6 @@ Unit tests for Python X2GoBroker. import os if __name__ == "__main__": + os.environ.update({'X2GOBROKER_DEBUG': "1"}) os.chdir(os.path.join('x2gobroker', 'tests',)) os.system('python ./runalltests.py') 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 - tmp (branch) updated: f0df0578d48cb5eb91bfb1e482d68f4937817fce
by git-admin＠x2go.org 23 Apr '13

23 Apr '13

The branch, tmp has been updated via f0df0578d48cb5eb91bfb1e482d68f4937817fce (commit) from d705e7ba70e7866ce904a5f509158430db94def7 (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/tests/test_broker_base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2gobroker/tests/test_broker_base.py b/x2gobroker/tests/test_broker_base.py index 8891103..bde1538 100644 --- a/x2gobroker/tests/test_broker_base.py +++ b/x2gobroker/tests/test_broker_base.py @@ -343,13 +343,13 @@ check-credentials = false # no ACLs will grant access acls = { 'acl-users-allow': [], - 'acl-user-deny': [], + 'acl-users-deny': [], 'acl-users-order': 'deny-allow', } self.assertEqual(base_backend.check_profile_acls(username, acls), True) acls = { 'acl-users-allow': [], - 'acl-user-deny': [], + 'acl-users-deny': [], 'acl-users-order': 'allow-deny', } self.assertEqual(base_backend.check_profile_acls(username, acls), True) 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 - tmp (branch) updated: 0.0.0.1-3-gdc84423
by git-admin＠x2go.org 23 Apr '13

23 Apr '13

The branch, tmp 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 - tmp (branch) updated: 0.0.0.1
by git-admin＠x2go.org 23 Apr '13

23 Apr '13

The branch, tmp 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 - tmp (branch) updated: 0.0.0.1-4-gd424e12
by git-admin＠x2go.org 23 Apr '13

23 Apr '13

The branch, tmp has been updated via d424e129de63d2fd187d1364bf5d2791d74571be (commit) from dc84423e202eba6c1022821b24a25504ee1cab0c (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 + etc/broker/x2gobroker-sessionprofiles.conf | 3 +-- x2gobroker/brokers/base_broker.py | 2 +- x2gobroker/defaults.py | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 573259f..025cc4c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,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. * /debian/control: + Add bin:package x2gobroker-agent. diff --git a/etc/broker/x2gobroker-sessionprofiles.conf b/etc/broker/x2gobroker-sessionprofiles.conf index 8b332a3..f84e097 100644 --- a/etc/broker/x2gobroker-sessionprofiles.conf +++ b/etc/broker/x2gobroker-sessionprofiles.conf @@ -144,8 +144,7 @@ acl-any-order=deny-allow [pool-C-XFCE] user= # no load balancing support, yet -#host=s-E1.pool-c.domain.local,s-E2.pool-c.domain.local,s-E3.pool-c.domain.local,s-E4.pool-c.domain.local,s-E5.pool-c.domain.local,s-E6.pool-c.domain.local -host=s-E1.pool-c.domain.local +host=s-E1.pool-c.domain.local,s-E2.pool-c.domain.local,s-E3.pool-c.domain.local,s-E4.pool-c.domain.local,s-E5.pool-c.domain.local,s-E6.pool-c.domain.local name=XFCE - pool-C command=XFCE acl-users-allow=testuser-A,testuser-B diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 7da6336..c06dfa6 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -699,7 +699,7 @@ class X2GoBroker(object): profile = self.get_profile(profile_id) selected_session = { - 'server': profile[u'host'], + 'server': profile[u'host'][0], 'port': profile[u'sshport'], } diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index 63bc254..48b61d8 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -139,6 +139,8 @@ X2GOBROKER_SESSIONPROFILE_DEFAULTS = { u'sshport': 22, u'setdpi': 0, u'pack': u'16m-jpeg', + u'user': '', + u'host': [ u'localhost', ], u'acl-users-allow': [], u'acl-users-deny': [], u'acl-users-order': '', 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 - tmp (branch) updated: 7dfbf692abd457506ebf3f1372b8d0a11f3c9767
by git-admin＠x2go.org 23 Apr '13

23 Apr '13

The branch, tmp 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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits