x2go-commits May 2013

x2go-commits@lists.x2go.org

2 participants
1156 discussions

x2gobroker.git - build-main (branch) updated: 0.0.2.0-5-g32d9d26
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 32d9d26f987613ad9d4fe7893ce07241975707af (commit) from 3e0b0a48d874da2238d8fbb725f476a87f9f51ca (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: etc/x2gobroker.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf index cf544bb..a64361b 100644 --- a/etc/x2gobroker.conf +++ b/etc/x2gobroker.conf @@ -104,7 +104,7 @@ # immediately. # # This option can be overridden by the session profile parameter -# broker-session-autologin=<file-location> +# broker-session-autologin={true|false} #default-session-autologin=false 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.2.0-4-g3e0b0a4
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 3e0b0a48d874da2238d8fbb725f476a87f9f51ca (commit) from b82e0ece59e929ba5245f483f0ee7a1b9c4ba37f (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-agent.postrm | 2 +- debian/x2gobroker-authservice.postrm | 2 +- debian/x2gobroker-daemon.postrm | 2 +- debian/x2gobroker-wsgi.postrm | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/x2gobroker-agent.postrm b/debian/x2gobroker-agent.postrm index f5c6be0..0739da6 100755 --- a/debian/x2gobroker-agent.postrm +++ b/debian/x2gobroker-agent.postrm @@ -31,7 +31,7 @@ case "$1" in fi if [ ! -d /usr/share/doc/x2gobroker-daemon ] && [ ! -d /usr/share/doc/x2gobroker-authservice ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then - # remove user/group x2gobroker from system (if not in use by x2gobroker-daemon + # remove user/group x2gobroker from system (if not in use by x2gobroker-daemon, x2gobroker-authservice, x2gobroker-wsgi) getent passwd x2gobroker 1>/dev/null && deluser x2gobroker getent group x2gobroker 1>/dev/null && delgroup x2gobroker getent group x2gobroker 1>/dev/null && delgroup x2gobroker diff --git a/debian/x2gobroker-authservice.postrm b/debian/x2gobroker-authservice.postrm index bf336f5..851bfa5 100755 --- a/debian/x2gobroker-authservice.postrm +++ b/debian/x2gobroker-authservice.postrm @@ -27,7 +27,7 @@ case "$1" in fi if [ ! -d /usr/share/doc/x2gobroker-daemon ] && [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then - # remove user/group x2gobroker from system (only if not in use by x2gobroker-agent + # remove user/group x2gobroker from system (only if not in use by x2gobroker-daemon, x2gobroker-agent, x2gobroker-wsgi) getent passwd x2gobroker 1>/dev/null && deluser x2gobroker getent group x2gobroker 1>/dev/null && delgroup x2gobroker getent group x2gobroker 1>/dev/null && delgroup x2gobroker diff --git a/debian/x2gobroker-daemon.postrm b/debian/x2gobroker-daemon.postrm index f4d0af9..5d76a1b 100755 --- a/debian/x2gobroker-daemon.postrm +++ b/debian/x2gobroker-daemon.postrm @@ -27,7 +27,7 @@ case "$1" in fi if [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-authservice ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then - # remove user/group x2gobroker from system (only if not in use by x2gobroker-agent + # remove user/group x2gobroker from system (only if not in use by x2gobroker-agent, x2gobroker-authservice, x2gobroker-wsgi) getent passwd x2gobroker 1>/dev/null && deluser x2gobroker getent group x2gobroker 1>/dev/null && delgroup x2gobroker getent group x2gobroker 1>/dev/null && delgroup x2gobroker diff --git a/debian/x2gobroker-wsgi.postrm b/debian/x2gobroker-wsgi.postrm index 9db9cfe..d976222 100755 --- a/debian/x2gobroker-wsgi.postrm +++ b/debian/x2gobroker-wsgi.postrm @@ -27,7 +27,7 @@ case "$1" in fi if [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-authservice ] && [ ! -d /usr/share/doc/x2gobroker-daemon ]; then - # remove user/group x2gobroker from system (only if not in use by x2gobroker-agent + # remove user/group x2gobroker from system (only if not in use by x2gobroker-agent, x2gobroker-authservice, x2gobroker-daemon) getent passwd x2gobroker 1>/dev/null && deluser x2gobroker getent group x2gobroker 1>/dev/null && delgroup x2gobroker getent group x2gobroker 1>/dev/null && delgroup x2gobroker hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

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

19 May '13

The branch, build-main has been updated via 1cbf2c397ba3253681e4303e52017da30f48f2eb (commit) from 32d9d26f987613ad9d4fe7893ce07241975707af (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: sbin/x2gobroker-pubkeyauthorizer | 4 ---- 1 file changed, 4 deletions(-) The diff of changes is: diff --git a/sbin/x2gobroker-pubkeyauthorizer b/sbin/x2gobroker-pubkeyauthorizer index 2308a72..f6ebaa4 100755 --- a/sbin/x2gobroker-pubkeyauthorizer +++ b/sbin/x2gobroker-pubkeyauthorizer @@ -55,10 +55,6 @@ if os.environ.has_key('X2GOBROKER_DAEMON_GROUP'): X2GOBROKER_DAEMON_GROUP=os.environ['X2GOBROKER_DAEMON_GROUP'] else: X2GOBROKER_DAEMON_GROUP="x2gobroker" -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_DEBUG'): X2GOBROKER_DEBUG = ( os.environ['X2GOBROKER_DEBUG'].lower() in ('1', 'on', 'true', 'yes', ) ) else: hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.2.0-9-g41a126a
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 41a126a851c6b472283542311ce9ec97a916f887 (commit) from 5fb663ba8d36cdcdc1c7f89ef9b3bf75ae22e97f (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/x2gobroker.conf | 35 +++++++---------------------------- 2 files changed, 8 insertions(+), 28 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 3ccf158..c7712eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ x2gobroker (0.0.2.1-0~x2go1) UNRELEASED; urgency=low - In Apache2 vhost configuration example, move WSGI environment variable settings into VirtualHost setup. - Remove unused, not-yet-developed broker backends and frontends. + - Remove old cruft from x2gobroker.conf. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 May 2013 21:07:41 +0200 diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf index c698f87..275a486 100644 --- a/etc/x2gobroker.conf +++ b/etc/x2gobroker.conf @@ -24,50 +24,31 @@ [global] -# Possible X2Go Session Broker backends: -# -# 1. backend = zeroconf -# Use the ZeroConf X2Go Session Broker backend, this backend is for demo only -# and only operates on localhost. Make sure you have x2gobroker-daemon and -# x2goserver installed on the same machine. No need to install x2gobroker-agent. - -# 2. backend = simple -# The Simple X2Go Session Broker backend is for providing session profiles -# to multiple users/clients on a text config file basis. -# Authentication is required, make sure you have a working PAM setup. The -# session profile setup is accomplished by two files, a session profile -# list and a session profile map. The session profile map defines what user -# will get offered what session profile(s). - -# 3. backend = minibalancer -# A minimal load balancer for an X2Go server farm. Provide the same set of -# session profiles to multiple users, optimally without login (set -# check_credentials to false, below) and offer one of several pre-configured -# X2Go servers running the same setup. - # Allow unauthenticated connections? Then set check-credentials to false. #check-credentials = true # To secure server-client communication the client can start the communication # with a pre-set, agreed on authentication ID. Set the below value to true # to make the X2Go Session Broker require this feature -#require-cookie-auth = false +#require-cookie-auth = false ### NOT-IN-USE-YET # X2Go supports two different cookie authentication modes (static and dynamic). -#use-static-cookie = false +#use-static-cookie = false ### NOT-IN-USE-YET # Every server-client communication (between X2Go Client and broker) has to be # accompanied by this initial authentication cookie. -#my-cookie = <aaaavveeeerrrrryyyyylooonnnnggggssttrrriiinnnggg> +#my-cookie = <aaaavveeeerrrrryyyyylooonnnnggggssttrrriiinnnggg> ### NOT-IN-USE-YET -# X2Go Session Broker knows about two output formats: a text/html based output -# and a text/json based output. The different outputs run under different URLs +# X2Go Session Broker knows about two output formats: a text/plain based output +# and a text/json based output that is compatible with UCCS. The different outputs +# run under different URLs. # enable {base_url}/plain/ #enable-plain-output = true # enable {base_url}/uccs/ #enable-uccs-output = false + # use this URL base to create URL field in UCCS-style JSON output #my-uccs-url-base = http://localhost:8080/ @@ -94,7 +75,6 @@ # # This option can be overridden by the session profile parameter # broker-session-autologin={true|false} - #default-session-autologin=false # X2Go's authorized_keys file for broker mediated autologin sessions @@ -122,7 +102,6 @@ # # This option can be overridden by the session profile parameter # broker-authorized-keys=<file-location> - #default-authorized-keys=%h/.x2go/authorized_keys # X2Go Broker Agent query mode 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.2.0-8-g5fb663b
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 5fb663ba8d36cdcdc1c7f89ef9b3bf75ae22e97f (commit) from a543b6df7faa4ec5d008304e4f16512109817cac (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/x2gobroker.conf | 17 +---- sbin/x2gobroker | 2 - x2gobroker/brokers/ldap_broker.py | 33 ---------- x2gobroker/web/html.py | 123 ------------------------------------- x2gobroker/web/json.py | 30 --------- 6 files changed, 2 insertions(+), 204 deletions(-) delete mode 100644 x2gobroker/brokers/ldap_broker.py delete mode 100644 x2gobroker/web/html.py delete mode 100644 x2gobroker/web/json.py The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 5e2f943..3ccf158 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ x2gobroker (0.0.2.1-0~x2go1) UNRELEASED; urgency=low - Remove trainling slashes from ManagementServer URLs. - In Apache2 vhost configuration example, move WSGI environment variable settings into VirtualHost setup. + - Remove unused, not-yet-developed broker backends and frontends. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 May 2013 21:07:41 +0200 diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf index a64361b..c698f87 100644 --- a/etc/x2gobroker.conf +++ b/etc/x2gobroker.conf @@ -45,11 +45,6 @@ # check_credentials to false, below) and offer one of several pre-configured # X2Go servers running the same setup. -# 4. backend = ldap -# A production backend that stores all session profile, server and session -# profile mapping in LDAP - - # Allow unauthenticated connections? Then set check-credentials to false. #check-credentials = true @@ -76,12 +71,6 @@ # use this URL base to create URL field in UCCS-style JSON output #my-uccs-url-base = http://localhost:8080/ -# enable {base_url}/json/ (THIS IS FUTURE, mg-20121129) -#enable-json-output = false - -# enable {base_url}/html/ (THIS IS FUTURE, mg-20121129) -#enable-html-output = false - # default authentication mechanism for all broker backends #default-auth-mech = pam @@ -207,10 +196,6 @@ # # For small-scale deployments the IniFile backend is the recommended backend. -# 4. backend = ldap (deactivated by default) -# A production backend that stores all session profiles, servers and session -# profile mapping in LDAP (MUSIC OF THE FUTURE!!!) - [zeroconf] #enable = true #auth-mech = pam @@ -222,7 +207,7 @@ #enable = false #session-profiles = /etc/x2go/broker/x2gobroker-sessionprofiles.conf -[ldap] +#[ldap] -> MUSIC OF THE FUTURE #enable = false #auth-mech = ldap #user-db = ldap diff --git a/sbin/x2gobroker b/sbin/x2gobroker index c2ee335..63823b4 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -116,8 +116,6 @@ import x2gobroker.web.extras urls = ( ('/plain/(.*)', x2gobroker.web.plain.X2GoBrokerWeb,), ('/uccs/[a-zA-Z]*(/*)$', x2gobroker.web.uccs.X2GoBrokerWeb,), ('/uccs/(.*)/api/([0-9])(/*)$', x2gobroker.web.uccs.X2GoBrokerWebAPI,), -# ('/json/(.*)', x2gobroker.web.json.X2GoBrokerWeb,), -# ('/html/(.*)', x2gobroker.web.html.X2GoBrokerWeb,), ('/pubkeys(/*)$', x2gobroker.web.extras.X2GoBrokerPubKeyService,), ) diff --git a/x2gobroker/brokers/ldap_broker.py b/x2gobroker/brokers/ldap_broker.py deleted file mode 100644 index 8f631ab..0000000 --- a/x2gobroker/brokers/ldap_broker.py +++ /dev/null @@ -1,33 +0,0 @@ -# -*- 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> -# -# 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. - -"""\ -L{ldap.X2GoBroker} class - a production X2GoBroker implementations that uses LDAP as configuration backend - -""" -__NAME__ = 'x2gobroker-pylib' - -# modules -import x2gobroker.base - -class X2GoBroker(x2gobroker.base.X2GoBroker): - """\ - - """ diff --git a/x2gobroker/web/html.py b/x2gobroker/web/html.py deleted file mode 100644 index 0cfb97e..0000000 --- a/x2gobroker/web/html.py +++ /dev/null @@ -1,123 +0,0 @@ -#!/usr/bin/env python - -# This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011-2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# -# X2Go Session Broker is free software; you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# X2Go Session Broker is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - -# modules -import tornado.web - -# Python X2Go Broker modules -from x2gobroker.defaults import X2GOBROKER_DEFAULT_BACKEND as _X2GOBROKER_DEFAULT_BACKEND - - -class X2GoBrokerWeb(tornado.web.RequestHandler): - - http_header_items = { - 'Content-Type': 'text/html; charset=utf-8', - 'Expires': '+1h', - } - - page = web.template.Template("""$def with (html_header_items, output) -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html> -<head> -$for meta_tag in html_header_items["meta"]: - <meta $meta_tag="$html_header_items["meta"][meta_tag]"> -<title>$html_header_items['title']</title> -</head> - -<body> -$output -</body> -</html> -""" - ) - html_header_items = { - 'title': 'X2Go Session Broker', - 'meta': { - 'author': 'X2Go Developers <x2go-dev(a)lists.berlios.de>', - 'charset': 'utf-8', - 'keywords': 'X2Go', - 'description': 'X2Go Session Broker', - }, - } - - def _gen_http_header(self): - - for http_header_item in self.http_header_items.keys(): - self.set_header(http_header_item, self.http_header_items[http_header_item]) - - def get(self, backend): - return self.post(backend) - - def post(self, backend): - - self._gen_http_header() - - if not backend: - backend = _X2GOBROKER_DEFAULT_BACKEND - else: - backend = backend.rstrip('/') - - # silence pyflakes... - broker_backend = None - try: - # dynamically detect broker backend from given URL - exec("import x2gobroker.brokers.{backend}_broker".format(backend=backend)) - exec("broker_backend = x2gobroker.brokers.{backend}_broker.X2GoBroker()".format(backend=backend)) - except ImportError: - # throw a 404 if the backend does not exist - raise tornado.web.HTTPError(405) - - global_config = broker_backend.get_global_config() - backend_config = broker_backend.get_backend_config(backend) - - if not backend_config['enable']: - raise tornado.web.HTTPError(404) - - username = self.get_argument('user', default='') - password = self.get_argument('password', default='') - cookie = self.get_argument('cookie', default='') - task = self.get_argument('task') - profile_id = self.get_argument('sid', default='') - new_password = self.get_argument('newpass', default='') - - output = '' - - if broker_backend.check_access(username=username, password=password, authid=authid): - - ### - ### CONFIRM SUCCESSFUL AUTHENTICATION FIRST - ### - - output += "<strong>Access granted</strong><br>" - - if task: - - ### - ### WORK TODO HERE!!! - ### - pass - - self.write(output) - return - - raise tornado.web.HTTPError(401) - diff --git a/x2gobroker/web/json.py b/x2gobroker/web/json.py deleted file mode 100644 index 2e97f89..0000000 --- a/x2gobroker/web/json.py +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env python - -# This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011-2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# -# X2Go Session Broker is free software; you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# X2Go Session Broker is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - -# modules -import tornado.web - - -class X2GoBrokerWeb(tornado.web.RequestHandler): - - # MUSIC OF THE FUTURE - pass \ No newline at end of file hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.2.0-7-ga543b6d
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via a543b6df7faa4ec5d008304e4f16512109817cac (commit) from 1cbf2c397ba3253681e4303e52017da30f48f2eb (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 + etc/x2gobroker-wsgi.apache.vhost | 78 +++++++++++++++++++------------------- 2 files changed, 41 insertions(+), 39 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index aa10d08..5e2f943 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ x2gobroker (0.0.2.1-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.0.2.0): - Remove trainling slashes from ManagementServer URLs. + - In Apache2 vhost configuration example, move WSGI environment + variable settings into VirtualHost setup. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 May 2013 21:07:41 +0200 diff --git a/etc/x2gobroker-wsgi.apache.vhost b/etc/x2gobroker-wsgi.apache.vhost index 4de60a8..931f7d2 100644 --- a/etc/x2gobroker-wsgi.apache.vhost +++ b/etc/x2gobroker-wsgi.apache.vhost @@ -7,55 +7,43 @@ # prefer setting up the X2Go Session Broker as a virtual host. # -# enable debugging -#SetEnv X2GOBROKER_DEBUG off - -# the default user/group that this WSGI application runs as -#X2GOBROKER_DAEMON_USER=x2gobroker -#X2GOBROKER_DAEMON_GROUP=x2gobroker -WSGIDaemonProcess x2gobroker user=x2gobroker group=x2gobroker processes=5 threads=15 -WSGIPassAuthorization On +<VirtualHost *:443> -# default broker backend (default: zeroconf) -#SetEnv X2GOBROKER_DEFAULT_BACKEND zeroconf -#SetEnv X2GOBROKER_DEFAULT_BACKEND inifile -#SetEnv X2GOBROKER_DEFAULT_BACKEND ldap -#SetEnv X2GOBROKER_DEFAULT_BACKEND <some-other-broker-backend> + ServerName localhost + ServerAdmin webmaster@localhost -# path to the X2Go Session Broker's configuration file -#SetEnv X2GOBROKER_CONFIG /etc/x2go/x2gobroker.conf + # enable debugging + #SetEnv X2GOBROKER_DEBUG off -# path to the X2Go Session Broker's session profiles file (when using the inifile backend) -#SetEnv X2GOBROKER_SESSIONPROFILES /etc/x2go/broker/x2gobroker-sessionprofiles.conf + # the default user/group that this WSGI application runs as + #X2GOBROKER_DAEMON_USER=x2gobroker + #X2GOBROKER_DAEMON_GROUP=x2gobroker + WSGIDaemonProcess x2gobroker user=x2gobroker group=x2gobroker processes=5 threads=15 + WSGIPassAuthorization On -# path to the X2Go Session Broker's agent command -#SetEnv X2GOBROKER_AGENT_CMD /usr/lib/x2go/x2gobroker-agent + # default broker backend (default: zeroconf) + #SetEnv X2GOBROKER_DEFAULT_BACKEND zeroconf + #SetEnv X2GOBROKER_DEFAULT_BACKEND inifile + #SetEnv X2GOBROKER_DEFAULT_BACKEND ldap + #SetEnv X2GOBROKER_DEFAULT_BACKEND <some-other-broker-backend> -# authentication socket of the X2Go Broker's PAM Authentication Service -#SetEnv X2GOBROKER_AUTHSOCKET /run/x2gobroker/x2gobroker-authservice.socket + # path to the X2Go Session Broker's configuration file + #SetEnv X2GOBROKER_CONFIG /etc/x2go/x2gobroker.conf -# if you have to-be-statically-served files somewhere below the broker URL -#Alias /x2gobroker/static /some/static/path/ + # path to the X2Go Session Broker's session profiles file (when using the inifile backend) + #SetEnv X2GOBROKER_SESSIONPROFILES /etc/x2go/broker/x2gobroker-sessionprofiles.conf -WSGIScriptAlias / /usr/sbin/x2gobroker -WSGIProcessGroup x2gobroker + # path to the X2Go Session Broker's agent command + #SetEnv X2GOBROKER_AGENT_CMD /usr/lib/x2go/x2gobroker-agent -<VirtualHost *:443> + # authentication socket of the X2Go Broker's PAM Authentication Service + #SetEnv X2GOBROKER_AUTHSOCKET /run/x2gobroker/x2gobroker-authservice.socket - ServerName localhost - ServerAdmin webmaster@localhost + # if you have to-be-statically-served files somewhere below the broker URL + #Alias /x2gobroker/static /some/static/path/ - SSLEngine on - # SSL Cipher Suite: - SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL - # Server Certificate: - SSLCertificateFile /etc/x2go/broker/ssl/broker.crt - # Server Private Key: - SSLCertificateKeyFile /etc/x2go/broker/ssl/broker.key - #SSLCertificateChainFile /etc/x2go/broker/ssl/cacert.key - #SetEnvIf User-Agent ".*MSIE.*" \ - # nokeepalive ssl-unclean-shutdown \ - # downgrade-1.0 force-response-1.0 + WSGIScriptAlias / /usr/sbin/x2gobroker + WSGIProcessGroup x2gobroker <Directory /usr/sbin/x2gobroker> Order deny,allow @@ -72,4 +60,16 @@ WSGIProcessGroup x2gobroker </Directory> + SSLEngine on + # SSL Cipher Suite: + SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL + # Server Certificate: + SSLCertificateFile /etc/x2go/broker/ssl/broker.crt + # Server Private Key: + SSLCertificateKeyFile /etc/x2go/broker/ssl/broker.key + #SSLCertificateChainFile /etc/x2go/broker/ssl/cacert.key + #SetEnvIf User-Agent ".*MSIE.*" \ + # nokeepalive ssl-unclean-shutdown \ + # downgrade-1.0 force-response-1.0 + </VirtualHost> 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.2.0-10-gae12eec
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via ae12eec822c2b508ca41df898e700855099d737a (commit) from 41a126a851c6b472283542311ce9ec97a916f887 (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/authmechs/htpasswd_authmech.py | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 x2gobroker/authmechs/htpasswd_authmech.py The diff of changes is: diff --git a/x2gobroker/authmechs/htpasswd_authmech.py b/x2gobroker/authmechs/htpasswd_authmech.py deleted file mode 100644 index 0778ca0..0000000 --- a/x2gobroker/authmechs/htpasswd_authmech.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- 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> -# -# 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. - -class X2GoBrokerAuthMech(object): - - def authenticate(self, username, password): - - ### TODO: implement an authentication mechanism that can use htpasswd files - return False - 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.2.0-12-g65d6359
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 65d635943bb2a8580eae0f04be99dcd3e5c9605c (commit) from a62fa864d38a7bad4938905782049d5d6af8d9bc (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 | 2 +- debian/changelog | 3 +++ src/x2gobroker-agent.c | 55 ++++-------------------------------------------- 3 files changed, 8 insertions(+), 52 deletions(-) The diff of changes is: diff --git a/Makefile b/Makefile index 02382e5..8b10c5e 100755 --- a/Makefile +++ b/Makefile @@ -56,7 +56,7 @@ build: build-arch build-indep build-arch: build_setuidwrappers build_setuidwrappers: - $(CC) $(CFLAGS) $(LDFLAGS) -o lib/x2gobroker-agent src/x2gobroker-agent.c + $(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(DESTDIR)$(LIBDIR)/x2gobroker-agent.pl\" -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 91ee2fc..038afcd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,9 @@ x2gobroker (0.0.2.1-0~x2go1) UNRELEASED; urgency=low variable settings into VirtualHost setup. - Remove unused, not-yet-developed broker backends and frontends. - Remove old cruft from x2gobroker.conf. + - Security fix for setuid wrapper x2gobroker-agent.c. Hard-code path to + x2gobroker-agent.pl during build via defining a macro in the Makefile. + Thanks to Richard Weinberger for spotting this!!! [ Jan Engelhardt ] * New upstream version (0.0.2.1): diff --git a/src/x2gobroker-agent.c b/src/x2gobroker-agent.c index 29992fd..0464ae7 100644 --- a/src/x2gobroker-agent.c +++ b/src/x2gobroker-agent.c @@ -19,61 +19,14 @@ * Free Software Foundation, Inc., * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * - * */ -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <libgen.h> -#include <errno.h> - int main( int argc, char *argv[] ) { - char * x2gobrokeragentpl = NULL; - size_t path_max; - -/* - The following snippet is taken from the realpath manpage -*/ -#ifdef PATH_MAX - path_max = PATH_MAX; -#else - path_max = pathconf (".", _PC_PATH_MAX); - if (path_max <= 0){ - path_max = 4096; - } -#endif - { - // allocate dynamic buffer in stack: this needs C99 or gnu?? - char buffer[path_max]; - ssize_t rvrl; - int rvap; - - // resolve link of /proc/self/exe to find out where we are - rvrl = readlink("/proc/self/exe", buffer, path_max); - if(rvrl == -1){ - perror("readlink(\"/proc/self/exe\",buffer,path_max)"); - exit(EXIT_FAILURE); - } - if(rvrl >= path_max){ - fprintf(stderr, "Could not resolve the path of this file using \"/proc/self/exe\". The path is too long (> %i)", path_max); - exit(EXIT_FAILURE); - } - - // derive the full path of x2gobroker-agent.pl from path of this binary - rvap = asprintf(&x2gobrokeragentpl, "%s/%s", dirname(buffer), "x2gobroker-agent.pl"); - if(rvap == -1){ - fprintf(stderr, "Failed to allocate memory calling asprintf\n"); - exit(EXIT_FAILURE); - } - - // execute the script, running with user-rights of this binary - execv(x2gobrokeragentpl, argv); - } + char x2gobrokeragent[] = TRUSTED_BINARY; - // ...fail - fprintf(stderr, "Failed to execute %s: %s\n", x2gobrokeragentpl, strerror(errno)); - return EXIT_FAILURE; + argv[0] = "x2gobroker-agent.pl"; + // execute the script, running with user-rights of this binary + execv(x2gobrokeragent, argv); } 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.2.0-13-g1120e90
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 1120e90923542f62c7e897de178afbf45e052e77 (commit) from 65d635943bb2a8580eae0f04be99dcd3e5c9605c (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/python-x2gobroker.default | 39 +------ debian/x2gobroker-authservice.default | 20 +--- debian/x2gobroker-authservice.init | 106 +---------------- debian/x2gobroker-daemon.default | 35 +----- debian/x2gobroker-daemon.init | 121 +------------------- {debian => defaults}/python-x2gobroker.default | 0 .../x2gobroker-authservice.default | 0 {debian => defaults}/x2gobroker-daemon.default | 0 {debian => init}/x2gobroker-authservice.init | 0 {debian => init}/x2gobroker-daemon.init | 0 11 files changed, 7 insertions(+), 316 deletions(-) mode change 100644 => 120000 debian/python-x2gobroker.default mode change 100644 => 120000 debian/x2gobroker-authservice.default mode change 100755 => 120000 debian/x2gobroker-authservice.init mode change 100644 => 120000 debian/x2gobroker-daemon.default mode change 100755 => 120000 debian/x2gobroker-daemon.init copy {debian => defaults}/python-x2gobroker.default (100%) copy {debian => defaults}/x2gobroker-authservice.default (100%) copy {debian => defaults}/x2gobroker-daemon.default (100%) copy {debian => init}/x2gobroker-authservice.init (100%) copy {debian => init}/x2gobroker-daemon.init (100%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 038afcd..b39fc37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ x2gobroker (0.0.2.1-0~x2go1) UNRELEASED; urgency=low - Security fix for setuid wrapper x2gobroker-agent.c. Hard-code path to x2gobroker-agent.pl during build via defining a macro in the Makefile. Thanks to Richard Weinberger for spotting this!!! + * Provide init scripts and *.default files outside of /debian folder (as + they are also relevant for non-Debian packaging. [ Jan Engelhardt ] * New upstream version (0.0.2.1): diff --git a/debian/python-x2gobroker.default b/debian/python-x2gobroker.default deleted file mode 100644 index 67b93cb..0000000 --- a/debian/python-x2gobroker.default +++ /dev/null @@ -1,38 +0,0 @@ -# X2Go Broker Session Broker (common) configuration for Debian - -# The posix user/group ID the broker runs under (do not change!) -# if you change those nonetheless, make sure that the log file -# directory (default: /var/log/x2gobroker) and files in there are -# writable by that user -#X2GOBROKER_DAEMON_USER=x2gobroker -#X2GOBROKER_DAEMON_GROUP=x2gobroker - -# The posix user under which the x2gobroker-agent can be launched on -# remote X2Go Servers. -#X2GOBROKER_AGENT_USER=x2gobroker - -# Control debug mode (0=disable, 1=enable). -# -# Apart from verbose logging in /var/log/x2gobroker/*.log, this will -# also make the broker available through http GET method requests -# (otherwise: POST method requests only) and you will be able to test -# the broker through your web browser -# -# This value has an effect on all (Python-based) X2Go Session Broker -# services and can be overridden in /etc/default/x2gobroker-* files. -#X2GOBROKER_DEBUG=0 - -# Default X2Go Session Broker backend (available: zeroconf, inifile) -#X2GOBROKER_DEFAULT_BACKEND=zeroconf - -# Path to the X2Go Session Broker's configuration file -#X2GOBROKER_CONFIG=/etc/x2go/x2gobroker.conf - -# Path to the X2Go Session Broker's session profiles file (when using the inifile backend) -#X2GOBROKER_SESSIONPROFILES=/etc/x2go/broker/x2gobroker-sessionprofiles.conf - -# Path to the X2Go Session Broker's agent command -#X2GOBROKER_AGENT_CMD=/usr/lib/x2go/x2gobroker-agent - -# The unix socket file for communication between the broker and the authentication service. -#X2GOBROKER_AUTHSERVICE_SOCKET=/run/x2gobroker/x2gobroker-authservice.socket diff --git a/debian/python-x2gobroker.default b/debian/python-x2gobroker.default new file mode 120000 index 0000000..04a50d2 --- /dev/null +++ b/debian/python-x2gobroker.default @@ -0,0 +1 @@ +../defaults/python-x2gobroker.default \ No newline at end of file diff --git a/debian/x2gobroker-authservice.default b/debian/x2gobroker-authservice.default deleted file mode 100644 index e8b5f7b..0000000 --- a/debian/x2gobroker-authservice.default +++ /dev/null @@ -1,19 +0,0 @@ -# X2Go Session Broker (PAM Authentication Service) configuration for Debian - -# For PAM authentication the X2Go Session Broker needs its authentication -# service. The session broker itself runs as a non-privileged user (see below) -# whereas the authentication service must run as super-user root. -# -# If you do not use PAM as authentication mechanism with the X2Go Session Broker, -# you can disable the authentication service here. -START_AUTHSERVICE=true - -# Control debug mode (0=disable, 1=enable) of the X2Go Broker Authentication -# Service. -# -# Logging is (by default) written to /var/log/x2gobroker/*log. -# -# This option can also be configured in /etc/default/python-x2go. -# The value configured here overrides the value from python-x2go -# defaults and only sets the x2gobroker-authservice into debug mode. -#X2GOBROKER_DEBUG=0 diff --git a/debian/x2gobroker-authservice.default b/debian/x2gobroker-authservice.default new file mode 120000 index 0000000..cb42293 --- /dev/null +++ b/debian/x2gobroker-authservice.default @@ -0,0 +1 @@ +../defaults/x2gobroker-authservice.default \ No newline at end of file diff --git a/debian/x2gobroker-authservice.init b/debian/x2gobroker-authservice.init deleted file mode 100755 index 56efcb7..0000000 --- a/debian/x2gobroker-authservice.init +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/sh -# -# Start the X2Go Session Broker PAM Authentication Service -# -# Copyright © 2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Distributable under the terms of the GNU AGPL version 2. -# -### BEGIN INIT INFO -# Provides: x2gobroker-authservice -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: X2Go Session Broker PAM Authentication Service -# Description: PAM authentication service for X2Go Session Broker -### END INIT INFO -# - -set -eu - -AUTHSERVICE=/usr/sbin/x2gobroker-authservice -test -d /run && RUNDIR=/run || RUNDIR=/var/run -PIDFILE_AUTHSERVICE=$RUNDIR/x2gobroker/x2gobroker-authservice.pid -DEBIANCONFIG_COMMON=/etc/default/python-x2gobroker -DEBIANCONFIG_AUTHSERVICE=/etc/default/x2gobroker-authservice - -test -x "$AUTHSERVICE" || exit 0 - -START_AUTHSERVICE=false -X2GOBROKER_DEBUG=0 -X2GOBROKER_DAEMON_USER='x2gobroker' -X2GOBROKER_DAEMON_GROUP='x2gobroker' -X2GOBROKER_AUTHSERVICE_SOCKET="$RUNDIR/x2gobroker/x2gobroker-authservice.socket" -test -f $DEBIANCONFIG_COMMON && . $DEBIANCONFIG_COMMON -test -f $DEBIANCONFIG_AUTHSERVICE && . $DEBIANCONFIG_AUTHSERVICE - -if ! getent passwd $X2GOBROKER_DAEMON_USER 1>/dev/null 2>/dev/null; then - X2GOBROKER_DAEMON_USER=nobody -fi -if ! getent group $X2GOBROKER_DAEMON_GROUP 1>/dev/null 2>/dev/null; then - X2GOBROKER_DAEMON_GROUP=nogroup -fi - -# create PID directory -mkdir -p $RUNDIR/x2gobroker -chown $X2GOBROKER_DAEMON_USER:$X2GOBROKER_DAEMON_GROUP $RUNDIR/x2gobroker -chmod 0770 $RUNDIR/x2gobroker - -export X2GOBROKER_DEBUG -export X2GOBROKER_DAEMON_USER -export X2GOBROKER_DAEMON_GROUP -export X2GOBROKER_AUTHSERVICE_SOCKET - -. /lib/lsb/init-functions - -is_true() -{ - case "${1:-}" in - [Yy]es|[Yy]|1|[Tt]|[Tt]rue) return 0;; - *) return 1; - esac -} - -case "${1:-}" in - start) - if [ -f $PIDFILE_AUTHSERVICE ]; then - if ps -u root | grep $(basename $AUTHSERVICE) 1>/dev/null 2>/dev/null; then - log_warning_msg "X2Go Broker Authentication Service already running" - else - log_warning_msg "X2Go Broker Authentication Service: stale PID file ($PIDFILE_AUTHSERVICE). Delete it manually!" - fi - START_AUTHSERVICE=no - fi - if is_true $START_AUTHSERVICE; then - set +e - # once we are here, we have to make sure the authservice.socket does not exist - rm -f $X2GOBROKER_AUTHSERVICE_SOCKET - # and now we can start the auth service - log_daemon_msg "Starting X2Go Broker Authentication Service" "$(basename $AUTHSERVICE)" - start-stop-daemon -b -m -S -p $PIDFILE_AUTHSERVICE -x $AUTHSERVICE -- -s $X2GOBROKER_AUTHSERVICE_SOCKET -o root -g $X2GOBROKER_DAEMON_GROUP -p 0660 - set -e - log_end_msg $? - fi - ;; - stop) - if [ -f $PIDFILE_AUTHSERVICE ] ; then - log_daemon_msg "Stopping X2Go Broker Authentication Service" "$(basename $AUTHSERVICE)" - set +e - start-stop-daemon -K -p $PIDFILE_AUTHSERVICE - rm -f $PIDFILE_AUTHSERVICE - log_end_msg $? - set -e - fi - ;; - restart|reload|force-reload) - ${0:-} stop - ${0:-} start - ;; - *) - echo "Usage: ${0:-} {start|stop|restart|reload|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/debian/x2gobroker-authservice.init b/debian/x2gobroker-authservice.init new file mode 120000 index 0000000..60f39ca --- /dev/null +++ b/debian/x2gobroker-authservice.init @@ -0,0 +1 @@ +../init/x2gobroker-authservice.init \ No newline at end of file diff --git a/debian/x2gobroker-daemon.default b/debian/x2gobroker-daemon.default deleted file mode 100644 index 0eb0a81..0000000 --- a/debian/x2gobroker-daemon.default +++ /dev/null @@ -1,34 +0,0 @@ -# X2Go Session Broker configuration for Debian - -# Uncomment to enable the X2Go Session Broker standalone daemon -START_BROKER=true - -# Bind standalone daemon to this address:port -#DAEMON_BIND_ADDRESS=127.0.0.1:8080 - -# Control debug mode (0=disable, 1=enable). -# -# Apart from verbose logging in /var/log/x2gobroker/*.log, this will -# also make the broker available through http GET method requests -# (otherwise: POST method requests only) and you will be able to -# test the broker through your web browser. -# -# This option can also be configured in /etc/default/python-x2go. -# The value configured here overrides the value from python-x2go -# defaults and only sets the x2gobroker-daemon into debug mode. -#X2GOBROKER_DEBUG=0 - -########################################################## -### ### -### 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 - -# SSL key file (ensure permissions are set to root:x2gobroker:0640) -#X2GOBROKER_SSL_KEYFILE=/etc/x2go/broker/ssl/broker.key diff --git a/debian/x2gobroker-daemon.default b/debian/x2gobroker-daemon.default new file mode 120000 index 0000000..8ec44b7 --- /dev/null +++ b/debian/x2gobroker-daemon.default @@ -0,0 +1 @@ +../defaults/x2gobroker-daemon.default \ No newline at end of file diff --git a/debian/x2gobroker-daemon.init b/debian/x2gobroker-daemon.init deleted file mode 100755 index 0a8b90a..0000000 --- a/debian/x2gobroker-daemon.init +++ /dev/null @@ -1,120 +0,0 @@ -#!/bin/sh -# -# Start the X2Go Session Broker standalone daemon -# -# Copyright © 2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Distributable under the terms of the GNU AGPL version 2. -# -### BEGIN INIT INFO -# Provides: x2gobroker-daemon -# Required-Start: $remote_fs $syslog x2gobroker-authservice -# Required-Stop: $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: X2Go Session Broker standalone daemon -# Description: X2Go Session Broker daemon comes with its own HTTP daemon -### END INIT INFO -# - -set -eu - -DAEMON=/usr/sbin/x2gobroker -test -d /run && RUNDIR=/run || RUNDIR=/var/run -PIDFILE_BROKER=$RUNDIR/x2gobroker/x2gobroker-daemon.pid -DEBIANCONFIG_COMMON=/etc/default/python-x2gobroker -DEBIANCONFIG_DAEMON=/etc/default/x2gobroker-daemon - -test -x "$DAEMON" || exit 0 - -START_BROKER=false -DAEMON_BIND_ADDRESS=127.0.0.1:8080 -X2GOBROKER_DEBUG=0 -X2GOBROKER_DAEMON_USER='x2gobroker' -X2GOBROKER_DAEMON_GROUP='x2gobroker' -X2GOBROKER_DEFAULT_BACKEND="zeroconf" -X2GOBROKER_CONFIG="/etc/x2go/x2gobroker.conf" -X2GOBROKER_SESSIONPROFILES="/etc/x2go/broker/x2gobroker-sessionprofiles.conf" -X2GOBROKER_AGENT_CMD="/usr/lib/x2go/x2gobroker-agent" -X2GOBROKER_AUTHSERVICE_SOCKET="$RUNDIR/x2gobroker/x2gobroker-authservice.socket" -X2GOBROKER_SSL_CERTFILE= -X2GOBROKER_SSL_KEYFILE= -test -f $DEBIANCONFIG_COMMON && . $DEBIANCONFIG_COMMON -test -f $DEBIANCONFIG_DAEMON && . $DEBIANCONFIG_DAEMON - -if ! getent passwd $X2GOBROKER_DAEMON_USER 1>/dev/null 2>/dev/null; then - X2GOBROKER_DAEMON_USER=nobody -fi -if ! getent group $X2GOBROKER_DAEMON_GROUP 1>/dev/null 2>/dev/null; then - X2GOBROKER_DAEMON_GROUP=nogroup -fi - -# create PID directory -mkdir -p $RUNDIR/x2gobroker -chown $X2GOBROKER_DAEMON_USER:$X2GOBROKER_DAEMON_GROUP $RUNDIR/x2gobroker -chmod 0770 $RUNDIR/x2gobroker - -# mend user ID variables when --chuid $X2GOBROKER_DAEMON_USER is used with start-stop-daemon -export LOGNAME=$X2GOBROKER_DAEMON_USER -export USER=$X2GOBROKER_DAEMON_USER -export USERNAME=$X2GOBROKER_DAEMON_USER - -export X2GOBROKER_DEBUG -export X2GOBROKER_DAEMON_USER -export X2GOBROKER_DAEMON_GROUP -export X2GOBROKER_CONFIG -export X2GOBROKER_DEFAULT_BACKEND -export X2GOBROKER_SESSIONPROFILES -export X2GOBROKER_AGENT_CMD -export X2GOBROKER_AUTHSERVICE_SOCKET -export X2GOBROKER_SSL_CERTFILE -export X2GOBROKER_SSL_KEYFILE - -. /lib/lsb/init-functions - -is_true() -{ - case "${1:-}" in - [Yy]es|[Yy]|1|[Tt]|[Tt]rue) return 0;; - *) return 1; - esac -} - -case "${1:-}" in - start) - if [ -f $PIDFILE_BROKER ]; then - if ps -u $X2GOBROKER_DAEMON_USER | grep $(basename $DAEMON) 1>/dev/null 2>/dev/null; then - log_warning_msg "X2Go Session Broker already running" - else - log_warning_msg "X2Go Session Broker: stale PID file ($PIDFILE_BROKER). Delete it manually!" - fi - START_BROKER=no - fi - if is_true $START_BROKER; then - log_daemon_msg "Starting X2Go Session Broker standalone daemon" "$(basename $DAEMON)" - set +e - start-stop-daemon --chuid $X2GOBROKER_DAEMON_USER -b -m -S -p $PIDFILE_BROKER -x $DAEMON -- -b $DAEMON_BIND_ADDRESS - log_end_msg $? - set -e - fi - ;; - stop) - if [ -f $PIDFILE_BROKER ] ; then - log_daemon_msg "Stopping X2Go Session Broker standalone daemon" "$(basename $DAEMON)" - set +e - start-stop-daemon -K -p $PIDFILE_BROKER - rm -f $PIDFILE_BROKER - log_end_msg $? - set -e - fi - ;; - restart|reload|force-reload) - ${0:-} stop - ${0:-} start - ;; - *) - echo "Usage: ${0:-} {start|stop|restart|reload|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/debian/x2gobroker-daemon.init b/debian/x2gobroker-daemon.init new file mode 120000 index 0000000..2c5f82e --- /dev/null +++ b/debian/x2gobroker-daemon.init @@ -0,0 +1 @@ +../init/x2gobroker-daemon.init \ No newline at end of file diff --git a/debian/python-x2gobroker.default b/defaults/python-x2gobroker.default similarity index 100% copy from debian/python-x2gobroker.default copy to defaults/python-x2gobroker.default diff --git a/debian/x2gobroker-authservice.default b/defaults/x2gobroker-authservice.default similarity index 100% copy from debian/x2gobroker-authservice.default copy to defaults/x2gobroker-authservice.default diff --git a/debian/x2gobroker-daemon.default b/defaults/x2gobroker-daemon.default similarity index 100% copy from debian/x2gobroker-daemon.default copy to defaults/x2gobroker-daemon.default diff --git a/debian/x2gobroker-authservice.init b/init/x2gobroker-authservice.init similarity index 100% copy from debian/x2gobroker-authservice.init copy to init/x2gobroker-authservice.init diff --git a/debian/x2gobroker-daemon.init b/init/x2gobroker-daemon.init similarity index 100% copy from debian/x2gobroker-daemon.init copy to init/x2gobroker-daemon.init 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.2.0-11-ga62fa86
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via a62fa864d38a7bad4938905782049d5d6af8d9bc (commit) from ae12eec822c2b508ca41df898e700855099d737a (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 | 43 +++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 7 ++++++- 2 files changed, 49 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/Makefile b/Makefile index b5c2148..02382e5 100755 --- a/Makefile +++ b/Makefile @@ -73,3 +73,46 @@ clean_indep: test: install: + mkdir -p "${DESTDIR}/var/lib/x2gobroker" \ + "${DESTDIR}/var/log/x2gobroker" + + # python-x2gobroker + python setup.py install --prefix="${PREFIX}" $${DESTDIR+--root="${DESTDIR}"} + mkdir -p "${DESTDIR}${ETCDIR}/broker" "${DESTDIR}/etc/pam.d" + ${INSTALL_FILE} etc/x2gobroker.conf "${DESTDIR}${ETCDIR}/" + ${INSTALL_FILE} etc/broker/x2gobroker-sessionprofiles.conf \ + etc/broker/x2gobroker-loggers.conf \ + "${DESTDIR}${ETCDIR}/broker/" + mkdir -p "${DESTDIR}/etc/pam.d" + ${INSTALL_FILE} pam/x2gobroker "${DESTDIR}/etc/pam.d/" + + # x2gobroker-agent + mkdir -p "${DESTDIR}${LIBDIR}" "${DESTDIR}${SBINDIR}" + ${INSTALL_PROGRAM} lib/x2gobroker-agent* "${DESTDIR}${LIBDIR}/" + ${INSTALL_PROGRAM} sbin/x2gobroker-pubkeyauthorizer "${DESTDIR}${SBINDIR}/" + + # x2gobroker-authservice + mkdir -p "${DESTDIR}${SBINDIR}" "${DESTDIR}/etc/logrotate.d" \ + "${DESTDIR}${ETCDIR}/broker" + ${INSTALL_PROGRAM} sbin/x2gobroker-authservice "${DESTDIR}${SBINDIR}/" + ${INSTALL_FILE} logrotate/x2gobroker-authservice \ + "${DESTDIR}/etc/logrotate.d/" + ${INSTALL_FILE} etc/broker/x2gobroker-authservice-logger.conf \ + "${DESTDIR}${ETCDIR}/broker/" + + # x2gobroker-daemon + mkdir -p "${DESTDIR}/etc/logrotate.d/" + ${INSTALL_FILE} logrotate/x2gobroker-daemon \ + "${DESTDIR}/etc/logrotate.d/" + + # x2gobroker-wsgi + mkdir -p "${DESTDIR}${ETCDIR}" "${DESTDIR}/etc/logrotate.d" + ${INSTALL_FILE} etc/x2gobroker-wsgi.apache.{conf,vhost} \ + "${DESTDIR}${ETCDIR}/" + ${INSTALL_FILE} logrotate/x2gobroker-wsgi "${DESTDIR}/etc/logrotate.d/" + + # x2gobroker + mkdir -p "${DESTDIR}${BINDIR}" "${DESTDIR}${SBINDIR}" + ${INSTALL_PROGRAM} bin/x2gobroker-testauth "${DESTDIR}${BINDIR}/" + ${INSTALL_PROGRAM} sbin/x2gobroker sbin/x2gobroker-keygen \ + "${DESTDIR}${SBINDIR}/" diff --git a/debian/changelog b/debian/changelog index c7712eb..91ee2fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,17 @@ x2gobroker (0.0.2.1-0~x2go1) UNRELEASED; urgency=low - * New upstream version (0.0.2.0): + [ Mike Gabriel ] + * New upstream version (0.0.2.1): - Remove trainling slashes from ManagementServer URLs. - In Apache2 vhost configuration example, move WSGI environment variable settings into VirtualHost setup. - Remove unused, not-yet-developed broker backends and frontends. - Remove old cruft from x2gobroker.conf. + [ Jan Engelhardt ] + * New upstream version (0.0.2.1): + - Populate install target of Makefile. (Fixes: #201). + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 May 2013 21:07:41 +0200 x2gobroker (0.0.2.0-0~x2go1) unstable; urgency=low 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

← Newer
1
2
3
4
5
6
7
8
...
116
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits May 2013