x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

x2gobroker.git - master (branch) updated: 0.0.0.1-71-gd7d2af9
by git-admin＠x2go.org 21 Feb '13

21 Feb '13

The branch, master has been updated via d7d2af96575cdf775bf2626e70a55062e4d104ed (commit) from cf5a5148589e8ab8832b3fde9521a3f838200120 (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 d7d2af96575cdf775bf2626e70a55062e4d104ed Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 21 19:50:31 2013 +0100 add python as dependency to bin:package x2gobroker-agent ----------------------------------------------------------------------- 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 3d38d5c..6d78bbd 100644 --- a/debian/control +++ b/debian/control @@ -181,6 +181,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, perl, + python, adduser, python-x2gobroker (>= ${source:Version}), python-x2gobroker (<< ${source:Version}.1~), x2goserver, 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.0.1-70-gcf5a514
by git-admin＠x2go.org 21 Feb '13

21 Feb '13

The branch, master has been updated via cf5a5148589e8ab8832b3fde9521a3f838200120 (commit) via 8fcdf930eddf2dd32a665ff5736f15935920d9aa (commit) from 8030518e4bab147e1f7b03feae7c63eff1f1f17c (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 cf5a5148589e8ab8832b3fde9521a3f838200120 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 21 19:48:32 2013 +0100 rewrite changelog commit 8fcdf930eddf2dd32a665ff5736f15935920d9aa Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 21 19:48:22 2013 +0100 add man pages for all executables found in /usr/sbin ----------------------------------------------------------------------- Summary of changes: debian/changelog | 23 ++++++++------ debian/x2gobroker-agent.manpages | 1 + debian/x2gobroker-authservice.manpages | 2 +- debian/x2gobroker.manpages | 3 +- man/man8/x2gobroker-authservice.8 | 53 ++++++++++++++++++++++++++++++++ man/man8/x2gobroker-keygen.8 | 48 +++++++++++++++++++++++++++++ man/man8/x2gobroker-pubkeyauthorizer.8 | 45 +++++++++++++++++++++++++++ man/man8/x2gobroker.8 | 2 ++ 8 files changed, 165 insertions(+), 12 deletions(-) create mode 100644 debian/x2gobroker-agent.manpages create mode 100644 man/man8/x2gobroker-authservice.8 create mode 100644 man/man8/x2gobroker-keygen.8 create mode 100644 man/man8/x2gobroker-pubkeyauthorizer.8 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. diff --git a/debian/x2gobroker-agent.manpages b/debian/x2gobroker-agent.manpages new file mode 100644 index 0000000..747905f --- /dev/null +++ b/debian/x2gobroker-agent.manpages @@ -0,0 +1 @@ +man/man8/x2gobroker-pubkeyauthorizer.8 \ No newline at end of file diff --git a/debian/x2gobroker-authservice.manpages b/debian/x2gobroker-authservice.manpages index f32e545..8b080d0 100644 --- a/debian/x2gobroker-authservice.manpages +++ b/debian/x2gobroker-authservice.manpages @@ -1 +1 @@ -#man/man8/x2gobroker-authservice.8 \ No newline at end of file +man/man8/x2gobroker-authservice.8 \ No newline at end of file diff --git a/debian/x2gobroker.manpages b/debian/x2gobroker.manpages index b010d6d..569dc33 100644 --- a/debian/x2gobroker.manpages +++ b/debian/x2gobroker.manpages @@ -1 +1,2 @@ -man/man8/x2gobroker.8 \ No newline at end of file +man/man8/x2gobroker.8 +man/man8/x2gobroker-keygen.8 diff --git a/man/man8/x2gobroker-authservice.8 b/man/man8/x2gobroker-authservice.8 new file mode 100644 index 0000000..59a3938 --- /dev/null +++ b/man/man8/x2gobroker-authservice.8 @@ -0,0 +1,53 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2gobroker-authservice 8 "Feb 2013" "Version 0.0.1.y" "X2Go Session Broker" +.SH NAME +x2gobroker-authservice \- PAM authentication service for X2Go Session Broker +.SH SYNOPSIS +'nh +.fi +.ad l +\fBx2gobroker-authservice\fR \kx +.if (\nx>(\n(.l/2)) .nr x (\n(.l/5) +'in \n(.iu+\nxu +[ +\fIoptions\fR +] +'in \n(.iu-\nxu +.ad b +'hy +.SH DESCRIPTION +\fBx2gobroker-authservice\fR is a PAM authentication service for X2Go Session Broker. Whereas +the X2Go Session Broker runs as a non-privileged user (standalone daemon mode) or as the +also non-privileged httpd server's system user (WSGI mode), an authentication against PAM +requires root privileges in most cases (esp. for pam_unix.so). +.PP +Thus, the PAM authentication has been moved into a separate service. The communication +between X2Go Session Broker and PAM Authentication Service is handled through a +unix domain socket file ($RUNDIR/x2gobroker/x2gobroker-authservice.socket). +.PP +This command is normally started through an init script. +.SH COMMON OPTIONS +\fBx2gobroker-authservice\fR accepts the following common options: +.TP +\*(T<\fB\-h, \-\-help\fR\*(T> +Display a help with all available command line options and exit. +.TP +\*(T<\fB\-s <AUTHSOCKET>, \-\-socket <AUTHSOCKET>\fR\*(T> +File name of the unix domain socket file used for communication between broker and authentication service. +\*(T<\fB\-o <OWNER>, \-\-owner <OWNER>\fR\*(T> +User ownership of the \fI<AUTHSOCKET>\fR file. +\*(T<\fB\-g <GROUP>, \-\-group <GROUP>\fR\*(T> +Group ownership of the \fI<AUTHSOCKET>\fR file. +\*(T<\fB\-p <PERMISSIONS>, \-\-permissions <PERMISSIONS>\fR\*(T> +Set these file permissions for the \fI<AUTHSOCKET>\fR file. Use numerical permissions (e.g. 0640). +.SH "FILES" +$RUNDIR/x2gobroker/x2gobroker-authservice.socket +.SH AUTHOR +This manual has been written for the X2Go project by +Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>. diff --git a/man/man8/x2gobroker-keygen.8 b/man/man8/x2gobroker-keygen.8 new file mode 100644 index 0000000..b17b5d2 --- /dev/null +++ b/man/man8/x2gobroker-keygen.8 @@ -0,0 +1,48 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2gobroker-keygen 8 "Feb 2013" "Version 0.0.1.y" "X2Go Session Broker" +.SH NAME +x2gobroker-keygen \- Generate SSH keys for X2Go Session Broker +.SH SYNOPSIS +'nh +.fi +.ad l +\fBx2gobroker-keygen\fR \kx +.if (\nx>(\n(.l/2)) .nr x (\n(.l/5) +'in \n(.iu+\nxu +[ +\fIoptions\fR +] +'in \n(.iu-\nxu +.ad b +'hy +.SH DESCRIPTION +\fBx2gobroker-keygen\fR generates a SSH pub/priv key pair and makes it usable through +X2Go Session Broker. +.PP +This command has to be execute once per broker installation and requires root privileges. +.SH COMMON OPTIONS +\fBx2gobroker-keygen\fR accepts the following common options: +.TP +\*(T<\fB\-h, \-\-help\fR\*(T> +Display a help with all available command line options and exit. +.TP +.TP +\*(T<\fB\-t {RSA,DSA}, \-\-key_type {RSA,DSA}\fR\*(T> +SSH pub/priv key type (allowed values: RSA, DSA). +.TP +\*(T<\fB\-f, \-\-force\fR\*(T> +Re-generate SSH pub/priv key pair and enforce overwriting of existing key pair files. + +WARNING: you will loose previously create key files when this option is used. +.SH "FILES" +~x2gobroker/.ssh/* +.PP +.SH AUTHOR +This manual has been written for the X2Go project by +Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>. diff --git a/man/man8/x2gobroker-pubkeyauthorizer.8 b/man/man8/x2gobroker-pubkeyauthorizer.8 new file mode 100644 index 0000000..4602ce8 --- /dev/null +++ b/man/man8/x2gobroker-pubkeyauthorizer.8 @@ -0,0 +1,45 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2gobroker-pubkeyauthorizer 8 "Feb 2013" "Version 0.0.1.y" "X2Go Session Broker" +.SH NAME +x2gobroker-pubkeyauthorizer \- Retrieve public SSH keys from an X2Go Session Broker +.SH SYNOPSIS +'nh +.fi +.ad l +\fBx2gobroker-pubkeyauthorizer\fR \kx +.if (\nx>(\n(.l/2)) .nr x (\n(.l/5) +'in \n(.iu+\nxu +[ +\fIoptions\fR +] +'in \n(.iu-\nxu +.ad b +'hy +.SH DESCRIPTION +\fBx2gobroker-pubkeyauthorizer\fR retrieves the X2Go Session Broker's public SSH key(s) and +adds it to ~x2gobroker/.ssh/authorized_keys. +.PP +This command has to be executed once on each X2Go Server that is to become a member of a muli-node +X2Go server farm. The execution of this command requires root-privileges. +.PP +.SH COMMON OPTIONS +\fBx2gobroker-pubkeyauthorizer\fR accepts the following common options: +.TP +\*(T<\fB\-h, \-\-help\fR\*(T> +Display a help with all available command line options and exit. +.TP +\*(T<\fB\-b <BROKER_URL>, \-\-broker-url <BROKER_URL>\fR\*(T> +The URL of the X2Go Session Broker that we want to retrieve public keys from. +The common pattern for this URL is http(s)://<broker_hostname>:<port>/pubkeys/, but may differ +depending on your X2Go Session Broker setup. +.SH "FILES" +~x2gobroker/.ssh/authorized_keys +.SH AUTHOR +This manual has been written for the X2Go project by +Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>. diff --git a/man/man8/x2gobroker.8 b/man/man8/x2gobroker.8 index 6782fda..8811c2b 100644 --- a/man/man8/x2gobroker.8 +++ b/man/man8/x2gobroker.8 @@ -24,6 +24,8 @@ x2gobroker \- Session Broker for X2Go .SH DESCRIPTION \fBx2gobroker\fR is a Web.py based implementation of the X2Go Session Broker API. .PP +This command is normally executed either through an init script or via the WSGI module in your httpd server. +.PP See the included README and TODO for further information on \fBx2gobroker\fR. .SH COMMON OPTIONS \fBx2gobroker\fR accepts the following common options: 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.0.1-68-g8030518
by git-admin＠x2go.org 21 Feb '13

21 Feb '13

The branch, master has been updated via 8030518e4bab147e1f7b03feae7c63eff1f1f17c (commit) from 93bd345a6cf4618b87d243c86988062c22ece0b4 (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 8030518e4bab147e1f7b03feae7c63eff1f1f17c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 21 19:14:41 2013 +0100 fine-tune agent query mode SSH ----------------------------------------------------------------------- Summary of changes: x2gobroker/agent.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index c9d2489..600a361 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -83,13 +83,16 @@ def call_remote_broker_agent(username, mode, remote_agent): client.set_missing_host_key_policy(paramiko.WarningPolicy) client.connect(remote_hostname, remote_port, remote_username, look_for_keys=True, allow_agent=True) + result = [] ssh_transport = client.get_transport() if ssh_transport.is_authenticated(): - cmd = cmd_line.join(' ') + cmd = ' '.join(cmd_line) cmd = 'sh -c \"{cmd}\"'.format(cmd=cmd) (stdin, stdout, stderr) = client.exec_command(cmd) + result = stdout.read().split('\n') client.close() - return stdout.read().split('\n') + if result and result[0].startswith('OK'): + return [ r for r in result[1:] if r ] except paramiko.SSHException: logger_error.error('could not connect to remote X2Go Broker Agent (user: {user}, hostname: {hostname}, port: {port}'.format(user=remote_username, hostname=remote_hostname, port=remote_port)) 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.0.1-67-g93bd345
by git-admin＠x2go.org 21 Feb '13

21 Feb '13

The branch, master has been updated via 93bd345a6cf4618b87d243c86988062c22ece0b4 (commit) from 2813264ea2724e15c3bd82722fb2eb5dc1447553 (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 93bd345a6cf4618b87d243c86988062c22ece0b4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 21 18:50:58 2013 +0100 fix typo ----------------------------------------------------------------------- Summary of changes: sbin/x2gobroker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/sbin/x2gobroker b/sbin/x2gobroker index 3b847bd..846a7e5 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -111,7 +111,7 @@ 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/(.*)', 'x2gobroker.web.plainX2Go.BrokerWeb', +urls = ( '/plain/(.*)', 'x2gobroker.web.plain.X2GoBrokerWeb', # '/json/(.*)', 'x2gobroker.web.json.X2GoBrokerWeb', # '/html/(.*)', 'x2gobroker.web.html.X2GoBrokerWeb', '/pubkeys/', 'x2gobroker.web.extras.X2GoBrokerPubKeyService', 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.0.1-66-g2813264
by git-admin＠x2go.org 21 Feb '13

21 Feb '13

The branch, master has been updated via 2813264ea2724e15c3bd82722fb2eb5dc1447553 (commit) from 74acb0d029a9d94f01251274f939425b0bf9d6b3 (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 2813264ea2724e15c3bd82722fb2eb5dc1447553 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 21 18:44:44 2013 +0100 use some variables for broker user properties ----------------------------------------------------------------------- Summary of changes: sbin/x2gobroker-pubkeyauthorizer | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/sbin/x2gobroker-pubkeyauthorizer b/sbin/x2gobroker-pubkeyauthorizer index 2dc9dd4..66ad1ce 100755 --- a/sbin/x2gobroker-pubkeyauthorizer +++ b/sbin/x2gobroker-pubkeyauthorizer @@ -90,17 +90,24 @@ if __name__ == '__main__': logger_error.error('Cannot proceed without having an URL specified. Use --broker-url as cmdline parameter. Exiting...') sys.exit(-2) + broker_uid = x2gobroker.defaults.X2GOBROKER_DAEMON_USER + broker_uidnumber = getpwnam(broker_uid).pw_uid + broker_gid = x2gobroker.defaults.X2GOBROKER_DAEMON_GROUP + broker_gidnumber = getgrnam(broker_gid).gr_gid + broker_home = x2gobroker.defaults.X2GOBROKER_HOME + if not os.path.exists(broker_home): logger_error.error('The home directory {home} of user {user} does not exists. Cannot continue. Exiting...'.format(home=broker_home, user=broker_uid)) sys.exit(-2) logger_broker.info('Authorizing access to this X2Go server for X2Go Session Broker at URL {url}'.format(url=cmdline_args.broker_url)) + if not os.path.exists('{home}/.ssh'.format(home=broker_home)): os.mkdir('{home}/.ssh'.format(home=broker_home)) os.chown('{home}/.ssh'.format(home=broker_home), broker_uidnumber, broker_gidnumber) os.chmod('{home}/.ssh'.format(home=broker_home), 0750) - logger_broker.info(' Created {home}/.ssh'.format(home=broker_home) + logger_broker.info(' Created {home}/.ssh'.format(home=broker_home)) # FIXME: this probably needs some sanity checks(?) tmpfile_name, httpmsg = urllib.urlretrieve(cmdline_args.broker_url) @@ -111,27 +118,27 @@ if __name__ == '__main__': tmpfile.close() try: - read_authorized_keys = open('{home}/.ssh/authorized_keys'.format(home=x2gobroker.defaults.X2GOBROKER_HOME), 'rb') + read_authorized_keys = open('{home}/.ssh/authorized_keys'.format(home=broker_home), 'rb') already_authorized_keys = read_authorized_keys.read().split('\n') read_authorized_keys.close() except IOError: already_authorized_keys = [] - append_authorized_keys = open('{home}/.ssh/authorized_keys'.format(home=x2gobroker.defaults.X2GOBROKER_HOME), 'ab') + append_authorized_keys = open('{home}/.ssh/authorized_keys'.format(home=broker_home), 'ab') i = 0 for new_pubkey in new_pubkeys: i += 1 if new_pubkey not in already_authorized_keys: append_authorized_keys.write('{k}\n'.format(k=new_pubkey)) - logger_broker.info(' Adding new public key (counter={i}) to {authorized_keys}.'.format(i=i, authorized_keys='{home}/.ssh/authorized_keys'.format(home=x2gobroker.defaults.X2GOBROKER_HOME))) + logger_broker.info(' Adding new public key (counter={i}) to {authorized_keys}.'.format(i=i, authorized_keys='{home}/.ssh/authorized_keys'.format(home=broker_home))) else: - logger_broker.warning(' Skipping new public key (counter={i}), already in {authorized_keys}.'.format(i=i, authorized_keys='{home}/.ssh/authorized_keys'.format(home=x2gobroker.defaults.X2GOBROKER_HOME))) + logger_broker.warning(' Skipping new public key (counter={i}), already in {authorized_keys}.'.format(i=i, authorized_keys='{home}/.ssh/authorized_keys'.format(home=broker_home))) append_authorized_keys.close() # set proper file permissions - os.chown('{home}/.ssh/authorized_keys'.format(home=x2gobroker.defaults.X2GOBROKER_HOME), getpwnam(x2gobroker.defaults.X2GOBROKER_DAEMON_USER).pw_uid, getgrnam(x2gobroker.defaults.X2GOBROKER_DAEMON_GROUP).gr_gid) - os.chmod('{home}/.ssh/authorized_keys'.format(home=x2gobroker.defaults.X2GOBROKER_HOME), 0644) + os.chown('{home}/.ssh/authorized_keys'.format(home=broker_home), broker_uidnumber, broker_gidnumber) + os.chmod('{home}/.ssh/authorized_keys'.format(home=broker_home), 0644) logger_broker.info('Completed successfully: X2Go Session Broker\'s PubKey Authorizer.'.format(url=cmdline_args.broker_url)) 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.0.1-65-g74acb0d
by git-admin＠x2go.org 21 Feb '13

21 Feb '13

The branch, master has been updated via 74acb0d029a9d94f01251274f939425b0bf9d6b3 (commit) from 6d09a1ccc82eab4b46e8133c8d6246f2c4761e69 (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 74acb0d029a9d94f01251274f939425b0bf9d6b3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 21 18:41:35 2013 +0100 create {broker_home}/.ssh before importing authorized_keys ----------------------------------------------------------------------- Summary of changes: sbin/x2gobroker-pubkeyauthorizer | 10 ++++++++++ 1 file changed, 10 insertions(+) The diff of changes is: diff --git a/sbin/x2gobroker-pubkeyauthorizer b/sbin/x2gobroker-pubkeyauthorizer index 0365b96..2dc9dd4 100755 --- a/sbin/x2gobroker-pubkeyauthorizer +++ b/sbin/x2gobroker-pubkeyauthorizer @@ -90,8 +90,18 @@ if __name__ == '__main__': logger_error.error('Cannot proceed without having an URL specified. Use --broker-url as cmdline parameter. Exiting...') sys.exit(-2) + if not os.path.exists(broker_home): + logger_error.error('The home directory {home} of user {user} does not exists. Cannot continue. Exiting...'.format(home=broker_home, user=broker_uid)) + sys.exit(-2) + logger_broker.info('Authorizing access to this X2Go server for X2Go Session Broker at URL {url}'.format(url=cmdline_args.broker_url)) + if not os.path.exists('{home}/.ssh'.format(home=broker_home)): + os.mkdir('{home}/.ssh'.format(home=broker_home)) + os.chown('{home}/.ssh'.format(home=broker_home), broker_uidnumber, broker_gidnumber) + os.chmod('{home}/.ssh'.format(home=broker_home), 0750) + logger_broker.info(' Created {home}/.ssh'.format(home=broker_home) + # FIXME: this probably needs some sanity checks(?) tmpfile_name, httpmsg = urllib.urlretrieve(cmdline_args.broker_url) 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.0.1-64-g6d09a1c
by git-admin＠x2go.org 21 Feb '13

21 Feb '13

The branch, master has been updated via 6d09a1ccc82eab4b46e8133c8d6246f2c4761e69 (commit) 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 ----------------------------------------------------------------- commit 6d09a1ccc82eab4b46e8133c8d6246f2c4761e69 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 21 18:17:37 2013 +0100 -bin:package x2gobroker-agent now also depends on python-x2gobroker, due to x2gobroker-pubkeyauthorizer script commit 9930f394ccd0ad73bccf3755248b89317227b89e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 21 18:16:01 2013 +0100 fix x2gobroker-agent.install ----------------------------------------------------------------------- Summary of changes: debian/control | 1 + debian/x2gobroker-agent.install | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 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 - master (branch) updated: 0.0.0.1-62-gc323c09
by git-admin＠x2go.org 21 Feb '13

21 Feb '13

The branch, master 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 ----------------------------------------------------------------- commit c323c09128de3638fb05e26153a14e295a661511 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 21 18:11:45 2013 +0100 add x2gobroker-pubkeyauthorizer to bin:package x2gobroker-agent ----------------------------------------------------------------------- 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 - master (branch) updated: 0.0.0.1-61-g8e5f855
by git-admin＠x2go.org 21 Feb '13

21 Feb '13

The branch, master has been updated via 8e5f855b236a1483ac6414d1a3782efcf124f2e0 (commit) from 9217c85255f9737bfe37a61b4a8457764e190b37 (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 8e5f855b236a1483ac6414d1a3782efcf124f2e0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 21 18:10:25 2013 +0100 improve the PubKey Authorizer, make it more robust and avoid ever-growing authorized_keys files ----------------------------------------------------------------------- Summary of changes: sbin/x2gobroker-pubkeyauthorizer | 127 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100755 sbin/x2gobroker-pubkeyauthorizer The diff of changes is: diff --git a/sbin/x2gobroker-pubkeyauthorizer b/sbin/x2gobroker-pubkeyauthorizer new file mode 100755 index 0000000..0365b96 --- /dev/null +++ b/sbin/x2gobroker-pubkeyauthorizer @@ -0,0 +1,127 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +# 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. + +import os +import sys +import setproctitle +import argparse +import logging +import binascii +import paramiko +import urllib + +from pwd import getpwnam +from grp import getgrnam + +try: + import x2gobroker.defaults +except ImportError: + sys.path.insert(0, os.path.join(os.getcwd(), '..')) + import x2gobroker.defaults + +PROG_NAME = os.path.basename(sys.argv[0]) +PROG_OPTIONS = sys.argv[1:] +setproctitle.setproctitle("%s %s" % (PROG_NAME, " ".join(PROG_OPTIONS))) + +from x2gobroker import __VERSION__ +from x2gobroker import __AUTHOR__ +from x2gobroker.loggers import logger_broker, logger_error + +if os.geteuid() == 0: + # propagate msgs for the broker logger to the root logger (i.e. to stderr) + logger_broker.propagate = 1 + logger_error.propagate = 1 + +# raise log level to DEBUG if requested... +if x2gobroker.defaults.X2GOBROKER_DEBUG and not x2gobroker.defaults.X2GOBROKER_TESTSUITE: + logger_broker.setLevel(logging.DEBUG) + +logger_broker.info('X2Go Session Broker ({version}), written by {author}'.format(version=__VERSION__, author=__AUTHOR__)) +logger_broker.info('Setting up the »PubKey Authorizer«\'s environment...') +logger_broker.info(' X2GOBROKER_DEBUG: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_DEBUG)) +logger_broker.info(' X2GOBROKER_DAEMON_USER: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_DAEMON_USER)) +logger_broker.info(' X2GOBROKER_DAEMON_GROUP: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_DAEMON_GROUP)) + +# check effective UID the broker runs as and complain appropriately... +if os.geteuid() != 0: + logger_error.error('X2Go Session Broker\'s »PubKey Authorizer« has to run with root privileges. Exiting...') + sys.exit(-1) + +if __name__ == '__main__': + + common_options = [ + {'args':['-t','--broker-url'], 'default': None, 'help': 'The URL of the X2Go Session Broker that we want to retrieve public keys from. The common pattern for this URL is http(s)://<broker_hostname>:<port>/pubkeys/.', }, + ] + p = argparse.ArgumentParser(description='X2Go Session Broker (PubKey Installer)',\ + formatter_class=argparse.RawDescriptionHelpFormatter, \ + add_help=True, argument_default=None) + p_common = p.add_argument_group('common parameters') + + for (p_group, opts) in ( (p_common, common_options), ): + for opt in opts: + args = opt['args'] + del opt['args'] + p_group.add_argument(*args, **opt) + + print + cmdline_args = p.parse_args() + + if cmdline_args.broker_url is None: + logger_error.error('Cannot proceed without having an URL specified. Use --broker-url as cmdline parameter. Exiting...') + sys.exit(-2) + + logger_broker.info('Authorizing access to this X2Go server for X2Go Session Broker at URL {url}'.format(url=cmdline_args.broker_url)) + + # FIXME: this probably needs some sanity checks(?) + tmpfile_name, httpmsg = urllib.urlretrieve(cmdline_args.broker_url) + + tmpfile = open(tmpfile_name, 'rb') + new_pubkeys = [ k for k in tmpfile.read().split('\n') if k ] + logger_broker.info(' Found {i} public keys at URL {url}'.format(i=len(new_pubkeys), url=cmdline_args.broker_url)) + tmpfile.close() + + try: + read_authorized_keys = open('{home}/.ssh/authorized_keys'.format(home=x2gobroker.defaults.X2GOBROKER_HOME), 'rb') + already_authorized_keys = read_authorized_keys.read().split('\n') + read_authorized_keys.close() + except IOError: + already_authorized_keys = [] + + append_authorized_keys = open('{home}/.ssh/authorized_keys'.format(home=x2gobroker.defaults.X2GOBROKER_HOME), 'ab') + + i = 0 + for new_pubkey in new_pubkeys: + i += 1 + if new_pubkey not in already_authorized_keys: + append_authorized_keys.write('{k}\n'.format(k=new_pubkey)) + logger_broker.info(' Adding new public key (counter={i}) to {authorized_keys}.'.format(i=i, authorized_keys='{home}/.ssh/authorized_keys'.format(home=x2gobroker.defaults.X2GOBROKER_HOME))) + else: + logger_broker.warning(' Skipping new public key (counter={i}), already in {authorized_keys}.'.format(i=i, authorized_keys='{home}/.ssh/authorized_keys'.format(home=x2gobroker.defaults.X2GOBROKER_HOME))) + + append_authorized_keys.close() + + # set proper file permissions + os.chown('{home}/.ssh/authorized_keys'.format(home=x2gobroker.defaults.X2GOBROKER_HOME), getpwnam(x2gobroker.defaults.X2GOBROKER_DAEMON_USER).pw_uid, getgrnam(x2gobroker.defaults.X2GOBROKER_DAEMON_GROUP).gr_gid) + os.chmod('{home}/.ssh/authorized_keys'.format(home=x2gobroker.defaults.X2GOBROKER_HOME), 0644) + + logger_broker.info('Completed successfully: X2Go Session Broker\'s PubKey Authorizer.'.format(url=cmdline_args.broker_url)) 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.0.1-60-g9217c85
by git-admin＠x2go.org 21 Feb '13

21 Feb '13

The branch, master has been updated via 9217c85255f9737bfe37a61b4a8457764e190b37 (commit) via 40b5a345b349598d4da6bb2492a8f29b7a202dc4 (commit) from a03e031ce619f538ca1f14cd65c3a502ca49ec15 (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 9217c85255f9737bfe37a61b4a8457764e190b37 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 21 17:16:00 2013 +0100 To make SSH pubkey deployment easier, serve the broker's public SSH key(s) under this URL http(s)://<broker_hostname>:<port>/pubkeys/. commit 40b5a345b349598d4da6bb2492a8f29b7a202dc4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 21 16:45:03 2013 +0100 log msg change ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ sbin/x2gobroker | 18 ++++++++------- sbin/x2gobroker-keygen | 2 +- x2gobroker/defaults.py | 8 ++++++- x2gobroker/web/extras.py | 57 ++++++++++++++++++++++++++++++++++++++++++++++ x2gobroker/web/html.py | 2 +- x2gobroker/web/json.py | 2 +- x2gobroker/web/plain.py | 2 +- 8 files changed, 80 insertions(+), 13 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/sbin/x2gobroker-keygen b/sbin/x2gobroker-keygen index ab98a07..2d3c037 100755 --- a/sbin/x2gobroker-keygen +++ b/sbin/x2gobroker-keygen @@ -116,7 +116,7 @@ if __name__ == '__main__': key = paramiko.DSSKey.generate(1024) id_file = 'id_dsa' - logger_broker.info(' The {key_type} key has been generated, fingerprint is {fingerprint}'.format(key_type=cmdline_args.key_type.upper(), fingerprint=binascii.hexlify(key.get_fingerprint()))) + logger_broker.info(' The {key_type} key has been generated, fingerprint: {fingerprint}'.format(key_type=cmdline_args.key_type.upper(), fingerprint=binascii.hexlify(key.get_fingerprint()))) if os.path.exists('{home}/.ssh/{id_file}'.format(home=broker_home, id_file=id_file)) and not cmdline_args.force: logger_broker.error(' Private key {home}/.ssh/{id_file} exists. Use --force to overwrite the file and regenerate a new key pair. Exiting...'.format(home=broker_home, id_file=id_file)) 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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits