x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

x2goserver.git - master (branch) updated: 3.1.1.3-148-gd82c204
by git-admin＠x2go.org 08 Apr '13

08 Apr '13

The branch, master has been updated via d82c2044f94705ba3884168b2b6f35066d5f0f8e (commit) from 5f4b153ddb457b32ab3ee6a92b6fddd03171b9c7 (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 d82c2044f94705ba3884168b2b6f35066d5f0f8e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Apr 8 22:38:11 2013 +0200 /debian/control: + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes: #163). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +++++ debian/control | 2 ++ 2 files changed, 7 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 88b4015..6b2b0fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -60,6 +60,11 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low * New upstream version (4.0.0.2): - Use x2gopath in Perl scripts to set the lib path. (Fixes: #103). + [ Mike Gabriel ] + /debian/control: + + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes: + #163). + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 25 Mar 2013 22:34:11 +0100 x2goserver (4.0.0.1-0~x2go1) unstable; urgency=low diff --git a/debian/control b/debian/control index 8706750..0b1f489 100644 --- a/debian/control +++ b/debian/control @@ -37,6 +37,8 @@ Recommends: x11-xfs-utils, x11-xkb-utils, x11-xserver-utils, + xfonts-base, + fontconfig, xinit, x2goserver-extensions (>= ${source:Version}), x2goserver-extensions (<< ${source:Version}.1~), x2goserver-xsession (>= ${source:Version}), x2goserver-xsession (<< ${source:Version}.1~), 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

x2gobroker.git - uccsoutput (branch) updated: 0.0.1.0-14-g317325d
by git-admin＠x2go.org 07 Apr '13

07 Apr '13

The branch, uccsoutput has been updated via 317325dd112ba89775ff81984ef985f061a81b21 (commit) via 2cee942cb70599dd79ef3cf7f93fc2aeaa950472 (commit) via 0beb6626be0dd1c9d0363435268def8df85f1380 (commit) from d14d83a114d66019fe9fa031f3a367c65224cf6a (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 317325dd112ba89775ff81984ef985f061a81b21 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Apr 7 12:01:15 2013 +0200 add listsessions test for UCCS web frontend commit 2cee942cb70599dd79ef3cf7f93fc2aeaa950472 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Apr 7 12:00:51 2013 +0200 remove debug output commit 0beb6626be0dd1c9d0363435268def8df85f1380 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Apr 7 11:38:48 2013 +0200 enable BR tests in test unit ----------------------------------------------------------------------- Summary of changes: x2gobroker/tests/test_broker_zeroconf.py | 2 - x2gobroker/tests/test_web_plain_zeroconf.py | 9 ++- x2gobroker/tests/test_web_uccs_zeroconf.py | 80 +++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 7 deletions(-) create mode 100644 x2gobroker/tests/test_web_uccs_zeroconf.py The diff of changes is: diff --git a/x2gobroker/tests/test_broker_zeroconf.py b/x2gobroker/tests/test_broker_zeroconf.py index 1a42278..485e8bd 100644 --- a/x2gobroker/tests/test_broker_zeroconf.py +++ b/x2gobroker/tests/test_broker_zeroconf.py @@ -75,8 +75,6 @@ class TestX2GoBrokerBackendZeroconf(unittest.TestCase): _test_profiles = { _key: list_of_profiles['unittest'] } - for key in _profiles[_key]: - print key, _profiles[_key][key], _test_profiles[_key][key] self.assertEqual(_profiles, _test_profiles) ### TEST: select_profile() method diff --git a/x2gobroker/tests/test_web_plain_zeroconf.py b/x2gobroker/tests/test_web_plain_zeroconf.py index dad829b..8b98daf 100644 --- a/x2gobroker/tests/test_web_plain_zeroconf.py +++ b/x2gobroker/tests/test_web_plain_zeroconf.py @@ -52,11 +52,10 @@ desktop-shell = KDE r.mustcontain('START_USER_SESSIONS') r.mustcontain('command=KDE') r.mustcontain('END_USER_SESSIONS') - # FIXME: get html tags out of the text/plain web renderer, needs patching of X2Go Client - #r.mustcontain(no=' ',) - #r.mustcontain(no=' ',) - #r.mustcontain(no=' ', ) - #r.mustcontain(no=' ', ) + r.mustcontain(no=' ',) + r.mustcontain(no=' ',) + r.mustcontain(no=' ', ) + r.mustcontain(no=' ', ) tf.close() _config = """ [zeroconf] diff --git a/x2gobroker/tests/test_web_uccs_zeroconf.py b/x2gobroker/tests/test_web_uccs_zeroconf.py new file mode 100644 index 0000000..6c5d2b5 --- /dev/null +++ b/x2gobroker/tests/test_web_uccs_zeroconf.py @@ -0,0 +1,80 @@ +# -*- coding: utf-8 -*- + +# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# +# X2Go Session Broker is free software; you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# X2Go Session Broker is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +import unittest +import tempfile +from paste.fixture import TestApp +from nose.tools import * +import tornado.wsgi +import json + +# Python X2GoBroker modules +import x2gobroker.defaults +import x2gobroker.web.uccs + +urls = ( ('/uccs/(.*)', x2gobroker.web.uccs.X2GoBrokerWeb,) ,) +application = tornado.wsgi.WSGIApplication(urls) + +class TestX2GoBrokerWebUccsZeroConf(unittest.TestCase): + + ### TEST TASK: listsessions (you can influence the session command via the X2Go Broker's configurationfile) + + def test_listsessions(self): + _expected_result = { + u'URL': u'http://localhost:8080/uccs/zeroconf', + u'AdditionalManagementServers': [], + u'Name': u'X2Go Session Broker', + u'RemoteDesktopServers': [ + { + u'Username': u'', + u'Protocol': u'x2go', + u'Name': u'LOCALHOST', + u'URL': u'localhost:22', + u'SessionTypeRequired': True, + u'Password': None + }, + ], + } + _config = """ +[global] +enable-uccs-output=true + +[zeroconf] +enable = true +auth-mech = testsuite +desktop-shell = KDE +""" + tf = tempfile.NamedTemporaryFile() + print >> tf, _config + tf.seek(0) + x2gobroker.defaults.X2GOBROKER_CONFIG = tf.name + testApp = TestApp(application) + r = testApp.get('/uccs/zeroconf/', params={'user': 'test', 'password': 'sweet', 'task': 'listsessions', }, expect_errors=True) + assert_equal(r.status, 200) + body = r.normal_body + result = json.loads(body) + self.assertEqual(_expected_result, result) + tf.close() + + +def test_suite(): + from unittest import TestSuite, makeSuite + suite = TestSuite() + suite.addTest(makeSuite(TestX2GoBrokerWebUccsZeroConf)) + return suite 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: 4.0.1.0-5-gcfa1e28
by git-admin＠x2go.org 07 Apr '13

07 Apr '13

The branch, master has been updated via cfa1e28665a8fa2f34f7546af7bd8d25ea1ba8bd (commit) from 2419bf34d1ecd28696e6c129001057c4de77a328 (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 cfa1e28665a8fa2f34f7546af7bd8d25ea1ba8bd Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Apr 7 10:59:01 2013 +0200 fix name of X2Go Client ----------------------------------------------------------------------- Summary of changes: onmainwindow.cpp | 6 +++--- portable/stopu3client.cpp | 4 ++-- printdialog.ui | 2 +- x2goclient_da.ts | 10 +++++----- x2goclient_de.ts | 8 ++++---- x2goclient_es.ts | 8 ++++---- x2goclient_fr.ts | 8 ++++---- x2goclient_nb_no.ts | 8 ++++---- x2goclient_ru.ts | 10 +++++----- x2goclient_sv.ts | 8 ++++---- x2goclient_zh_tw.ts | 8 ++++---- xsettingsui.ui | 2 +- 12 files changed, 41 insertions(+), 41 deletions(-) The diff of changes is: diff --git a/onmainwindow.cpp b/onmainwindow.cpp index dbcb092..31dbc17 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -139,7 +139,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) cleanAskPass(); - setWindowTitle ( tr ( "X2Go client" ) ); + setWindowTitle ( tr ( "X2Go Client" ) ); ld=0; tunnel=0l; sndTunnel=0l; @@ -205,7 +205,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) { portableDataPath=u3Path; ONMainWindow::portable=true; - setWindowTitle ( "X2Go client - U3" ); + setWindowTitle ( "X2Go Client - U3" ); } #endif @@ -7481,7 +7481,7 @@ void ONMainWindow::slotAbout() "further information." ); QMessageBox::about ( this,tr ( "About X2GO client" ), - tr ( "X2Go client V. " ) +VERSION+ + tr ( "X2Go Client V. " ) +VERSION+ " (Qt - "+qVersion() +")"+ aboutStr ); } diff --git a/portable/stopu3client.cpp b/portable/stopu3client.cpp index 3cc7c67..c6e7a4f 100644 --- a/portable/stopu3client.cpp +++ b/portable/stopu3client.cpp @@ -27,11 +27,11 @@ int main() { - HWND wid=FindWindowEx(0,0,0,"X2Go client - U3"); + HWND wid=FindWindowEx(0,0,0,"X2Go Client - U3"); while(wid) { HWND prevWid=wid; - wid=FindWindowEx(0,wid,0,"X2Go client - U3"); + wid=FindWindowEx(0,wid,0,"X2Go Client - U3"); PostMessage(prevWid,WM_CLOSE,0,0); } return 0; diff --git a/printdialog.ui b/printdialog.ui index 4f52e41..9420099 100644 --- a/printdialog.ui +++ b/printdialog.ui @@ -15,7 +15,7 @@ </rect> </property> <property name="windowTitle"> - <string>Print - X2Go client</string> + <string>Print - X2Go Client</string> </property> <layout class="QVBoxLayout" name="verticalLayout"> <item> diff --git a/x2goclient_da.ts b/x2goclient_da.ts index 0ef73a7..eba13a4 100644 --- a/x2goclient_da.ts +++ b/x2goclient_da.ts @@ -792,7 +792,7 @@ Public key hash: </translation> </message> <message> <location filename="onmainwindow.cpp" line="142"/> - <source>X2Go client</source> + <source>X2Go Client</source> <translation>X2go klient</translation> </message> <message> @@ -1587,8 +1587,8 @@ Ugemte dokumenter vil gå tabt</translation> </message> <message> <location filename="onmainwindow.cpp" line="7463"/> - <source>X2Go client V. </source> - <translation>X2Go client V. </translation> + <source>X2Go Client V. </source> + <translation>X2Go Client V. </translation> </message> <message> <location filename="onmainwindow.cpp" line="7508"/> @@ -1803,7 +1803,7 @@ du kan installere sshd med <name>PrintDialog</name> <message> <location filename="printdialog.ui" line="18"/> - <source>Print - X2Go client</source> + <source>Print - X2Go Client</source> <translation>Udskrift - X2Go klient</translation> </message> <message> @@ -2807,7 +2807,7 @@ lydsystemets forbindelse igennem firewalls</translation> </message> <message> <location filename="xsettingsui.ui" line="102"/> - <source>start X-Server on X2Go client start</source> + <source>start X-Server on X2Go Client start</source> <translation>start X-Server sammen med X2Go klient</translation> </message> <message> diff --git a/x2goclient_de.ts b/x2goclient_de.ts index d8fe44c..ba726ae 100644 --- a/x2goclient_de.ts +++ b/x2goclient_de.ts @@ -1841,7 +1841,7 @@ Please check your settings</source> </message> <message> <location filename="onmainwindow.cpp" line="142"/> - <source>X2Go client</source> + <source>X2Go Client</source> <translation></translation> </message> <message> @@ -2019,7 +2019,7 @@ Public key hash: </source> </message> <message> <location filename="onmainwindow.cpp" line="7463"/> - <source>X2Go client V. </source> + <source>X2Go Client V. </source> <translation>X2GoClient V. </translation> </message> <message> @@ -2357,7 +2357,7 @@ Sie können SSHD über folgenden Befehl installieren: </message> <message> <location filename="printdialog.ui" line="18"/> - <source>Print - X2Go client</source> + <source>Print - X2Go Client</source> <translation>Drucken - X2GoClient</translation> </message> </context> @@ -3385,7 +3385,7 @@ sound system connections through firewalls</source> </message> <message> <location filename="xsettingsui.ui" line="102"/> - <source>start X-Server on X2Go client start</source> + <source>start X-Server on X2Go Client start</source> <translation>X-Server auf X2GoClient starten</translation> </message> <message> diff --git a/x2goclient_es.ts b/x2goclient_es.ts index 8fb5b01..dc31106 100644 --- a/x2goclient_es.ts +++ b/x2goclient_es.ts @@ -791,7 +791,7 @@ Hash de su clave pública: </translation> </message> <message> <location filename="onmainwindow.cpp" line="142"/> - <source>X2Go client</source> + <source>X2Go Client</source> <translation>Cliente X2Go</translation> </message> <message> @@ -1590,7 +1590,7 @@ Los documentos no guardados se perderán</translation> </message> <message> <location filename="onmainwindow.cpp" line="7463"/> - <source>X2Go client V. </source> + <source>X2Go Client V. </source> <translation>cliente X2Go v. </translation> </message> <message> @@ -1806,7 +1806,7 @@ puedes instalar sshd con <name>PrintDialog</name> <message> <location filename="printdialog.ui" line="18"/> - <source>Print - X2Go client</source> + <source>Print - X2Go Client</source> <translation>Imprimir - Cliente X2Go</translation> </message> <message> @@ -2809,7 +2809,7 @@ el sonido en conexiones a través de firewalls</translation> </message> <message> <location filename="xsettingsui.ui" line="102"/> - <source>start X-Server on X2Go client start</source> + <source>start X-Server on X2Go Client start</source> <translation>iniciar ServidorX en el inicio del cliente X2Go</translation> </message> <message> diff --git a/x2goclient_fr.ts b/x2goclient_fr.ts index 6a8c203..8d77c9e 100644 --- a/x2goclient_fr.ts +++ b/x2goclient_fr.ts @@ -618,7 +618,7 @@ Public key hash: </source> <translation>pc105/us</translation> </message> <message> - <source>X2Go client</source> + <source>X2Go Client</source> <translation>X2Go Client</translation> </message> <message> @@ -1158,7 +1158,7 @@ Unsaved documents will be lost</source> <translation type="unfinished"></translation> </message> <message> - <source>X2Go client V. </source> + <source>X2Go Client V. </source> <translation type="unfinished"></translation> </message> <message> @@ -1341,7 +1341,7 @@ you can install sshd with <translation type="unfinished"></translation> </message> <message> - <source>Print - X2Go client</source> + <source>Print - X2Go Client</source> <translation type="unfinished"></translation> </message> </context> @@ -2101,7 +2101,7 @@ sound system connections through firewalls</source> <translation type="unfinished"></translation> </message> <message> - <source>start X-Server on X2Go client start</source> + <source>start X-Server on X2Go Client start</source> <translation type="unfinished"></translation> </message> <message> diff --git a/x2goclient_nb_no.ts b/x2goclient_nb_no.ts index 3f9ec66..219c205 100644 --- a/x2goclient_nb_no.ts +++ b/x2goclient_nb_no.ts @@ -1489,7 +1489,7 @@ Vennligst sjekk instillingene dine</translation> </message> <message> <location filename="onmainwindow.cpp" line="142"/> - <source>X2Go client</source> + <source>X2Go Client</source> <translation>X2Go klient</translation> </message> <message> @@ -1670,7 +1670,7 @@ Offentlig nøkkel: </translation> </message> <message> <location filename="onmainwindow.cpp" line="7463"/> - <source>X2Go client V. </source> + <source>X2Go Client V. </source> <translation>X2Go klient v. </translation> </message> <message> @@ -1998,7 +1998,7 @@ Du kan installere sshd med: <name>PrintDialog</name> <message> <location filename="printdialog.ui" line="18"/> - <source>Print - X2Go client</source> + <source>Print - X2Go Client</source> <translation>Utskrift - X2Go klient</translation> </message> <message> @@ -3011,7 +3011,7 @@ lydsystem forbindelser gjennom brannmurer</translation> </message> <message> <location filename="xsettingsui.ui" line="102"/> - <source>start X-Server on X2Go client start</source> + <source>start X-Server on X2Go Client start</source> <translation>start X-Serveren når X2Go klienten startes</translation> </message> <message> diff --git a/x2goclient_ru.ts b/x2goclient_ru.ts index 6984c5c..61bd030 100644 --- a/x2goclient_ru.ts +++ b/x2goclient_ru.ts @@ -1881,7 +1881,7 @@ Please check your settings</source> </message> <message> <location filename="onmainwindow.cpp" line="142"/> - <source>X2Go client</source> + <source>X2Go Client</source> <translation></translation> </message> <message> @@ -2003,7 +2003,7 @@ Please check your settings</source> </message> <message> <location filename="onmainwindow.cpp" line="7463"/> - <source>X2Go client V. </source> + <source>X2Go Client V. </source> <translation>X2Go Client V. </translation> </message> <message> @@ -2342,7 +2342,7 @@ you can install sshd with </message> <message> <location filename="printdialog.ui" line="18"/> - <source>Print - X2Go client</source> + <source>Print - X2Go Client</source> <translation>Печать - X2Go Client</translation> </message> </context> @@ -3366,8 +3366,8 @@ sound system connections through firewalls</source> </message> <message> <location filename="xsettingsui.ui" line="102"/> - <source>start X-Server on X2Go client start</source> - <translation>запускать X-Server при запуске X2Go client</translation> + <source>start X-Server on X2Go Client start</source> + <translation>запускать X-Server при запуске X2Go Client</translation> </message> <message> <location filename="xsettingsui.ui" line="114"/> diff --git a/x2goclient_sv.ts b/x2goclient_sv.ts index 9d3a253..73fab61 100644 --- a/x2goclient_sv.ts +++ b/x2goclient_sv.ts @@ -796,7 +796,7 @@ Publik nyckel: </translation> </message> <message> <location filename="onmainwindow.cpp" line="142"/> - <source>X2Go client</source> + <source>X2Go Client</source> <translation>X2Go-klient</translation> </message> <message> @@ -1596,7 +1596,7 @@ Data som ej sparats kommer att förloras</translation> </message> <message> <location filename="onmainwindow.cpp" line="7463"/> - <source>X2Go client V. </source> + <source>X2Go Client V. </source> <translation>X2Go-klient V. </translation> </message> <message> @@ -1831,7 +1831,7 @@ du kan installera sshd med (Debian/Ubuntu) <name>PrintDialog</name> <message> <location filename="printdialog.ui" line="18"/> - <source>Print - X2Go client</source> + <source>Print - X2Go Client</source> <translation>Utskrift - X2Go-klient</translation> </message> <message> @@ -2835,7 +2835,7 @@ ljudström genom brandväggar</translation> </message> <message> <location filename="xsettingsui.ui" line="102"/> - <source>start X-Server on X2Go client start</source> + <source>start X-Server on X2Go Client start</source> <translation>Starta X-server när X2Go-klienten startas</translation> </message> <message> diff --git a/x2goclient_zh_tw.ts b/x2goclient_zh_tw.ts index 4d93162..1d03c34 100644 --- a/x2goclient_zh_tw.ts +++ b/x2goclient_zh_tw.ts @@ -790,7 +790,7 @@ Public key hash: </source> </message> <message> <location filename="onmainwindow.cpp" line="142"/> - <source>X2Go client</source> + <source>X2Go Client</source> <translation>X2Go用戶端</translation> </message> <message> @@ -1587,7 +1587,7 @@ Unsaved documents will be lost</source> </message> <message> <location filename="onmainwindow.cpp" line="7463"/> - <source>X2Go client V. </source> + <source>X2Go Client V. </source> <translation>X2Go 客戶端 V. </translation> </message> <message> @@ -1819,7 +1819,7 @@ you can install sshd with <name>PrintDialog</name> <message> <location filename="printdialog.ui" line="18"/> - <source>Print - X2Go client</source> + <source>Print - X2Go Client</source> <translation>列印 - X2Go用戶端</translation> </message> <message> @@ -2822,7 +2822,7 @@ sound system connections through firewalls</source> </message> <message> <location filename="xsettingsui.ui" line="102"/> - <source>start X-Server on X2Go client start</source> + <source>start X-Server on X2Go Client start</source> <translation>當X2Go用戶端啟動時啟動X伺服器</translation> </message> <message> diff --git a/xsettingsui.ui b/xsettingsui.ui index e58ba50..9aa8ffa 100644 --- a/xsettingsui.ui +++ b/xsettingsui.ui @@ -106,7 +106,7 @@ <item> <widget class="QCheckBox" name="cbOnstart"> <property name="text"> - <string>start X-Server on X2Go client start</string> + <string>start X-Server on X2Go Client start</string> </property> <property name="checked"> <bool>false</bool> 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-11-gd14d83a
by git-admin＠x2go.org 07 Apr '13

07 Apr '13

The branch, uccsoutput has been updated via d14d83a114d66019fe9fa031f3a367c65224cf6a (commit) from 8130c9d12e3447fda3064b4b3f1ba0aef1015341 (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 d14d83a114d66019fe9fa031f3a367c65224cf6a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Apr 7 10:21:27 2013 +0200 commit after more (successful) testing of UCCS compat code ----------------------------------------------------------------------- Summary of changes: x2gobroker/uccsjson.py | 2 +- x2gobroker/web/uccs.py | 36 +++++++++++++++++------------------- 2 files changed, 18 insertions(+), 20 deletions(-) The diff of changes is: diff --git a/x2gobroker/uccsjson.py b/x2gobroker/uccsjson.py index 779e2ba..abbcd80 100644 --- a/x2gobroker/uccsjson.py +++ b/x2gobroker/uccsjson.py @@ -62,7 +62,7 @@ class ManagementServer(): else: raise TypeError("set_default expects a string argument") - def add_terminal_server(self, server): + def add_terminalserver(self, server): """\ Add a terminal server to this management server object. diff --git a/x2gobroker/web/uccs.py b/x2gobroker/web/uccs.py index 6078383..394583c 100644 --- a/x2gobroker/web/uccs.py +++ b/x2gobroker/web/uccs.py @@ -102,29 +102,27 @@ class X2GoBrokerWeb(tornado.web.RequestHandler): ### profiles = broker_backend.list_profiles(username) - if profiles: - ms = x2gobroker.uccsjson.ManagementServer('http://localhost:8080/uccs/{backend}'.format(backend=backend), 'X2Go Session Broker') + ms = x2gobroker.uccsjson.ManagementServer('http://localhost:8080/uccs/{backend}'.format(backend=backend), 'X2Go Session Broker') - profile_ids = profiles.keys() - profile_ids.sort() + profile_ids = profiles.keys() + profile_ids.sort() - for profile_id in profile_ids: + for profile_id in profile_ids: - print profiles[profile_id] - if profiles[profile_id][u'directrdp']: - pass - else: - ts = x2gobroker.uccsjson.X2GoServer( - host='{hostname}:{port}'.format(hostname=profiles[profile_id][u'host'], port=profiles[profile_id][u'sshport']), - name=profiles[profile_id][u'name'], - username=profiles[profile_id][u'user'], - ) - ms.add_terminal(ts) + if profiles[profile_id][u'directrdp']: + pass + else: + ts = x2gobroker.uccsjson.X2GoServer( + host='{hostname}:{port}'.format(hostname=profiles[profile_id][u'host'], port=profiles[profile_id][u'sshport']), + name=profiles[profile_id][u'name'], + username=profiles[profile_id][u'user'], + ) + ms.add_terminalserver(ts) - output += ms.toJson() + output += ms.toJson() - self.write(output) - return + self.write(output) + return - raise tornado.web.HTTPError(401) + #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

x2gobroker.git - uccsoutput (branch) updated: 0.0.1.0-10-g8130c9d
by git-admin＠x2go.org 07 Apr '13

07 Apr '13

The branch, uccsoutput has been updated via 8130c9d12e3447fda3064b4b3f1ba0aef1015341 (commit) via 00fb61c3429809f7511f7bda5667a77facd96918 (commit) via e341bd86111730b2919697a74ac18d759d2a9e74 (commit) via c9c92dbff6b4e9ee872eb738121dbd51da94d329 (commit) via 1734e9987eebeaf7574c42c28b92f010fb827008 (commit) via cd9500b7a1d12cd973af7726dbead83b79bc8581 (commit) via 890debb62b31a29ed482d392e7d276c5d9936d90 (commit) from aea8e30472982caf3be18c73e3175becfc6d6b4a (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 8130c9d12e3447fda3064b4b3f1ba0aef1015341 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Apr 7 10:08:09 2013 +0200 Fix wrong usage of session option »cmd«, has to be »command«. commit 00fb61c3429809f7511f7bda5667a77facd96918 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Apr 6 14:01:40 2013 +0200 add test that checks profile completion from hard-coded defaults commit e341bd86111730b2919697a74ac18d759d2a9e74 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Apr 6 13:39:43 2013 +0200 Add cmd and directrdp session profile parameters to defaults. commit c9c92dbff6b4e9ee872eb738121dbd51da94d329 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Apr 6 13:37:33 2013 +0200 sbin/x2gobroker: import UCCS web frontend commit 1734e9987eebeaf7574c42c28b92f010fb827008 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Apr 6 13:36:38 2013 +0200 fix x2gobroker/web/uccs.py commit cd9500b7a1d12cd973af7726dbead83b79bc8581 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Apr 6 13:26:27 2013 +0200 new parameter in default profile commit 890debb62b31a29ed482d392e7d276c5d9936d90 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Apr 6 13:03:58 2013 +0200 move UCCS JSON classes into separate file ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +- etc/broker/x2gobroker-sessionprofiles.conf | 3 +- sbin/x2gobroker | 1 + x2gobroker/brokers/zeroconf_broker.py | 7 +- x2gobroker/defaults.py | 3 +- x2gobroker/tests/test_broker_base.py | 4 +- x2gobroker/tests/test_broker_inifile.py | 142 +++++++++++++--- x2gobroker/tests/test_broker_zeroconf.py | 4 + x2gobroker/uccsjson.py | 241 ++++++++++++++++++++++++++++ x2gobroker/web/uccs.py | 93 ++--------- 10 files changed, 387 insertions(+), 116 deletions(-) create mode 100644 x2gobroker/uccsjson.py The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b460d0d..be2985b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ x2gobroker (0.0.1.1-0~x2go1) UNRELEASED; urgency=low - * New upstream version (0.0.1.0): - - Continue development... + * New upstream version (0.0.1.1): + - Add command and directrdp session profile parameters to defaults. + - Fix wrong usage of session option »cmd«, has to be »command«. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 10 Mar 2013 13:00:32 +0100 diff --git a/etc/broker/x2gobroker-sessionprofiles.conf b/etc/broker/x2gobroker-sessionprofiles.conf index 2f0caea..8d060ec 100644 --- a/etc/broker/x2gobroker-sessionprofiles.conf +++ b/etc/broker/x2gobroker-sessionprofiles.conf @@ -29,6 +29,7 @@ [DEFAULT] +command=TERMINAL defsndport=true useiconv=false iconvfrom=UTF-8 @@ -52,7 +53,7 @@ applications=TERMINAL,WWWBROWSER,MAILCLIENT,OFFICE multidisp=false sshproxyport=22 sound=true -rootless=false +rootless=true iconvto=UTF-8 soundtunnel=true dpi=96 diff --git a/sbin/x2gobroker b/sbin/x2gobroker index 05678ab..894b3c0 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -110,6 +110,7 @@ if __name__ == "__main__": # import classes serving the different web.py URLs import x2gobroker.web.plain +import x2gobroker.web.uccs #import x2gobroker.web.json #import x2gobroker.web.html import x2gobroker.web.extras diff --git a/x2gobroker/brokers/zeroconf_broker.py b/x2gobroker/brokers/zeroconf_broker.py index 5970659..6cb83ad 100644 --- a/x2gobroker/brokers/zeroconf_broker.py +++ b/x2gobroker/brokers/zeroconf_broker.py @@ -36,7 +36,7 @@ class X2GoBroker(base.X2GoBroker): def list_profiles(self, username): - list_of_profiles = { + _list_of_profiles = { uuid.uuid4(): { 'user': u'', 'defsndport': True, @@ -74,6 +74,11 @@ class X2GoBroker(base.X2GoBroker): 'pack': u'16m-jpeg', }, } + list_of_profiles = {} + for profile_id in _list_of_profiles.keys(): + profile = self.get_profile_defaults() + profile.update(_list_of_profiles[profile_id]) + list_of_profiles[profile_id] = profile return list_of_profiles def select_session(self, profile_id, username=None): diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index 8a930dc..9e61d83 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -161,6 +161,7 @@ X2GOBROKER_CONFIG_DEFAULTS = { # defaults for X2Go Sessino Broker session profiles file X2GOBROKER_SESSIONPROFILE_DEFAULTS = { u'DEFAULT': { + u'command': u'TERMINAL', u'defsndport': True, u'useiconv': False, u'iconvfrom': u'UTF-8', @@ -184,7 +185,7 @@ X2GOBROKER_SESSIONPROFILE_DEFAULTS = { u'multidisp': False, u'sshproxyport': 22, u'sound': True, - u'rootless': False, + u'rootless': True, u'iconvto': u'UTF-8', u'soundtunnel': True, u'dpi': 96, diff --git a/x2gobroker/tests/test_broker_base.py b/x2gobroker/tests/test_broker_base.py index 0bda18e..1371724 100644 --- a/x2gobroker/tests/test_broker_base.py +++ b/x2gobroker/tests/test_broker_base.py @@ -274,6 +274,7 @@ check-credentials = false def test_getdefaultprofile(self): base_backend = self._init_base_backend() _expected_profile = { + 'command': 'TERMINAL', 'defsndport': True, 'useiconv': False, 'iconvfrom': 'UTF-8', @@ -297,7 +298,7 @@ check-credentials = false 'multidisp': False, 'sshproxyport': 22, 'sound': True, - 'rootless': False, + 'rootless': True, 'iconvto': 'UTF-8', 'soundtunnel': True, 'dpi': 96, @@ -306,6 +307,7 @@ check-credentials = false 'pack': '16m-jpeg', 'user': '', 'host': [u'localhost'], + 'directrdp': False, } _profile = base_backend.get_profile_defaults() self.assertEqual(len(_expected_profile.keys()), len(_profile.keys())) diff --git a/x2gobroker/tests/test_broker_inifile.py b/x2gobroker/tests/test_broker_inifile.py index 35b4289..6bc62f8 100644 --- a/x2gobroker/tests/test_broker_inifile.py +++ b/x2gobroker/tests/test_broker_inifile.py @@ -47,6 +47,96 @@ class TestX2GoBrokerBackendInifile(unittest.TestCase): for _profile_id in _profile_ids: self.assertTrue( ( 'default' not in inifile_backend.get_profile(_profile_id).keys() ) ) + # TEST COMPLETION OF DEFAULTS FROM CODE IN defaults.py + + def test_getprofilecompletion(self): + _session_profiles = """ +[DEFAULT] +exports = +fullscreen = false +width = 800 +height = 600 +applications = TERMINAL, WWWBROWSER + +[testprofile] +user = foo +command = GNOME + +""" + tf = tempfile.NamedTemporaryFile() + print >> tf, _session_profiles + tf.seek(0) + inifile_backend = inifile.X2GoBroker(profile_config_file=tf.name) + _expected_defaults = copy.deepcopy(x2gobroker.defaults.X2GOBROKER_SESSIONPROFILE_DEFAULTS['DEFAULT']) + for key in copy.deepcopy(_expected_defaults).keys(): + if key.startswith('acl-'): + del _expected_defaults[key] + _expected_defaults.update( { + u'exports': '', + u'fullscreen': False, + u'width': 800, + u'height': 600, + u'applications': ['TERMINAL','WWWBROWSER',], + u'user': 'foo', + u'command': 'GNOME', + } ) + # just testing the directrdp hard-coded defaults + _expected_defaults.update( { + u'directrdp': False, + } ) + _expected_profile = copy.deepcopy(_expected_defaults) + _profile = inifile_backend.get_profile('testprofile') + print _expected_defaults + for key in _expected_profile.keys(): + self.assertTrue( ( key in _profile.keys() ) ) + for key in _profile.keys(): + self.assertTrue( ( key in _expected_profile.keys() and _profile[key] == _expected_profile[key] ) ) + + # TEST COMPLETION OF DEFAULTS FROM CODE IN defaults.py + + def test_getprofilecompletion(self): + _session_profiles = """ +[DEFAULT] +exports = +fullscreen = false +width = 800 +height = 600 +applications = TERMINAL, WWWBROWSER + +[testprofile] +user = foo +command = GNOME + +""" + tf = tempfile.NamedTemporaryFile() + print >> tf, _session_profiles + tf.seek(0) + inifile_backend = inifile.X2GoBroker(profile_config_file=tf.name) + _expected_defaults = copy.deepcopy(x2gobroker.defaults.X2GOBROKER_SESSIONPROFILE_DEFAULTS['DEFAULT']) + for key in copy.deepcopy(_expected_defaults).keys(): + if key.startswith('acl-'): + del _expected_defaults[key] + _expected_defaults.update( { + u'exports': '', + u'fullscreen': False, + u'width': 800, + u'height': 600, + u'applications': ['TERMINAL','WWWBROWSER',], + u'user': 'foo', + u'command': 'GNOME', + } ) + # just testing the directrdp hard-coded defaults + _expected_defaults.update( { + u'directrdp': False, + } ) + _expected_profile = copy.deepcopy(_expected_defaults) + _profile = inifile_backend.get_profile('testprofile') + for key in _expected_profile.keys(): + self.assertTrue( ( key in _profile.keys() ) ) + for key in _profile.keys(): + self.assertTrue( ( key in _expected_profile.keys() and _profile[key] == _expected_profile[key] ) ) + + ### TEST SESSION PROFILES: get_profile_defaults() def test_getprofiledefaults(self): @@ -74,16 +164,16 @@ applications = TERMINAL, WWWBROWSER [testprofile1] user = foo -cmd = GNOME +command = GNOME [testprofile2] user = bar -cmd = KDE +command = KDE fullscreen = true [testprofile3] user = bar -cmd = KDE +command = KDE fullscreen = true acl-users-deny = ALL acl-users-allow = foo,bar @@ -102,23 +192,23 @@ acl-users-order = deny-allow u'fullscreen': False, u'width': 800, u'height': 600, - u'applications': ['TERMINAL','WWWBROWSER',] + u'applications': ['TERMINAL','WWWBROWSER',], } ) _expected_profile1 = copy.deepcopy(_expected_defaults) _expected_profile1.update({ u'user': 'foo', - u'cmd': 'GNOME', + u'command': 'GNOME', }) _expected_profile2 = copy.deepcopy(_expected_defaults) _expected_profile2.update({ u'user': 'bar', - u'cmd': 'KDE', + u'command': 'KDE', u'fullscreen': True, }) _expected_profile3 = copy.deepcopy(_expected_defaults) _expected_profile3.update({ u'user': 'bar', - u'cmd': 'KDE', + u'command': 'KDE', u'fullscreen': True, }) _profile1 = inifile_backend.get_profile('testprofile1') @@ -154,16 +244,16 @@ acl-clients-allow = 10.0.0.0/16,10.1.0.0/16,admin-1.intern,admin-2.intern [testprofile1] user = foo -cmd = GNOME +command = GNOME [testprofile2] user = foo -cmd = GNOME +command = GNOME acl-clients-deny = 10.0.2.0/24,ALL [testprofile3] user = bar -cmd = KDE +command = KDE fullscreen = true acl-users-deny = ALL acl-users-allow = foo,bar @@ -223,15 +313,15 @@ applications = TERMINAL, WWWBROWSER [testprofile1] user = -cmd = GNOME +command = GNOME [testprofile2] user = -cmd = XFCE +command = XFCE [testprofile3] user = -cmd = KDE +command = KDE fullscreen = true """ tf = tempfile.NamedTemporaryFile() @@ -273,21 +363,21 @@ acl-groups-order = deny-allow [testprofile1] user = -cmd = GNOME +command = GNOME acl-users-allow = flip acl-users-deny = ALL acl-users-order = deny-allow [testprofile2] user = -cmd = XFCE +command = XFCE acl-users-allow = thekla acl-users-deny = ALL acl-users-order = deny-allow [testprofile3] user = -cmd = KDE +command = KDE fullscreen = true acl-users-deny = willi acl-users-order = deny-allow @@ -302,40 +392,40 @@ acl-users-order = deny-allow list_of_profile_ids = list_of_profiles.keys() list_of_profile_ids.sort() self.assertEqual(list_of_profile_ids, ['testprofile1']) - self.assertEqual(list_of_profiles['testprofile1']['cmd'], 'GNOME') + self.assertEqual(list_of_profiles['testprofile1']['command'], 'GNOME') username_m = 'maja' list_of_profiles = inifile_backend.list_profiles(username_m) list_of_profile_ids = list_of_profiles.keys() list_of_profile_ids.sort() self.assertEqual(list_of_profile_ids, ['testprofile1', 'testprofile2', 'testprofile3']) - self.assertEqual(list_of_profiles['testprofile1']['cmd'], 'GNOME') - self.assertEqual(list_of_profiles['testprofile2']['cmd'], 'XFCE') - self.assertEqual(list_of_profiles['testprofile3']['cmd'], 'KDE') + self.assertEqual(list_of_profiles['testprofile1']['command'], 'GNOME') + self.assertEqual(list_of_profiles['testprofile2']['command'], 'XFCE') + self.assertEqual(list_of_profiles['testprofile3']['command'], 'KDE') username_k = 'kassandra' list_of_profiles = inifile_backend.list_profiles(username_k) list_of_profile_ids = list_of_profiles.keys() list_of_profile_ids.sort() self.assertEqual(list_of_profile_ids, ['testprofile1', 'testprofile2', 'testprofile3']) - self.assertEqual(list_of_profiles['testprofile1']['cmd'], 'GNOME') - self.assertEqual(list_of_profiles['testprofile2']['cmd'], 'XFCE') - self.assertEqual(list_of_profiles['testprofile3']['cmd'], 'KDE') + self.assertEqual(list_of_profiles['testprofile1']['command'], 'GNOME') + self.assertEqual(list_of_profiles['testprofile2']['command'], 'XFCE') + self.assertEqual(list_of_profiles['testprofile3']['command'], 'KDE') username_t = 'thekla' list_of_profiles = inifile_backend.list_profiles(username_t) list_of_profile_ids = list_of_profiles.keys() list_of_profile_ids.sort() self.assertEqual(list_of_profile_ids, ['testprofile2']) - self.assertEqual(list_of_profiles['testprofile2']['cmd'], 'XFCE') + self.assertEqual(list_of_profiles['testprofile2']['command'], 'XFCE') username_w = 'willi' list_of_profiles = inifile_backend.list_profiles(username_w) list_of_profile_ids = list_of_profiles.keys() list_of_profile_ids.sort() self.assertEqual(list_of_profile_ids, ['testprofile1', 'testprofile2']) - self.assertEqual(list_of_profiles['testprofile1']['cmd'], 'GNOME') - self.assertEqual(list_of_profiles['testprofile2']['cmd'], 'XFCE') + self.assertEqual(list_of_profiles['testprofile1']['command'], 'GNOME') + self.assertEqual(list_of_profiles['testprofile2']['command'], 'XFCE') ### TEST: select_session() method diff --git a/x2gobroker/tests/test_broker_zeroconf.py b/x2gobroker/tests/test_broker_zeroconf.py index 0e97b66..1a42278 100644 --- a/x2gobroker/tests/test_broker_zeroconf.py +++ b/x2gobroker/tests/test_broker_zeroconf.py @@ -63,6 +63,8 @@ class TestX2GoBrokerBackendZeroconf(unittest.TestCase): 'sshport': 22, 'setdpi': 0, 'pack': u'16m-jpeg', + # make sure, hard-coded defaults end up in the list_profiles() output of the zeroconf backend, as well + 'directrdp': False, }, } zeroconf_backend = x2gobroker.brokers.zeroconf_broker.X2GoBroker() @@ -73,6 +75,8 @@ class TestX2GoBrokerBackendZeroconf(unittest.TestCase): _test_profiles = { _key: list_of_profiles['unittest'] } + for key in _profiles[_key]: + print key, _profiles[_key][key], _test_profiles[_key][key] self.assertEqual(_profiles, _test_profiles) ### TEST: select_profile() method diff --git a/x2gobroker/uccsjson.py b/x2gobroker/uccsjson.py new file mode 100644 index 0000000..779e2ba --- /dev/null +++ b/x2gobroker/uccsjson.py @@ -0,0 +1,241 @@ +# 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 json + +def convert_to_builtin_type(obj): + """\ + Helper function for converting Python objects to dictionaries. + Used for doing JSON dumps. + + """ + d = { } + d.update(obj.__dict__) + return d + +class ManagementServer(): + """\ + Base class for generating UCCS compatible JSON object. + + """ + def __init__(self, url, name): + """\ + Initializ instance. + + @param url: URL of the UCCS broker server + @type url: C{unicode} + @param name: human-readable, descriptive server name + @type name: C{unicode} + + """ + self.RemoteDesktopServers = [] + self.AdditionalManagementServers = [] + self.URL = url + self.Name = name + + def set_default(self, ts_name): + """\ + Define the default (terminal) server instance. + + @param ts_name: name of the terminal server that is to be set as default + @type ts_name: C{unicode} + + """ + if isinstance(tsName, str): + self.DefaultServer = tsName + else: + raise TypeError("set_default expects a string argument") + + def add_terminal_server(self, server): + """\ + Add a terminal server to this management server object. + + @param server: instance of class L{RDPServer} or L{X2GoServer}. + @type server: C{obj} + + """ + self.RemoteDesktopServers.append(server) + + # NOT USED!!! + #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): + """\ + Dump this instance as JSON object. + + """ + return json.dumps(self, default=convert_to_builtin_type) + + +# NOT USED!!! +#class AdditionalManagementServer(): +# def __init__(self, url, name): +# self.URL = url +# self.Name = name + + +class RDPServer(): + """\ + Instantiate a UCCS compatible RDP server session profile object. + + """ + def __init__(self, host, name, username=None, password=None): + """\ + @param host: hostname of RDP server host + @type host: C{unicode} + @param name: session profile name + @type name: C{unicode} + @param username: username to be used for login + @type username: C{unicode} + @param password: password to be used for login + @type password: C{unicode} + + """ + self.URL = unicode(host) + self.Name = unicode(name) + self.Protocol = u'freerdp' + self.DomainRequired = unicode(True) + self.Username = unicode(username) + self.Password = unicode(password) + + def set_domain(self, domain): + """\ + Set the domain for this RDP server. + + @param domain: the domain name to be set + @type domain: C{unicode} + + @raise TypeError: domain has to be C{str} or C{unicode} + + """ + if isinstance(domainName, str): + self.WindowsDomain = unicode(domain) + elif isinstance(domainName, unicode): + self.WindowsDomain = domain + else: + raise TypeError("set_domain() expects a string or unicode argument") + + def toJson(self): + """\ + Dump this instance as JSON object. + + """ + return json.dumps(self, default=convert_to_builtin_type) + + +class ICAServer(): + """\ + Instantiate a UCCS compatible ICA server session profile object. + + """ + def __init__(self, host, name, username=None, password=None): + """\ + @param host: hostname of ICA server host + @type host: C{unicode} + @param name: session profile name + @type name: C{unicode} + @param username: username to be used for login + @type username: C{unicode} + @param password: password to be used for login + @type password: C{unicode} + + """ + self.URL = unicode(host) + self.Name = unicode(name) + self.Protocol = u'ica' + self.DomainRequired = unicode(True) + self.Username = unicode(username) + self.Password = unicode(password) + + def set_domain(self, domain): + """\ + Set the domain for this ICA server. + + @param domain: the domain name to be set + @type domain: C{unicode} + + @raise TypeError: domain has to be C{str} or C{unicode} + + """ + if isinstance(domainName, str): + self.WindowsDomain = unicode(domain) + elif isinstance(domainName, unicode): + self.WindowsDomain = domain + else: + raise TypeError("set_domain() expects a string or unicode argument") + + def toJson(self): + """\ + Dump this instance as JSON object. + + """ + return json.dumps(self, default=convert_to_builtin_type) + + +class X2GoServer(): + """\ + Instantiate a UCCS compatible X2Go Server session profile object. + + """ + def __init__(self, host, name, username=None, password=None): + """\ + @param host: hostname of X2Go Server host + @type host: C{unicode} + @param name: session profile name + @type name: C{unicode} + @param username: username to be used for login + @type username: C{unicode} + @param password: password to be used for login + @type password: C{unicode} + + """ + self.URL = host + self.Name = name + self.Protocol = 'x2go' + self.SessionTypeRequired = True + self.Username = username + self.Password = password + + def set_session_type(self, session_type): + """\ + Set the session type to be used with this X2Go Server. + + @param session_type: the session type to be set + @type session_type: C{unicode} + + @raise TypeError: session_type has to be C{str} or C{unicode} + + """ + if isinstance(domainName, str): + self.SessionType = sessiontypeName + else: + raise TypeError("set_session_type() expects a string or unicode argument") + + def toJson(self): + """\ + Dump this instance as JSON object. + + """ + return json.dumps(self, default=convert_to_builtin_type) + diff --git a/x2gobroker/web/uccs.py b/x2gobroker/web/uccs.py index be63096..6078383 100644 --- a/x2gobroker/web/uccs.py +++ b/x2gobroker/web/uccs.py @@ -29,84 +29,7 @@ from tornado.escape import native_str, parse_qs_bytes 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) - +import x2gobroker.uccsjson class X2GoBrokerWeb(tornado.web.RequestHandler): @@ -161,6 +84,7 @@ class X2GoBrokerWeb(tornado.web.RequestHandler): logger_error.error('client could not provide an IP address, pretending: 404 Not Found') raise tornado.web.HTTPError(404) + username = 'foo' #username = self.get_argument('user', default='') #password = self.get_argument('password', default='') #cookie = self.get_argument('cookie', default='') @@ -179,20 +103,21 @@ class X2GoBrokerWeb(tornado.web.RequestHandler): profiles = broker_backend.list_profiles(username) if profiles: - ms = ManagementServer('http://localhost:8080/uccs/{backend}'.format(backend=backend), 'X2Go Session Broker') + ms = x2gobroker.uccsjson.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']: + print profiles[profile_id] + if profiles[profile_id][u'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'] + ts = x2gobroker.uccsjson.X2GoServer( + host='{hostname}:{port}'.format(hostname=profiles[profile_id][u'host'], port=profiles[profile_id][u'sshport']), + name=profiles[profile_id][u'name'], + username=profiles[profile_id][u'user'], ) ms.add_terminal(ts) 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: 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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits