x2go-commits

x2go-commits@lists.x2go.org

1 participants
37914 discussions

x2gobroker.git - build-main (branch) updated: 0.0.0.3-2-g64a4bbc
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 64a4bbcdb88c6c7c9748da79e11e0cec7fe37bed (commit) from 7ed759b99d34ebfafaf169816a6e545be555bad8 (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/brokers/base_broker.py | 9 +++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 80d6878..e32ed19 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ x2gobroker (0.0.0.4-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (0.0.0.4): + - Capture DNS resolver failures on client ACLs in case the + one of the listed hostnames in one client ACL definition is + not resolvable. Such a failure will deny access to the + corresponding session profile. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 21 Feb 2013 21:47:32 +0100 diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 9e811c0..ad3e3e7 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -301,8 +301,13 @@ class X2GoBroker(object): _acls_clients_deny[idx] = '0.0.0.0/0' _acls_clients_deny.insert(idx, '::/0') - _allow_address_set = netaddr.IPSet(_acls_clients_allow) - _deny_address_set = netaddr.IPSet(_acls_clients_deny) + _allow_address_set = [] + _deny_address_set = ['ALL'] + try: + _allow_address_set = netaddr.IPSet(_acls_clients_allow) + _deny_address_set = netaddr.IPSet(_acls_clients_deny) + except netaddr.core.AddrFormatError, e: + logger_error.error('base_broker.X2GoBroker.check_acls(): netaddr.core.AddrFormatError - {why}'.format(why=str(e))) _allow_client = self._client_address in _allow_address_set _deny_client = self._client_address in _deny_address_set hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

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

19 May '13

The branch, build-main 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 - build-main (branch) updated: 0.0.0.1-71-gd7d2af9
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main 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 ----------------------------------------------------------------- ----------------------------------------------------------------------- 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 - build-main (branch) updated: 0.0.0.1-62-gc323c09
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main 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 - build-main (branch) updated: 0.0.0.1-65-g74acb0d
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main 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 ----------------------------------------------------------------- ----------------------------------------------------------------------- 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 - build-main (branch) updated: 0.0.0.1-68-g8030518
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main 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 ----------------------------------------------------------------- ----------------------------------------------------------------------- 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 - build-main (branch) updated: 0.0.0.1-61-g8e5f855
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main 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 ----------------------------------------------------------------- ----------------------------------------------------------------------- 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 - build-main (branch) updated: 0.0.0.1-67-g93bd345
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main 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 ----------------------------------------------------------------- ----------------------------------------------------------------------- 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 - build-main (branch) updated: 0.0.0.1-63-g9930f39
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main 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 - build-main (branch) updated: 0.0.0.1-64-g6d09a1c
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main 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:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits