x2go-commits April 2013

x2go-commits@lists.x2go.org

2 participants
1376 discussions

x2goclient.git - master (branch) updated: 4.0.1.0-4-g2419bf3
by git-admin＠x2go.org 04 Apr '13

04 Apr '13

The branch, master has been updated via 2419bf34d1ecd28696e6c129001057c4de77a328 (commit) from 036222619b0e93c7dce07204a5b04ad60e689c49 (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 2419bf34d1ecd28696e6c129001057c4de77a328 Author: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de> Date: Thu Apr 4 11:38:20 2013 +0200 waiting for x2gocmdexitmessage to return before closing in hidden mode ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + onmainwindow.cpp | 16 ++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 227a7af..dbe9045 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low [ Oleksandr Shneyder ] * Use "127.0.0.1" instead of localhost to avoid wrong IPv6 hostname resolution. (Fixes: #151). + - waiting for x2gocmdexitmessage to return before closing in hidden mode -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 22 Mar 2013 23:21:11 +0100 diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 840a699..dbcb092 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -5284,9 +5284,11 @@ void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus ) delete sshConnection; x2goDebug<<"done"<<endl; sshConnection=0; + if ( startHidden ) + { + close(); + } } - if ( startHidden ) - close(); if ( readExportsFrom!=QString::null ) { @@ -8270,9 +8272,6 @@ void ONMainWindow::slotCmdMessage ( bool result,QString output, passForm->setEnabled ( true ); pass->setFocus(); pass->selectAll(); - delete sshConnection; - sshConnection=0; - return; } if ( output.indexOf ( "X2GORUNCOMMAND ERR NOEXEC:" ) !=-1 ) { @@ -8283,8 +8282,13 @@ void ONMainWindow::slotCmdMessage ( bool result,QString output, cmd,QMessageBox::Ok, QMessageBox::NoButton ); } - delete sshConnection; + if(sshConnection) + delete sshConnection; sshConnection=0; + if ( startHidden ) + { + close(); + } } 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 - uccsoutput (branch) updated: 0.0.1.0-3-gaea8e30
by git-admin＠x2go.org 03 Apr '13

03 Apr '13

The branch, uccsoutput has been updated via aea8e30472982caf3be18c73e3175becfc6d6b4a (commit) from 19582aa37e0e3cab202c43cd7497d791cbeee1b3 (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 aea8e30472982caf3be18c73e3175becfc6d6b4a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Apr 3 21:42:21 2013 +0000 more work on UCCS compatible mode ----------------------------------------------------------------------- Summary of changes: etc/broker/x2gobroker-sessionprofiles.conf | 1 + x2gobroker/defaults.py | 1 + x2gobroker/web/uccs.py | 205 ++++++++++++++++++++++++++++ 3 files changed, 207 insertions(+) create mode 100644 x2gobroker/web/uccs.py The diff of changes is: diff --git a/etc/broker/x2gobroker-sessionprofiles.conf b/etc/broker/x2gobroker-sessionprofiles.conf index dc79a6b..2f0caea 100644 --- a/etc/broker/x2gobroker-sessionprofiles.conf +++ b/etc/broker/x2gobroker-sessionprofiles.conf @@ -59,6 +59,7 @@ dpi=96 sshport=22 setdpi=0 pack=16m-jpeg +directrdp=false ### EXAMPLES: Below you find some config examples. Adapt them to your needs or ### simply write your own session profiles and remove the examples below. diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index fcbb8ca..8a930dc 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -193,6 +193,7 @@ X2GOBROKER_SESSIONPROFILE_DEFAULTS = { u'pack': u'16m-jpeg', u'user': '', u'host': [ u'localhost', ], + u'directrdp': False, u'acl-users-allow': [], u'acl-users-deny': [], u'acl-users-order': '', diff --git a/x2gobroker/web/uccs.py b/x2gobroker/web/uccs.py new file mode 100644 index 0000000..be63096 --- /dev/null +++ b/x2gobroker/web/uccs.py @@ -0,0 +1,205 @@ +#!/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 types +import tornado.web +from tornado.escape import native_str, parse_qs_bytes + +# Python X2Go Broker modules +import x2gobroker.defaults + +from x2gobroker.loggers import logger_broker, logger_error + + +def convert_to_builtin_type(obj): + d = { } + d.update(obj.__dict__) + return d + + +class ManagementServer(): + def __init__(self, url, name): + self.RemoteDesktopServers = [] + self.AdditionalManagementServers = [] + self.URL = url + self.Name = name + + def set_default(self, tsName): + if isinstance(tsName, str): + self.DefaultServer = tsName + else: + raise TypeError("set_default expects a string argument") + + def add_terminal_server(self, server): + self.RemoteDesktopServers.append(server) + + def add_additional_management_server(self, amserver): + if isinstance(amserver, AdditionalManagementServer): + self.AdditionalManagementServers.append(amserver) + else: + raise TypeError("add_additional_management_server expects a "\ + "AdditionalManagementServer argument") + + def toJson(self): + return json.dumps(self, default=convert_to_builtin_type) + + +class AdditionalManagementServer(): + def __init__(self, url, name): + self.URL = url + self.Name = name + + +class RDPServer(): + def __init__(self, url, name, username=None, password=None): + self.URL = url + self.Name = name + self.Protocol = 'freerdp' + self.DomainRequired = True + self.Username = username + self.Password = password + + def add_domain(self, domainName): + if isinstance(domainName, str): + self.WindowsDomain = domainName + else: + raise TypeError("add_domain expects a string argument") + + def toJson(self): + return json.dumps(self, default=convert_to_builtin_type) + + +class X2GoServer(): + def __init__(self, url, name, username=None, password=None): + self.URL = url + self.Name = name + self.Protocol = 'x2go' + self.SessionTypeRequired = True + self.Username = username + self.Password = password + + def add_sessiontype(self, sessiontypeName): + if isinstance(domainName, str): + self.SessionType = sessiontypeName + else: + raise TypeError("add_sessiontype expects a string argument") + + def toJson(self): + return json.dumps(self, default=convert_to_builtin_type) + + +class X2GoBrokerWeb(tornado.web.RequestHandler): + + 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(): + self.set_header(http_header_item, self.http_header_items[http_header_item]) + + def get(self, backend): + if x2gobroker.defaults.X2GOBROKER_DEBUG: + self._gen_http_header() + logger_broker.warn('GET http request detected, if unwanted: disable X2GOBROKER_DEBUG') + return self.post(backend) + raise tornado.web.HTTPError(404) + + def post(self, backend): + + if not backend: + backend = x2gobroker.defaults.X2GOBROKER_DEFAULT_BACKEND + else: + backend = backend.rstrip('/') + + # silence pyflakes... + broker_backend = None + # dynamically detect broker backend from given URL + exec("import x2gobroker.brokers.{backend}_broker".format(backend=backend)) + exec("broker_backend = x2gobroker.brokers.{backend}_broker.X2GoBroker()".format(backend=backend)) + global_config = broker_backend.get_global_config() + + # if the broker backend is disabled in the configuration, pretend to have nothing on offer + if not broker_backend.is_enabled(): + raise tornado.web.HTTPError(404) + + # FIXME: this is to work around a bug in X2Go Client (http://bugs.x2go.org/138) + content_type = self.request.headers.get("Content-Type", "") + if not content_type.startswith("application/x-www-form-urlencoded"): + for name, values in parse_qs_bytes(native_str(self.request.body)).iteritems(): + self.request.arguments.setdefault(name, []).extend(values) + + # set the client address for the broker backend + ip = self.request.remote_ip + if ip: + logger_broker.info('client address is {address}'.format(address=ip)) + broker_backend.set_client_address(ip) + elif not x2gobroker.defaults.X2GOBROKER_DEBUG: + # if the client IP is not set, we pretend to have nothing on offer + logger_error.error('client could not provide an IP address, pretending: 404 Not Found') + raise tornado.web.HTTPError(404) + + #username = self.get_argument('user', default='') + #password = self.get_argument('password', default='') + #cookie = self.get_argument('cookie', default='') + #task = self.get_argument('task', default='') + #profile_id = self.get_argument('sid', default='') + #new_password = self.get_argument('newpass', default='') + + output = '' + + #logger_broker.debug ('username: {username}, password: {password}, task: {task}, profile_id: {profile_id}'.format(username=username, password='XXXXX', task=task, profile_id=profile_id)) + #if broker_backend.check_access(username=username, password=password, cookie=cookie): + + ### + ### CONFIRM SUCCESSFUL AUTHENTICATION FIRST + ### + + profiles = broker_backend.list_profiles(username) + if profiles: + ms = ManagementServer('http://localhost:8080/uccs/{backend}'.format(backend=backend), 'X2Go Session Broker') + + profile_ids = profiles.keys() + profile_ids.sort() + + for profile_id in profile_ids: + + if profiles[profile_id]['directrdp']: + pass + else: + ts = X2GoServer( + url='{hostname}:{port}'.format(hostname=profiles[profile_id]['host'], port=profiles[profile_id]['sshport']) + name=profiles[profile_id]['name'] + username=profiles[profile_id]['user'] + ) + ms.add_terminal(ts) + + output += ms.toJson() + + self.write(output) + return + + raise tornado.web.HTTPError(401) + 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

page changed: download:start
by wiki-admin＠x2go.org 03 Apr '13

03 Apr '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/04/03 15:22 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:18.0) Gecko/20100101 Firefox/18.0 Iceweasel/18.0.1 IP-Address : 46.142.131.32 Hostname : 32-131-142-46.pool.kielnet.net Old Revision: http://wiki.x2go.org/doku.php/download:start?rev=1364265137 New Revision: http://wiki.x2go.org/doku.php/download:start Edit Summary: [X2Go Package Repositories for GNU/Linux] User : sunweaver @@ -33,9 +33,9 @@ ===== X2Go Package Repositories for GNU/Linux ===== <WRAP round download> - When on GNU/Linux obtain all X2Go components from one of the package archives listed below. + When on GNU/Linux, you can obtain all X2Go components from one of the package archives listed below. * Summary: [[wiki:repositories:start|Official X2Go Packages in GNU/Linux Distributions]] * [[wiki:repositories:debian|Debian GNU/Linux]] * [[wiki:repositories:ubuntu|Ubuntu GNU/Linux]] * [[wiki:repositories:suse|SUSE-based]] -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: start
by wiki-admin＠x2go.org 03 Apr '13

03 Apr '13

1 0

page changed: contact:start
by wiki-admin＠x2go.org 03 Apr '13

03 Apr '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/04/03 14:05 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:18.0) Gecko/20100101 Firefox/18.0 Iceweasel/18.0.1 IP-Address : 46.142.131.32 Hostname : 32-131-142-46.pool.kielnet.net Old Revision: http://wiki.x2go.org/doku.php/contact:start?rev=1364997905 New Revision: http://wiki.x2go.org/doku.php/contact:start Edit Summary: [Overview on X2Go Community Support] User : sunweaver @@ -1,5 +1,5 @@ - ====== Overview on X2Go Community Support ====== + ====== Overview on X2Go Community Communication ====== X2Go is mainly organized via IRC and mailing lists. We use IRC in cases where we need quick feedback on specific issues. IRC is also a place where you can get community support from. With the mailing lists, all content is public. The major (long term) discussions happen on the mailing lists. Also the dicussions from the bug tracker are cross-posted to one of the lists (x2go-dev ML). Before you can send to one of the X2Go mailing lists, you have to get a subscription. This is to avoid spam on the mailing lists. -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: contact:start
by wiki-admin＠x2go.org 03 Apr '13

03 Apr '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/04/03 14:05 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:18.0) Gecko/20100101 Firefox/18.0 Iceweasel/18.0.1 IP-Address : 46.142.131.32 Hostname : 32-131-142-46.pool.kielnet.net Old Revision: http://wiki.x2go.org/doku.php/contact:start?rev=1364809941 New Revision: http://wiki.x2go.org/doku.php/contact:start Edit Summary: User : sunweaver @@ -1,5 +1,5 @@ - ====== Communication Resources ====== + ====== Overview on X2Go Community Support ====== X2Go is mainly organized via IRC and mailing lists. We use IRC in cases where we need quick feedback on specific issues. IRC is also a place where you can get community support from. With the mailing lists, all content is public. The major (long term) discussions happen on the mailing lists. Also the dicussions from the bug tracker are cross-posted to one of the lists (x2go-dev ML). Before you can send to one of the X2Go mailing lists, you have to get a subscription. This is to avoid spam on the mailing lists. -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

x2gobroker.git - uccsoutput (branch) created: 0.0.1.0-2-g19582aa
by git-admin＠x2go.org 03 Apr '13

03 Apr '13

The branch, uccsoutput has been created at 19582aa37e0e3cab202c43cd7497d791cbeee1b3 (commit) - Log ----------------------------------------------------------------- commit 19582aa37e0e3cab202c43cd7497d791cbeee1b3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Apr 3 09:49:17 2013 +0200 start development of the UCCS compatible output frontend ----------------------------------------------------------------------- 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

x2gothinclient.git - master (branch) updated: 1.0.1.8-104-gb5d162e
by git-admin＠x2go.org 02 Apr '13

02 Apr '13

The branch, master has been updated via b5d162e7e16051e56c1e7e5d5f000fac655ef0e8 (commit) from 10a0dcead951d21559280d8fdb063f6292c4793d (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 b5d162e7e16051e56c1e7e5d5f000fac655ef0e8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Apr 3 00:14:57 2013 +0200 follow-up commit for f3cba4107, add README.qemu ----------------------------------------------------------------------- Summary of changes: README.qemu | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 README.qemu The diff of changes is: diff --git a/README.qemu b/README.qemu new file mode 100644 index 0000000..fb4dad6 --- /dev/null +++ b/README.qemu @@ -0,0 +1,45 @@ +Testing X2Go Thin Client Environment +==================================== + +... with qemu. + +This HowTo has been inspired by Thomas Guettler. Thanks for your input. + +Do a complete installation of the X2Go TCE as described here: +http://wiki.x2go.org/doku.php/wiki:advanced:tce:install + +Esp. make sure that you have run x2gothinclient_preptftpboot at the end. + +Note: for this test setup you do __not__ need a DHCP server. + +1. +Then add the below ACL to the chroot export in /etc/exports + +--- exports.orig2013-04-02 23:59:06.000000000 +0200 ++++ exports.qemu2013-04-02 23:59:39.000000000 +0200 +@@ -9,5 +9,5 @@ + # /srv/nfs4/homes gss/krb5i(rw,sync,no_subtree_check) + # + +-/opt/x2gothinclient/chroot <your-network>(ro,async,no_root_squash,no_subtree_check) ++/opt/x2gothinclient/chroot <your-network>(ro,async,no_root_squash,no_subtree_check) 127.0.0.1(ro,async,no_root_squash,no_subtree_check,insecure) + + +Of course, the place holder <your-network> has to be filled in +with a proper network/netmask value. For testing the X2Go TCE with +qemu only, you can omit the <your-network> part in the above NFS ACL +completely. + +When done with /etc/exports, re-export all NFS exports with this command: + + $ sudo exportfs -ar + +2. +Launch the X2Go TCE in qemu (with normal user privileges): + + $ qemu-system-i386 -bootp tftp://10.0.2.2/pxelinux.0 -tftp /srv/tftp/ + + + +light+love, +Mike Gabriel \ No newline at end of file hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.8-103-g10a0dce
by git-admin＠x2go.org 02 Apr '13

02 Apr '13

The branch, master has been updated via 10a0dcead951d21559280d8fdb063f6292c4793d (commit) via f3cba41078e51e7d70c4837837e8ddebab2cf8b9 (commit) from dbfe3d7b8201bab714a1eea7dbbfed5cfb85d256 (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 10a0dcead951d21559280d8fdb063f6292c4793d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Apr 3 00:07:04 2013 +0200 add README.howto into x2gothinclientmanagement bin:package commit f3cba41078e51e7d70c4837837e8ddebab2cf8b9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Apr 3 00:06:39 2013 +0200 Add README.qemu that explains how to test the X2Go TCE with qemu. (Fixes: #115). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/x2gothinclientmanagement.docs | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9a2df76..9c65d6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -61,6 +61,8 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low processes have vanished. Only kill processes owned by user x2gothinclient. - When finishing x2gothinclientd, make sure no dbus-* processes remain. - Unmount /proc, /sys and /dev/pts before doing x2gothinclient_cleanup. + - Add README.qemu that explains how to test the X2Go TCE with qemu. + (Fixes: #115). * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + Priority: optional. diff --git a/debian/x2gothinclientmanagement.docs b/debian/x2gothinclientmanagement.docs index 362fedf..49f3949 100644 --- a/debian/x2gothinclientmanagement.docs +++ b/debian/x2gothinclientmanagement.docs @@ -1,2 +1,4 @@ x2gothinclientmanagement/README -x2gothinclientmanagement/README.hostname \ No newline at end of file +x2gothinclientmanagement/README.hostname +README.howto +README.qemu \ No newline at end of file hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.8-101-gdbfe3d7
by git-admin＠x2go.org 02 Apr '13

02 Apr '13

The branch, master has been updated via dbfe3d7b8201bab714a1eea7dbbfed5cfb85d256 (commit) from e537c9b2c5b4951ff306b5eeaa21dff26f9595c4 (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 dbfe3d7b8201bab714a1eea7dbbfed5cfb85d256 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Apr 2 23:40:31 2013 +0200 fix URL to the TCE HowTo on wiki.x2go.org ----------------------------------------------------------------------- Summary of changes: README.howto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/README.howto b/README.howto index 11d4e8d..83c1fd0 100644 --- a/README.howto +++ b/README.howto @@ -2,7 +2,7 @@ X2go Thin Client Environment ============================ A detailled installation description is available in the X2Go Wiki: -http://wiki.x2go.org/doku.php/wiki:components:tce +http://wiki.x2go.org/doku.php/wiki:advanced:tce:install light+love, Mike Gabriel hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits April 2013