x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

x2gobroker.git - master (branch) updated: e77e74374b3f18f4ee272605a8352b99c9221b09
by git-admin＠x2go.org 03 Dec '12

03 Dec '12

The branch, master has been updated via e77e74374b3f18f4ee272605a8352b99c9221b09 (commit) from b3c10d7e36590aaa5b1de35313c6e2bbdadb5018 (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 e77e74374b3f18f4ee272605a8352b99c9221b09 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Dec 3 14:52:26 2012 +0100 more work on the broker, get zeroconf broker working ----------------------------------------------------------------------- Summary of changes: etc/x2gobroker.conf | 8 +- sbin/x2gobroker | 6 +- x2gobroker/backends/base.py | 55 ++++++-- x2gobroker/backends/ldap.py | 12 -- .../{__init__.py => backends/loadbalancer.py} | 12 +- x2gobroker/backends/simple.py | 10 -- x2gobroker/backends/zeroconf.py | 60 ++++++-- x2gobroker/defaults.py | 6 +- x2gobroker/web/html.py | 50 ++----- x2gobroker/web/plain.py | 143 ++++++++++++++++++++ 10 files changed, 265 insertions(+), 97 deletions(-) copy x2gobroker/{__init__.py => backends/loadbalancer.py} (78%) create mode 100644 x2gobroker/web/plain.py The diff of changes is: diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf index ec6f4a9..d7a3d6a 100644 --- a/etc/x2gobroker.conf +++ b/etc/x2gobroker.conf @@ -69,18 +69,22 @@ authid = <aaaavveeeerrrrryyyyylooonnnnggggssttrrriiinnnggg> # X2Go Session Broker knows about two output formats: a text/html based output # and a text/json based output. The different outputs run under different URLs -# enable {base_url}/html/ -enable-html-output = true +# enable {base_url}/plain/ +enable-plain-output = true # enable {base_url}/json/ (THIS IS FUTURE, mg-20121129) enable-json-output = false +# enable {base_url}/html/ (THIS IS FUTURE, mg-20121129) +enable-html-output = false + ### ### configurations for individual session brokers ### [zeroconf] enable = true +desktop-shell = KDE [simple] enable = false diff --git a/sbin/x2gobroker b/sbin/x2gobroker index 0a67c34..b64fd13 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -60,12 +60,14 @@ if __name__ == "__main__": } # import classes serving the different web.py URLs -from x2gobroker.web.html import * +from x2gobroker.web.plain import * #from x2gobroker.web.json import * +#from x2gobroker.web.html import * # define the web.py URLs -urls = ( '/html/(.*)', 'X2GoBrokerWebHtml', +urls = ( '/plain/(.*)', 'X2GoBrokerWebPlain', # '/json/(.*)', 'X2GoBrokerWebJson', + '/html/(.*)', 'X2GoBrokerWebHtml', ) # run the web.py standalone daemon... diff --git a/x2gobroker/backends/base.py b/x2gobroker/backends/base.py index f5228f7..06b7150 100644 --- a/x2gobroker/backends/base.py +++ b/x2gobroker/backends/base.py @@ -27,20 +27,22 @@ __NAME__ = 'x2gobroker-pylib' # modules import types import uuid +import pam # X2Go Broker modules import x2gobroker.config class X2GoBroker(object): """\ - X2GoBrokerBASE is an abstract class for X2Go broker implementations. + L{base.X2GoBroker} is an abstract class for X2Go broker implementations. This class needs to be inherited from a concrete broker class. Currently available broker classes are:: - L{zeroconf.X2GoBroker} - L{simple.X2GoBroker} - L{ldap.X2GoBroker} + L{zeroconf.X2GoBroker} (working) + L{simple.X2GoBroker} (in prep) + L{ldap.X2GoBroker} (in prep) + L{loadbalancer.X2GoBroker} (in prep) """ @@ -84,6 +86,22 @@ class X2GoBroker(object): """ return self.config.get_backend_config(backend=backend) + def get_backend_value(self, backend='zeroconf', option='enabled'): + """\ + Get the configuration setting for backend C{backend} and option + C{option}. + + @param backend: the name of the backend + @type backend: C{str} + @param option: option name of the backend's configuration section + @type option: C{str} + + @return: the value for the given C{backend} C{option} + @rtype: C{dict} + + """ + return self.config.get_value(backend, option) + def test_connection(self): #if($cgi->param('task') eq 'testcon') #{ @@ -96,6 +114,14 @@ class X2GoBroker(object): #} return 'OK' + def _check_access(self, username='', password='', authid=None): + + # do a simple PAM authentication against the PAM service ,,x2gobroker'' + if username and password: + if pam.authenticate(username, password, service="x2gobroker"): + return True + return False + def check_access(self, username='', password='', authid=None, ): """\ Check if a given user with a given password may gain access to the @@ -165,30 +191,31 @@ class X2GoBroker(object): except KeyError: return None - def list_sessions(self, username): + def list_profiles(self, username): """\ - Retrieve a list of running/suspended sessions for the user that has authenticated to this - L{X2GoBroker} instance + Retrieve a list of available session profiles for the authenticated user. @param username: query session list for this user @type username: C{unicode} - return: list of session objects - rtype: C{obj} + return: list of profile dictionaries + rtype: C{dict} """ - return [] + return {} - def select_session(self, session_name=None): + def select_profile(self, profile_name='DEFAULT'): """\ - Select a running/suspended session to be transferred/resumed to the requesting X2Go Client. - If no C{session_name} is given, a new X2Go session is launched for the authenticated user. + Start/resume a session by selecting a profile name offered by the X2Go client. The X2Go server that the session is launched on is selected automatically by the X2Go session broker. + @param profile_name: a dictionary object containing information on a selected session profile + @type profile_name: C{dict} + """ - return None + return {} def change_password(self, new='', old=''): """\ diff --git a/x2gobroker/backends/ldap.py b/x2gobroker/backends/ldap.py index 25fc8b4..62b9801 100644 --- a/x2gobroker/backends/ldap.py +++ b/x2gobroker/backends/ldap.py @@ -31,15 +31,3 @@ class X2GoBroker(x2gobroker.base.X2GoBroker): """\ """ - def __init__(self): - """\ - - """ - x2gobroker.base.X2GoBroker.__init__(self) - - def __del__(self): - """\ - - """ - x2gobroker.base.X2GoBroker.__del__(self) - diff --git a/x2gobroker/__init__.py b/x2gobroker/backends/loadbalancer.py similarity index 78% copy from x2gobroker/__init__.py copy to x2gobroker/backends/loadbalancer.py index ad8c1e4..6be2f18 100644 --- a/x2gobroker/__init__.py +++ b/x2gobroker/backends/loadbalancer.py @@ -18,6 +18,16 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.0.0.1' +"""\ +X2goBrokerLOADBALANCER class - a simple load balancer example for n X2Go Server with the same session profile +""" +__NAME__ = 'x2gobroker-pylib' +# modules +import x2gobroker.base + +class X2GoBroker(x2gobroker.base.X2GoBroker): + """\ + + """ diff --git a/x2gobroker/backends/simple.py b/x2gobroker/backends/simple.py index 923676e..3596f88 100644 --- a/x2gobroker/backends/simple.py +++ b/x2gobroker/backends/simple.py @@ -25,7 +25,6 @@ X2goBrokerSIMPLE class - a simple X2GoBroker implementations that uses text-base __NAME__ = 'x2gobroker-pylib' # modules -import pam # Python X2GoBroker modules import x2gobroker.base @@ -34,12 +33,3 @@ class X2GoBroker(x2gobroker.base.X2GoBroker): """\ """ - def check_access(self, username='', password='', authid=None): - - # do a simple PAM authentication against the PAM service ,,x2gobroker'' - if username and password: - if pam.authenticate(username, password, service="x2gobroker"): - return True - return False - - return x2gobroker.base.X2GoBroker.check_access(self, username=username, password=password, authid=authid) diff --git a/x2gobroker/backends/zeroconf.py b/x2gobroker/backends/zeroconf.py index 3598e68..4e6a21d 100644 --- a/x2gobroker/backends/zeroconf.py +++ b/x2gobroker/backends/zeroconf.py @@ -25,8 +25,8 @@ X2goBrokerZEROCONF class - a demo X2GoBroker implementations that needs not conf __NAME__ = 'x2gobroker-pylib' # modules -import pam import subprocess +import uuid import base @@ -34,19 +34,53 @@ from x2gobroker.defaults import X2GOBROKER_AGENT_CMD as _X2GOBROKER_AGENT_CMD class X2GoBroker(base.X2GoBroker): - def _check_access(self, username='', password='', authid=None): + backend_name = 'zeroconf' - # do a simple PAM authentication against the PAM service ,,x2gobroker'' - if username and password: - if pam.authenticate(username, password, service="x2gobroker"): - return True - return False + def list_profiles(self, username): - def list_sessions(self, username): + list_of_profiles = { + uuid.uuid4(): { + 'user': u'', + 'defsndport': True, + 'useiconv': False, + 'iconvfrom': u'UTF-8', + 'height': 600, + 'export': u'', + 'quality': 9, + 'fullscreen': False, + 'layout': u'', + 'useexports': 1, + 'width': 800, + 'speed': 2, + 'soundsystem': u'pulse', + 'print': True, + 'type': u'auto', + 'sndport': 4713, + 'xinerama': True, + 'variant': u'', + 'usekbd': True, + 'fstunnel': True, + 'applications': [u'TERMINAL',u'WWWBROWSER',u'MAILCLIENT',u'OFFICE',], + 'host': u'localhost', + 'multidisp': 0, + 'sshproxyport': 22, + 'sound': True, + 'rootless': 0, + 'name': u'LOCALHOST', + 'iconvto': u'UTF-8', + 'soundtunnel': True, + 'command': self.get_backend_value(self.backend_name, u'desktop-shell'), + 'dpi': 96, + 'sshport': 22, + 'setdpi': 0, + 'pack': u'16m-jpeg', + }, + } + return list_of_profiles - # simply call the local x2gobroker-agent to retrieve a session list for <username> - cmd_line = [ _X2GOBROKER_AGENT_CMD, username, "listsessions" ] - broker_agent = subprocess.Popen(cmd_line) - - return broker_agent.stdout() + def select_profile(self, profile_name): + selectprofile_output = { + 'server': 'localhost:22', + } + return selectprofile_output diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index b9dc3c6..017021c 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -27,7 +27,7 @@ import uuid X2GOBROKER_HOME = os.path.normpath(os.path.expanduser('~')) # FIXME: this path must not be hard-coded -X2GOBROKER_AGENT_CMD="/usr/lib/x2gobroker-agent" +X2GOBROKER_AGENT_CMD="/usr/lib/x2go/x2gobroker-agent" # defaults for X2Go Sessino Broker configuration file X2GOBROKER_CONFIG_DEFAULTS = { @@ -37,11 +37,13 @@ X2GOBROKER_CONFIG_DEFAULTS = { 'use-authid': False, 'use-static-authid': True, 'authid': uuid.uuid4(), - 'enable-html-output': True, + 'enable-plain-output': True, 'enable-json-output': False, + 'enable-html-output': False, }, 'zeroconf': { 'enable': True, + 'desktop-shell': 'KDE', }, 'simple': { 'enable': False, diff --git a/x2gobroker/web/html.py b/x2gobroker/web/html.py index b3b3ce2..429c4f8 100644 --- a/x2gobroker/web/html.py +++ b/x2gobroker/web/html.py @@ -60,6 +60,9 @@ $output 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, backend): + return self.POST(backend) + def POST(self, backend): if not backend: @@ -92,55 +95,20 @@ $output self._gen_http_header() - # FIXME: the ,,testcon'' task can be object to DoS attacks... - if task == 'testcon': + if broker_backend.check_access(username=username, password=password, authid=authid): ### - ### TEST THE CONNECTION + ### CONFIRM SUCCESSFUL AUTHENTICATION FIRST ### - return broker_backend.test_connection() - - if broker_backend.check_access(username=username, password=password, authid=authid): - - if not task: - - ### - ### PERFORM A TEST AUTHENTICATION - ### - - if global_config['use-authid']: - - ### FIXME: make up a nice protocol for this, disabled for now - #output += "AUTHID: {authid} ".format(authid=broker_backend.get_next_authid(username=data.user)) - pass + output += "Access granted " - output += "Access granted " - return self.page(self.html_header_items, output) - - else: + if task: ### - ### X2GO BROKER TASKS + ### WORK TODO HERE!!! ### - if task == 'listsessions': - - output += broker_backend.list_sessions() - - if task == 'selectsession': - - if session_name: - - output += broker_backend.select_session(session_name=session_name) - - if task == 'setpass': - - if new_password: - - output += broker_backend.change_password(new_password=new_password) - return self.page(self.html_header_items, output) - else: - return self.page(self.html_header_items, "<hr>Access denied") + return self.page(self.html_header_items, "<hr>Access denied") diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py new file mode 100644 index 0000000..8819e73 --- /dev/null +++ b/x2gobroker/web/plain.py @@ -0,0 +1,143 @@ +#!/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 web +import types + +class X2GoBrokerWebPlain: + + 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, backend): + return self.POST(backend) + + def POST(self, backend): + + if not backend: + backend = 'zeroconf' + else: + backend = backend.rstrip('/') + + # silence pyflakes... + broker_backend = None + exec("import x2gobroker.backends.{backend}".format(backend=backend)) + exec("broker_backend = x2gobroker.backends.{backend}.X2GoBroker()".format(backend=backend)) + global_config = broker_backend.get_global_config() + backend_config = broker_backend.get_backend_config(backend) + + data = web.input() + try: username = data.user + except AttributeError: username = '' + try: password = data.password + except AttributeError: password = '' + try: authid = data.authid + except AttributeError: authid = '' + try: task = data.task + except AttributeError: task = '' + try: profile_name = data.sid + except AttributeError: profile_name = '' + try: new_password = data.newpass + except AttributeError: new_password = '' + + output = '' + + self._gen_http_header() + + if broker_backend.check_access(username=username, password=password, authid=authid): + + ### + ### CONFIRM SUCCESSFUL AUTHENTICATION FIRST + ### + + if global_config['use-authid']: + + ### FIXME: make up a nice protocol for this, disabled for now + #output += "AUTHID: {authid} ".format(authid=broker_backend.get_next_authid(username=data.user)) + pass + + output += "Access granted\n" + + ### + ### X2GO BROKER TASKS + ### + + # FIXME: the ,,testcon'' task can be object to DoS attacks... + if task == 'testcon': + + ### + ### TEST THE CONNECTION + ### + + return broker_backend.test_connection() + + if task == 'listsessions': + + profiles = broker_backend.list_profiles(username) + if profiles: + # FIXME (in x2goclient): accept \n as EOL + #output += "START_USER_SESSIONS\n" + output += "START_USER_SESSIONS " + for profile_id in profiles: + output += "[{profile_id}]".format(profile_id=profile_id) + for key in profiles[profile_id].keys(): + if type(profiles[profile_id][key]) in (types.UnicodeType, types.StringType): + output += "{key}={value}".format(key=key, value=unicode(profiles[profile_id][key])) + elif type(profiles[profile_id][key]) in (types.ListType, types.TupleType): + output += "{key}={value}".format(key=key, value=unicode(",".join(profiles[profile_id][key]))) + else: + output += "{key}={value}".format(key=key, value=unicode(int(profiles[profile_id][key]))) + + # FIXME (in x2goclient): accept \n as EOL + # output += "\n" + output += " " + + output += "\n" + # FIXME (in x2goclient): accept \n as EOL + #output += "END_USER_SESSIONS\n" + output += "END_USER_SESSIONS " + + if task == 'selectsession': + + if profile_name: + + profile_info = broker_backend.select_profile(profile_name=profile_name) + if profile_info.has_key('server'): + output += "SERVER:" + output += profile_info['server'] + "\n" + if profile_info.has_key('authentication_key'): + output += "" + if profile_info.has_key('session_info'): + output += "SESSION_INFOS:\n" + output += "\n".join(profile_info['session_info']) + "\n" + + return output + + return "Access denied" 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

x2goclient.git - master (branch) updated: 3.99.3.0-12-g8913672
by git-admin＠x2go.org 03 Dec '12

03 Dec '12

The branch, master has been updated via 8913672eea21b4f262b6dd73002e2df7957627a2 (commit) from a0f3507b126c07b4fde403e8c939a6864a0451c2 (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 8913672eea21b4f262b6dd73002e2df7957627a2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Dec 3 13:55:13 2012 +0100 fix find call (order of options) ----------------------------------------------------------------------- Summary of changes: Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/Makefile b/Makefile index bc98046..b76e5ef 100755 --- a/Makefile +++ b/Makefile @@ -41,10 +41,10 @@ build_man: ${MAKE} -f Makefile.man2html build clean: clean_client clean_plugin clean_man - find . -type f -maxdepth 2 -name '*.o' -exec rm -vf {} + - find . -type f -maxdepth 2 -name 'moc_*.cpp' -exec rm -vf {} + - find . -type f -maxdepth 2 -name 'ui_*.h' -exec rm -vf {} + - find . -type f -maxdepth 2 -name 'qrc_*.cpp' -exec rm -vf {} + + find . -maxdepth 2 -name '*.o' -exec rm -vf {} + -type f + find . -maxdepth 2 -name 'moc_*.cpp' -exec rm -vf {} + -type f + find . -maxdepth 2 -name 'ui_*.h' -exec rm -vf {} + -type f + find . -maxdepth 2 -name 'qrc_*.cpp' -exec rm -vf {} + -type f rm -f x2goclient rm -f x2goclient.tag hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2gobroker.git - master (branch) updated: b3c10d7e36590aaa5b1de35313c6e2bbdadb5018
by git-admin＠x2go.org 03 Dec '12

03 Dec '12

The branch, master has been updated via b3c10d7e36590aaa5b1de35313c6e2bbdadb5018 (commit) via 1b7296655b69600342ad40a60fcb112409eedf20 (commit) from b47d8fe5206d5d4c0cbf77238462f0044cc4357e (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 b3c10d7e36590aaa5b1de35313c6e2bbdadb5018 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Dec 3 10:02:17 2012 +0100 X2Go Client uses the POST method, not the GET method commit 1b7296655b69600342ad40a60fcb112409eedf20 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Dec 3 10:01:29 2012 +0100 catch socket.error exceptions when starting web.py ----------------------------------------------------------------------- Summary of changes: sbin/x2gobroker | 10 +++++++--- x2gobroker/web/html.py | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/sbin/x2gobroker b/sbin/x2gobroker index b5f3b48..0a67c34 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -24,6 +24,7 @@ import sys import os import web import argparse +import socket try: import x2gobroker @@ -74,6 +75,9 @@ if __name__ == "__main__": sys.argv.append('') sys.argv[1] = cmdline_args.bind sys.argv[2:] = [] - app = web.application(urls, globals()) - app.internalerror = web.debugerror - app.run() + try: + app = web.application(urls, globals()) + app.internalerror = web.debugerror + app.run() + except socket.error, e: + print (e) diff --git a/x2gobroker/web/html.py b/x2gobroker/web/html.py index 48124e8..b3b3ce2 100644 --- a/x2gobroker/web/html.py +++ b/x2gobroker/web/html.py @@ -60,7 +60,7 @@ $output 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, backend): + def POST(self, backend): if not backend: backend = 'zeroconf' 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

x2godesktopsharing.git - master (branch) updated: 3.1.0.5-12-ge35dd7c
by git-admin＠x2go.org 03 Dec '12

03 Dec '12

The branch, master has been updated via e35dd7c318dbaf227b5a127aa919452801cd9481 (commit) from 849390ae0aded35735b2305f8ca23ec82efb33ef (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 e35dd7c318dbaf227b5a127aa919452801cd9481 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Dec 3 09:16:00 2012 +0100 typo fix ----------------------------------------------------------------------- Summary of changes: main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/main.cpp b/main.cpp index 039c617..68645f8 100644 --- a/main.cpp +++ b/main.cpp @@ -53,7 +53,7 @@ void client ( const QStringList & cmd ) QString dispname=params[2]; // QString socketName=QDir::tempPath() +"/x2godesktopsharing_@"+ // params[1]+"@"+dispname; - QString socketName=/tmp/x2godesktopsharing_@" + params[1]+"@"+dispname; + QString socketName="/tmp/x2godesktopsharing_@" + params[1]+"@"+dispname; QLocalSocket sock; sock.connectToServer ( socketName ); if ( !sock.waitForConnected ( 3000 ) ) hooks/post-receive -- x2godesktopsharing.git (Desktop Sharing 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 "x2godesktopsharing.git" (Desktop Sharing for X2Go).

1 0

x2godesktopsharing.git - master (branch) updated: 3.1.0.5-11-g849390a
by git-admin＠x2go.org 03 Dec '12

03 Dec '12

The branch, master has been updated via 849390ae0aded35735b2305f8ca23ec82efb33ef (commit) from 55eb03e343db26040beeb3af2592e9be3f092e41 (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 849390ae0aded35735b2305f8ca23ec82efb33ef Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Dec 3 09:14:38 2012 +0100 /debian/control: Add build dependency: qt4-dev-tools. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/control | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b080687..92a420e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ x2godesktopsharing (3.1.0.6-0~x2go1) UNRELEASED; urgency=low - Fix TEMP path for finding the x2godesktopsharing socket. Solves issues on setups where pam_tmpdir.so is in use. (Closes upstream issue #69). + * /debian/control: + + Add build dependency: qt4-dev-tools. [ Daniel Lindgren ] * New upstream version (3.1.0.6): diff --git a/debian/control b/debian/control index 0f8fc51..70f365e 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,8 @@ Uploaders: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, Build-Depends: debhelper (>= 7), - libqt4-dev + libqt4-dev, + qt4-dev-tools, Standards-Version: 3.9.2 Homepage: http://code.x2go.org/releases/source/x2godesktopsharing Vcs-Git: git://code.x2go.org/x2godesktopsharing.git hooks/post-receive -- x2godesktopsharing.git (Desktop Sharing 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 "x2godesktopsharing.git" (Desktop Sharing for X2Go).

1 0

x2godesktopsharing.git - master (branch) updated: 3.1.0.5-10-g55eb03e
by git-admin＠x2go.org 03 Dec '12

03 Dec '12

The branch, master has been updated via 55eb03e343db26040beeb3af2592e9be3f092e41 (commit) via b40f007de1db835fbda46497250654a8d9d454e5 (commit) via ef891ba6480d5407b7253bc1ca4bac4264d3163d (commit) from 93331c08a1798b3d21279f2cabbec0162faa09e9 (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 55eb03e343db26040beeb3af2592e9be3f092e41 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Dec 3 09:02:01 2012 +0100 Fix TEMP path for finding the x2godesktopsharing socket. Solves issues on setups where pam_tmpdir.so is in use. (Closes upstream issue #69). commit b40f007de1db835fbda46497250654a8d9d454e5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Nov 27 22:00:43 2012 +0100 run lrelease-qt4 before qmake commit ef891ba6480d5407b7253bc1ca4bac4264d3163d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Nov 27 22:00:20 2012 +0100 fix Dutch translation file ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ debian/rules | 1 + main.cpp | 5 +++-- x2godesktopsharing_nl.ts | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index bd843e7..b080687 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ x2godesktopsharing (3.1.0.6-0~x2go1) UNRELEASED; urgency=low - Prepare for translating into the current project languages (da, de, es, fr, nb_no, ru, sv, zh_tw). - Update German translation file (not much to do). + - Fix TEMP path for finding the x2godesktopsharing socket. + Solves issues on setups where pam_tmpdir.so is in use. + (Closes upstream issue #69). [ Daniel Lindgren ] * New upstream version (3.1.0.6): diff --git a/debian/rules b/debian/rules index 6add866..5d1039c 100755 --- a/debian/rules +++ b/debian/rules @@ -24,6 +24,7 @@ configure: configure-stamp configure-stamp: dh_testdir # Add here commands to configure the package. + lrelease-qt4 x2godesktopsharing.pro qmake-qt4 x2godesktopsharing.pro touch configure-stamp diff --git a/main.cpp b/main.cpp index d3733b5..039c617 100644 --- a/main.cpp +++ b/main.cpp @@ -51,8 +51,9 @@ void client ( const QStringList & cmd ) cmd.join(" ").toAscii().data() <<std::endl; QString dispname=params[2]; - QString socketName=QDir::tempPath() +"/x2godesktopsharing_@"+ - params[1]+"@"+dispname; + // QString socketName=QDir::tempPath() +"/x2godesktopsharing_@"+ + // params[1]+"@"+dispname; + QString socketName=/tmp/x2godesktopsharing_@" + params[1]+"@"+dispname; QLocalSocket sock; sock.connectToServer ( socketName ); if ( !sock.waitForConnected ( 3000 ) ) diff --git a/x2godesktopsharing_nl.ts b/x2godesktopsharing_nl.ts index 6f75276..5520335 100644 --- a/x2godesktopsharing_nl.ts +++ b/x2godesktopsharing_nl.ts @@ -145,7 +145,7 @@ en start opnieuw</translation> <message> <location filename="sharetray.cpp" line="587"/> <source>X2Go Desktop Sharing</source> - <translation>X2Go Desktop Sharing<translation> + <translation>X2Go Desktop Sharing</translation> </message> </context> <context> hooks/post-receive -- x2godesktopsharing.git (Desktop Sharing 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 "x2godesktopsharing.git" (Desktop Sharing for X2Go).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.0.4-114-gc037703
by git-admin＠x2go.org 03 Dec '12

03 Dec '12

The branch, master has been updated via c0377039208d2527f0c037b8576dd39b387fb378 (commit) from bc3bb9dab6e47c904b52ea9c9e9dec32c821b944 (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 c0377039208d2527f0c037b8576dd39b387fb378 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Dec 3 08:41:56 2012 +0100 If the profile manager is open for a certain session profile, disable all menu items that relate to this session profile. Re-enable the menu items again, once the corresponding profile manager window has been closed. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++++ pyhoca/wxgui/frontend.py | 5 +++++ pyhoca/wxgui/menus_taskbar.py | 4 ++-- pyhoca/wxgui/profilemanager.py | 11 +++++++++++ 4 files changed, 22 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 236efaa..34a3503 100644 --- a/debian/changelog +++ b/debian/changelog @@ -49,6 +49,10 @@ pyhoca-gui (0.2.1.0-0~x2go1) UNRELEASED; urgency=low resumption / re-start. Sponsored by Dick Kniep, LinDix NL. - Hide the file sharing submenu if the master session's submenu is currently disabled due to some current action and an expected session status change. + - If the profile manager is open for a certain session profile, disable + all menu items that relate to this session profile. Re-enable the menu + items again, once the corresponding profile manager window has been + closed. * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index a86fa31..b52659e 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -1003,6 +1003,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): """ profile_name = self._eventid_profilenames_map[evt.GetId()] + self._temp_disabled_profile_names.append(profile_name) self._pyhoca_logger('editing session profile %s' % profile_name, loglevel=x2go.log.loglevel_INFO, ) if self.args.single_session_profile: _edit_action = "EDIT_EXPLICITLY" @@ -1019,6 +1020,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): """ profile_name = self._eventid_profilenames_map[evt.GetId()] + self._temp_disabled_profile_names.append(profile_name) self._pyhoca_logger('using session profile %s as template for new profile' % profile_name, loglevel=x2go.log.loglevel_INFO, ) profilemanager.PyHocaGUI_ProfileManager(self, 'COPY', profile_name=profile_name) @@ -1031,6 +1033,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): """ profile_name = self._eventid_profilenames_map[evt.GetId()] + self._temp_disabled_profile_names.append(profile_name) self._pyhoca_logger('editing session profile %s' % profile_name, loglevel=x2go.log.loglevel_INFO, ) profilemanager.PyHocaGUI_ProfileManager(self, 'EDIT_CONNECTED', profile_name=profile_name) @@ -1043,6 +1046,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): """ profile_name = self._eventid_profilenames_map[evt.GetId()] + self._temp_disabled_profile_names.append(profile_name) m = messages.PyHoca_MessageWindow_NoYes(self, shortmsg='REALLY_DELETE_PROFILE', title=_(u'Really Delete Session Profile ,,%s\'\'?') % profile_name, icon='question', profile_name=profile_name) m.ShowModal() @@ -1053,6 +1057,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): self.notifier.send(title=_(u'%s - profile deleted') % profile_name, text=_(u'The session profile has been deleted.'), icon='profile_delete') except: pass + self._temp_disabled_profile_names.remove(profile_name) def OnShareCustomLocalFolder(self, evt): """\ diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index 97b56cd..8fb35ab 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -118,7 +118,7 @@ class PyHocaGUI_Menu_TaskbarOptionsManager(wx.Menu): submenu=PyHocaGUI_Menu_TaskbarProfileNames(self._PyHocaGUI, caller=self, filter_profiles=[], - disabled_profiles=self._PyHocaGUI.client_connected_profiles(return_profile_names=True), + disabled_profiles=self._PyHocaGUI.client_connected_profiles(return_profile_names=True) + self._PyHocaGUI._temp_disabled_profile_names, submenu=PyHocaGUI_Menu_TaskbarManageProfile, group_menus=True, ) @@ -948,7 +948,7 @@ class PyHocaGUI_Menu_TaskbarSessionManager(wx.Menu): submenu=PyHocaGUI_Menu_TaskbarProfileNames(self._PyHocaGUI, caller=self, filter_profiles=[], - disabled_profiles=self._PyHocaGUI.client_connected_sessions(return_profile_names=True), + disabled_profiles=self._PyHocaGUI.client_connected_profiles(return_profile_names=True) + self._PyHocaGUI._temp_disabled_profile_names, bind_method=self._PyHocaGUI.OnSessionAuthenticate)) self.AppendSeparator() diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 32ffcda..0d3dde5 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -2432,6 +2432,17 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.profile_config = copy.deepcopy(self.profile_config_bak) self.__update_fields() + def Close(self): + """\ + Clean-up disabled profile_names when closing the profile manager dialog. + + """ + try: + self._PyHocaGUI._temp_disabled_profile_names.remove(self.profile_name) + except ValueError: + pass + wx.Dialog.Close(self) + def Destroy(self): """\ Tidy up some stuff in the main application instance before allowing desctruction of the hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

x2gobroker.git - master (branch) updated: b47d8fe5206d5d4c0cbf77238462f0044cc4357e
by git-admin＠x2go.org 01 Dec '12

01 Dec '12

The branch, master has been updated via b47d8fe5206d5d4c0cbf77238462f0044cc4357e (commit) from 01ed711dba1fea373f1b212b40c1a50f61436ed4 (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 b47d8fe5206d5d4c0cbf77238462f0044cc4357e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Dec 1 13:06:00 2012 +0100 white space fix ----------------------------------------------------------------------- Summary of changes: x2gobroker/web/html.py | 1 + 1 file changed, 1 insertion(+) The diff of changes is: diff --git a/x2gobroker/web/html.py b/x2gobroker/web/html.py index f83bc1b..48124e8 100644 --- a/x2gobroker/web/html.py +++ b/x2gobroker/web/html.py @@ -104,6 +104,7 @@ $output if broker_backend.check_access(username=username, password=password, authid=authid): if not task: + ### ### PERFORM A TEST AUTHENTICATION ### 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: 01ed711dba1fea373f1b212b40c1a50f61436ed4
by git-admin＠x2go.org 01 Dec '12

01 Dec '12

The branch, master has been updated via 01ed711dba1fea373f1b212b40c1a50f61436ed4 (commit) via 92a791df1fcefa36560ed18b326ab0cc1ea5a5f2 (commit) from 9adabffa81c28e09169d03ea0df588e926476350 (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 01ed711dba1fea373f1b212b40c1a50f61436ed4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Dec 1 13:02:07 2012 +0100 prepare for future API changes, current API name: html, possible API in the future: JSON, provide working check_access method for now commit 92a791df1fcefa36560ed18b326ab0cc1ea5a5f2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Dec 1 13:00:45 2012 +0100 add .gitignore file ----------------------------------------------------------------------- Summary of changes: .gitignore | 11 ++ etc/x2gobroker.conf | 4 +- sbin/x2gobroker | 153 ++++---------- x2gobroker/{ => backends}/__init__.py | 3 - x2gobroker/{ => backends}/base.py | 88 ++++++--- x2gobroker/{ => backends}/ldap.py | 0 x2gobroker/{ => backends}/simple.py | 20 +- x2gobroker/{ => backends}/zeroconf.py | 18 +- x2gobroker/config.py | 308 +++++++++++++++++++++++++++++ x2gobroker/defaults.py | 13 +- x2gobroker/utils.py | 82 ++++++++ x2gobroker/{ => web}/__init__.py | 3 - sbin/x2gobroker => x2gobroker/web/html.py | 121 ++++++------ x2gobroker/{__init__.py => web/json.py} | 12 +- 14 files changed, 598 insertions(+), 238 deletions(-) create mode 100644 .gitignore copy x2gobroker/{ => backends}/__init__.py (97%) rename x2gobroker/{ => backends}/base.py (61%) rename x2gobroker/{ => backends}/ldap.py (100%) rename x2gobroker/{ => backends}/simple.py (71%) rename x2gobroker/{ => backends}/zeroconf.py (77%) create mode 100644 x2gobroker/config.py create mode 100644 x2gobroker/utils.py copy x2gobroker/{ => web}/__init__.py (97%) copy sbin/x2gobroker => x2gobroker/web/html.py (53%) mode change 100755 => 100644 copy x2gobroker/{__init__.py => web/json.py} (70%) The diff of changes is: diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7288ef5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,11 @@ +*.pyc +.pc/ +build/ +debian/files +debian/patches/ +debian/*.debhelper.log +debian/*.postinst.debhelper +debian/*.prerm.debhelper +debian/*.substvars +debian/*x2go*/ +*.egg-info/ diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf index 0123e60..ec6f4a9 100644 --- a/etc/x2gobroker.conf +++ b/etc/x2gobroker.conf @@ -63,8 +63,8 @@ use-authid = false # below value to true use-static-authid = true -# Make up your own static_authid below... -static-authid = <aaaavveeeerrrrryyyyylooonnnnggggssttrrriiinnnggg> +# Make up your own authid below... +authid = <aaaavveeeerrrrryyyyylooonnnnggggssttrrriiinnnggg> # X2Go Session Broker knows about two output formats: a text/html based output # and a text/json based output. The different outputs run under different URLs diff --git a/sbin/x2gobroker b/sbin/x2gobroker index 0b42c84..b5f3b48 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -23,132 +23,57 @@ import sys import os import web +import argparse try: import x2gobroker except ImportError: sys.path.insert(0, os.path.join(os.getcwd(), '..')) -# FIXME: here we have to add some code that genuinely detects the session broker backend... -broker_backend = "zeroconf" - -# load the requested broker -if broker_backend == "zeroconf": - import x2gobroker.zeroconf as broker -elif broker_backend == "simple": - import x2gobroker.simple as broker -elif broker_backend == "ldap": - import x2gobroker.ldap as broker - - -urls = ( '/', 'x2gobroker' ) - - -class x2gobroker: - - broker_backend = broker.X2GoBroker() - - http_header_items = { - 'Content-Type': 'text/html; charset=utf-8', - 'Expires': '+1h', - } - - page = web.template.Template("""$def with (html_header_items, output) -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html> -<head> -$for meta_tag in html_header_items["meta"]: - <meta $meta_tag="$html_header_items["meta"][meta_tag]"> -<title>$html_header_items['title']</title> -</head> +# parse-in potential command line options +cmdline_args = None +if __name__ == "__main__": + import setproctitle + setproctitle.setproctitle(os.path.basename(sys.argv[0])) -<body> -$output -</body> -</html> -""" - ) - html_header_items = { - 'title': 'X2Go Session Broker', - 'meta': { - 'author': 'X2Go Developers <x2go-dev(a)lists.berlios.de>', - 'charset': 'utf-8', - 'keywords': 'X2Go', - 'description': 'X2Go Session Broker', - }, + daemon_options = [ + {'args':['-C','--config-file'], 'default': None, 'metavar': 'CONFIG_FILE', 'help': 'Specify a special configuration file name, default is: /etc/x2go/x2gobroker.conf', }, + {'args':['-b', '--bind'], 'default': '127.0.0.1:8080', 'metavar': 'BIND_ADDRESS', 'help': 'The [address:]port that the web.py http-engine shall bind to (default: 127.0.0.1:8080)', }, + ] + p = argparse.ArgumentParser(description='X2Go Session Broker (Standalone Daemon)',\ + formatter_class=argparse.RawDescriptionHelpFormatter, \ + add_help=True, argument_default=None) + p_daemon = p.add_argument_group('standalone-daemon arguments') + + for (p_group, opts) in ( (p_daemon, daemon_options), ): + for opt in opts: + args = opt['args'] + del opt['args'] + p_group.add_argument(*args, **opt) + + cmdline_args = p.parse_args() + + ### FIXME: not working yet for the config_file diversion via -C option + broker_kwargs = { + 'config_file': cmdline_args.config_file, } - 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): - - data = web.input() - output = '' - - self._gen_http_header() - - - # FIXME: the ,,testcon'' task can be object to DoS attacks... - if hasattr(data, 'task') and data.task == 'testcon': - - ### - ### TEST THE CONNECTION - ### - - return self.broker_backend.test_connection() - - if hasattr(data, 'user') and hasattr(data, 'password') and self.broker_backend.check_access(username=data.user, password=data.password): - - ### - ### PERFORM INITIAL AUTHENTICATION - ### - - output += "Access granted " - output += "AUTHID: {authid} ".format(authid=self.broker_backend.get_next_authid(username=data.user)) - return self.page(self.html_header_items, output) - - else: - return self.page(self.html_header_items, "<hr>Access denied") - - if hasattr(data, 'user') and hasattr(data, 'authid'): - - ### - ### X2GO BROKER TASKS - ### - - if self.broker_backend.check_access(username=data.user, authid=data.authid): - - if hasattr(data, 'task'): - task = data.task - - if task == 'listsessions': - - output += self.broker_backend.list_sessions() - - if task == 'selectsession': - - if hasattr(data, 'sid'): - - output += self.broker_backend.select_session(session_name=data.sid) - - if task == 'setpass': - - if hasattr(data, 'oldpass') and hasattr(data, 'newpass'): - - output += self.broker_backend.change_password(new=data.newpass, old=data.oldpass) - - return self.page(self.html_header_items, output) - - else: - return self.page(self.html_header_items, "<hr>Access denied") +# import classes serving the different web.py URLs +from x2gobroker.web.html import * +#from x2gobroker.web.json import * +# define the web.py URLs +urls = ( '/html/(.*)', 'X2GoBrokerWebHtml', +# '/json/(.*)', 'X2GoBrokerWebJson', + ) +# run the web.py standalone daemon... if __name__ == "__main__": - import setproctitle - setproctitle.setproctitle(os.path.basename(sys.argv[0])) + if len(sys.argv) <= 1: + sys.argv.append('') + sys.argv.append('') + sys.argv[1] = cmdline_args.bind + sys.argv[2:] = [] app = web.application(urls, globals()) app.internalerror = web.debugerror app.run() diff --git a/x2gobroker/__init__.py b/x2gobroker/backends/__init__.py similarity index 97% copy from x2gobroker/__init__.py copy to x2gobroker/backends/__init__.py index ad8c1e4..11b7f8f 100644 --- a/x2gobroker/__init__.py +++ b/x2gobroker/backends/__init__.py @@ -18,6 +18,3 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.0.0.1' - - diff --git a/x2gobroker/base.py b/x2gobroker/backends/base.py similarity index 61% rename from x2gobroker/base.py rename to x2gobroker/backends/base.py index a1fe0ca..f5228f7 100644 --- a/x2gobroker/base.py +++ b/x2gobroker/backends/base.py @@ -28,6 +28,9 @@ __NAME__ = 'x2gobroker-pylib' import types import uuid +# X2Go Broker modules +import x2gobroker.config + class X2GoBroker(object): """\ X2GoBrokerBASE is an abstract class for X2Go broker implementations. @@ -40,12 +43,16 @@ class X2GoBroker(object): L{ldap.X2GoBroker} """ - def __init__(self): + + def __init__(self, config_file="/etc/x2go/x2gobroker.conf"): """\ Initialize a new X2GoBroker instance to control X2Go session through an X2Go Client with an intermediate session broker. + """ - self._authid_dict = {} + self.config = x2gobroker.config.X2GoBrokerConfigFile() + + self._dynamic_authid_map = {} def __del__(self): """\ @@ -54,6 +61,29 @@ class X2GoBroker(object): """ pass + def get_global_config(self): + """\ + Get the global section of the configuration file. + + @return: all global configuration parameters + @rtype: C{dict} + + """ + return self.config.get_global_config() + + def get_backend_config(self, backend='zeroconf'): + """\ + Get the configuration section of a specific backend. + + @param backend: the name of the backend + @type backend: C{str} + + @return: all backend configuration parameters + @rtype: C{dict} + + """ + return self.config.get_backend_config(backend=backend) + def test_connection(self): #if($cgi->param('task') eq 'testcon') #{ @@ -66,7 +96,7 @@ class X2GoBroker(object): #} return 'OK' - def check_access(self, username='', password='', authid=None): + def check_access(self, username='', password='', authid=None, ): """\ Check if a given user with a given password may gain access to the X2Go session broker. @@ -80,32 +110,44 @@ class X2GoBroker(object): @rtype: C{bool} """ + ### FOR INTRANET LOAD BALANCER WE MAY JUST ALLOW ACCESS TO EVERYONE + ### This is handled through the config file, normally /etc/x2go/x2gobroker.conf - ### IMPLEMENT YOUR AUTHENTICATION LOGIC FIRST, then call base.X2GoBroker.check_access - ### to finalize the authentication process. + if not self.config.get_value('global', 'check-credentials'): + return True - # Before calling this code, you have to evaluate username and password. - # - # If the credentials (username, password) are considered as valid then - # set authid to True. - # - # If credentials are invalid, set authid to None. + ### IMPLEMENT YOUR AUTHENTICATION LOGIC IN THE self._check_access(**kwargs) METHOD + ### when inheriting from the base.X2GoBroker class. - if type(authid) is types.StringType: - authid = unicode(authid) + access = False + access = self._check_access(username=username, password=password, authid=authid) - if type(authid) is types.UnicodeType: + # using authid as extra security? + if self.config.get_value('global', 'use-authid'): - if authid == self._authid_dict[username]: - self._authid_dict[username] = uuid.uuid5(namespace=authid, name=username) - return True + if type(authid) is types.StringType: + authid = unicode(authid) - elif type(authid) is types.BooleanType and authid is True: - # generate a first uuid, initialize the connection - self._authid_dict[username] = uuid.uuid4() - return True + if self.config.get_value('global', 'use-static-authid'): - return False + # evaluate access based on static authentication ID feature + access = access and ( authid == self.config.get_value('global', 'authid') ) + + else: + + # evaluate access based on dynamic authentication ID feature + if self._dynamic_authid_map.has_key(username): + access = access and ( authid == self._dynamic_authid_map[username] ) + if access: + self._dynamic_authid_map[username] = uuid.uuid5(namespace=authid, name=username) + + else: + access = access and ( authid == self.config.get_value('global', 'authid') ) + if access: + # generate a first uuid, initialize the dynamic authencation ID security feature + self._dynamic_authid_map[username] = uuid.uuid4() + + return access def get_next_authid(self, username): """\ @@ -119,7 +161,7 @@ class X2GoBroker(object): """ try: - return self._authid_dict[username] + return self._dynamic_authid_map[username] except KeyError: return None diff --git a/x2gobroker/ldap.py b/x2gobroker/backends/ldap.py similarity index 100% rename from x2gobroker/ldap.py rename to x2gobroker/backends/ldap.py diff --git a/x2gobroker/simple.py b/x2gobroker/backends/simple.py similarity index 71% rename from x2gobroker/simple.py rename to x2gobroker/backends/simple.py index ea3fc87..923676e 100644 --- a/x2gobroker/simple.py +++ b/x2gobroker/backends/simple.py @@ -25,21 +25,21 @@ X2goBrokerSIMPLE class - a simple X2GoBroker implementations that uses text-base __NAME__ = 'x2gobroker-pylib' # modules +import pam + +# Python X2GoBroker modules import x2gobroker.base class X2GoBroker(x2gobroker.base.X2GoBroker): """\ """ - def __init__(self): - """\ - - """ - x2gobroker.base.X2GoBroker.__init__(self) - - def __del__(self): - """\ + def check_access(self, username='', password='', authid=None): - """ - x2gobroker.base.X2GoBroker.__del__(self) + # do a simple PAM authentication against the PAM service ,,x2gobroker'' + if username and password: + if pam.authenticate(username, password, service="x2gobroker"): + return True + return False + return x2gobroker.base.X2GoBroker.check_access(self, username=username, password=password, authid=authid) diff --git a/x2gobroker/zeroconf.py b/x2gobroker/backends/zeroconf.py similarity index 77% rename from x2gobroker/zeroconf.py rename to x2gobroker/backends/zeroconf.py index af0da2d..3598e68 100644 --- a/x2gobroker/zeroconf.py +++ b/x2gobroker/backends/zeroconf.py @@ -28,23 +28,19 @@ __NAME__ = 'x2gobroker-pylib' import pam import subprocess -import x2gobroker.base +import base from x2gobroker.defaults import X2GOBROKER_AGENT_CMD as _X2GOBROKER_AGENT_CMD -class X2GoBroker(x2gobroker.base.X2GoBroker): +class X2GoBroker(base.X2GoBroker): - def check_access(self, username='', password='', authid=None): + def _check_access(self, username='', password='', authid=None): # do a simple PAM authentication against the PAM service ,,x2gobroker'' - if authid is None: - if username and password: - if pam.authenticate(username, password, service="x2gobroker"): - authid = True - else: - authid = None - - return x2gobroker.base.X2GoBroker.check_access(self, username=username, password=password, authid=authid) + if username and password: + if pam.authenticate(username, password, service="x2gobroker"): + return True + return False def list_sessions(self, username): diff --git a/x2gobroker/config.py b/x2gobroker/config.py new file mode 100644 index 0000000..99531ae --- /dev/null +++ b/x2gobroker/config.py @@ -0,0 +1,308 @@ +# -*- coding: utf-8 -*- + +# Copyright (C) 2010-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. +# +# This code was initially written by for the Python X2Go project: +# 2010 Dick Kniep <dick.kniep(a)lindix.nl> +# + +"""\ +X2goProcessIniFile - helper class for parsing .ini files + +""" +__NAME__ = 'x2goinifiles-pylib' + +# modules +import os +import ConfigParser +import types +import cStringIO + +# Python X2GoBroker modules +import x2gobroker.utils + +from x2gobroker.defaults import X2GOBROKER_HOME as _X2GOBROKER_HOME +from x2gobroker.defaults import X2GOBROKER_CONFIG_DEFAULTS as _X2GOBROKER_CONFIG_DEFAULTS + +class X2GoBrokerConfigFile(object): + """ + Class for processing a ini-file like configuration file. + + If entries are omitted in such a config file, they are filled with + default values (as hard-coded in Python X2goBroker), so the resulting objects + always contain the same fields. + + The default values are also used to define a data type for each configuration + option. An on-the-fly type conversion takes place when loading the configuration + file. + + """ + defaultValues = { + 'none': { + 'none': 'empty', + }, + } + write_user_config = False + user_config_file = None + + def __init__(self, config_files='/etc/x2go/x2gobroker.conf', defaults=None): + """\ + @param config_files: a list of configuration file names (e.g. a global filename and a user's home + directory filename) + @type config_files: C{list} + @param defaults: a cascaded Python dicitionary structure with ini file defaults (to override + Python X2goBroker's hard-coded defaults in L{defaults} + @type defaults: C{dict} + + """ + # make sure a None type gets turned into list type + if not config_files: + config_files = [] + + # allow string/unicode objects as config_files, as well + if type(config_files) in (types.StringType, types.UnicodeType): + config_files = [config_files] + self.config_files = config_files + + if x2gobroker.utils._checkConfigFileDefaults(defaults): + self.defaultValues = defaults + else: + self.defaultValues = _X2GOBROKER_CONFIG_DEFAULTS + + # we purposefully do not inherit the ConfigParser class + # here as we do not want to run into name conflicts between + # X2GoBroker config file options and method / property names in + # SafeConfigParser... This is a pre-cautious approach... + self.iniConfig = ConfigParser.ConfigParser(self.defaultValues) + self.iniConfig.optionxform = str + + _create_file = False + for file_name in self.config_files: + if file_name.startswith(_X2GOBROKER_HOME): + if not os.path.exists(file_name): + x2gobroker.utils.touch_file(file_name) + _create_file = True + break + + self.load() + + if _create_file: + self.write_user_config = True + self.write() + + def __repr__(self): + result = 'X2goConfigFile(' + for p in dir(self): + if '__' in p or not p in self.__dict__ or type(p) is types.InstanceType: continue + result += p + '=' + str(self.__dict__[p]) + ',' + result = result.strip(',') + return result + ')' + + def load(self): + """\ + R(e-r)ead configuration file(s). + + """ + _found_config_files = self.iniConfig.read(self.config_files) + + for file_name in _found_config_files: + if file_name.startswith(os.path.normpath(_X2GOBROKER_HOME)): + # we will use the first file found in the user's home dir for writing modifications + self.user_config_file = file_name + break + + self.config_files = _found_config_files + self._fill_defaults() + + def _storeValue(self, section, key, value): + """\ + Stores a value for a given section and key. + + This methods affects a SafeConfigParser object held in + RAM. No configuration file is affected by this + method. To write the configuration to disk use + the L{write()} method. + + @param section: the ini file section + @type section: C{str} + @param key: the ini file key in the given section + @type key: C{str} + @param value: the value for the given section and key + @type value: C{str}, C{list}, C{booAl}, ... + + """ + if type(value) == type(u''): + value = value.encode(x2gobroker.utils.get_encoding()) + if type(value) is types.BooleanType: + self.iniConfig.set(section, key, str(int(value))) + elif type(value) in (types.ListType, types.TupleType): + self.iniConfig.set(section, key, ", ".join(value)) + else: + self.iniConfig.set(section, key, str(value)) + + def _fill_defaults(self): + """\ + Fills a C{SafeConfigParser} object with the default config file + values as pre-defined in Python X2GoBroker or. This SafeConfigParser + object is held in RAM. No configuration file is affected by this + method. + + """ + for section, sectionvalue in self.defaultValues.items(): + for key, value in sectionvalue.items(): + if self.iniConfig.has_option(section, key): continue + if not self.iniConfig.has_section(section): + self.iniConfig.add_section(section) + self._storeValue(section, key, value) + + def update_value(self, section, key, value): + """\ + Change a value for a given section and key. This method + does not have any effect on configuration files. + + @param section: the ini file section + @type section: C{str} + @param key: the ini file key in the given section + @type key: C{str} + @param value: the value for the given section and key + @type value: C{str}, C{list}, C{bool}, ... + + """ + if not self.iniConfig.has_section(section): + self.iniConfig.add_section(section) + self._storeValue(section, key, value) + self.write_user_config = True + + def write(self): + """\ + Write the ini file modifications (SafeConfigParser object) from RAM to disk. + + For writing the first of the C{config_files} specified on instance construction + that is writable will be used. + + """ + if self.user_config_file and self.write_user_config: + fd = open(self.user_config_file, 'wb') + self.iniConfig.write(fd) + fd.close() + self.write_user_config = False + + def get_type(self, section, key): + """\ + Retrieve a value type for a given section and key. The returned + value type is based on the default values dictionary. + + @param section: the ini file section + @type section: C{str} + @param key: the ini file key in the given section + @type key: C{str} + + @return: a Python variable type + @rtype: class + + """ + return type(self.defaultValues[section][key]) + + def get_value(self, section, key, key_type=None): + """\ + Retrieve a value for a given section and key. + + @param section: the ini file section + @type section: C{str} + @param key: the ini file key in the given section + @type key: C{str} + + @return: the value for the given section and key + @rtype: class + + """ + if key_type is None: + key_type = self.get_type(section, key) + if self.iniConfig.has_option(section, key): + if key_type is types.BooleanType: + return self.iniConfig.getboolean(section, key) + elif key_type is types.IntType: + return self.iniConfig.getint(section, key) + elif key_type is types.ListType: + _val = self.iniConfig.get(section, key) + _val = _val.strip() + if _val.startswith('[') and _val.endswith(']'): + return eval(_val) + elif ',' in _val: + _val = [ v.strip() for v in _val.split(',') ] + else: + _val = [ _val ] + return _val + else: + _val = self.iniConfig.get(section, key) + return _val.decode(x2gobroker.utils.get_encoding()) + get = get_value + __call__ = get_value + + def get_section(self, section): + """\ + Get all keys and values for a certain section of the config file. + + @param section: the name of the section to get + @type section: C{str} + + @return: the section with all keys and values + @rtype: C{dict} + + """ + _section_config = {} + for option in self.iniConfig.options(section): + if option not in self.iniConfig.sections(): + _section_config[option] = self.get(section, option, key_type=self.get_type(section, option)) + + return _section_config + + def get_global_config(self): + """\ + Get the global section of the configuration file. + + @return: all global configuration parameters + @rtype: C{dict} + + """ + return self.get_section('global') + + def get_backend_config(self, backend='zeroconf'): + """\ + Get the configuration section of a specific backend. + + @param backend: the name of the backend + @type backend: C{str} + + @return: all backend configuration parameters + @rtype: C{dict} + + """ + return self.get_section(backend) + + @property + def printable_config_file(self): + """\ + Returns a printable configuration file as a multi-line string. + + """ + stdout = cStringIO.StringIO() + self.iniConfig.write(stdout) + _ret_val = stdout.getvalue() + stdout.close() + return _ret_val diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index d3de516..b9dc3c6 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -19,8 +19,13 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +# modules +import os import uuid +# the home directory of the user that the daemon/cgi runs as +X2GOBROKER_HOME = os.path.normpath(os.path.expanduser('~')) + # FIXME: this path must not be hard-coded X2GOBROKER_AGENT_CMD="/usr/lib/x2gobroker-agent" @@ -30,14 +35,14 @@ X2GOBROKER_CONFIG_DEFAULTS = { 'backend': 'zeroconf', 'check-credentials': True, 'use-authid': False, - 'use-static-authid': true, - 'static-authid': uuid.uuid4(), + 'use-static-authid': True, + 'authid': uuid.uuid4(), 'enable-html-output': True, 'enable-json-output': False, }, 'zeroconf': { 'enable': True, - } + }, 'simple': { 'enable': False, 'session-profiles': '/etc/x2go/x2gobroker-simple-sessionprofiles.conf', @@ -48,7 +53,7 @@ X2GOBROKER_CONFIG_DEFAULTS = { 'session-profiles': '/etc/x2go/x2gobroker-loadbalancer-sessionprofiles.conf', 'server-list-PROFILENAME1': ['server1.profile1.mydomain.tld','server2.profile1.mydomain.tld','server3.profile1.mydomain.tld',], 'server-list-PROFILENAME2': ['server1.profile2.mydomain.tld','server2.profile2.mydomain.tld',], - } + }, 'ldap': { 'enable': False, 'uri': 'ldap://localhost:389', diff --git a/x2gobroker/utils.py b/x2gobroker/utils.py new file mode 100644 index 0000000..1a74ed8 --- /dev/null +++ b/x2gobroker/utils.py @@ -0,0 +1,82 @@ +# -*- coding: utf-8 -*- + +# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# +# X2Go Session Broker is free software; you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# X2Go Session Broker is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +import os +import sys +import types +import locale + +def _checkConfigFileDefaults(data_structure): + """\ + Check an ini-file-like data structure. + + @param data_structure: an ini-file-like data structure + @type data_structure: C{dict} of C{dict}s + + @return: C{True} if C{data_structure} matches that of an ini file data structure + @rtype: C{bool} + + """ + if data_structure is None: + return False + if type(data_structure) is not types.DictType: + return False + for sub_dict in data_structure.values(): + if type(sub_dict) is not types.DictType: + return False + return True + + +def touch_file(filename, mode='a'): + """\ + Imitates the behaviour of the GNU/touch command. + + @param filename: name of the file to touch + @type filename: C{str} + @param mode: the file mode (as used for Python file objects) + @type mode: C{str} + + """ + if not os.path.isdir(os.path.dirname(filename)): + os.makedirs(os.path.dirname(filename), mode=00700) + f = open(filename, mode=mode) + f.close() + + +def get_encoding(): + """\ + Detect systems default character encoding. + + @return: The system's local character encoding. + @rtype: C{str} + + """ + try: + encoding = locale.getdefaultlocale()[1] + if encoding is None: + raise BaseException + except: + try: + encoding = sys.getdefaultencoding() + except: + encoding = 'ascii' + return encoding + diff --git a/x2gobroker/__init__.py b/x2gobroker/web/__init__.py similarity index 97% copy from x2gobroker/__init__.py copy to x2gobroker/web/__init__.py index ad8c1e4..11b7f8f 100644 --- a/x2gobroker/__init__.py +++ b/x2gobroker/web/__init__.py @@ -18,6 +18,3 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.0.0.1' - - diff --git a/sbin/x2gobroker b/x2gobroker/web/html.py old mode 100755 new mode 100644 similarity index 53% copy from sbin/x2gobroker copy to x2gobroker/web/html.py index 0b42c84..f83bc1b --- a/sbin/x2gobroker +++ b/x2gobroker/web/html.py @@ -20,33 +20,10 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -import sys -import os +# modules import web -try: - import x2gobroker -except ImportError: - sys.path.insert(0, os.path.join(os.getcwd(), '..')) - -# FIXME: here we have to add some code that genuinely detects the session broker backend... -broker_backend = "zeroconf" - -# load the requested broker -if broker_backend == "zeroconf": - import x2gobroker.zeroconf as broker -elif broker_backend == "simple": - import x2gobroker.simple as broker -elif broker_backend == "ldap": - import x2gobroker.ldap as broker - - -urls = ( '/', 'x2gobroker' ) - - -class x2gobroker: - - broker_backend = broker.X2GoBroker() +class X2GoBrokerWebHtml: http_header_items = { 'Content-Type': 'text/html; charset=utf-8', @@ -83,72 +60,86 @@ $output 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): + def GET(self, backend): + + if not backend: + backend = 'zeroconf' + else: + backend = backend.rstrip('/') + + # silence pyflakes... + broker_backend = None + exec("import x2gobroker.backends.{backend}".format(backend=backend)) + exec("broker_backend = x2gobroker.backends.{backend}.X2GoBroker()".format(backend=backend)) + global_config = broker_backend.get_global_config() + backend_config = broker_backend.get_backend_config(backend) data = web.input() + try: username = data.user + except AttributeError: username = '' + try: password = data.password + except AttributeError: password = '' + try: authid = data.authid + except AttributeError: authid = '' + try: task = data.task + except AttributeError: task = '' + try: session_name = data.sid + except AttributeError: session_name = '' + try: new_password = data.newpass + except AttributeError: new_password = '' + output = '' self._gen_http_header() - # FIXME: the ,,testcon'' task can be object to DoS attacks... - if hasattr(data, 'task') and data.task == 'testcon': + if task == 'testcon': ### ### TEST THE CONNECTION ### - return self.broker_backend.test_connection() + return broker_backend.test_connection() - if hasattr(data, 'user') and hasattr(data, 'password') and self.broker_backend.check_access(username=data.user, password=data.password): + if broker_backend.check_access(username=username, password=password, authid=authid): - ### - ### PERFORM INITIAL AUTHENTICATION - ### + if not task: + ### + ### PERFORM A TEST AUTHENTICATION + ### - output += "Access granted " - output += "AUTHID: {authid} ".format(authid=self.broker_backend.get_next_authid(username=data.user)) - return self.page(self.html_header_items, output) + if global_config['use-authid']: - else: - return self.page(self.html_header_items, "<hr>Access denied") - - if hasattr(data, 'user') and hasattr(data, 'authid'): - - ### - ### X2GO BROKER TASKS - ### - - if self.broker_backend.check_access(username=data.user, authid=data.authid): + ### FIXME: make up a nice protocol for this, disabled for now + #output += "AUTHID: {authid} ".format(authid=broker_backend.get_next_authid(username=data.user)) + pass - if hasattr(data, 'task'): - task = data.task + output += "Access granted " + return self.page(self.html_header_items, output) - if task == 'listsessions': + else: - output += self.broker_backend.list_sessions() + ### + ### X2GO BROKER TASKS + ### - if task == 'selectsession': + if task == 'listsessions': - if hasattr(data, 'sid'): + output += broker_backend.list_sessions() - output += self.broker_backend.select_session(session_name=data.sid) + if task == 'selectsession': - if task == 'setpass': + if session_name: - if hasattr(data, 'oldpass') and hasattr(data, 'newpass'): + output += broker_backend.select_session(session_name=session_name) - output += self.broker_backend.change_password(new=data.newpass, old=data.oldpass) + if task == 'setpass': - return self.page(self.html_header_items, output) + if new_password: - else: - return self.page(self.html_header_items, "<hr>Access denied") + output += broker_backend.change_password(new_password=new_password) + return self.page(self.html_header_items, output) -if __name__ == "__main__": - import setproctitle - setproctitle.setproctitle(os.path.basename(sys.argv[0])) - app = web.application(urls, globals()) - app.internalerror = web.debugerror - app.run() + else: + return self.page(self.html_header_items, "<hr>Access denied") diff --git a/x2gobroker/__init__.py b/x2gobroker/web/json.py similarity index 70% copy from x2gobroker/__init__.py copy to x2gobroker/web/json.py index ad8c1e4..b879b77 100644 --- a/x2gobroker/__init__.py +++ b/x2gobroker/web/json.py @@ -1,7 +1,9 @@ -# -*- coding: utf-8 -*- +#!/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> -# Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by @@ -18,6 +20,10 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.0.0.1' +# modules +import web +class X2GoBrokerWebJson: + # MUSIC OF THE FUTURE + pass \ No newline at end of file hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-102-g88389bf
by git-admin＠x2go.org 30 Nov '12

30 Nov '12

The branch, master has been updated via 88389bf045c33d96260ce5b1c6af92ff5d858e8f (commit) from 03afe809d558b5aa87205e09b28b85ca3ff1dc26 (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 88389bf045c33d96260ce5b1c6af92ff5d858e8f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 30 08:39:42 2012 +0100 Fix mounting of multiple paths, thanks to Pascal Vibet. (Closes upstream issue #67). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/bin/x2gomountdirs | 11 ++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6a2246e..03e44ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -44,6 +44,8 @@ x2goserver (3.1.1.10-0~x2go1) UNRELEASED; urgency=low * New upstream version (3.1.1.10): - Adapt Xinerama path in x2gopath: use $base for detecting the path to the Xinerama libs, as well, as is done with all the other paths. + - Fix mounting of multiple paths, thanks to Pascal Vibet. (Closes upstream + issue #67). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 23 Nov 2012 15:35:48 +0100 diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index b008d1c..b9f9431 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -200,6 +200,7 @@ for (my $i=0;$i<@dirs;$i++) my $printspool=0; my $mimeboxspool=0; my $mntpath; + my $this_mdir = $mdir; if(@dirs[$i]=~m/__PRINT_SPOOL_/) { @dirs[$i]=~s/__PRINT_SPOOL_//; @@ -222,24 +223,24 @@ for (my $i=0;$i<@dirs;$i++) $p=~s/\/ramdrive\/mnt\///; if ($p =~ m/CDROM/) { - $mdir=$mdir."/cd"; + $this_mdir=$this_mdir."/cd"; } else { - $mdir=$mdir."/rm"; + $this_mdir=$this_mdir."/rm"; } } else { - $mdir=$mdir."/disk"; + $this_mdir=$this_mdir."/disk"; } $p=~s/\//_/g; $p=~s/ /_/g; $p=~s/~_cygdrive_//; $p=~s/~_windrive_//; $p=~s/~//g; - mkdir("$mdir/$p"); - $mntpath="$mdir/$p"; + mkdir("$this_mdir/$p"); + $mntpath="$this_mdir/$p"; } if (db_insertmount( $session, $mntpath, $host)) hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits