x2go-commits April 2013

x2go-commits@lists.x2go.org

2 participants
1376 discussions

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

23 Apr '13

The branch, tmp has been updated via fd4ae726f53e4ee701e987e31c73079797670b71 (commit) from 18b8b460391374b141283e004a826d6ef51e61c0 (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/broker/x2gobroker-sessionprofiles.conf | 66 ++++++++++++++++++---------- 1 file changed, 42 insertions(+), 24 deletions(-) The diff of changes is: diff --git a/etc/broker/x2gobroker-sessionprofiles.conf b/etc/broker/x2gobroker-sessionprofiles.conf index d797697..f3b4e8b 100644 --- a/etc/broker/x2gobroker-sessionprofiles.conf +++ b/etc/broker/x2gobroker-sessionprofiles.conf @@ -1,11 +1,12 @@ ### X2Go Broker Session Profiles - ADAPT TO YOUR NEEDS ### -# This whole file reflects a set of examplary X2Go session profiles being provided -# via the X2Go Session Broker (backend: iniconf). +# This whole file reflects a set of examplary X2Go session profiles being +# provided via the X2Go Session Broker (backend: iniconf). -# This whole file could be the broker setup in some university institute that runs -# three server pools (pool-A, pool-B and pool-C). Though most univerities have -# real IPv4 internet addresses, we use private subnets in the examples below. +# This whole file could be the broker setup in some university institute that +# runs three server pools (pool-A, pool-B and pool-C). Though most univerities +# have real IPv4 internet addresses, we use private subnets in the examples +# below. # The X2Go Session Broker is served into the institutes local intranet, the # broker cannot be reached from the internet directly. @@ -13,14 +14,18 @@ # The first section [DEFAULTS] provides a set of default profile settings that # are common to all session profiles given in sections below. -# The other section names can be freely chosen, however, each section name has to -# be unique within this file. +# The other section names can be freely chosen, however, each section name has +# to be unique within this file. -# IMPORTANT: in the session profiles below you will find some lines starting with -# acl-... These lines do neither protect the X2Go Session Broker nor your X2Go Servers. -# For protecting the broker use iptables and ip6tables. For protecting your X2Go Servers -# use iptable+ip6tables and a tightened PAM configuration (e.g. pam_access.so). Securing -# X2Go Servers means securing the SSH daemon that runs on the X2Go Server. +# IMPORTANT: in the session profiles below you will find some lines starting +# with acl-... These lines do neither protect the X2Go Session Broker nor +# your X2Go Servers. They simply allow for selective session profile provision +# based on client address, user name and group memberships. +# +# For protecting the broker use iptables and ip6tables. For protecting your +# X2Go Servers use iptable+ip6tables and a tightened PAM configuration (e.g. +# pam_access.so). Securing X2Go Servers means securing the SSH daemon that +# runs on the X2Go Server. [DEFAULT] @@ -55,19 +60,26 @@ sshport=22 setdpi=0 pack=16m-jpeg +### EXAMPLES: Below you find some config examples. Adapt them to your needs or +### simply write your own session profiles and remove the examples below. + ## -## pool-A (staff servers) +## EXAMPLE: pool-A (staff servers) ## ## The pool-A contains three X2Go Servers (server-A, server-B and server-C). -## The staff of our example institute falls into two groups of users: gnome-users and kde-users. -## The gnome-users log into server-A or server-B, depending on their client subnet (IP configuration of the client). -## The kde-users login to server-C (server-C can be reached from the whole intranet). +## The staff of our example institute falls into two groups of users: +## gnome-users and kde-users. +## The gnome-users log into server-A or server-B, depending on their client +## subnet (IP configuration of the client). +## The kde-users login to server-C (server-C can be reached from the whole +## intranet). ## -## The split-up of the GNOME users allows some primitive load balancing. +## The client IP based split-up of the GNOME users allows some primitive load +## balancing. ## -## If staff people are members of both groups (kde-users, gnome-users) both session profiles will be -## shown in X2Go Client. +## If staff people are members of both groups (kde-users, gnome-users) both +## session profiles will be shown in X2Go Client. ## [pool-A-server-A] @@ -102,7 +114,7 @@ acl-groups-deny=ALL acl-any-order=deny-allow ## -## pool-B (e.g. webserver in the DMZ or on the internet) +## EXAMPLE: pool-B (e.g. webserver in the DMZ or on the internet) ## ## The pool-B is a single X2Go Server (server-D) that is ## hosted externally. The server-D has an official internet IP. @@ -127,7 +139,7 @@ acl-clients-allow=admin-machine1.domain.local, admin-machine2.domain.local, admi acl-any-order=deny-allow ## -## pool-C +## EXAMPLE: pool-C (REAL LOAD BALANCING!!!) ## ## The pool-C is a server pool for students. Our example institute ## knows 200-300 students and has to offer working places for @@ -137,13 +149,19 @@ acl-any-order=deny-allow ## normally stay away from these machines, anyway. Only two test account ## get this session profile into their X2Go Clients. ## -## The pool-C contains 6 X2Go Servers that serve all students users together as a load balance -## server farm. +## The pool-C contains 6 X2Go Servers that serve all students users together +## as a load balance server farm. +## +## Make sure to install x2gobroker-agent on all these 6 X2Go Servers. Also make +## sure to once run the script x2gobroker-keygen on the broker host and once +## the script x2gobroker-pubkeyauthorizer per X2Go Server. +## +## All 6 X2Go Servers have to be configured to use the PostgreSQL X2Go session +## DB backend. ## [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 name=XFCE - pool-C command=XFCE 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.2
by git-admin＠x2go.org 23 Apr '13

23 Apr '13

The branch, tmp has been updated via 015ccfd30ce69e3cba7cad23c766f19eb7009ad6 (commit) from d7d2af96575cdf775bf2626e70a55062e4d104ed (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 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d0afa47..f8f19b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2gobroker (0.0.0.2-0~x2go1) UNRELEASED; urgency=low +x2gobroker (0.0.0.2-0~x2go1) unstable; urgency=low * New upstream version (0.0.0.2): - Make CC, CFLAGS and LDFLAGS configurable through build system. @@ -30,7 +30,7 @@ x2gobroker (0.0.0.2-0~x2go1) UNRELEASED; urgency=low + The user x2gobroker is required by x2gobroker-agent and x2gobroker-daemon. So now both bin:packages provide that user account. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 13 Feb 2013 12:03:25 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 21 Feb 2013 19:51:30 +0100 x2gobroker (0.0.0.1-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

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

23 Apr '13

The branch, tmp has been updated via e6d532ca4ffa675beda709a2b861c7ad2b542330 (commit) from 015ccfd30ce69e3cba7cad23c766f19eb7009ad6 (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 | 6 ++++++ x2gobroker/__init__.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f8f19b0..3d7d3d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2gobroker (0.0.0.3-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 21 Feb 2013 20:00:43 +0100 + x2gobroker (0.0.0.2-0~x2go1) unstable; urgency=low * New upstream version (0.0.0.2): diff --git a/x2gobroker/__init__.py b/x2gobroker/__init__.py index d9172cc..6684a5b 100644 --- a/x2gobroker/__init__.py +++ b/x2gobroker/__init__.py @@ -18,5 +18,5 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.0.0.2' +__VERSION__ = '0.0.0.3' __AUTHOR__ = 'Mike Gabriel (X2Go Project) <mike.gabriel(a)das-netzwerkteam.de>' hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

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

23 Apr '13

The branch, tmp has been updated via e1970e0d61508915fe9bea869f5139a5c6cd7cac (commit) from fd4ae726f53e4ee701e987e31c73079797670b71 (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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index bbc3d05..6871bdf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ -x2gobroker (0.0.0.3-0~x2go1) UNRELEASED; urgency=low +x2gobroker (0.0.0.3-0~x2go1) unstable; urgency=low * New upstream version (0.0.0.3): - Script x2gobroker-pubkeyauthorizer is now independent from Python module x2gobroker. + - Word wrap config files and limit line lenght to <= 80 chars. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 21 Feb 2013 20:00:43 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 21 Feb 2013 21:44:33 +0100 x2gobroker (0.0.0.2-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

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

23 Apr '13

The branch, tmp has been updated via cf5a5148589e8ab8832b3fde9521a3f838200120 (commit) from 8fcdf930eddf2dd32a665ff5736f15935920d9aa (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 | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 80c2bf8..d0afa47 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,27 +2,30 @@ 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. + - Make host session option a (Python) list, not unicode/string. - Add load balancing support. - - Add foundation for logging support. - - Add man page for x2gobroker executable. + - Add file logging support. - Add logrotate configuration for x2gobroker log files. - - Make the daemon user ID configurable through x2gobroker-daemon.default. - - Handle different situation for X2GOBROKER_DAEMON_USER. Make sure - the getpass.getuser() function sees the correct effective UID. - - Make sure the unprivileged daemon user (x2gobroker) has access to the - PID file directory. + - Make the daemon user and group ID configurable through + python-x2gobroker.default. - Set log level to CRITICAL if running unit tests. - Perform PAM authentication via an authentication service (the broker runs as non-privileged user, the authentication service as root). - - Add tool: x2gobroker-keygen. Generate pub/priv SSH keypair for the - system user x2gobroker. - To make SSH pubkey deployment easier, serve the broker's public SSH key(s) under this URL http(s)://<broker_hostname>:<port>/pubkeys/. + - Add tool: x2gobroker-keygen. Generate pub/priv SSH keypair for the + system user x2gobroker. + - Add tool: x2gobroker-pubkeyauthorizer. Retrive broker's public SSH + keys and install them (on X2Go Servers with x2gobroker-agent installed). + - Add man pages for all executables in /usr/sbin. * /debian/control: + Add bin:package x2gobroker-agent. * /debian/x2gobroker-daemon.init: + Handle stale PID file and already running daemon. + + Handle different situation for X2GOBROKER_DAEMON_USER. Make sure + the getpass.getuser() function sees the correct effective UID. + + Make sure the unprivileged daemon user (x2gobroker) has access to the + PID file directory. * postinst/postrm scripts: + The user x2gobroker is required by x2gobroker-agent and x2gobroker-daemon. So now both bin:packages provide that user account. 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-63-g9930f39
by git-admin＠x2go.org 23 Apr '13

23 Apr '13

The branch, tmp has been updated via 9930f394ccd0ad73bccf3755248b89317227b89e (commit) from c323c09128de3638fb05e26153a14e295a661511 (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.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/x2gobroker-agent.install b/debian/x2gobroker-agent.install index cdf4bfc..a9bf1d8 100644 --- a/debian/x2gobroker-agent.install +++ b/debian/x2gobroker-agent.install @@ -1,2 +1,2 @@ lib/x2gobroker-agent* usr/lib/x2go/ -usr/sbin/x2gobroker-pubkeyauthorizer usr/sbin/ \ No newline at end of file +sbin/x2gobroker-pubkeyauthorizer usr/sbin/ \ 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 - tmp (branch) updated: 0.0.0.1-60-g9217c85
by git-admin＠x2go.org 23 Apr '13

23 Apr '13

The branch, tmp has been updated via 9217c85255f9737bfe37a61b4a8457764e190b37 (commit) from 40b5a345b349598d4da6bb2492a8f29b7a202dc4 (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 ++ sbin/x2gobroker | 18 ++++++++------- x2gobroker/defaults.py | 8 ++++++- x2gobroker/web/extras.py | 57 ++++++++++++++++++++++++++++++++++++++++++++++ x2gobroker/web/html.py | 2 +- x2gobroker/web/json.py | 2 +- x2gobroker/web/plain.py | 2 +- 7 files changed, 79 insertions(+), 12 deletions(-) create mode 100644 x2gobroker/web/extras.py The diff of changes is: diff --git a/debian/changelog b/debian/changelog index be93ac2..80c2bf8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ x2gobroker (0.0.0.2-0~x2go1) UNRELEASED; urgency=low runs as non-privileged user, the authentication service as root). - Add tool: x2gobroker-keygen. Generate pub/priv SSH keypair for the system user x2gobroker. + - To make SSH pubkey deployment easier, serve the broker's public SSH key(s) + under this URL http(s)://<broker_hostname>:<port>/pubkeys/. * /debian/control: + Add bin:package x2gobroker-agent. * /debian/x2gobroker-daemon.init: diff --git a/sbin/x2gobroker b/sbin/x2gobroker index 566b57c..3b847bd 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -57,10 +57,10 @@ if x2gobroker.defaults.X2GOBROKER_DEBUG and not x2gobroker.defaults.X2GOBROKER_T # check effective UID the broker runs as and complain appropriately... if x2gobroker.defaults.X2GOBROKER_USER != x2gobroker.defaults.X2GOBROKER_DAEMON_USER and os.geteuid() != 0: - logger_broker.warn('X2Go Session Broker has been started interactively by user {username}, better run as user {daemon_username}.'.format(username=X2GOBROKER_USER, daemon_username=X2GOBROKER_DAEMON_USER)) + logger_broker.warn('X2Go Session Broker has been started interactively by user {username}, better run as user {daemon_username}.'.format(username=x2gobroker.defaults.X2GOBROKER_USER, daemon_username=x2gobroker.defaults.X2GOBROKER_DAEMON_USER)) logger_broker.info('Automatically switching to DEBUG mode due to interactive launch of this application.') elif x2gobroker.defaults.X2GOBROKER_DAEMON_USER != 'root' and os.geteuid() == 0: - logger_broker.warn('X2Go Session Broker should not be run as root, better run as user {daemon_username}.'.format(daemon_username=X2GOBROKER_DAEMON_USER)) + logger_broker.warn('X2Go Session Broker should not be run as root, better run as user {daemon_username}.'.format(daemon_username=x2gobroker.defaults.X2GOBROKER_DAEMON_USER)) elif os.geteuid() == 0: logger_broker.warn('X2Go Session Broker should not be run as root, better run as non-privileged user') @@ -100,9 +100,10 @@ if __name__ == "__main__": # import classes serving the different web.py URLs -from x2gobroker.web.plain import * -#from x2gobroker.web.json import * -#from x2gobroker.web.html import * +import x2gobroker.web.plain +#import x2gobroker.web.json +#import x2gobroker.web.html +import x2gobroker.web.extras # switch on https:// mode if x2gobroker.defaults.X2GOBROKER_SSL_CERTFILE and x2gobroker.defaults.X2GOBROKER_SSL_KEYFILE: @@ -110,9 +111,10 @@ if x2gobroker.defaults.X2GOBROKER_SSL_CERTFILE and x2gobroker.defaults.X2GOBROKE CherryPyWSGIServer.ssl_private_key = x2gobroker.defaults.X2GOBROKER_SSL_KEYFILE # define the web.py URLs -urls = ( '/plain/(.*)', 'X2GoBrokerWebPlain', -# '/json/(.*)', 'X2GoBrokerWebJson', -# '/html/(.*)', 'X2GoBrokerWebHtml', +urls = ( '/plain/(.*)', 'x2gobroker.web.plainX2Go.BrokerWeb', +# '/json/(.*)', 'x2gobroker.web.json.X2GoBrokerWeb', +# '/html/(.*)', 'x2gobroker.web.html.X2GoBrokerWeb', + '/pubkeys/', 'x2gobroker.web.extras.X2GoBrokerPubKeyService', ) # run the web.py standalone daemon... diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index 0a99af4..6c377c4 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -23,6 +23,7 @@ import os import uuid import getpass +import socket import logging from loggers import logger_broker, logger_access, logger_error, X2GOBROKER_DAEMON_USER @@ -89,11 +90,16 @@ if os.environ.has_key('X2GOBROKER_SSL_KEYFILE'): else: X2GOBROKER_SSL_KEYFILE = "" - ### ### static / hard-coded defaults ### +if socket.gethostname().find('.') >= 0: + X2GOBROKER_HOSTNAME = socket.gethostname() +else: + X2GOBROKER_HOSTNAME = socket.gethostbyaddr(socket.gethostname())[0] + + X2GOBROKER_SESSIONPROFILES = "/etc/x2go/broker/x2gobroker-sessionprofiles.conf" # the home directory of the user that the daemon/cgi runs as diff --git a/x2gobroker/web/extras.py b/x2gobroker/web/extras.py new file mode 100644 index 0000000..728aaec --- /dev/null +++ b/x2gobroker/web/extras.py @@ -0,0 +1,57 @@ +#!/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 os.path +import paramiko +import x2gobroker.defaults + +class X2GoBrokerPubKeyService: + + http_header_items = { + 'Content-Type': 'text/plain; charset=utf-8', + 'Expires': '+1h', + } + + def _gen_http_header(self): + + for http_header_item in self.http_header_items.keys(): + web.header(http_header_item, self.http_header_items[http_header_item]) + + def GET(self): + + output = "" + + broker_home = x2gobroker.defaults.X2GOBROKER_HOME + + if os.path.exists('{home}/.ssh/id_rsa.pub'.format(home=broker_home)): + pubkey = paramiko.RSAKey(filename='{home}/.ssh/id_rsa'.format(home=broker_home)) + output += 'ssh-rsa {pubkey} {user}@{hostname}\n'.format(pubkey=str(pubkey.get_base64()), user=x2gobroker.defaults.X2GOBROKER_DAEMON_USER, hostname=x2gobroker.defaults.X2GOBROKER_HOSTNAME) + + if os.path.exists('{home}/.ssh/id_dsa.pub'.format(home=broker_home)): + pubkey = paramiko.DSSKey(filename='{home}/.ssh/id_dsa'.format(home=broker_home)) + output += 'ssh-dss {pubkey} {user}@{hostname}\n'.format(pubkey=str(pubkey.get_base64()), user=x2gobroker.defaults.X2GOBROKER_DAEMON_USER, hostname=x2gobroker.defaults.X2GOBROKER_HOSTNAME) + + if not output: + return web.notfound() + + return output diff --git a/x2gobroker/web/html.py b/x2gobroker/web/html.py index a85a1ff..1a0b1db 100644 --- a/x2gobroker/web/html.py +++ b/x2gobroker/web/html.py @@ -26,7 +26,7 @@ import web # Python X2Go Broker modules from x2gobroker.defaults import X2GOBROKER_DEFAULT_BACKEND as _X2GOBROKER_DEFAULT_BACKEND -class X2GoBrokerWebHtml: +class X2GoBrokerWeb: http_header_items = { 'Content-Type': 'text/html; charset=utf-8', diff --git a/x2gobroker/web/json.py b/x2gobroker/web/json.py index 04743b5..ef35a0f 100644 --- a/x2gobroker/web/json.py +++ b/x2gobroker/web/json.py @@ -22,7 +22,7 @@ # modules -class X2GoBrokerWebJson: +class X2GoBrokerWeb: # MUSIC OF THE FUTURE pass \ No newline at end of file diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py index 2e88de9..07c36b2 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/web/plain.py @@ -29,7 +29,7 @@ import x2gobroker.defaults from x2gobroker.loggers import logger_broker, logger_error -class X2GoBrokerWebPlain: +class X2GoBrokerWeb: http_header_items = { 'Content-Type': 'text/plain; charset=utf-8', 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-62-gc323c09
by git-admin＠x2go.org 23 Apr '13

23 Apr '13

The branch, tmp has been updated via c323c09128de3638fb05e26153a14e295a661511 (commit) from 8e5f855b236a1483ac6414d1a3782efcf124f2e0 (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.install | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/x2gobroker-agent.install b/debian/x2gobroker-agent.install index 2ad94cd..cdf4bfc 100644 --- a/debian/x2gobroker-agent.install +++ b/debian/x2gobroker-agent.install @@ -1 +1,2 @@ -lib/x2gobroker-agent* usr/lib/x2go/ \ No newline at end of file +lib/x2gobroker-agent* usr/lib/x2go/ +usr/sbin/x2gobroker-pubkeyauthorizer usr/sbin/ \ 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 - tmp (branch) updated: 0.0.0.1-58-ga03e031
by git-admin＠x2go.org 23 Apr '13

23 Apr '13

The branch, tmp has been updated via a03e031ce619f538ca1f14cd65c3a502ca49ec15 (commit) from e5feb370b34cf26eeb68086377ea295132cb0f70 (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-keygen | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/sbin/x2gobroker-keygen b/sbin/x2gobroker-keygen index eab787e..ab98a07 100755 --- a/sbin/x2gobroker-keygen +++ b/sbin/x2gobroker-keygen @@ -133,7 +133,7 @@ if __name__ == '__main__': if id_file == 'id_rsa': pubkey_file.write("ssh-rsa " +key.get_base64()) elif id_file == 'id_dsa': - pubkey_file.write("ssh-dsa " +key.get_base64()) + pubkey_file.write("ssh-dss " +key.get_base64()) pubkey_file.close() os.chown('{home}/.ssh/{id_file}.pub'.format(home=broker_home, id_file=id_file), broker_uidnumber, broker_gidnumber) os.chmod('{home}/.ssh/{id_file}.pub'.format(home=broker_home, id_file=id_file), 0644) 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-64-g6d09a1c
by git-admin＠x2go.org 23 Apr '13

23 Apr '13

The branch, tmp has been updated via 6d09a1ccc82eab4b46e8133c8d6246f2c4761e69 (commit) from 9930f394ccd0ad73bccf3755248b89317227b89e (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 + 1 file changed, 1 insertion(+) The diff of changes is: diff --git a/debian/control b/debian/control index 769975d..3d38d5c 100644 --- a/debian/control +++ b/debian/control @@ -182,6 +182,7 @@ Depends: ${misc:Depends}, perl, adduser, + python-x2gobroker (>= ${source:Version}), python-x2gobroker (<< ${source:Version}.1~), x2goserver, Description: X2Go http(s) based session broker (common files) X2Go is a server based computing environment with 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 April 2013