x2go-commits November 2013

x2go-commits@lists.x2go.org

2 participants
391 discussions

x2goclient.git - master (branch) updated: 4.0.1.1-18-g2f53855
by git-admin＠x2go.org 05 Nov '13

05 Nov '13

The branch, master has been updated via 2f53855ca00741af1f2276163201607484ddd861 (commit) from 8d9dc5b9c3c1f89a4430b1d9ffcc89a311891a2c (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 2f53855ca00741af1f2276163201607484ddd861 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Nov 5 10:55:04 2013 +0100 Properly handle (=expand) the "~" character in key filenames. (Brought to attention by Eldamir on IRC. Thanks!). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ onmainwindow.cpp | 7 +++++++ 2 files changed, 9 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 603d6ba..2d6cd76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ x2goclient (4.0.1.2-0~x2go2) UNRELEASED; urgency=low installed (self-signed) SSL certificate chains for https (SSL) session broker connections. (Fixes: #311). - Update man page for new --tray-icon cmdline option. + - Properly handle (=expand) the "~" character in key filenames. (Brought to + attention by Eldamir on IRC. Thanks!). * Pull-in packaging changes from Debian. [ Ricardo Díaz Martín ] diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 7811540..164b2a6 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -2681,6 +2681,10 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session ) currentKey=st->setting()->value ( sid+"/key", ( QVariant ) QString::null ).toString(); + if ( currentKey.startsWith("~") ) { + currentKey = currentKey.replace(QString("~"), QDir::homePath()); + } + autologin=st->setting()->value ( sid+"/autologin", ( QVariant ) false ).toBool(); @@ -3419,6 +3423,9 @@ bool ONMainWindow::startSession ( const QString& sid ) sid+"/sshproxykeyfile", QString() ).toString() ); + if ( proxyKey.startsWith("~") ) { + proxyKey = proxyKey.replace(QString("~"), QDir::homePath()); + } proxyserver=(st->setting()->value ( sid+"/sshproxyhost", hooks/post-receive -- x2goclient.git (X2Go Client) 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 "x2goclient.git" (X2Go Client).

1 0

python-x2go.git - master (branch) updated: 0.4.0.8-18-g6e04237
by git-admin＠x2go.org 05 Nov '13

05 Nov '13

The branch, master has been updated via 6e04237345370000d3deda0e66b462670b626d54 (commit) from 5b8164de3596bd79e89de18e574252b2730b0916 (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 6e04237345370000d3deda0e66b462670b626d54 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Nov 5 10:12:25 2013 +0100 Properly handle (=expand) the "~" character in key filenames. (Brought to attention by Eldamir on IRC. Thanks!). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/backends/control/_stdout.py | 3 +++ x2go/sshproxy.py | 3 +++ 3 files changed, 8 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index cee5b48..538cff8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ python-x2go (0.4.0.9-0~x2go1) UNRELEASED; urgency=low versions. - Handle echoing ~/.*shrc files gracefully via SSH client connections. Do not allow data injections via ~/.*shrc files. (Fixes: #335). + - Properly handle (=expand) the "~" character in key filenames. (Brought to + attention by Eldamir on IRC. Thanks!). [ Orion Poplawski ] * debian/control: diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index da9f9b7..78ac5bb 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -902,6 +902,9 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient): if timeout and self.low_latency: timeout = timeout * 2 + if "~" in key_filename: + key_filename = os.path.expanduser(key_filename) + if key_filename or pkey or look_for_keys or allow_agent or (password and force_password_auth): try: if password and force_password_auth: diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py index 74b4be0..ee1fa6f 100644 --- a/x2go/sshproxy.py +++ b/x2go/sshproxy.py @@ -192,6 +192,9 @@ class X2GoSSHProxy(paramiko.SSHClient, threading.Thread): key_filename = None pkey = None + if "~" in key_filename: + key_filename = os.path.expanduser(key_filename) + if not passphrase: passphrase = password # enforce IPv4 for localhost addresses!!! hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-216-g0aa03b5
by git-admin＠x2go.org 04 Nov '13

04 Nov '13

The branch, master has been updated via 0aa03b521f0ce56db59374bed994c90a318029e1 (commit) from 538f5a7d20af6a74e8a6720214030d216a39329b (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 0aa03b521f0ce56db59374bed994c90a318029e1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Nov 4 15:15:52 2013 +0100 indentation fix ----------------------------------------------------------------------- Summary of changes: x2goserver/sbin/x2godbadmin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin index 4f10b02..e3fc6f5 100755 --- a/x2goserver/sbin/x2godbadmin +++ b/x2goserver/sbin/x2godbadmin @@ -63,7 +63,7 @@ $Config->read('/etc/x2go/x2gosql/sql' ) or die "Can't read config file /etc/x2go if ($Config->param("backend") eq 'sqlite') { -my $user="x2gouser"; + my $user="x2gouser"; my ($name, $pass, $uid, $pgid, $quota, $comment, $gcos, $dir, $shell, $expire) = getpwnam($user); my $dbfile="$dir/x2go_sessions"; hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - release/4.0.1.x (branch) updated: 4.0.1.6-12-gce2312a
by git-admin＠x2go.org 04 Nov '13

04 Nov '13

The branch, release/4.0.1.x has been updated via ce2312a68eabdddb70f0659bd345c0ca6ff88e74 (commit) from c3be1cdb1145b0d6ebdc27f0aa1c2b8564f0000b (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 ce2312a68eabdddb70f0659bd345c0ca6ff88e74 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Nov 4 15:15:52 2013 +0100 indentation fix ----------------------------------------------------------------------- Summary of changes: x2goserver/sbin/x2godbadmin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin index 00ce036..0e008d8 100755 --- a/x2goserver/sbin/x2godbadmin +++ b/x2goserver/sbin/x2godbadmin @@ -64,7 +64,7 @@ $Config->read('/etc/x2go/x2gosql/sql' ) or die "Can't read config file /etc/x2go if ($Config->param("backend") eq 'sqlite') { -my $user="x2gouser"; + my $user="x2gouser"; my ($name, $pass, $uid, $pgid, $quota, $comment, $gcos, $dir, $shell, $expire) = getpwnam($user); my $dbfile="$dir/x2go_sessions"; hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - release/4.0.0.x (branch) updated: 4.0.0.5-2-gc338b40
by git-admin＠x2go.org 04 Nov '13

04 Nov '13

The branch, release/4.0.0.x has been updated via c338b408edd49d363fa139469d6701f745315fca (commit) from bb53cc7514668c05673040ad1ac1dd36683bf8c7 (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 c338b408edd49d363fa139469d6701f745315fca Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Nov 4 15:15:52 2013 +0100 indentation fix ----------------------------------------------------------------------- Summary of changes: x2goserver/sbin/x2godbadmin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin index f8eea83..0ea113c 100755 --- a/x2goserver/sbin/x2godbadmin +++ b/x2goserver/sbin/x2godbadmin @@ -64,7 +64,7 @@ $Config->read('/etc/x2go/x2gosql/sql' ) or die "Can't read config file /etc/x2go if ($Config->param("backend") eq 'sqlite') { -my $user="x2gouser"; + my $user="x2gouser"; my ($name, $pass, $uid, $pgid, $quota, $comment, $gcos, $dir, $shell, $expire) = getpwnam($user); my $dbfile="$dir/x2go_sessions"; hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-63-gc598102
by git-admin＠x2go.org 04 Nov '13

04 Nov '13

The branch, master has been updated via c5981026bd3dc77f6d33adf8d170d606e65de9fd (commit) from 61081484edc970a30a3101813b45cfa71365ab05 (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 c5981026bd3dc77f6d33adf8d170d606e65de9fd Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Nov 4 12:37:09 2013 +0100 New authentication mechanism: none. Always authenticate a user, even if password is not provided or wrong. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ .../{base_authmech.py => none_authmech.py} | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) copy x2gobroker/authmechs/{base_authmech.py => none_authmech.py} (97%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 04d5f12..180f147 100644 --- a/debian/changelog +++ b/debian/changelog @@ -52,6 +52,8 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low AssertionErrors whenever we trigger a tornado.web.HTTPError. - Add password prompt to x2gobroker-testauth. Password prompt is used if the --password option is not used. + - New authentication mechanism: none. Always authenticate a user, even if + password is not provided or wrong. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + Recommend apache2 and libapache2-mod-wsgi for x2gobroker-wsgi. diff --git a/x2gobroker/authmechs/base_authmech.py b/x2gobroker/authmechs/none_authmech.py similarity index 97% copy from x2gobroker/authmechs/base_authmech.py copy to x2gobroker/authmechs/none_authmech.py index 5ed362f..b5f1b11 100644 --- a/x2gobroker/authmechs/base_authmech.py +++ b/x2gobroker/authmechs/none_authmech.py @@ -21,4 +21,4 @@ class X2GoBrokerAuthMech(object): def authenticate(self, username, password): - return False + return 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 - master (branch) updated: 0.0.2.3-62-g6108148
by git-admin＠x2go.org 04 Nov '13

04 Nov '13

The branch, master has been updated via 61081484edc970a30a3101813b45cfa71365ab05 (commit) from de2cd9ede46b1e74f92d2907729a6fc9cc62a77e (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 61081484edc970a30a3101813b45cfa71365ab05 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Nov 4 11:15:12 2013 +0100 x2gobroker-testauth: typo fixes ----------------------------------------------------------------------- Summary of changes: bin/x2gobroker-testauth | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/bin/x2gobroker-testauth b/bin/x2gobroker-testauth index 2c3893a..5b2f27e 100755 --- a/bin/x2gobroker-testauth +++ b/bin/x2gobroker-testauth @@ -49,7 +49,7 @@ if __name__ == "__main__": auth_options = [ {'args':['-u','--username', '--user'], 'default': None, 'metavar': 'USERNAME', 'help': 'Test authentication for the account with this username', }, - {'args':['-p', '--password'], 'default': None, 'metavar': 'PASSWORD', 'help': 'Test authentication using this password (not recommend!!! please prefer using the provided password prompt instead)', }, + {'args':['-p', '--password'], 'default': None, 'metavar': 'PASSWORD', 'help': 'Test authentication using this password (Not recommended!!! Please prefer using the provided password prompt instead)', }, ] misc_options = [ {'args':['-C','--config-file'], 'default': None, 'metavar': 'CONFIG_FILE', 'help': 'Specify a special configuration file name, default is: {default}'.format(default=x2gobroker.defaults.X2GOBROKER_CONFIG), }, 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-61-gde2cd9e
by git-admin＠x2go.org 04 Nov '13

04 Nov '13

The branch, master has been updated via de2cd9ede46b1e74f92d2907729a6fc9cc62a77e (commit) from b421552475f78cfc2a954ac8368d05eb112fe3aa (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 de2cd9ede46b1e74f92d2907729a6fc9cc62a77e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Nov 4 11:14:02 2013 +0100 Add password prompt to x2gobroker-testauth. Password prompt is used if the --password option is not used. ----------------------------------------------------------------------- Summary of changes: bin/x2gobroker-testauth | 15 +++++++++------ debian/changelog | 2 ++ x2gobroker/authmechs/pam_authmech.py | 2 ++ 3 files changed, 13 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/bin/x2gobroker-testauth b/bin/x2gobroker-testauth index bc97751..2c3893a 100755 --- a/bin/x2gobroker-testauth +++ b/bin/x2gobroker-testauth @@ -25,6 +25,7 @@ import sys import setproctitle import argparse import logging +import getpass # perform an authentication against the authentication mechanism configured for WSGI try: @@ -48,7 +49,7 @@ if __name__ == "__main__": auth_options = [ {'args':['-u','--username', '--user'], 'default': None, 'metavar': 'USERNAME', 'help': 'Test authentication for the account with this username', }, - {'args':['-p', '--password'], 'default': None, 'metavar': 'PASSWORD', 'help': 'Test authentication using this password', }, + {'args':['-p', '--password'], 'default': None, 'metavar': 'PASSWORD', 'help': 'Test authentication using this password (not recommend!!! please prefer using the provided password prompt instead)', }, ] misc_options = [ {'args':['-C','--config-file'], 'default': None, 'metavar': 'CONFIG_FILE', 'help': 'Specify a special configuration file name, default is: {default}'.format(default=x2gobroker.defaults.X2GOBROKER_CONFIG), }, @@ -56,7 +57,6 @@ if __name__ == "__main__": {'args':['-d','--debug'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code', }, ] p = argparse.ArgumentParser(description='X2Go Session Broker (Authentication Test Utility)',\ - epilog="WARNING: Using this utility from the command line is not recommended!!!\nYour credentials will get revealed in your shells history file.",\ formatter_class=argparse.RawDescriptionHelpFormatter, \ add_help=True, argument_default=None) p_auth = p.add_argument_group('authentication parameters') @@ -70,10 +70,10 @@ if __name__ == "__main__": cmdline_args = p.parse_args() - if cmdline_args.username is None or cmdline_args.password is None: + if cmdline_args.username is None: p.print_help() print - print "*** Cannot continue without username and password... ***" + print "*** Cannot continue without username... ***" print sys.exit(-1) @@ -115,9 +115,12 @@ def check_password(username, password): if __name__ == "__main__": + if password is None: + password = getpass.getpass() + if check_password(username, password): - print "authentication succeeded" + print "Authentication succeeded." sys.exit(0) else: - print "authentication failed" + print "Authentication failed!" sys.exit(-1) diff --git a/debian/changelog b/debian/changelog index b17af94..04d5f12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -50,6 +50,8 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low style. - WSGI implementation: keep SCRIPT_NAME in environ, as removing it causes AssertionErrors whenever we trigger a tornado.web.HTTPError. + - Add password prompt to x2gobroker-testauth. Password prompt is used + if the --password option is not used. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + Recommend apache2 and libapache2-mod-wsgi for x2gobroker-wsgi. diff --git a/x2gobroker/authmechs/pam_authmech.py b/x2gobroker/authmechs/pam_authmech.py index 76c0a71..b10e0f9 100644 --- a/x2gobroker/authmechs/pam_authmech.py +++ b/x2gobroker/authmechs/pam_authmech.py @@ -20,6 +20,7 @@ # modules from socket import error +import getpass import pam # X2Go Session Broker modules @@ -38,6 +39,7 @@ class X2GoBrokerAuthMech(object): except error: logger_error.error('Authentication against authentication service failed, trying direct PAM authentication (which is likely to fail on most PAM setups).') + logger_error.error('Make sure the current user ({user}) is allowed to use the PAM authentication mechanism.'.format(user=getpass.getuser())) # fallback to direct PAM authentication against the PAM service ,,x2gobroker'' if pam.authenticate(username, password, service="x2gobroker"): return 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 - master (branch) updated: 0.0.2.3-59-gca61624
by git-admin＠x2go.org 04 Nov '13

04 Nov '13

The branch, master has been updated via ca61624002de349c4b20f3217383066f7bd8b9d8 (commit) from b1a588120a97a6ff83121528320f99b4bda5f869 (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 ca61624002de349c4b20f3217383066f7bd8b9d8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Nov 4 10:57:30 2013 +0100 Make bin:package x2gobroker-wsgi compliant Debian's packaging style of Apache2.4 / Apache2.2. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ debian/control | 1 - debian/x2gobroker-wsgi.links | 2 +- debian/x2gobroker-wsgi.postinst | 24 +++++++++++++++++++++--- debian/x2gobroker-wsgi.postrm | 28 +++++++++++++++++++++++++--- 5 files changed, 50 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c1017c8..d0ecb8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -53,6 +53,9 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low + Recommend apache2 and libapache2-mod-wsgi for x2gobroker-wsgi. * /debian/x2gobroker-agent.dirs: + Provide empty log file directory. + * x2gobroker-wsgi postinst/postrm: + + Make bin:package x2gobroker-wsgi compliant Debian's packaging style of + Apache2.4 / Apache2.2. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 07 Jun 2013 23:25:30 +0200 diff --git a/debian/control b/debian/control index 77ff00b..5d9799c 100644 --- a/debian/control +++ b/debian/control @@ -158,7 +158,6 @@ Depends: adduser, x2gobroker (>= ${source:Version}), x2gobroker (<< ${source:Version}.1~), Recommends: - apache2, libapache2-mod-wsgi, Description: X2Go http(s) based session broker (CGI) X2Go is a server based computing environment with diff --git a/debian/x2gobroker-wsgi.links b/debian/x2gobroker-wsgi.links index cb9db8a..be31287 100644 --- a/debian/x2gobroker-wsgi.links +++ b/debian/x2gobroker-wsgi.links @@ -1,2 +1,2 @@ -/etc/x2go/x2gobroker-wsgi.apache.conf /etc/apache2/conf.d/x2gobroker-wsgi.conf +/etc/x2go/x2gobroker-wsgi.apache.conf /etc/apache2/conf-available/x2gobroker-wsgi.conf /etc/x2go/x2gobroker-wsgi.apache.vhost /etc/apache2/sites-available/x2gobroker diff --git a/debian/x2gobroker-wsgi.postinst b/debian/x2gobroker-wsgi.postinst index 0372383..2da0c9b 100755 --- a/debian/x2gobroker-wsgi.postinst +++ b/debian/x2gobroker-wsgi.postinst @@ -20,6 +20,22 @@ set -e # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package +apacheconf_configure() { + # + # Apache2.4 (and Apache2.2 compatible) handling of apache*.conf files + # + CONF="x2gobroker-wsgi" + COMMON_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true) + + if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then + . /usr/share/apache2/apache2-maintscript-helper + apache2_invoke enconf $CONF || exit $? + elif [ "$COMMON_STATE" = "installed" ] || [ "$COMMON_STATE" = "unpacked" ] ; then + if [ -d /etc/apache2/conf.d/ -a ! -L /etc/apache2/conf.d/$CONF.conf ]; then + ln -s ../conf-available/$CONF.conf /etc/apache2/conf.d/$CONF.conf + fi + fi +} case "$1" in configure) @@ -60,15 +76,17 @@ case "$1" in touch /var/log/x2gobroker/error.log && chown x2gobroker:adm /var/log/x2gobroker/error.log touch /var/log/x2gobroker/wsgi.log && chown x2gobroker:adm /var/log/x2gobroker/wsgi.log - ;; + apacheconf_configure + + ;; abort-upgrade|abort-remove|abort-deconfigure) - ;; + ;; *) echo "postinst called with unknown argument \`$1'" 1>&2 exit 1 - ;; + ;; esac # dh_installdeb will replace this with shell code automatically diff --git a/debian/x2gobroker-wsgi.postrm b/debian/x2gobroker-wsgi.postrm index d976222..2898f4d 100755 --- a/debian/x2gobroker-wsgi.postrm +++ b/debian/x2gobroker-wsgi.postrm @@ -15,6 +15,20 @@ set -e +apacheconf_remove() { + # + # Apache2.4 (and Apache2.2 compatible) handling of apache*.conf files + # + CONF="x2gobroker-wsgi" + COMMON_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true) + + if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then + . /usr/share/apache2/apache2-maintscript-helper + apache2_invoke disconf $CONF || exit $? + elif [ "$COMMON_STATE" = "installed" ] || [ "$COMMON_STATE" = "unpacked" ] ; then + [ ! -L /etc/apache2/conf.d/$CONF.conf ] || rm /etc/apache2/conf.d/$CONF.conf + fi +} case "$1" in purge) @@ -34,13 +48,21 @@ case "$1" in rm -Rf /var/lib/x2gobroker fi + apacheconf_remove + ;; - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; + + remove) + apacheconf_remove + ;; + + upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + *) echo "postrm called with unknown argument \`$1'" 1>&2 exit 0 - ;; + ;; esac # dh_installdeb will replace this with shell code automatically 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-60-gb421552
by git-admin＠x2go.org 04 Nov '13

04 Nov '13

The branch, master has been updated via b421552475f78cfc2a954ac8368d05eb112fe3aa (commit) from ca61624002de349c4b20f3217383066f7bd8b9d8 (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 b421552475f78cfc2a954ac8368d05eb112fe3aa Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Nov 4 11:00:24 2013 +0100 WSGI implementation: keep SCRIPT_NAME in environ, as removing it causes AssertionErrors whenever we trigger a tornado.web.HTTPError. ----------------------------------------------------------------------- Summary of changes: bin/x2gobroker | 7 +++++-- debian/changelog | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/bin/x2gobroker b/bin/x2gobroker index b9c7ec7..e37a5ee 100755 --- a/bin/x2gobroker +++ b/bin/x2gobroker @@ -220,9 +220,12 @@ else: def _application(environ, start_response): + ### FIXME: the code below causes AssertionErrors whenever we trigger a + ### tornado.web.HTTPError. Commenting out for now, may be removed + ### later. # some WSGI implementations do not like the SCRIPT_NAME env var - if 'SCRIPT_NAME' in environ: - del environ['SCRIPT_NAME'] + #if 'SCRIPT_NAME' in environ: + # del environ['SCRIPT_NAME'] # make sure the httpd server's environment is set as os.environ for key in environ.keys(): diff --git a/debian/changelog b/debian/changelog index d0ecb8c..b17af94 100644 --- a/debian/changelog +++ b/debian/changelog @@ -48,6 +48,8 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low authorized_keys file location in SSH server daemon. Thanks to Stefan Heitmüller for pointing out more recent SSH server's configuration style. + - WSGI implementation: keep SCRIPT_NAME in environ, as removing it causes + AssertionErrors whenever we trigger a tornado.web.HTTPError. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + Recommend apache2 and libapache2-mod-wsgi for x2gobroker-wsgi. hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits November 2013