x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

x2goclient.git - master (branch) updated: 3.99.3.0-10-g76b7b5b
by git-admin＠x2go.org 29 Nov '12

29 Nov '12

The branch, master has been updated via 76b7b5bbc335e23ad7bb22847af4d82579bf8b93 (commit) via a6226808a2a7063e52dfaf922f8d8f69c2e7450d (commit) from ff0b4c63ad7cfb3a1e3c51470c5f76d8dd5a4497 (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 76b7b5bbc335e23ad7bb22847af4d82579bf8b93 Author: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de> Date: Thu Nov 29 14:56:12 2012 +0100 fixed displaying ssh proxy box in session settings if sessions type changed commit a6226808a2a7063e52dfaf922f8d8f69c2e7450d Author: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de> Date: Thu Nov 29 14:46:17 2012 +0100 add support for pgp cards in broker mode ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ httpbrokerclient.cpp | 26 ++++++++++++++++++-------- onmainwindow.cpp | 17 ++++++++++++++++- onmainwindow.h | 8 ++++++++ sessionwidget.cpp | 2 +- 5 files changed, 45 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c2b59f2..eb45f48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ x2goclient (3.99.3.1-0~x2go1) UNRELEASED; urgency=low * New upstream version (3.99.3.1): - Translation files updated. - Russian translation updated. + * add support for pgp cards in broker mode + * fixed displaying ssh proxy box in session settings if sessions type changed [ Ricardo Diaz ] * New upstream version (3.99.3.1): diff --git a/httpbrokerclient.cpp b/httpbrokerclient.cpp index ca4bbec..3788600 100644 --- a/httpbrokerclient.cpp +++ b/httpbrokerclient.cpp @@ -82,7 +82,6 @@ void HttpBrokerClient::createSshConnection() connect ( sshConnection, SIGNAL ( connectionError(QString,QString)), this, SLOT ( slotSshConnectionError ( QString,QString ) ) ); sshConnection->start(); - } void HttpBrokerClient::slotSshConnectionError(QString message, QString lastSessionError) @@ -214,13 +213,16 @@ void HttpBrokerClient::slotSshUserAuthError(QString error) void HttpBrokerClient::getUserSessions() { + QString brokerUser=config->brokerUser; + if(mainWindow->getUsePGPCard()) + brokerUser=mainWindow->getCardLogin(); config->sessiondata=QString::null; if(!sshBroker) { QString req; QTextStream ( &req ) << "task=listsessions&"<< - "user="<<config->brokerUser<<"&"<< + "user="<<brokerUser<<"&"<< "password="<<config->brokerPass<<"&"<< "authid="<<config->brokerUserId; QUrl lurl ( config->brokerurl ); @@ -235,20 +237,24 @@ void HttpBrokerClient::getUserSessions() createSshConnection(); return; } - sshConnection->executeCommand ( config->sshBrokerBin+" --authid "+config->brokerUserId+ " --task listsessions", + sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --authid "+config->brokerUserId+ " --task listsessions", this, SLOT ( slotListSessions ( bool, QString,int ) )); } } void HttpBrokerClient::selectUserSession(const QString& session) { + QString brokerUser=config->brokerUser; + if(mainWindow->getUsePGPCard()) + brokerUser=mainWindow->getCardLogin(); + if(!sshBroker) { QString req; QTextStream ( &req ) << "task=selectsession&"<< "sid="<<session<<"&"<< - "user="<<config->brokerUser<<"&"<< + "user="<<brokerUser<<"&"<< "password="<<config->brokerPass<<"&"<< "authid="<<config->brokerUserId; QUrl lurl ( config->brokerurl ); @@ -258,7 +264,7 @@ void HttpBrokerClient::selectUserSession(const QString& session) } else { - sshConnection->executeCommand ( config->sshBrokerBin+" --authid "+config->brokerUserId+ " --task selectsession --sid "+session, + sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --authid "+config->brokerUserId+ " --task selectsession --sid "+session, this,SLOT ( slotSelectSession(bool,QString,int))); } @@ -267,13 +273,17 @@ void HttpBrokerClient::selectUserSession(const QString& session) void HttpBrokerClient::changePassword(QString newPass) { newBrokerPass=newPass; + QString brokerUser=config->brokerUser; + if(mainWindow->getUsePGPCard()) + brokerUser=mainWindow->getCardLogin(); + if(!sshBroker) { QString req; QTextStream ( &req ) << "task=setpass&"<< "newpass="<<newPass<<"&"<< - "user="<<config->brokerUser<<"&"<< + "user="<<brokerUser<<"&"<< "password="<<config->brokerPass<<"&"<< "authid="<<config->brokerUserId; QUrl lurl ( config->brokerurl ); @@ -283,8 +293,8 @@ void HttpBrokerClient::changePassword(QString newPass) } else { - sshConnection->executeCommand ( config->sshBrokerBin+" --authid "+config->brokerUserId+ " --task setpass --newpass "+newPass, this, - SLOT ( slotPassChanged(bool,QString,int))); + sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --authid "+config->brokerUserId+ " --task setpass --newpass "+newPass, this, + SLOT ( slotPassChanged(bool,QString,int))); } } diff --git a/onmainwindow.cpp b/onmainwindow.cpp index bdd8a55..76f8ba9 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -2147,6 +2147,15 @@ void ONMainWindow::slotReadSessions() SLOT ( slotUnameChanged ( const QString& ) ) ); connect ( uname,SIGNAL ( textEdited ( const QString& ) ),this, SLOT ( slotSnameChanged ( const QString& ) ) ); + + if(usePGPCard &&brokerMode&&cardReady) + { + if(sessions.count()==1) + { + slotSelectedFromList(sessions[0]); + } + } + if ( !defaultSession&& startHidden ) { startHidden=false; @@ -7873,6 +7882,10 @@ void ONMainWindow::slotGpgAgentFinished ( int , QProcess::ExitStatus ) QString sshout ( sshadd.readAllStandardOutput() ); sshout=sshout.simplified(); x2goDebug<<"SSH-ADD out:"<<sshout<<endl; + if(brokerMode) + { + broker->getUserSessions(); + } } else { @@ -7890,6 +7903,7 @@ void ONMainWindow::slotGpgAgentFinished ( int , QProcess::ExitStatus ) x2goDebug<<"SSH-ADD out:"<<sshout<<endl; return; } + if ( passForm->isVisible() ) slotClosePass(); uname->setText ( cardLogin ); @@ -10807,7 +10821,8 @@ void ONMainWindow::slotStartBroker() setStatStatus ( tr ( "Connecting to broker" ) ); stInfo->insertPlainText ( "broker url: "+config.brokerurl ); setEnabled ( false ); - broker->getUserSessions(); + if(!usePGPCard) + broker->getUserSessions(); } void ONMainWindow::slotGetBrokerSession() diff --git a/onmainwindow.h b/onmainwindow.h index ae8ac77..7c1b2a5 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -381,6 +381,14 @@ public: { return config.showextconfig; } + bool getUsePGPCard() + { + return usePGPCard; + } + QString getCardLogin() + { + return cardLogin; + } QString getDefaultCmd() { return defaultCmd; diff --git a/sessionwidget.cpp b/sessionwidget.cpp index 4da9bcd..715c332 100644 --- a/sessionwidget.cpp +++ b/sessionwidget.cpp @@ -350,7 +350,7 @@ void SessionWidget::slot_rdpDirectClicked() rdpPort->setVisible(isDirectRDP); cbProxy->setVisible(!isDirectRDP); - proxyBox->setVisible(!isDirectRDP); + proxyBox->setVisible(!isDirectRDP && cbProxy->isChecked()); if (isDirectRDP) { 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: e4c48da663e47c7fa1afc0892effdb871c93d027
by git-admin＠x2go.org 29 Nov '12

29 Nov '12

The branch, master has been updated via e4c48da663e47c7fa1afc0892effdb871c93d027 (commit) via bd1f9e0e3e0f14d7d98c537ef3bfeb19b025a9e5 (commit) from 57030875e10c269c360ac2b1c1623b9f427d6714 (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 e4c48da663e47c7fa1afc0892effdb871c93d027 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Nov 29 12:45:42 2012 +0100 first draft of packaging the Python approach of x2gobroker.git commit bd1f9e0e3e0f14d7d98c537ef3bfeb19b025a9e5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Nov 29 10:13:57 2012 +0100 migrate Perl-based code into a Python-based solution using web.py ----------------------------------------------------------------------- Summary of changes: Makefile | 4 +- Makefile.PL | 9 - NEWS | 12 + README | 8 + README.dangerous-piece-of-code | 11 - TODO | 7 + X2Go/Broker.pm | 60 -- X2Go/Broker/Common.pm | 49 -- X2Go/Broker/LDAP.pm | 633 -------------------- X2Go/Broker/Simple.pm | 633 -------------------- X2Go/Broker/ZeroConf.pm | 184 ------ cgi/x2gobroker.cgi | 97 --- debian/changelog | 11 +- debian/control | 101 ++-- debian/copyright | 10 +- ...x2gobroker-ldap.dirs => python-x2gobroker.dirs} | 1 + ...gobroker-common.docs => python-x2gobroker.docs} | 0 debian/python-x2gobroker.install | 3 + debian/rules | 8 +- debian/x2gobroker-agent.dirs | 1 - .../x2gobroker-cgi.install | 0 debian/x2gobroker-common.dirs | 2 - debian/x2gobroker-common.install | 1 - debian/x2gobroker-daemon.default | 4 + debian/x2gobroker-daemon.init | 72 +++ debian/x2gobroker-ldap.docs | 3 - debian/x2gobroker-ldap.install | 1 - debian/x2gobroker-ldap.links | 1 - debian/x2gobroker-simple.dirs | 1 - debian/x2gobroker-simple.docs | 3 - debian/x2gobroker-simple.install | 1 - debian/x2gobroker-simple.links | 1 - debian/x2gobroker-zeroconf.dirs | 1 - debian/x2gobroker-zeroconf.docs | 3 - debian/x2gobroker-zeroconf.links | 1 - debian/x2gobroker.install | 1 + debian/x2gobroker.pam | 2 - etc/{x2gobroker-ldap.cfg => x2gobroker.conf} | 7 + lib/x2gobroker-agent.pl | 28 +- pam/x2gobroker | 2 + sbin/x2gobroker | 152 +++++ etc/x2gobroker-ldap.cfg => setup.py | 27 +- etc/x2gobroker-ldap.cfg => x2gobroker/__init__.py | 13 +- x2gobroker/base.py | 157 +++++ etc/x2gobroker-ldap.cfg => x2gobroker/ldap.py | 35 +- etc/x2gobroker-ldap.cfg => x2gobroker/simple.py | 35 +- x2gobroker/zeroconf.py | 56 ++ 47 files changed, 627 insertions(+), 1825 deletions(-) delete mode 100644 Makefile.PL delete mode 100644 README.dangerous-piece-of-code delete mode 100644 X2Go/Broker.pm delete mode 100644 X2Go/Broker/Common.pm delete mode 100644 X2Go/Broker/LDAP.pm delete mode 100644 X2Go/Broker/Simple.pm delete mode 100644 X2Go/Broker/ZeroConf.pm delete mode 100755 cgi/x2gobroker.cgi rename debian/{x2gobroker-ldap.dirs => python-x2gobroker.dirs} (50%) rename debian/{x2gobroker-common.docs => python-x2gobroker.docs} (100%) create mode 100644 debian/python-x2gobroker.install delete mode 100644 debian/x2gobroker-agent.dirs rename etc/x2gobroker-simple.cfg => debian/x2gobroker-cgi.install (100%) delete mode 100644 debian/x2gobroker-common.dirs delete mode 100644 debian/x2gobroker-common.install create mode 100644 debian/x2gobroker-daemon.default create mode 100644 debian/x2gobroker-daemon.init delete mode 100644 debian/x2gobroker-ldap.docs delete mode 100644 debian/x2gobroker-ldap.install delete mode 100644 debian/x2gobroker-ldap.links delete mode 100644 debian/x2gobroker-simple.dirs delete mode 100644 debian/x2gobroker-simple.docs delete mode 100644 debian/x2gobroker-simple.install delete mode 100644 debian/x2gobroker-simple.links delete mode 100644 debian/x2gobroker-zeroconf.dirs delete mode 100644 debian/x2gobroker-zeroconf.docs delete mode 100644 debian/x2gobroker-zeroconf.links create mode 100644 debian/x2gobroker.install delete mode 100644 debian/x2gobroker.pam copy etc/{x2gobroker-ldap.cfg => x2gobroker.conf} (95%) create mode 100644 pam/x2gobroker create mode 100755 sbin/x2gobroker copy etc/x2gobroker-ldap.cfg => setup.py (59%) mode change 100644 => 100755 copy etc/x2gobroker-ldap.cfg => x2gobroker/__init__.py (69%) create mode 100644 x2gobroker/base.py copy etc/x2gobroker-ldap.cfg => x2gobroker/ldap.py (59%) rename etc/x2gobroker-ldap.cfg => x2gobroker/simple.py (59%) create mode 100644 x2gobroker/zeroconf.py The diff of changes is: diff --git a/Makefile b/Makefile index 0cf6a8b..3a68e40 100755 --- a/Makefile +++ b/Makefile @@ -55,8 +55,8 @@ build_setuidwrappers: gcc -fPIE -pie -o lib/x2gobroker-agent src/x2gobroker-agent.c build-indep: - $(PERL) Makefile.PL INSTALLDIRS=vendor - $(MAKE) -f Makefile.perl +# $(PERL) Makefile.PL INSTALLDIRS=vendor +# $(MAKE) -f Makefile.perl distclean: clean diff --git a/Makefile.PL b/Makefile.PL deleted file mode 100644 index 1b63b56..0000000 --- a/Makefile.PL +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/perl - -use ExtUtils::MakeMaker; - -WriteMakefile(FIRST_MAKEFILE => 'Makefile.perl', - PMLIBDIRS => ['X2Go'], - NAME => '', - VERSION => '0.0.0.1', - ); diff --git a/NEWS b/NEWS index e69de29..37d39b4 100644 --- a/NEWS +++ b/NEWS @@ -0,0 +1,12 @@ +NEWS on X2Go Session Broker +=========================== + +X2Go Session Broker is a Web project that provides +session brokerage for X2Go via HTTP(S). + +The framework was originally designed in Perl and his +been rewritten in Python using the web.py framework +in 2012/2013. + +light+love, +Mike Gabriel, 20121129 \ No newline at end of file diff --git a/README b/README index e69de29..763a825 100644 --- a/README +++ b/README @@ -0,0 +1,8 @@ +README for X2Go Session Broker +============================== + +X2Go Session Broker is a Web project that provides +session brokerage for X2Go via HTTP(S). + +light+love, +Mike Gabriel, 20121129 \ No newline at end of file diff --git a/README.dangerous-piece-of-code b/README.dangerous-piece-of-code deleted file mode 100644 index 0909f32..0000000 --- a/README.dangerous-piece-of-code +++ /dev/null @@ -1,11 +0,0 @@ -X2Go subproject: X2Go Session Broker (x2gobroker.git) ------------------------------------------------------ - -Whoever takes a look at this piece of code... - -It is currently a quite dangerous piece of software and not at all usable. - -Please stay away from it. - -light+love, 20120916 -Mike Gabriel diff --git a/TODO b/TODO index e69de29..4787426 100644 --- a/TODO +++ b/TODO @@ -0,0 +1,7 @@ +TODO list for X2Go Session Broker +================================= + +Plenty of work in the loop... + +light+love, +Mike Gabriel, 20121129 \ No newline at end of file diff --git a/X2Go/Broker.pm b/X2Go/Broker.pm deleted file mode 100644 index 62d0da0..0000000 --- a/X2Go/Broker.pm +++ /dev/null @@ -1,60 +0,0 @@ -# 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. - -package X2Go::Broker; - -=head1 NAME - -X2Go::Broker - X2GO Session Broker modules for Perl - -=head1 DESCRIPTION - -An X2Go Session Broker allows to manage X2Go server farms TTW (using -https protocol). - -=head1 VERSION - -Version 0.0.0.1 - -=head1 AUTHOR - -Oleksandr Shneyder, C<< <oleksandr.shneyder at obviously-nice.de> >> - -Mike Gabriel, C<< <mike.gabriel at das-netzwerkteam.de> >> - -=head1 LICENSE AND COPYRIGHT - -Copyright 2011-2012, Oleksandr Shneyder, C<< <oleksandr.shneyder at obviously-nice.de> >> - -Copyright 2012, Mike Gabriel, C<< <mike.gabriel at das-netzwerkteam.de> >> - -This program is free software; you can redistribute it and/or modify it -under the terms of the AGPL-3+ license. - -=cut - -use strict; - -### for debugging purposes... -#use Data::Dumper; - -use base 'Exporter'; -our @EXPORT = ( ); - diff --git a/X2Go/Broker/Common.pm b/X2Go/Broker/Common.pm deleted file mode 100644 index f480082..0000000 --- a/X2Go/Broker/Common.pm +++ /dev/null @@ -1,49 +0,0 @@ -# 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. - -package X2Go::Broker::Common; - -use strict; - -### for debugging purposes... -#use Data::Dumper; - -use base 'Exporter'; -our @EXPORT = ('ExecBrokerAgent', ); - -### -### public functions -### - -sub ExecBrokerAgent -{ - my ($user, $hostname, $cmd)=@_; - my $res=`ssh -o ConnectTimeout=15 -o UserKnownHostsFile=/etc/x2go/x2gobroker/ts_known_hosts x2gobroker\@$hostname -i /etc/x2go/x2gobroker/id_x2gobroker_dsa \"/usr/lib/x2go/x2gobroker-agent $user $cmd 2>/dev/null\"`; - my @rarr=split("\n",$res); - my $stat; - if( @rarr[0] eq 'OK' ) - { - $stat=1; - } else { - $stat=0; - } - shift(@rarr); - return($stat,join("\n",@rarr)); -} diff --git a/X2Go/Broker/LDAP.pm b/X2Go/Broker/LDAP.pm deleted file mode 100644 index d05d63f..0000000 --- a/X2Go/Broker/LDAP.pm +++ /dev/null @@ -1,633 +0,0 @@ -# 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. - -package x2gobroker-ldap; - -use strict; -use Net::LDAP; -use Config::Simple; -use Crypt::SaltedHash; -use MIME::Base64; -use Data::Dumper; - - -my $cfg=new Config::Simple(syntax=>'ini'); -$cfg->read("/etc/x2go/x2gobroker-ldap.cfg"); -my $ldapuri=$cfg->param('ldapuri'); -my $replica=$cfg->param('replica'); -my $binddn=$cfg->param('binddn'); -my $bindpw=$cfg->param('bindpw'); - -use base 'Exporter'; -our @EXPORT = ('checkAccess', 'listSessions', 'selectSession', 'setPass'); - -sub getBase -### -### FIXME: provide that in /etc/x2go/x2gobroker-ldap.cfg -### FIXME: put the pid of this process in the lock files -{ - my $login=shift; - $login=~s/cn=ldapadmin,//; - return $login; -} - -sub initLdap -### -### FIXME: lock files have to be in /run or /var/run... -### -{ - my $masterlocked=0; - my $replicalocked=0; - if ( ( -e "/etc/x2go/x2gobroker/masterldap.lock") && ( -e "/etc/x2go/x2gobroker/replicaldap.lock" ) ) - { - die "Can't connect to LDAP server"; - } - if ( -e "/etc/x2go/x2gobroker/replicaldap.lock" ) - { - $masterlocked=1; - my ($ldap,$error)=initLDAPServer( $ldapuri ); - if( ! $ldap ) - { - `touch /etc/x2go/x2gobroker/masterldap.lock`; - die "Can't connect to LDAP server"; - } - return $ldap; - } - if( -e "/etc/x2go/x2gobroker/masterldap.lock" ) - { - $replicalocked=1; - my ($ldap,$error)=initLDAPServer( $replica ); - if ( ! $ldap ) - { - `touch /etc/x2go/x2gobroker/replicaldap.lock`; - die "Can't connect to LDAP server"; - } - return $ldap; - } - if( ! int(rand(2)) ) - { - my ($ldap,$error)=initLDAPServer( $ldapuri ); - if( ! $ldap ) - { - `touch /etc/x2go/x2gobroker/masterldap.lock`; - return initLdap(); - } - return $ldap; - } else { - my ($ldap,$error)=initLDAPServer( $replica ); - if(!$ldap) - { - `touch /etc/x2go/x2gobroker/replicaldap.lock`; - return initLdap(); - } - return $ldap; - } -} - -sub initMasterLdap -{ - if(-e "/etc/x2go/x2gobroker/masterldap.lock") - { - die "Master LDAP server is down\n"; - } - my ($ldap,$error)=initLDAPServer( $ldapuri ); - if( ! $ldap ) - { - `touch /etc/x2go/x2gobroker/masterldap.lock`; - die $error; - } - return $ldap; -} - -sub initLDAPServer -{ - my $url=shift; - my $ldap=Net::LDAP->new( $url ); - if( ! $ldap ) - { - notify("LDAP server $url is down ($@). Please, repair it and remove lock file in /etc/x2go/x2gobroker\n"); - return (0,"$@"); - } - my $message = $ldap->bind($binddn,password=>$bindpw); - if(!$message) - { - notify("LDAP server $url is down ($@). Please, repair it and remove lock file in /etc/x2go/x2gobroker\n"); - return (0,"$@"); - } - return ($ldap,0); -} - -sub setPass -{ - my ($user, $newpass)=@_; - # check if we have master ldap here - - my $attr; - - my $csh=Crypt::SaltedHash->new(algorithm => 'SHA-1'); - $csh->add($newpass); - $newpass=$csh->generate; - - push(@$attr,'userPassword'=>$newpass); - my $changes; - push(@$changes,'replace'=>$attr); - - my $ldap = initMasterLdap(); - - my $dn="cn=$user,ou=BrokerUsers".getBase($binddn); - my $message=$ldap->modify($dn, changes => $changes); - - if($message->code) - { - die $message->error.": ".$message->error_desc; - } - print "\n CHANGING PASS OK \n"; -} - -sub selectSession -{ - my ($user, $sid)=@_; - my @words=split("\@",$sid); - my $sess_id=@words[1]; - my $host=@words[0]; - checkAndStartSession($user, $host, $sess_id); -} - -sub getExtCon -{ - my $host=shift; - - my $ldap = initLdap(); - - my $dn="cn=$host,ou=Servers,ou=ON".getBase($binddn); - #### - #### FIXME: get scope from config file in /etc/x2go/x2gobroker-*.conf - #### - my $message=$ldap->search(base => $dn, - scope => 'base', - filter => '(objectClass=ipHost)' - ); - - if($message->code) - { - die $message->error.": ".$message->error_desc; - } - foreach ($message->entries) - { - my $asn=$_->{'asn'}; - my $attr=$asn->{'attributes'}; - foreach (@$attr) - { - my $type=$_->{'type'}; - my $value=$_->{'vals'}[0]; - if( $type eq 'description' ) - { - my @words=split(":",$value); - return (@words[0], @words[1]); - } - } - } -} - -sub checkAndStartSession -{ - my ($uid,$host,$sid)=@_; - my ($status,$sessions)=check_ts($host,$uid); - if(!$status) - { - print "ERROR check TS\n"; - return; - } - my $running=0; - if( $sessions ) - { - my @sinfo=split("\\|",$sessions); - my $sess_stat=@sinfo[4]; - my $sess_srv=@sinfo[3]; - $sid=@sinfo[1]; - if( $sess_stat eq 'R' ) - { - $running=1; - my $str; - ($status,$str)=remoteBroker($host,$uid,"suspend $sid"); - $sessions=~s/\|R\|/\|S\|/; - } - if( $sess_stat eq 'S' ) - { - $running=1; - } - } - - my($ip,$port)=getExtCon($host); - print "SERVER:$ip:$port\n"; - if($running) - { - print "SESSION_INFO:".(split("\n",$sessions))[0]."\n"; - } -} - -sub checkRunningSession -{ - my ($sess_srv, $sess_stat, $server_dn, $uid, $sid, $ldap)=@_; - my @dn_el=split(',',$server_dn); - shift(@dn_el); - shift(@dn_el); - my $node_dn="cn=".$sess_srv.",ou=Hosts,".join(',',@dn_el); - #### - #### FIXME: get scope from config file in /etc/x2go/x2gobroker-*.conf - #### - my $mesg=$ldap->search(base => $node_dn, - scope => 'base', - filter => '(objectClass=X2GoServerNode)' - ); - if(!$mesg->code) - { - my @entries=$mesg->entries(); - if(@entries[0]->get_value('serverStatus') eq 'TRUE') - { - my $node_ref={}; - $node_ref->{'ip'}=@entries[0]->get_value('ipHostNumber'); - $node_ref->{'dn'}=$node_dn; - my $status; - my $str; - if( $sess_stat eq 'R' ) - { - print "session running, suspend session $sid\n"; - ($status,$str)=remoteBroker($node_ref->{'ip'},$uid,"suspend $sid",$node_ref->{'dn'}, $ldap); - } else { - print "session not running, ping node\n"; - ($status,$str)=remoteBroker($node_ref->{'ip'},$uid,'ping',$node_ref->{'dn'}, $ldap); - } - if($status) - { - return $node_ref; - } - print "error executing remote broker \n"; - } - print "node is down \n"; - return 0; - } - print "error searching $node_dn: ".$mesg->error."\n"; - return 0; -} - -sub startNewSession -{ - my ($dn, $ldap, $uid)=@_; - #### - #### FIXME: get scope from config file in /etc/x2go/x2gobroker-*.conf - #### - my $mesg=$ldap->search(base => $dn, - scope => 'base', - filter => '(objectClass=X2GoServer)' - ); - - if($mesg->code) - { - return 0; - } - - my @entries=$mesg->entries(); - my $ref = @entries[0]->get_value ( 'serverNode', asref => 1 ); - my $nodes; - foreach(@$ref) - { - my $server=$_; - my @sdn=split(",",$dn); - shift(@sdn); - shift(@sdn); - my $server_dn="cn=$server,ou=Hosts,".join(",",@sdn); - - my $mesg=$ldap->search(base => $server_dn, - scope => 'base', - filter => '(objectClass=X2GoServerNode)' - ); - if( ! $mesg->code ) - { - my @entries=$mesg->entries(); - if(@entries[0]->get_value('serverStatus') eq 'TRUE') - { - my $node_ref={}; - $node_ref->{'ip'}=@entries[0]->get_value('ipHostNumber'); - $node_ref->{'sessions'}=0; - $node_ref->{'dn'}=$server_dn; - $nodes->{$server}=$node_ref; - } - } - } - return findBestServer($nodes,$ldap, $uid); -} - -sub findBestServer -{ - my ($nodes, $ldap, $user)=@_; - my $servers; - my $status; - while( my ($key,$value) = each(%$nodes)) - { - if( ! $status ) - { - my $ip=$value->{'ip'}; - my $dn=$value->{'dn'}; - ($status,$servers)=remoteBroker($ip,$user,'getservers',$dn, $ldap); - if(!$status) - { - delete $nodes->{$key}; - } - } - } - if( ! $status ) - { - return 0; - } - my @srvlines=split("\n",$servers); - foreach(@srvlines) - { - my @words=split(' ',$_); - my $ref=$nodes->{@words[0]}; - if( $ref ) - { - $ref->{'sessions'}=1*@words[1]; - } - } - return checkServers($nodes, $ldap, $user); -} - -sub checkServers -{ - my ($nodes, $ldap, $user)=@_; - my $bestnode=0; - my $bestnodekey; - my $key; - my $value; - while( ($key,$value) = each(%$nodes)) - { - if(! $bestnode) - { - $bestnode=$value; - $bestnodekey=$key; - } else { - if($value->{'sessions'}<$bestnode->{'sessions'}) - { - $bestnode=$value; - $bestnodekey=$key; - } - } - } - if( ! $bestnode ) - { - print "bestnode is null: \n"; - return 0; - } else { - my $ip=$bestnode->{'ip'}; - my $dn=$bestnode->{'dn'}; - my ($status,$fakearr)=remoteBroker($ip,$user,'ping',$dn, $ldap); - if( ! $status ) - { - delete $nodes->{$bestnodekey}; - return checkServers($nodes, $ldap, $user); - } else { - return $bestnode; - } - } -} - - -sub check_ts -{ - my ($host, $user)=@_; - my $server_dn; - my $ldap; - my($status,$sessions)=getSessionRunning($server_dn, $host, $user, $ldap); - if( $status ) - { - return (1,$sessions); - } - return (0,0); -} - -sub getSessionRunning -{ - my ($dn,$ip,$user, $ldap)=@_; - my ($status,$sessions)=remoteBroker($ip,$user,'listsessions', $dn, $ldap); - if( ! $status ) - { - return (0,0); - } else { - return (1,$sessions); - } -} - -sub remoteBroker -{ - my ($ip, $user, $cmd, $dn, $ldap)=@_; - my $res=`ssh -o ConnectTimeout=15 -o UserKnownHostsFile=/etc/x2go/x2gobroker/ts_known_hosts x2gobroker\@$ip -i /etc/x2go/x2gobroker/id_x2gobroker_dsa \"/usr/lib/x2go/broker/x2gobroker-command $user $cmd 2>/dev/null\"`; - my @rarr=split("\n",$res); - my $stat; - if(@rarr[0] eq 'OK') - { - $stat=1; - } else { - $stat=0; - # setNodeDown($dn, $ldap, $cmd, $user); - } - shift(@rarr); - return($stat,join("\n",@rarr)); -} - -sub notify -{ - my $message=shift; - open (F,">>/tmp/x2gobroker.log"); - print F `date`.$message."\n"; - close(F); -} - -sub setNodeDown -{ - my($dn, $ldap, $cmd, $user)=@_; - my $attr; - push(@$attr,'serverStatus' => 'FALSE'); - my $changes; - push (@$changes, 'replace' => $attr); - $ldap->modify($dn,changes => $changes); - notify ("set status of $dn to \"down\", failed command: \"$cmd\", user: \"$user\"\n"); -} - -sub setServerDown -{ - my($dn, $ldap)=@_; - my $attr; - push(@$attr,'serverStatus' => 'FALSE'); - my $changes; - push (@$changes, 'replace' => $attr); - $ldap->modify($dn,changes => $changes); - notify ("set status of $dn to \"down\", all nodes are down\n"); -} - -sub checkAccess -{ - my ($user,$pass)=@_; - - my $ldap = initLdap(); - - my $dn="uid=$user,ou=People".getBase($binddn); - my $mesg=$ldap->search(base => $dn, - scope => 'base', - filter => '(objectClass=posixAccount)' - ); - - if( $mesg->code ) - { - return 0; - } - - my @entries=$mesg->entries(); - my $crypted=@entries[0]->get_value('userPassword'); - $mesg = $ldap->unbind; - if ( Crypt::SaltedHash->validate($crypted, $pass) ) - { - return 1; - } - return 0; -} - -sub listSessions -{ - my $user=shift; - - my $ldap = initLdap(); - - my $dn="ou=Servers,ou=ON".getBase($binddn); - my $message=$ldap->search(base => $dn, - scope => 'sub', - filter => '(objectClass=ipHost)' - ); - - if($message->code) - { - die $message->error.": ".$message->error_desc; - } - # print Dumper($message->entries); - print "START_USER_SESSIONS "; - foreach ($message->entries) - { - my $asn=$_->{'asn'}; - my $attr=$asn->{'attributes'}; - my $host; - my $int_ip; - my $ext_ip; - my $ext_port; - foreach (@$attr) - { - my $type=$_->{'type'}; - my $value=$_->{'vals'}[0]; - if( $type eq 'cn' ) - { - $host=$value; - } - } - my($status,$sessions)=getSessionRunning($dn,$host,$user, $ldap); - if($status) - { - my $sess_srv; - if($sessions) - { - my @sinfo=split("\\|",$sessions); - my $sess_stat=@sinfo[4]; - $sess_srv=@sinfo[3]; - my $sid=@sinfo[1]; - print " [$host\@$sid] "; - print "status=$sess_stat "; - #get ip - #get port - } else { - my $sessions; - ($sess_srv,$ext_ip,$ext_port, $sessions)=getBestNode($dn, $ldap, $user, $host, $message); - print " [$host] "; - } - #print "host=$ext_ip "; - print "user=$user "; - #print "sshport=$ext_port "; - print "name=Stadt Treuchtlingen "; - goto loop_end; - } - } - loop_end: - print "END_USER_SESSIONS "; - $ldap->unbind(); -} - -sub getBestNode -{ - my ($dn, $ldap, $user, $ip, $message)=@_; - my $servers; - my $status; - ($status,$servers)=remoteBroker($ip,$user,'getservers',$dn, $ldap); - my $srvref={}; - my @srvlines=split("\n",$servers); - foreach(@srvlines) - { - my @words=split(' ',$_); - $srvref->{@words[0]}=1*@words[1]; - } - my $bestval=-1; - my $bestsrv; - my $bestext_ip; - my $bestext_port; - foreach ($message->entries) - { - my $asn=$_->{'asn'}; - my $attr=$asn->{'attributes'}; - my $host; - my $ext_ip; - my $ext_port; - foreach (@$attr) - { - my $type=$_->{'type'}; - my $value=$_->{'vals'}[0]; - if( $type eq 'cn' ) - { - $host=$value; - } - if($type eq 'description') - { - my @words=split(":",$value); - $ext_ip=@words[0]; - $ext_port=@words[1]; - } - } - my $sess=$srvref->{$host}; - if( ! $sess ) - { - return($host, $ext_ip, $ext_port,0); - } - if($sess < $bestval || $bestval == -1) - { - $bestval=$sess; - $bestsrv=$host; - $bestext_ip=$ext_ip; - $bestext_port=$ext_port; - } - } - return($bestsrv, $bestext_ip, $bestext_port, $bestval); -} - -1; diff --git a/X2Go/Broker/Simple.pm b/X2Go/Broker/Simple.pm deleted file mode 100644 index 5e56c28..0000000 --- a/X2Go/Broker/Simple.pm +++ /dev/null @@ -1,633 +0,0 @@ -# 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. - -package x2gobroker-simple; - -use strict; -use Net::LDAP; -use Config::Simple; -use Crypt::SaltedHash; -use MIME::Base64; -use Data::Dumper; - - -my $cfg=new Config::Simple(syntax=>'ini'); -$cfg->read("/etc/x2go/x2gobroker-simple.cfg"); -my $ldapuri=$cfg->param('ldapuri'); -my $replica=$cfg->param('replica'); -my $binddn=$cfg->param('binddn'); -my $bindpw=$cfg->param('bindpw'); - -use base 'Exporter'; -our @EXPORT = ('checkAccess', 'listSessions', 'selectSession', 'setPass'); - -sub getBase -### -### FIXME: provide that in /etc/x2go/x2gobroker-simple.cfg -### FIXME: put the pid of this process in the lock files -{ - my $login=shift; - $login=~s/cn=ldapadmin,//; - return $login; -} - -sub initLdap -### -### FIXME: lock files have to be in /run or /var/run... -### -{ - my $masterlocked=0; - my $replicalocked=0; - if ( ( -e "/etc/x2go/x2gobroker/masterldap.lock") && ( -e "/etc/x2go/x2gobroker/replicaldap.lock" ) ) - { - die "Can't connect to LDAP server"; - } - if ( -e "/etc/x2go/x2gobroker/replicaldap.lock" ) - { - $masterlocked=1; - my ($ldap,$error)=initLDAPServer( $ldapuri ); - if( ! $ldap ) - { - `touch /etc/x2go/x2gobroker/masterldap.lock`; - die "Can't connect to LDAP server"; - } - return $ldap; - } - if( -e "/etc/x2go/x2gobroker/masterldap.lock" ) - { - $replicalocked=1; - my ($ldap,$error)=initLDAPServer( $replica ); - if ( ! $ldap ) - { - `touch /etc/x2go/x2gobroker/replicaldap.lock`; - die "Can't connect to LDAP server"; - } - return $ldap; - } - if( ! int(rand(2)) ) - { - my ($ldap,$error)=initLDAPServer( $ldapuri ); - if( ! $ldap ) - { - `touch /etc/x2go/x2gobroker/masterldap.lock`; - return initLdap(); - } - return $ldap; - } else { - my ($ldap,$error)=initLDAPServer( $replica ); - if(!$ldap) - { - `touch /etc/x2go/x2gobroker/replicaldap.lock`; - return initLdap(); - } - return $ldap; - } -} - -sub initMasterLdap -{ - if(-e "/etc/x2go/x2gobroker/masterldap.lock") - { - die "Master LDAP server is down\n"; - } - my ($ldap,$error)=initLDAPServer( $ldapuri ); - if( ! $ldap ) - { - `touch /etc/x2go/x2gobroker/masterldap.lock`; - die $error; - } - return $ldap; -} - -sub initLDAPServer -{ - my $url=shift; - my $ldap=Net::LDAP->new( $url ); - if( ! $ldap ) - { - notify("LDAP server $url is down ($@). Please, repair it and remove lock file in /etc/x2go/x2gobroker\n"); - return (0,"$@"); - } - my $message = $ldap->bind($binddn,password=>$bindpw); - if(!$message) - { - notify("LDAP server $url is down ($@). Please, repair it and remove lock file in /etc/x2go/x2gobroker\n"); - return (0,"$@"); - } - return ($ldap,0); -} - -sub setPass -{ - my ($user, $newpass)=@_; - # check if we have master ldap here - - my $attr; - - my $csh=Crypt::SaltedHash->new(algorithm => 'SHA-1'); - $csh->add($newpass); - $newpass=$csh->generate; - - push(@$attr,'userPassword'=>$newpass); - my $changes; - push(@$changes,'replace'=>$attr); - - my $ldap = initMasterLdap(); - - my $dn="cn=$user,ou=BrokerUsers".getBase($binddn); - my $message=$ldap->modify($dn, changes => $changes); - - if($message->code) - { - die $message->error.": ".$message->error_desc; - } - print "\n CHANGING PASS OK \n"; -} - -sub selectSession -{ - my ($user, $sid)=@_; - my @words=split("\@",$sid); - my $sess_id=@words[1]; - my $host=@words[0]; - checkAndStartSession($user, $host, $sess_id); -} - -sub getExtCon -{ - my $host=shift; - - my $ldap = initLdap(); - - my $dn="cn=$host,ou=Servers,ou=ON".getBase($binddn); - #### - #### FIXME: get scope from config file in /etc/x2go/x2gobroker-*.conf - #### - my $message=$ldap->search(base => $dn, - scope => 'base', - filter => '(objectClass=ipHost)' - ); - - if($message->code) - { - die $message->error.": ".$message->error_desc; - } - foreach ($message->entries) - { - my $asn=$_->{'asn'}; - my $attr=$asn->{'attributes'}; - foreach (@$attr) - { - my $type=$_->{'type'}; - my $value=$_->{'vals'}[0]; - if( $type eq 'description' ) - { - my @words=split(":",$value); - return (@words[0], @words[1]); - } - } - } -} - -sub checkAndStartSession -{ - my ($uid,$host,$sid)=@_; - my ($status,$sessions)=check_ts($host,$uid); - if(!$status) - { - print "ERROR check TS\n"; - return; - } - my $running=0; - if( $sessions ) - { - my @sinfo=split("\\|",$sessions); - my $sess_stat=@sinfo[4]; - my $sess_srv=@sinfo[3]; - $sid=@sinfo[1]; - if( $sess_stat eq 'R' ) - { - $running=1; - my $str; - ($status,$str)=remoteBroker($host,$uid,"suspend $sid"); - $sessions=~s/\|R\|/\|S\|/; - } - if( $sess_stat eq 'S' ) - { - $running=1; - } - } - - my($ip,$port)=getExtCon($host); - print "SERVER:$ip:$port\n"; - if($running) - { - print "SESSION_INFO:".(split("\n",$sessions))[0]."\n"; - } -} - -sub checkRunningSession -{ - my ($sess_srv, $sess_stat, $server_dn, $uid, $sid, $ldap)=@_; - my @dn_el=split(',',$server_dn); - shift(@dn_el); - shift(@dn_el); - my $node_dn="cn=".$sess_srv.",ou=Hosts,".join(',',@dn_el); - #### - #### FIXME: get scope from config file in /etc/x2go/x2gobroker-*.conf - #### - my $mesg=$ldap->search(base => $node_dn, - scope => 'base', - filter => '(objectClass=X2GoServerNode)' - ); - if(!$mesg->code) - { - my @entries=$mesg->entries(); - if(@entries[0]->get_value('serverStatus') eq 'TRUE') - { - my $node_ref={}; - $node_ref->{'ip'}=@entries[0]->get_value('ipHostNumber'); - $node_ref->{'dn'}=$node_dn; - my $status; - my $str; - if( $sess_stat eq 'R' ) - { - print "session running, suspend session $sid\n"; - ($status,$str)=remoteBroker($node_ref->{'ip'},$uid,"suspend $sid",$node_ref->{'dn'}, $ldap); - } else { - print "session not running, ping node\n"; - ($status,$str)=remoteBroker($node_ref->{'ip'},$uid,'ping',$node_ref->{'dn'}, $ldap); - } - if($status) - { - return $node_ref; - } - print "error executing remote broker \n"; - } - print "node is down \n"; - return 0; - } - print "error searching $node_dn: ".$mesg->error."\n"; - return 0; -} - -sub startNewSession -{ - my ($dn, $ldap, $uid)=@_; - #### - #### FIXME: get scope from config file in /etc/x2go/x2gobroker-*.conf - #### - my $mesg=$ldap->search(base => $dn, - scope => 'base', - filter => '(objectClass=X2GoServer)' - ); - - if($mesg->code) - { - return 0; - } - - my @entries=$mesg->entries(); - my $ref = @entries[0]->get_value ( 'serverNode', asref => 1 ); - my $nodes; - foreach(@$ref) - { - my $server=$_; - my @sdn=split(",",$dn); - shift(@sdn); - shift(@sdn); - my $server_dn="cn=$server,ou=Hosts,".join(",",@sdn); - - my $mesg=$ldap->search(base => $server_dn, - scope => 'base', - filter => '(objectClass=X2GoServerNode)' - ); - if( ! $mesg->code ) - { - my @entries=$mesg->entries(); - if(@entries[0]->get_value('serverStatus') eq 'TRUE') - { - my $node_ref={}; - $node_ref->{'ip'}=@entries[0]->get_value('ipHostNumber'); - $node_ref->{'sessions'}=0; - $node_ref->{'dn'}=$server_dn; - $nodes->{$server}=$node_ref; - } - } - } - return findBestServer($nodes,$ldap, $uid); -} - -sub findBestServer -{ - my ($nodes, $ldap, $user)=@_; - my $servers; - my $status; - while( my ($key,$value) = each(%$nodes)) - { - if( ! $status ) - { - my $ip=$value->{'ip'}; - my $dn=$value->{'dn'}; - ($status,$servers)=remoteBroker($ip,$user,'getservers',$dn, $ldap); - if(!$status) - { - delete $nodes->{$key}; - } - } - } - if( ! $status ) - { - return 0; - } - my @srvlines=split("\n",$servers); - foreach(@srvlines) - { - my @words=split(' ',$_); - my $ref=$nodes->{@words[0]}; - if( $ref ) - { - $ref->{'sessions'}=1*@words[1]; - } - } - return checkServers($nodes, $ldap, $user); -} - -sub checkServers -{ - my ($nodes, $ldap, $user)=@_; - my $bestnode=0; - my $bestnodekey; - my $key; - my $value; - while( ($key,$value) = each(%$nodes)) - { - if(! $bestnode) - { - $bestnode=$value; - $bestnodekey=$key; - } else { - if($value->{'sessions'}<$bestnode->{'sessions'}) - { - $bestnode=$value; - $bestnodekey=$key; - } - } - } - if( ! $bestnode ) - { - print "bestnode is null: \n"; - return 0; - } else { - my $ip=$bestnode->{'ip'}; - my $dn=$bestnode->{'dn'}; - my ($status,$fakearr)=remoteBroker($ip,$user,'ping',$dn, $ldap); - if( ! $status ) - { - delete $nodes->{$bestnodekey}; - return checkServers($nodes, $ldap, $user); - } else { - return $bestnode; - } - } -} - - -sub check_ts -{ - my ($host, $user)=@_; - my $server_dn; - my $ldap; - my($status,$sessions)=getSessionRunning($server_dn, $host, $user, $ldap); - if( $status ) - { - return (1,$sessions); - } - return (0,0); -} - -sub getSessionRunning -{ - my ($dn,$ip,$user, $ldap)=@_; - my ($status,$sessions)=remoteBroker($ip,$user,'listsessions', $dn, $ldap); - if( ! $status ) - { - return (0,0); - } else { - return (1,$sessions); - } -} - -sub remoteBroker -{ - my ($ip, $user, $cmd, $dn, $ldap)=@_; - my $res=`ssh -o ConnectTimeout=15 -o UserKnownHostsFile=/etc/x2go/x2gobroker/ts_known_hosts x2gobroker\@$ip -i /etc/x2go/x2gobroker/id_x2gobroker_dsa \"/usr/lib/x2go/broker/x2gobroker-command $user $cmd 2>/dev/null\"`; - my @rarr=split("\n",$res); - my $stat; - if(@rarr[0] eq 'OK') - { - $stat=1; - } else { - $stat=0; - # setNodeDown($dn, $ldap, $cmd, $user); - } - shift(@rarr); - return($stat,join("\n",@rarr)); -} - -sub notify -{ - my $message=shift; - open (F,">>/tmp/x2gobroker.log"); - print F `date`.$message."\n"; - close(F); -} - -sub setNodeDown -{ - my($dn, $ldap, $cmd, $user)=@_; - my $attr; - push(@$attr,'serverStatus' => 'FALSE'); - my $changes; - push (@$changes, 'replace' => $attr); - $ldap->modify($dn,changes => $changes); - notify ("set status of $dn to \"down\", failed command: \"$cmd\", user: \"$user\"\n"); -} - -sub setServerDown -{ - my($dn, $ldap)=@_; - my $attr; - push(@$attr,'serverStatus' => 'FALSE'); - my $changes; - push (@$changes, 'replace' => $attr); - $ldap->modify($dn,changes => $changes); - notify ("set status of $dn to \"down\", all nodes are down\n"); -} - -sub checkAccess -{ - my ($user,$pass)=@_; - - my $ldap = initLdap(); - - my $dn="uid=$user,ou=People".getBase($binddn); - my $mesg=$ldap->search(base => $dn, - scope => 'base', - filter => '(objectClass=posixAccount)' - ); - - if( $mesg->code ) - { - return 0; - } - - my @entries=$mesg->entries(); - my $crypted=@entries[0]->get_value('userPassword'); - $mesg = $ldap->unbind; - if ( Crypt::SaltedHash->validate($crypted, $pass) ) - { - return 1; - } - return 0; -} - -sub listSessions -{ - my $user=shift; - - my $ldap = initLdap(); - - my $dn="ou=Servers,ou=ON".getBase($binddn); - my $message=$ldap->search(base => $dn, - scope => 'sub', - filter => '(objectClass=ipHost)' - ); - - if($message->code) - { - die $message->error.": ".$message->error_desc; - } - # print Dumper($message->entries); - print "START_USER_SESSIONS "; - foreach ($message->entries) - { - my $asn=$_->{'asn'}; - my $attr=$asn->{'attributes'}; - my $host; - my $int_ip; - my $ext_ip; - my $ext_port; - foreach (@$attr) - { - my $type=$_->{'type'}; - my $value=$_->{'vals'}[0]; - if( $type eq 'cn' ) - { - $host=$value; - } - } - my($status,$sessions)=getSessionRunning($dn,$host,$user, $ldap); - if($status) - { - my $sess_srv; - if($sessions) - { - my @sinfo=split("\\|",$sessions); - my $sess_stat=@sinfo[4]; - $sess_srv=@sinfo[3]; - my $sid=@sinfo[1]; - print " [$host\@$sid] "; - print "status=$sess_stat "; - #get ip - #get port - } else { - my $sessions; - ($sess_srv,$ext_ip,$ext_port, $sessions)=getBestNode($dn, $ldap, $user, $host, $message); - print " [$host] "; - } - #print "host=$ext_ip "; - print "user=$user "; - #print "sshport=$ext_port "; - print "name=Stadt Treuchtlingen "; - goto loop_end; - } - } - loop_end: - print "END_USER_SESSIONS "; - $ldap->unbind(); -} - -sub getBestNode -{ - my ($dn, $ldap, $user, $ip, $message)=@_; - my $servers; - my $status; - ($status,$servers)=remoteBroker($ip,$user,'getservers',$dn, $ldap); - my $srvref={}; - my @srvlines=split("\n",$servers); - foreach(@srvlines) - { - my @words=split(' ',$_); - $srvref->{@words[0]}=1*@words[1]; - } - my $bestval=-1; - my $bestsrv; - my $bestext_ip; - my $bestext_port; - foreach ($message->entries) - { - my $asn=$_->{'asn'}; - my $attr=$asn->{'attributes'}; - my $host; - my $ext_ip; - my $ext_port; - foreach (@$attr) - { - my $type=$_->{'type'}; - my $value=$_->{'vals'}[0]; - if( $type eq 'cn' ) - { - $host=$value; - } - if($type eq 'description') - { - my @words=split(":",$value); - $ext_ip=@words[0]; - $ext_port=@words[1]; - } - } - my $sess=$srvref->{$host}; - if( ! $sess ) - { - return($host, $ext_ip, $ext_port,0); - } - if($sess < $bestval || $bestval == -1) - { - $bestval=$sess; - $bestsrv=$host; - $bestext_ip=$ext_ip; - $bestext_port=$ext_port; - } - } - return($bestsrv, $bestext_ip, $bestext_port, $bestval); -} - -1; diff --git a/X2Go/Broker/ZeroConf.pm b/X2Go/Broker/ZeroConf.pm deleted file mode 100644 index da4eb98..0000000 --- a/X2Go/Broker/ZeroConf.pm +++ /dev/null @@ -1,184 +0,0 @@ -# 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. - -package X2Go::Broker::ZeroConf; - -use strict; -use Sys::Hostname; -use Authen::PAM; -use Authen::Simple::PAM; -use X2Go::Broker::Common; - -### for debugging purposes... -#use Data::Dumper; - -use base 'Exporter'; -our @EXPORT = ('CheckAccess', 'ListSessions', 'SelectSession', 'SetPass', ); - -my $hostname = hostname; - -### -### public functions, available to broker cgi -### - -my $username; -my $password; - -### exported function ### -sub CheckAccess -{ - # zeroconf broker: use PAM to perform authentication against - # the local PAM login module - ($username, $password)=@_; - my $pam = Authen::Simple::PAM->new(service => 'x2gobroker'); - if ( $pam->authenticate( $username, $password ) ) { - # successfull authentication - return 0 - } - return 1; -} - -### exported function ### -sub SetPass -{ - ### - ### the broker API in X2Go Client currently requests a password change - ### without verifying the old password, this needs to be fixed... - ### - - my ($username, $oldpassword, $newpassword)=@_; - - # zeroconf broker: use PAM to initiate a local passwd change - my $service = "x2gobroker"; - my $pamh = new Authen::PAM($service, $username, \&passwd_conv_func) || - die "Error code \$pamh during PAM init!"; - my $state = 0; - my $res = $pamh->pam_chauthtok; - die $pamh->pam_strerror($res) unless $res == PAM_SUCCESS(); - - print "\n CHANGING PASS OK \n"; -} - -### exported function ### -sub SelectSession -{ - my ($user, $session_id)=@_; - my @words=split("\@",$session_id); - ### - ### FIXME: why the heck is the $session_id format <host>@<session>, - ### <session>@<host> would make much more sense!!! (for - ### the human eye...) - ### - my $session_id=@words[1]; - my $host=@words[0]; - check_and_start_session($user, $host, $session_id); -} - -### exported function ### -sub ListSessions -{ - # print Dumper($message->entries); - print "START_USER_SESSIONS "; - my($status,$sessions)=CallBrokerAgent($hostname, $username, 'listsessions'); - if ( $status ) - { - if($sessions) - { - my @sinfo = split("\\|",$sessions); - my $session_status = @sinfo[4]; - my $session_id = @sinfo[1]; - print " [$hostname\@$session_id] "; - print "status=$session_status "; - } else { - print " [$hostname] "; - } - } - print "END_USER_SESSIONS "; -} - -### -### private functions, not available to broker cgi -### - -# helper function for SetPass -sub passwd_conv_func { - my @res; - while ( @_ ) { - my $code = shift; - my $msg = shift; - my $ans = ""; - my $state; - - my $oldpassword; - my $newpassword; - - $ans = $username if ( $code == PAM_PROMPT_ECHO_ON() ); - if ( $code == PAM_PROMPT_ECHO_OFF() ) { - $ans = $oldpassword if ($state == 0); - $ans = $newpassword if ($state == 1); - $ans = $newpassword if ($state == 2); - $state++; - } - push @res, (PAM_SUCCESS(),$ans); - } - push @res, PAM_SUCCESS(); - return @res; -} - -sub check_and_start_session -{ - my ($username, $hostname, $session_id) = @_; - my $running; - my ($status, $sessions)=ExecRemoteBroker($username, $hostname, 'listsessions'); - if ( ! $status ) - { - print "ERROR: X2Go server not available\n"; - return; - } - my $running_sessions = 0; - if ( $sessions ) - { - # suspend all running sessions first... - my @sinfo = split("\\|",$sessions); - my $session_status = @sinfo[4]; - my $session_server = @sinfo[3]; - $session_id=@sinfo[1]; - if( $session_status eq 'R' ) - { - $running = 1; - my $str; - ($status, $str) = ExecRemoteBroker($username, $hostname, "suspend $session_id"); - $sessions =~ s/\|R\|/\|S\|/; - } - if( $session_status eq 'S' ) - { - $running = 1; - } - } - - print "SERVER:$hostname\n"; - if($running) - { - # use first session in session list... - print "SESSION_INFO:".(split("\n",$sessions))[0]."\n"; - } -} - -1; diff --git a/cgi/x2gobroker.cgi b/cgi/x2gobroker.cgi deleted file mode 100755 index 3d44d52..0000000 --- a/cgi/x2gobroker.cgi +++ /dev/null @@ -1,97 +0,0 @@ -#!/usr/bin/perl - -# 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. - -use strict; -use File::Basename qw(basename); - -my $cgi_name = basename($0); -my $broker_backend = $cgi_name; -$broker_backend =~ s/x2gobroker-(.*)\.cgi/\1/; - -SWITCH: { - $broker_backend == "zeroconf" && do { use X2Go::Broker::ZeroConf qw(CheckAccess SetPass SelectSession ListSessions); last SWITCH; }; -# $broker_backend == "simple" && do { use X2Go::Broker::Simple qw(CheckAccess SetPass SelectSession ListSessions); last SWITCH; }; -# $broker_backend == "ldap" && do { use X2Go::Broker::LDAP qw(CheckAccess SetPass SelectSession ListSessions); last SWITCH; }; -} - -use CGI; -use CGI::Carp qw(fatalsToBrowser); - -my $cgi = new CGI; -my @formValues = $cgi->param(); - -print $cgi->header( - -type =>'text/html', - -expires =>'+1h' - ), - $cgi->start_html( - -title =>'X2Go Session Broker', - -author =>'X2Go Developers <x2go-dev(a)lists.berlios.de>', - -base =>'true', - -meta =>{'keywords' =>'X2Go', 'description'=>'X2Go Session Broker'} - ); - -if($cgi->param('task') eq 'testcon') -{ - for ( my $i=0;$i<2*1024*1024;$i++ ) - { - print int(rand(9)); - } - print $cgi->end_html(); -} - -if ( ! CheckAccess($cgi->param('user'), $cgi->param('password'), $cgi->param('authid')) == 1 ) -{ - print_no_access(); - print $cgi->end_html(); - exit (0); -} - -print $cgi->start_form(), -$cgi->strong('Access granted'); - -if ($cgi->param('task') eq 'listsessions') -{ - ListSessions($cgi->param('user')); -} - -if ($cgi->param('task') eq 'selectsession') -{ - SelectSession($cgi->param('user'), $cgi->param('sid')); -} - -if ($cgi->param('task') eq 'setpass') -{ - SetPass($cgi->param('user'), $cgi->param('newpass')); -} - -$cgi->hr(), -$cgi->end_form(); -print $cgi->end_html(); - -sub print_no_access -{ - print $cgi->start_form(), - $cgi->hr(), - $cgi->strong('Access denied'), - $cgi->end_form(); -} diff --git a/debian/changelog b/debian/changelog index 42e3641..f99aeb6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,5 @@ x2gobroker (0.0.0.1-0~x2go1) UNRELEASED; urgency=low - [ Mike Gabriel ] - * Setting up new public X2Go project: x2gobroker. - - Using our own PAM service ,,x2gobroker''. - * /debian/control: - + Add an initial dependency selection to the various Depends fields. - + Make sure libx2go-broker-perl of the same version gets installed - with x2gobroker-common. - + Add dependencies: libauthen-pam-perl, libauthen-simple-pam-perl. - * Fix code indentations (spaces replaced by tabs, use proper indentation - levels). + * Initial upstream version. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 15 Sep 2012 17:30:24 +0200 diff --git a/debian/control b/debian/control index 3381442..81ecded 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,5 @@ Source: x2gobroker -Section: web +Section: python Priority: optional Maintainer: X2Go Developers <x2go-dev(a)lists.berlios.de> Uploaders: @@ -9,43 +9,20 @@ Build-Depends: debhelper (>= 7.0.50~), cdbs (>= 0.4.90~), dpkg-dev (>= 1.16.1~), + python (>= 2.6.6-3~), Standards-Version: 3.9.3 +XS-Python-Version: >= 2.4 -Package: libx2go-broker-perl +Package: x2gobroker Architecture: all -Section: perl Depends: ${misc:Depends}, - ${perl:Depends}, -Description: X2Go http(s) based session broker (Perl modules) - X2Go is a serverbased computing environment with - - session resuming - - low bandwidth support - - LDAP support - - client side mass storage mounting support - - client side printing support - - audio support - - authentication by smartcard and USB stick - . - The session broker is a server tool for X2Go that - tells your X2Go Client application in a terminal - server cluster what servers and session types are - most appropriate for the user in front of the - X2Go terminal. - . - A session broker is most useful in load balanced - X2Go server farms. - . - This package contains the related Perl modules needed - by the X2Go Session Broker scripts. - -Package: x2gobroker-common -Architecture: all -Depends: - ${misc:Depends}, - libx2go-broker-perl (>= ${source:Version}), libx2go-broker-perl (<< ${source:Version}.1~), -Description: X2Go http(s) based session broker (common files) - X2Go is a serverbased computing environment with + ${python:Depends}, + python, +Suggests: + apache2 | httpd, +Description: X2Go http(s) based session broker (executable) + X2Go is a server based computing environment with - session resuming - low bandwidth support - LDAP support @@ -63,18 +40,17 @@ Description: X2Go http(s) based session broker (common files) A session broker is most useful in load balanced X2Go server farms. . - This package contains common files needed by all X2Go session - brokers being package for this distribution. + This package contains the x2gobroker executable. -Package: x2gobroker-simple +Package: x2gobroker-daemon Architecture: all Depends: ${misc:Depends}, + ${python:Depends}, +Suggests: apache2 | httpd, - perl, - x2gobroker-common (>= ${source:Version}), x2gobroker-common (<< ${source:Version}.1~), -Description: X2Go http(s) session broker (simple broker) - X2Go is a serverbased computing environment with +Description: X2Go http(s) based session broker (daemon) + X2Go is a server based computing environment with - session resuming - low bandwidth support - LDAP support @@ -92,20 +68,19 @@ Description: X2Go http(s) session broker (simple broker) A session broker is most useful in load balanced X2Go server farms. . - This package contains a simple example of an X2Go session - broker. This session broker will be configured with a few steps, - no LDAP is required. + This package contains the start-stop script that + installs the X2Go Session Broker as standalone + daemon. -Package: x2gobroker-ldap +Package: x2gobroker-cgi Architecture: all Depends: ${misc:Depends}, + ${python:Depends}, +Suggests: apache2 | httpd, - perl, - libnet-ldap-perl, - x2gobroker-common (>= ${source:Version}), x2gobroker-common (<< ${source:Version}.1~), -Description: X2Go http(s) session broker (simple broker) - X2Go is a serverbased computing environment with +Description: X2Go http(s) based session broker (CGI) + X2Go is a server based computing environment with - session resuming - low bandwidth support - LDAP support @@ -123,21 +98,19 @@ Description: X2Go http(s) session broker (simple broker) A session broker is most useful in load balanced X2Go server farms. . - This package contains an LDAP based X2Go session broker. - This session broker is targeted for large production setups - with many X2Go servers managed via a session broker. + This package contains a configuration that installs + the X2Go Session Broker as a CGI script so it + can be run from within an existing httpd server. -Package: x2gobroker-zeroconf +Package: python-x2gobroker Architecture: all Depends: ${misc:Depends}, + ${python:Depends}, +Suggests: apache2 | httpd, - perl, - x2gobroker-common (>= ${source:Version}), x2gobroker-common (<< ${source:Version}.1~), - libauthen-pam-perl, - libauthen-simple-pam-perl, -Description: X2Go http(s) session broker (for demo purposes only) - X2Go is a serverbased computing environment with +Description: X2Go http(s) based session broker (Python modules) + X2Go is a server based computing environment with - session resuming - low bandwidth support - LDAP support @@ -155,21 +128,19 @@ Description: X2Go http(s) session broker (for demo purposes only) A session broker is most useful in load balanced X2Go server farms. . - This package contains a demo X2Go session broker that - runs out-of-the-box. However, it can not be configured - and it only manages one single X2Go server. This package - can be installed to test X2Go's clients, so you get an - idea of how your clients behave when set into broker mode. + This package contains common files needed by all X2Go session + brokers being package for this distribution. Package: x2gobroker-agent Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, + perl, adduser, x2goserver, Description: X2Go http(s) based session broker (common files) - X2Go is a serverbased computing environment with + X2Go is a server based computing environment with - session resuming - low bandwidth support - LDAP support diff --git a/debian/copyright b/debian/copyright index 1891023..7b2fde0 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,13 +1,15 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: X2Go Broker -Upstream-Contact: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -Source: http://code.x2go.org/releases/source/x2gohttpbroker +Upstream-Contact: + Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> + Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +Source: http://code.x2go.org/releases/source/x2gobroker Files: * Copyright: - 2011-2012, Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> - 2011-2012, Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> 2012, Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> + 2012, Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> + 2012, Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> License: AGPL-3+ Files: debian/* diff --git a/debian/x2gobroker-ldap.dirs b/debian/python-x2gobroker.dirs similarity index 50% rename from debian/x2gobroker-ldap.dirs rename to debian/python-x2gobroker.dirs index d973e65..2fd303e 100644 --- a/debian/x2gobroker-ldap.dirs +++ b/debian/python-x2gobroker.dirs @@ -1 +1,2 @@ /etc/x2go +/etc/pam.d \ No newline at end of file diff --git a/debian/x2gobroker-common.docs b/debian/python-x2gobroker.docs similarity index 100% rename from debian/x2gobroker-common.docs rename to debian/python-x2gobroker.docs diff --git a/debian/python-x2gobroker.install b/debian/python-x2gobroker.install new file mode 100644 index 0000000..99281cd --- /dev/null +++ b/debian/python-x2gobroker.install @@ -0,0 +1,3 @@ +etc/x2gobroker.conf etc/x2go/ +pam/x2gobroker etc/pam.d/ +usr/ diff --git a/debian/rules b/debian/rules index 8b53e5a..787fc72 100755 --- a/debian/rules +++ b/debian/rules @@ -21,8 +21,8 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_CFLAGS_MAINT_APPEND = -Wall include /usr/share/dpkg/buildflags.mk -DEB_PERL_PACKAGES=libx2go-broker-perl -DEB_PERL_CLEAN_TARGET=realclean -include /usr/share/cdbs/1/class/perl-makemaker.mk +#DEB_PERL_PACKAGES=libx2go-broker-perl +#DEB_PERL_CLEAN_TARGET=realclean +#include /usr/share/cdbs/1/class/perl-makemaker.mk include /usr/share/cdbs/1/rules/debhelper.mk - +include /usr/share/cdbs/1/class/python-distutils.mk diff --git a/debian/x2gobroker-agent.dirs b/debian/x2gobroker-agent.dirs deleted file mode 100644 index 88c7d70..0000000 --- a/debian/x2gobroker-agent.dirs +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/x2go/broker \ No newline at end of file diff --git a/etc/x2gobroker-simple.cfg b/debian/x2gobroker-cgi.install similarity index 100% rename from etc/x2gobroker-simple.cfg rename to debian/x2gobroker-cgi.install diff --git a/debian/x2gobroker-common.dirs b/debian/x2gobroker-common.dirs deleted file mode 100644 index cec872f..0000000 --- a/debian/x2gobroker-common.dirs +++ /dev/null @@ -1,2 +0,0 @@ -/usr/lib/cgi-bin -/usr/lib/x2go/broker \ No newline at end of file diff --git a/debian/x2gobroker-common.install b/debian/x2gobroker-common.install deleted file mode 100644 index e9793a9..0000000 --- a/debian/x2gobroker-common.install +++ /dev/null @@ -1 +0,0 @@ -cgi/x2gobroker.cgi usr/lib/cgi-bin/ diff --git a/debian/x2gobroker-daemon.default b/debian/x2gobroker-daemon.default new file mode 100644 index 0000000..52a89c4 --- /dev/null +++ b/debian/x2gobroker-daemon.default @@ -0,0 +1,4 @@ +# X2Go Session Broker configuration for Debian + +# Uncomment to enable the X2Go Session Broker standalone daemon +#START_DAEMON=true \ No newline at end of file diff --git a/debian/x2gobroker-daemon.init b/debian/x2gobroker-daemon.init new file mode 100644 index 0000000..9901128 --- /dev/null +++ b/debian/x2gobroker-daemon.init @@ -0,0 +1,72 @@ +#!/bin/sh +# +# Start the X2Go Session Broker standalone daemon +# +# Copyright © 2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Distributable under the terms of the GNU AGPL version 2. +# +### BEGIN INIT INFO +# Provides: x2gobroker-daemon +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: X2Go Session Broker standalone daemon +# Description: X2Go Session Broker daemon comes with its own HTTP daemon +### END INIT INFO +# + +set -eu + +DAEMON=/usr/sbin/x2gobroker +test -d /run && RUNDIR=/run/ || RUNDIR=/var/run +PIDFILE=$RUNDIR/x2gobroker-daemon.pid +DEBIANCONFIG=/etc/default/x2gobroker-daemon + +test -x "$DAEMON" || exit 0 + +START_DAEMON=false +test -f $DEBIANCONFIG && . $DEBIANCONFIG + +. /lib/lsb/init-functions + +is_true() +{ + case "${1:-}" in + [Yy]es|[Yy]|1|[Tt]|[Tt]rue) return 0;; + *) return 1; + esac +} + +case "${1:-}" in + start) + if is_true $START_DAEMON; then + log_daemon_msg "Starting X2Go Session Broker standalone daemon" "x2gobroker" + mkdir -p $RUNDIR + set +e + start-stop-daemon -S -p $PIDFILE -x $DAEMON + log_end_msg $? + set -e + fi + ;; + stop) + if [ -f $PIDFILE ] ; then + log_daemon_msg "Stopping X2Go Session Broker standalone daemon" "x2gobroker" + set +e + start-stop-daemon -K -p $PIDFILE -x $DAEMON + rm -f $PIDFILE + log_end_msg $? + set -e + fi + ;; + restart|reload|force-reload) + ${0:-} stop + ${0:-} start + ;; + *) + echo "Usage: ${0:-} {start|stop|restart|reload|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/debian/x2gobroker-ldap.docs b/debian/x2gobroker-ldap.docs deleted file mode 100644 index 5502ed8..0000000 --- a/debian/x2gobroker-ldap.docs +++ /dev/null @@ -1,3 +0,0 @@ -NEWS -README -TODO diff --git a/debian/x2gobroker-ldap.install b/debian/x2gobroker-ldap.install deleted file mode 100644 index c35da81..0000000 --- a/debian/x2gobroker-ldap.install +++ /dev/null @@ -1 +0,0 @@ -etc/x2gobroker-ldap.cfg etc/x2go/ diff --git a/debian/x2gobroker-ldap.links b/debian/x2gobroker-ldap.links deleted file mode 100644 index b8a8a9b..0000000 --- a/debian/x2gobroker-ldap.links +++ /dev/null @@ -1 +0,0 @@ -usr/lib/cgi-bin/x2gobroker.cgi usr/lib/cgi-bin/x2gobroker-ldap.cgi diff --git a/debian/x2gobroker-simple.dirs b/debian/x2gobroker-simple.dirs deleted file mode 100644 index d973e65..0000000 --- a/debian/x2gobroker-simple.dirs +++ /dev/null @@ -1 +0,0 @@ -/etc/x2go diff --git a/debian/x2gobroker-simple.docs b/debian/x2gobroker-simple.docs deleted file mode 100644 index 5502ed8..0000000 --- a/debian/x2gobroker-simple.docs +++ /dev/null @@ -1,3 +0,0 @@ -NEWS -README -TODO diff --git a/debian/x2gobroker-simple.install b/debian/x2gobroker-simple.install deleted file mode 100644 index 258c187..0000000 --- a/debian/x2gobroker-simple.install +++ /dev/null @@ -1 +0,0 @@ -etc/x2gobroker-simple.cfg etc/x2go/ diff --git a/debian/x2gobroker-simple.links b/debian/x2gobroker-simple.links deleted file mode 100644 index 27df28e..0000000 --- a/debian/x2gobroker-simple.links +++ /dev/null @@ -1 +0,0 @@ -usr/lib/cgi-bin/x2gobroker.cgi usr/lib/cgi-bin/x2gobroker-simple.cgi diff --git a/debian/x2gobroker-zeroconf.dirs b/debian/x2gobroker-zeroconf.dirs deleted file mode 100644 index d973e65..0000000 --- a/debian/x2gobroker-zeroconf.dirs +++ /dev/null @@ -1 +0,0 @@ -/etc/x2go diff --git a/debian/x2gobroker-zeroconf.docs b/debian/x2gobroker-zeroconf.docs deleted file mode 100644 index 5502ed8..0000000 --- a/debian/x2gobroker-zeroconf.docs +++ /dev/null @@ -1,3 +0,0 @@ -NEWS -README -TODO diff --git a/debian/x2gobroker-zeroconf.links b/debian/x2gobroker-zeroconf.links deleted file mode 100644 index 1d6c3cf..0000000 --- a/debian/x2gobroker-zeroconf.links +++ /dev/null @@ -1 +0,0 @@ -usr/lib/cgi-bin/x2gobroker.cgi usr/lib/cgi-bin/x2gobroker-zeroconf.cgi diff --git a/debian/x2gobroker.install b/debian/x2gobroker.install new file mode 100644 index 0000000..fac20e4 --- /dev/null +++ b/debian/x2gobroker.install @@ -0,0 +1 @@ +sbin/x2gobroker usr/sbin/ diff --git a/debian/x2gobroker.pam b/debian/x2gobroker.pam deleted file mode 100644 index 1eaad76..0000000 --- a/debian/x2gobroker.pam +++ /dev/null @@ -1,2 +0,0 @@ -@include common-auth -@include common-passwd diff --git a/etc/x2gobroker-ldap.cfg b/etc/x2gobroker.conf similarity index 95% copy from etc/x2gobroker-ldap.cfg copy to etc/x2gobroker.conf index fe8e9bd..a1b56f5 100644 --- a/etc/x2gobroker-ldap.cfg +++ b/etc/x2gobroker.conf @@ -18,6 +18,13 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +[common] +backend=zeroconf + +[simple] +#... + +[ldap] ldapuri=ldap://<ldapmaster.localdomain> #replica=ldapi:/// binddn="cn=admin,dc=example,dc=net" diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl index 0d5b559..6a64bbf 100755 --- a/lib/x2gobroker-agent.pl +++ b/lib/x2gobroker-agent.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl -wU +#!/usr/bin/perl -XU # 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> @@ -24,7 +24,7 @@ use strict; sub InitX2GoUser { - my ($user, $uid, $gid, $home)=@_; + my ($user, $uidNumber, $gidNumber, $home)=@_; if ( -f "/etc/x2go/x2gosql/sql" ) { @@ -56,11 +56,11 @@ sub CreateKey ### authorized_keys file is starting to get ### scared... (Mike) ### - #my ($uid, $gid, $home)=@_; + #my ($uidNumber, $gidNumber, $home)=@_; #if ( ! -d "$home/.ssh" ) #{ # mkdir ("$home/.ssh", 0700); - # chown ($uid, $gid, "$home/.ssh"); + # chown ($uidNumber, $gidNumber, "$home/.ssh"); #} #if( -e "$home/.ssh/authorized_keys" ) #{ @@ -84,41 +84,41 @@ $ENV{'PATH'} = '/bin:/usr/bin'; my $username=shift or die; my $mode=shift or die; -my ($name, $passwd, $uid, $gid, $quota, $comment, $gcos, $home, $shell, $expire) = getpwnam($username); +my ($uid, $passwd, $uidNumber, $gidNumber, $quota, $comment, $gcos, $home, $shell, $expire) = getpwnam($username); -if($uid < 1000) +if($uidNumber < 1000) { die 'operation on system user'; } if($mode eq 'listsessions') { - InitX2GoUser($name, $uid, $gid, $home); + InitX2GoUser($uid, $uidNumber, $gidNumber, $home); print "OK\n"; - system "/bin/su - ", $name, "-c", "x2golistsessions --all-servers"; + exec ("/bin/su - $uid -c \"x2golistsessions --all-servers\""); } if($mode eq 'getservers') { - InitX2GoUser($name, $uid, $gid, $home); + InitX2GoUser($uid, $uidNumber, $gidNumber, $home); print "OK\n"; - system "/bin/su - ", $name, "-c", "x2gogetservers"; + exec ("/bin/su - $uid -c \"x2gogetservers\""); } if($mode eq 'key') { - InitX2GoUser($name, $uid, $gid, $home); + InitX2GoUser($uid, $uidNumber, $gidNumber, $home); print "OK\n"; - createKey($uid, $gid, $home); + createKey($uidNumber, $gidNumber, $home); } if($mode eq 'suspend') { - InitX2GoUser($name, $uid, $gid, $home); + InitX2GoUser($uid, $uidNumber, $gidNumber, $home); print "OK\n"; my $sid=shift; - system "/bin/su - ", $name, "-c", "x2gosuspend-session $sid"; + exec ("/bin/su - $uid -c \"x2gosuspend-session $sid\""); } if($mode eq 'ping') diff --git a/pam/x2gobroker b/pam/x2gobroker new file mode 100644 index 0000000..b561496 --- /dev/null +++ b/pam/x2gobroker @@ -0,0 +1,2 @@ +@include common-auth +@include common-password diff --git a/sbin/x2gobroker b/sbin/x2gobroker new file mode 100755 index 0000000..103a6a5 --- /dev/null +++ b/sbin/x2gobroker @@ -0,0 +1,152 @@ +#!/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. + +import sys +import os +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() + + 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> + +<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', + }, + } + + 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") + + +if __name__ == "__main__": + app = web.application(urls, globals()) + app.internalerror = web.debugerror + app.run() diff --git a/etc/x2gobroker-ldap.cfg b/setup.py old mode 100644 new mode 100755 similarity index 59% copy from etc/x2gobroker-ldap.cfg copy to setup.py index fe8e9bd..e1fa4e8 --- a/etc/x2gobroker-ldap.cfg +++ b/setup.py @@ -1,7 +1,11 @@ -# 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> +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +# -*- 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-M. Graesing <heint-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 @@ -18,7 +22,16 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -ldapuri=ldap://<ldapmaster.localdomain> -#replica=ldapi:/// -binddn="cn=admin,dc=example,dc=net" -bindpw="<very-secret>" +from setuptools import setup, find_packages +import x2gobroker + +setup( + name = "x2gobroker", + version = x2gobroker.__VERSION__, + description = "X2Go Session Broker", + license = 'AGPLv3+', + author = 'Mike Gabriel', + url = 'http://www.x2go.org', + packages = find_packages('.'), + package_dir = {'': '.'}, +) diff --git a/etc/x2gobroker-ldap.cfg b/x2gobroker/__init__.py similarity index 69% copy from etc/x2gobroker-ldap.cfg copy to x2gobroker/__init__.py index fe8e9bd..ad8c1e4 100644 --- a/etc/x2gobroker-ldap.cfg +++ b/x2gobroker/__init__.py @@ -1,7 +1,7 @@ -# 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> +# -*- 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> # # 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,7 +18,6 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -ldapuri=ldap://<ldapmaster.localdomain> -#replica=ldapi:/// -binddn="cn=admin,dc=example,dc=net" -bindpw="<very-secret>" +__VERSION__ = '0.0.0.1' + + diff --git a/x2gobroker/base.py b/x2gobroker/base.py new file mode 100644 index 0000000..a1fe0ca --- /dev/null +++ b/x2gobroker/base.py @@ -0,0 +1,157 @@ +# -*- 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> +# +# 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. + +"""\ +X2goBrokerBASE class - base skeleton for X2GoBroker implementations + +""" +__NAME__ = 'x2gobroker-pylib' + +# modules +import types +import uuid + +class X2GoBroker(object): + """\ + X2GoBrokerBASE 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} + + """ + def __init__(self): + """\ + Initialize a new X2GoBroker instance to control X2Go session through an + X2Go Client with an intermediate session broker. + """ + self._authid_dict = {} + + def __del__(self): + """\ + Cleanup on destruction of an L{X2GoBroker} instance. + + """ + pass + + def test_connection(self): + #if($cgi->param('task') eq 'testcon') + #{ + # for ( my $i=0;$i<2*1024*1024;$i++ ) + # { + # print int(rand(9)); + # } + # print $cgi->end_html(); + # exit (0); + #} + return 'OK' + + 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. + + @param username: a username known to the session broker + @type username: C{unicode} + @param password: a password that authenticates the user against the X2Go session broker + @type password: C{unicode} + + @return: returns C{True} if the authentication has been successful + @rtype: C{bool} + + """ + + ### IMPLEMENT YOUR AUTHENTICATION LOGIC FIRST, then call base.X2GoBroker.check_access + ### to finalize the authentication process. + + # 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. + + if type(authid) is types.StringType: + authid = unicode(authid) + + if type(authid) is types.UnicodeType: + + if authid == self._authid_dict[username]: + self._authid_dict[username] = uuid.uuid5(namespace=authid, name=username) + return True + + 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 + + return False + + def get_next_authid(self, username): + """\ + Get the next expected authentication ID for the given user name. + + @param username: query next auth ID for this user + @type username: C{unicode} + + @return: returns next authentication ID for the given username, None if no auth ID has been generated, yet. + @rtype: C{unicode} or C{None} + + """ + try: + return self._authid_dict[username] + except KeyError: + return None + + def list_sessions(self, username): + """\ + Retrieve a list of running/suspended sessions for the user that has authenticated to this + L{X2GoBroker} instance + + @param username: query session list for this user + @type username: C{unicode} + + return: list of session objects + rtype: C{obj} + + """ + return [] + + def select_session(self, session_name=None): + """\ + 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. + + The X2Go server that the session is launched on is selected automatically by the X2Go session + broker. + + """ + return None + + def change_password(self, new='', old=''): + """\ + Modify the authenticated user's password on the X2Go infrastructure (normally, one user + in one X2Go site setup should have the same password on all machines). + + """ + return False diff --git a/etc/x2gobroker-ldap.cfg b/x2gobroker/ldap.py similarity index 59% copy from etc/x2gobroker-ldap.cfg copy to x2gobroker/ldap.py index fe8e9bd..25fc8b4 100644 --- a/etc/x2gobroker-ldap.cfg +++ b/x2gobroker/ldap.py @@ -1,7 +1,7 @@ -# 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> +# -*- 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> # # 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,7 +18,28 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -ldapuri=ldap://<ldapmaster.localdomain> -#replica=ldapi:/// -binddn="cn=admin,dc=example,dc=net" -bindpw="<very-secret>" +"""\ +X2goBrokerLDAP class - a production X2GoBroker implementations that uses LDAP as configuration backend + +""" +__NAME__ = 'x2gobroker-pylib' + +# modules +import x2gobroker.base + +class X2GoBroker(x2gobroker.base.X2GoBroker): + """\ + + """ + def __init__(self): + """\ + + """ + x2gobroker.base.X2GoBroker.__init__(self) + + def __del__(self): + """\ + + """ + x2gobroker.base.X2GoBroker.__del__(self) + diff --git a/etc/x2gobroker-ldap.cfg b/x2gobroker/simple.py similarity index 59% rename from etc/x2gobroker-ldap.cfg rename to x2gobroker/simple.py index fe8e9bd..ea3fc87 100644 --- a/etc/x2gobroker-ldap.cfg +++ b/x2gobroker/simple.py @@ -1,7 +1,7 @@ -# 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> +# -*- 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> # # 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,7 +18,28 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -ldapuri=ldap://<ldapmaster.localdomain> -#replica=ldapi:/// -binddn="cn=admin,dc=example,dc=net" -bindpw="<very-secret>" +"""\ +X2goBrokerSIMPLE class - a simple X2GoBroker implementations that uses text-based config files only + +""" +__NAME__ = 'x2gobroker-pylib' + +# modules +import x2gobroker.base + +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/zeroconf.py b/x2gobroker/zeroconf.py new file mode 100644 index 0000000..af0da2d --- /dev/null +++ b/x2gobroker/zeroconf.py @@ -0,0 +1,56 @@ +# -*- 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> +# +# 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. + +"""\ +X2goBrokerZEROCONF class - a demo X2GoBroker implementations that needs not configuration at all + +""" +__NAME__ = 'x2gobroker-pylib' + +# modules +import pam +import subprocess + +import x2gobroker.base + +from x2gobroker.defaults import X2GOBROKER_AGENT_CMD as _X2GOBROKER_AGENT_CMD + +class X2GoBroker(x2gobroker.base.X2GoBroker): + + 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) + + def list_sessions(self, username): + + # 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() + 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-66-gd2cc801
by git-admin＠x2go.org 29 Nov '12

29 Nov '12

The branch, master has been updated via d2cc801523e925317f3b3eddde55910075aaf7a1 (commit) from 598c9aee2faa7f60d81c2318ce917239d41f31c4 (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 d2cc801523e925317f3b3eddde55910075aaf7a1 Author: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de> Date: Thu Nov 29 12:17:46 2012 +0100 modified x2gothinclientd to find /var/lib/x2goclient/.halt ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++++ x2gothinclient/sbin/x2gothinclientd | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d549911..fb55b78 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low + [ Mike Gabriel ] * New upstream version (1.0.99.1): - When X2Go TCE has plymouth installed, make sure pressing the halt button does not change to the wrong tty. @@ -69,6 +70,9 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low * /debian/x2gothinclient.init: + Update pointer to X2Go TCE documentation on http://wiki.x2go.org. + [ Oleksandr Shneyder ] + * modified x2gothinclientd to find /var/lib/x2goclient/.halt + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 10 Aug 2012 14:13:49 +0200 x2gothinclient (1.0.1.8-0~x2go1) unstable; urgency=low diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd index d23084e..6a406c3 100755 --- a/x2gothinclient/sbin/x2gothinclientd +++ b/x2gothinclient/sbin/x2gothinclientd @@ -93,7 +93,7 @@ elsif ($pid == 0 ) while(sleep 1) { # test if shutdown button on X2Go Client was clicked - if ( -e "~x2gothinclient/.halt") + if ( -e "/var/lib/x2gothinclient/.halt") { # when used with plymouth, make sure we stay on the correct terminal system("killall Xorg"); 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

python-x2go.git - master (branch) updated: 0.2.0.10-94-ga853ca8
by git-admin＠x2go.org 29 Nov '12

29 Nov '12

The branch, master has been updated via a853ca8373782108de71c4a24189e0d60703ac98 (commit) from 901b38885619f6f4a16a42b17633de61d531427a (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 a853ca8373782108de71c4a24189e0d60703ac98 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Nov 29 09:59:13 2012 +0100 fix license in setup.py ----------------------------------------------------------------------- Summary of changes: setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/setup.py b/setup.py index 1aeb494..396dd13 100755 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ setup( name = "x2go", version = x2go.__VERSION__, description = "Python X2Go implements an X2Go client/session library in Python based on the Python Paramiko SSH module.", - license = 'GPLv3+', + license = 'AGPLv3+', author = 'Mike Gabriel', url = 'http://www.x2go.org', packages = find_packages('.'), hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

python-x2go.git - master (branch) updated: 0.2.0.10-93-g901b388
by git-admin＠x2go.org 28 Nov '12

28 Nov '12

The branch, master has been updated via 901b38885619f6f4a16a42b17633de61d531427a (commit) from 64dbd1b29eeefb88427ee92a5ba0ccfef2cb309f (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 901b38885619f6f4a16a42b17633de61d531427a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 28 08:28:00 2012 +0100 fix faulty boolean expression in auto-connect detection code ----------------------------------------------------------------------- Summary of changes: x2go/session.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/x2go/session.py b/x2go/session.py index e1159f1..bca32ec 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1113,19 +1113,19 @@ class X2goSession(object): # do we have a key file passed as control parameter? if self.control_params.has_key('key_filename') and self.control_params['key_filename'] and os.path.exists(os.path.normpath(self.control_params['key_filename'])): - return (_can_sshproxy_auto_connect is not None) or _can_sshproxy_auto_connect + return (_can_sshproxy_auto_connect is None) or _can_sshproxy_auto_connect # or a private key? elif self.control_params.has_key('pkey') and self.control_params['pkey']: - return (_can_sshproxy_auto_connect is not None) or _can_sshproxy_auto_connect + return (_can_sshproxy_auto_connect is None) or _can_sshproxy_auto_connect # or a key auto discovery? elif self.control_params.has_key('look_for_keys') and self.control_params['look_for_keys'] and (os.path.exists(os.path.expanduser('~/.ssh/id_rsa')) or os.path.exists(os.path.expanduser('~/.ssh/id_dsa'))): - return (_can_sshproxy_auto_connect is not None) or _can_sshproxy_auto_connect + return (_can_sshproxy_auto_connect is None) or _can_sshproxy_auto_connect # or an SSH agent usage? elif self.control_params.has_key('allow_agent') and self.control_params['allow_agent'] and paramiko.Agent().get_keys(): - return (_can_sshproxy_auto_connect is not None) or _can_sshproxy_auto_connect + return (_can_sshproxy_auto_connect is None) or _can_sshproxy_auto_connect else: return False hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

x2godesktopsharing.git - master (branch) updated: 3.1.0.5-7-g93331c0
by git-admin＠x2go.org 27 Nov '12

27 Nov '12

The branch, master has been updated via 93331c08a1798b3d21279f2cabbec0162faa09e9 (commit) from f063996331d57da837459753a20743b356cee3ed (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 93331c08a1798b3d21279f2cabbec0162faa09e9 Author: Ricardo Díaz Martín <oceanosoftlapalma(a)gmail.com> Date: Tue Nov 27 14:50:44 2012 +0100 Add Spanish translation file. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 +++ x2godesktopsharing_es.ts | 64 ++++++++++++++++++++++++++-------------------- 2 files changed, 40 insertions(+), 28 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 63811ae..bd843e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,10 @@ x2godesktopsharing (3.1.0.6-0~x2go1) UNRELEASED; urgency=low * New upstream version (3.1.0.6): - Add Swedish translation file. + [ Ricardo Díaz Martín ] + * New upstream version (3.1.0.6): + - Add Spanish translation file. + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 13 Nov 2012 16:24:02 +0100 x2godesktopsharing (3.1.0.5-0~x2go1) unstable; urgency=low diff --git a/x2godesktopsharing_es.ts b/x2godesktopsharing_es.ts index 5c7fb28..07ef50c 100644 --- a/x2godesktopsharing_es.ts +++ b/x2godesktopsharing_es.ts @@ -6,12 +6,12 @@ <message> <location filename="messagebox.cpp" line="20"/> <source>Save selection for %1</source> - <translation type="unfinished"></translation> + <translation>Guardar selección para %1</translation> </message> <message> <location filename="messagebox.cpp" line="24"/> <source>Accept %1 from %2 ?</source> - <translation type="unfinished"></translation> + <translation>¿Aceptar %1 desde %2?</translation> </message> </context> <context> @@ -19,120 +19,121 @@ <message> <location filename="sharetray.cpp" line="68"/> <source>X2GO DesktopSharing v</source> - <translation type="unfinished"></translation> + <translation>X2GO DesktopSharing v</translation> </message> <message> <location filename="sharetray.cpp" line="101"/> <source>X2Go desktop sharing application is already active for this display if this application is no longer running, remove %1 and start again</source> - <translation type="unfinished"></translation> + <translation>La aplicación X2Go DesktopSharing está ya activa para esta pantalla +si no está funcionando borra %1 e iníciala de nuevo</translation> </message> <message> <location filename="sharetray.cpp" line="108"/> <location filename="sharetray.cpp" line="337"/> <source>Error</source> - <translation type="unfinished"></translation> + <translation>Error</translation> </message> <message> <location filename="sharetray.cpp" line="128"/> <source>X2Go desktop sharing application</source> - <translation type="unfinished"></translation> + <translation>aplicación X2Go DesktopSharing</translation> </message> <message> <location filename="sharetray.cpp" line="133"/> <source>Granted users...</source> - <translation type="unfinished"></translation> + <translation>Usuarios con acceso...</translation> </message> <message> <location filename="sharetray.cpp" line="135"/> <source>Banned users...</source> - <translation type="unfinished"></translation> + <translation>Usuarios bloqueados...</translation> </message> <message> <location filename="sharetray.cpp" line="139"/> <source>Activate desktop sharing</source> - <translation type="unfinished"></translation> + <translation>Activar compartir escritorio</translation> </message> <message> <location filename="sharetray.cpp" line="142"/> <source>Deactivate desktop sharing</source> - <translation type="unfinished"></translation> + <translation>Desactivar compartir escritorio</translation> </message> <message> <location filename="sharetray.cpp" line="147"/> <source>About X2GO Sharing</source> - <translation type="unfinished"></translation> + <translation>Acerca de X2Go DesktopSharing</translation> </message> <message> <location filename="sharetray.cpp" line="160"/> <source>&Quit</source> - <translation type="unfinished"></translation> + <translation>&Salir</translation> </message> <message> <location filename="sharetray.cpp" line="335"/> <source>Can't listen on socket:</source> - <translation type="unfinished"></translation> + <translation>No se puede escuchar en el socket:</translation> </message> <message> <location filename="sharetray.cpp" line="371"/> <source>Access granted</source> - <translation type="unfinished"></translation> + <translation>Acceso concedido</translation> </message> <message> <location filename="sharetray.cpp" line="371"/> <source>%1(%2): access granted</source> - <translation type="unfinished"></translation> + <translation>%1(%2): acceso concedido</translation> </message> <message> <location filename="sharetray.cpp" line="391"/> <source>Disconnect %1(%2)</source> - <translation type="unfinished"></translation> + <translation>Desconectar %1(%2)</translation> </message> <message> <location filename="sharetray.cpp" line="396"/> <source>Remote connection</source> - <translation type="unfinished"></translation> + <translation>Conexión remota</translation> </message> <message> <location filename="sharetray.cpp" line="398"/> <source>%1(%2) connected</source> - <translation type="unfinished"></translation> + <translation>%1(%2) conectado</translation> </message> <message> <location filename="sharetray.cpp" line="403"/> <source>Access denied</source> - <translation type="unfinished"></translation> + <translation>Acceso denegado</translation> </message> <message> <location filename="sharetray.cpp" line="404"/> <source>%1(%2): access denied</source> - <translation type="unfinished"></translation> + <translation>%1(%2) acceso denegado</translation> </message> <message> <location filename="sharetray.cpp" line="477"/> <source>User disconnected</source> - <translation type="unfinished"></translation> + <translation>Usuario desconectado</translation> </message> <message> <location filename="sharetray.cpp" line="479"/> <source>%1(%2) disconnected</source> - <translation type="unfinished"></translation> + <translation>%1(%2) desconectado</translation> </message> <message> <location filename="sharetray.cpp" line="515"/> <source>Banned users</source> - <translation type="unfinished"></translation> + <translation>Usuario bloqueados</translation> </message> <message> <location filename="sharetray.cpp" line="522"/> <source>Granted users</source> - <translation type="unfinished"></translation> + <translation>Usuarios con acceso</translation> </message> <message> <location filename="sharetray.cpp" line="587"/> <source>X2Go Desktop Sharing</source> - <translation type="unfinished"></translation> + <translation>X2Go Desktop Sharing</translation> </message> </context> <context> @@ -140,12 +141,12 @@ and start again</source> <message> <location filename="dlg.ui" line="22"/> <source>X2Go Desktop Sharing</source> - <translation type="unfinished"></translation> + <translation>X2Go Desktop Sharing</translation> </message> <message> <location filename="dlg.ui" line="34"/> <source>remove</source> - <translation type="unfinished"></translation> + <translation>borrar</translation> </message> <message> <location filename="dlg.ui" line="75"/> @@ -157,7 +158,14 @@ p, li { white-space: pre-wrap; } This application enables you to share your running X-Session with other users over a local network or internet. You'll have the chance to allow or deny user connections and to save your preferences. A TrayBar Icon will inform you about the chosen configuration and you'll be informed about connection events. For further information, please visit <a href="http://www.x2go.org">http://www.x2go.org</a></body></html></source> - <translation type="unfinished"></translation> + <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'OpenSymbol'; font-size:9pt; font-weight:400; font-style:normal;"> +(C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) + Esta aplicación permite compartir la sesión X activa con otros usuarios sobre una red local o sobre internet. Tienes la opción de aceptar o rechazar las conexiones del resto de usuarios y guardar estas preferencias para futuros accesos. Un icono en la barra de notificaciones del sistema informa sobre la configuración actual y sobre los eventos relacionados con conexiones entrantes. Para más información visita + +<a href="http://www.x2go.org">http://www.x2go.org</a></body></html></translation> </message> </context> </TS> 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-6-gf063996
by git-admin＠x2go.org 27 Nov '12

27 Nov '12

The branch, master has been updated via f063996331d57da837459753a20743b356cee3ed (commit) from 3c06a4b01e9fc5bca18034cfd13888b4bb750e85 (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 f063996331d57da837459753a20743b356cee3ed Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Nov 27 10:58:31 2012 +0100 Add Swedish translation file. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 9 +++++-- x2godesktopsharing_sv.ts | 65 ++++++++++++++++++++++++++-------------------- 2 files changed, 44 insertions(+), 30 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 822da78..63811ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,18 @@ x2godesktopsharing (3.1.0.6-0~x2go1) UNRELEASED; urgency=low + [ Dick Kniep ] + * New upstream version (3.1.0.6): + - Add Dutch translation file. + + [ Mike Gabriel ] * New upstream version (3.1.0.6): - 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). - [ Dick Kniep ] + [ Daniel Lindgren ] * New upstream version (3.1.0.6): - - Add Dutch translation file. + - Add Swedish translation file. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 13 Nov 2012 16:24:02 +0100 diff --git a/x2godesktopsharing_sv.ts b/x2godesktopsharing_sv.ts index 2e17c06..116ed49 100644 --- a/x2godesktopsharing_sv.ts +++ b/x2godesktopsharing_sv.ts @@ -6,12 +6,12 @@ <message> <location filename="messagebox.cpp" line="20"/> <source>Save selection for %1</source> - <translation type="unfinished"></translation> + <translation>Spara urval för %1</translation> </message> <message> <location filename="messagebox.cpp" line="24"/> <source>Accept %1 from %2 ?</source> - <translation type="unfinished"></translation> + <translation>Acceptera %1 från %2?</translation> </message> </context> <context> @@ -19,120 +19,122 @@ <message> <location filename="sharetray.cpp" line="68"/> <source>X2GO DesktopSharing v</source> - <translation type="unfinished"></translation> + <translation>X2GO Skrivbordsdelning v</translation> </message> <message> <location filename="sharetray.cpp" line="101"/> <source>X2Go desktop sharing application is already active for this display if this application is no longer running, remove %1 and start again</source> - <translation type="unfinished"></translation> + <translation>X2Go Skrivbordsdelning är redan aktiv på denna display +om applikationen inte längre körs, ta bort %1 +och starta igen</translation> </message> <message> <location filename="sharetray.cpp" line="108"/> <location filename="sharetray.cpp" line="337"/> <source>Error</source> - <translation type="unfinished"></translation> + <translation>Fel</translation> </message> <message> <location filename="sharetray.cpp" line="128"/> <source>X2Go desktop sharing application</source> - <translation type="unfinished"></translation> + <translation>X2Go Skrivbordsdelning</translation> </message> <message> <location filename="sharetray.cpp" line="133"/> <source>Granted users...</source> - <translation type="unfinished"></translation> + <translation>Beviljade användare...</translation> </message> <message> <location filename="sharetray.cpp" line="135"/> <source>Banned users...</source> - <translation type="unfinished"></translation> + <translation>Spärrade användare...</translation> </message> <message> <location filename="sharetray.cpp" line="139"/> <source>Activate desktop sharing</source> - <translation type="unfinished"></translation> + <translation>Aktivera skrivbordsdelning</translation> </message> <message> <location filename="sharetray.cpp" line="142"/> <source>Deactivate desktop sharing</source> - <translation type="unfinished"></translation> + <translation>Deaktivera skrivbordsdelning</translation> </message> <message> <location filename="sharetray.cpp" line="147"/> <source>About X2GO Sharing</source> - <translation type="unfinished"></translation> + <translation>Om X2Go Skrivbordsdelning</translation> </message> <message> <location filename="sharetray.cpp" line="160"/> <source>&Quit</source> - <translation type="unfinished"></translation> + <translation>&Avsluta</translation> </message> <message> <location filename="sharetray.cpp" line="335"/> <source>Can't listen on socket:</source> - <translation type="unfinished"></translation> + <translation>Kan inte lyssna på socket:</translation> </message> <message> <location filename="sharetray.cpp" line="371"/> <source>Access granted</source> - <translation type="unfinished"></translation> + <translation>Åtkomst beviljad</translation> </message> <message> <location filename="sharetray.cpp" line="371"/> <source>%1(%2): access granted</source> - <translation type="unfinished"></translation> + <translation>%1(%2): åtkomst beviljad</translation> </message> <message> <location filename="sharetray.cpp" line="391"/> <source>Disconnect %1(%2)</source> - <translation type="unfinished"></translation> + <translation>Koppla från %1(%2)</translation> </message> <message> <location filename="sharetray.cpp" line="396"/> <source>Remote connection</source> - <translation type="unfinished"></translation> + <translation>Fjärranslutning</translation> </message> <message> <location filename="sharetray.cpp" line="398"/> <source>%1(%2) connected</source> - <translation type="unfinished"></translation> + <translation>%1(%2) ansluten</translation> </message> <message> <location filename="sharetray.cpp" line="403"/> <source>Access denied</source> - <translation type="unfinished"></translation> + <translation>Åtkomst nekad</translation> </message> <message> <location filename="sharetray.cpp" line="404"/> <source>%1(%2): access denied</source> - <translation type="unfinished"></translation> + <translation>%1(%2): åtkomst nekad</translation> </message> <message> <location filename="sharetray.cpp" line="477"/> <source>User disconnected</source> - <translation type="unfinished"></translation> + <translation>Användare frånkopplad</translation> </message> <message> <location filename="sharetray.cpp" line="479"/> <source>%1(%2) disconnected</source> - <translation type="unfinished"></translation> + <translation>%1(%2) frånkopplad</translation> </message> <message> <location filename="sharetray.cpp" line="515"/> <source>Banned users</source> - <translation type="unfinished"></translation> + <translation>Spärrade användare</translation> </message> <message> <location filename="sharetray.cpp" line="522"/> <source>Granted users</source> - <translation type="unfinished"></translation> + <translation>Beviljade användare</translation> </message> <message> <location filename="sharetray.cpp" line="587"/> <source>X2Go Desktop Sharing</source> - <translation type="unfinished"></translation> + <translation>X2Go Skrivbordsdelning</translation> </message> </context> <context> @@ -140,12 +142,12 @@ and start again</source> <message> <location filename="dlg.ui" line="22"/> <source>X2Go Desktop Sharing</source> - <translation type="unfinished"></translation> + <translation>X2Go Skrivbordsdelning</translation> </message> <message> <location filename="dlg.ui" line="34"/> <source>remove</source> - <translation type="unfinished"></translation> + <translation>Ta bort</translation> </message> <message> <location filename="dlg.ui" line="75"/> @@ -157,7 +159,14 @@ p, li { white-space: pre-wrap; } This application enables you to share your running X-Session with other users over a local network or internet. You'll have the chance to allow or deny user connections and to save your preferences. A TrayBar Icon will inform you about the chosen configuration and you'll be informed about connection events. For further information, please visit <a href="http://www.x2go.org">http://www.x2go.org</a></body></html></source> - <translation type="unfinished"></translation> + <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'OpenSymbol'; font-size:9pt; font-weight:400; font-style:normal;"> +(C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) + Denna applikation möjliggör skrivbordsdelning med andra användare på ett lokalt nätverk eller över internet. Du har möjligheten att tillåta eller neka anslutningar och att spara dina inställningar. En ikon i systemfältet visar vald konfiguration och du meddelas om anslutningshändelser. För vidare information, gå till: + +<a href="http://www.x2go.org">http://www.x2go.org</a></body></html></translation> </message> </context> </TS> 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-5-g3c06a4b
by git-admin＠x2go.org 26 Nov '12

26 Nov '12

The branch, master has been updated via 3c06a4b01e9fc5bca18034cfd13888b4bb750e85 (commit) via fbbbbe1c9990221e5e561f1ca28f3fa5665f0e09 (commit) from 946c16314e840f368434207d1c39063f2d2148ec (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 3c06a4b01e9fc5bca18034cfd13888b4bb750e85 Author: Dick Kniep <dick.kniep(a)lindix.nl> Date: Mon Nov 26 15:35:45 2012 +0100 Add Dutch translation file. commit fbbbbe1c9990221e5e561f1ca28f3fa5665f0e09 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Nov 26 15:34:58 2012 +0100 Update qt_XX.qm files from Debian unstable ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++ qt_da.qm | Bin 113560 -> 118059 bytes qt_de.qm | Bin 273787 -> 328730 bytes qt_es.qm | Bin 82602 -> 87843 bytes qt_fr.qm | Bin 161917 -> 255035 bytes qt_ru.qm | Bin 191977 -> 288378 bytes qt_sv.qm | Bin 65830 -> 71452 bytes qt_zh_tw.qm | Bin 112498 -> 116231 bytes resources.rcc | 1 + x2godesktopsharing.pro | 1 + ...esktopsharing_de.ts => x2godesktopsharing_nl.ts | 60 ++++++++++---------- 11 files changed, 36 insertions(+), 30 deletions(-) copy x2godesktopsharing_de.ts => x2godesktopsharing_nl.ts (81%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index fac771f..822da78 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,10 @@ x2godesktopsharing (3.1.0.6-0~x2go1) UNRELEASED; urgency=low languages (da, de, es, fr, nb_no, ru, sv, zh_tw). - Update German translation file (not much to do). + [ Dick Kniep ] + * New upstream version (3.1.0.6): + - Add Dutch translation file. + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 13 Nov 2012 16:24:02 +0100 x2godesktopsharing (3.1.0.5-0~x2go1) unstable; urgency=low diff --git a/qt_da.qm b/qt_da.qm index 57a0aa7..9366c63 100644 Binary files a/qt_da.qm and b/qt_da.qm differ diff --git a/qt_de.qm b/qt_de.qm index 28197e1..941a1ea 100644 Binary files a/qt_de.qm and b/qt_de.qm differ diff --git a/qt_es.qm b/qt_es.qm index 2c5e54f..00e2ae9 100644 Binary files a/qt_es.qm and b/qt_es.qm differ diff --git a/qt_fr.qm b/qt_fr.qm index fb29306..a5ec99d 100644 Binary files a/qt_fr.qm and b/qt_fr.qm differ diff --git a/qt_ru.qm b/qt_ru.qm index 0b1ac9e..88bf39b 100644 Binary files a/qt_ru.qm and b/qt_ru.qm differ diff --git a/qt_sv.qm b/qt_sv.qm index b2c5557..81c6d2c 100644 Binary files a/qt_sv.qm and b/qt_sv.qm differ diff --git a/qt_zh_tw.qm b/qt_zh_tw.qm index 09f82f8..bc15ed0 100644 Binary files a/qt_zh_tw.qm and b/qt_zh_tw.qm differ diff --git a/resources.rcc b/resources.rcc index d218d9f..eb74183 100644 --- a/resources.rcc +++ b/resources.rcc @@ -23,6 +23,7 @@ <file>x2godesktopsharing_es.qm</file> <file>x2godesktopsharing_fr.qm</file> <file>x2godesktopsharing_nb_no.qm</file> + <file>x2godesktopsharing_nl.qm</file> <file>x2godesktopsharing_ru.qm</file> <file>x2godesktopsharing_sv.qm</file> <file>x2godesktopsharing_zh_tw.qm</file> diff --git a/x2godesktopsharing.pro b/x2godesktopsharing.pro index d51cb40..f727528 100644 --- a/x2godesktopsharing.pro +++ b/x2godesktopsharing.pro @@ -12,6 +12,7 @@ TRANSLATIONS += \ x2godesktopsharing_es.ts \ x2godesktopsharing_fr.ts \ x2godesktopsharing_nb_no.ts \ + x2godesktopsharing_nl.ts \ x2godesktopsharing_ru.ts \ x2godesktopsharing_sv.ts \ x2godesktopsharing_zh_tw diff --git a/x2godesktopsharing_de.ts b/x2godesktopsharing_nl.ts similarity index 81% copy from x2godesktopsharing_de.ts copy to x2godesktopsharing_nl.ts index 0b6a298..6f75276 100644 --- a/x2godesktopsharing_de.ts +++ b/x2godesktopsharing_nl.ts @@ -5,7 +5,7 @@ <name>ListDialog</name> <message> <source>remove</source> - <translation type="obsolete">entfernen</translation> + <translation type="obsolete">verwijderen</translation> </message> </context> <context> @@ -13,12 +13,12 @@ <message> <location filename="messagebox.cpp" line="24"/> <source>Accept %1 from %2 ?</source> - <translation>Verbindung von %1(%2) erlauben?</translation> + <translation>Verbinding van %1(%2) toestaan?</translation> </message> <message> <location filename="messagebox.cpp" line="20"/> <source>Save selection for %1</source> - <translation>Auswahl für Benutzer %1 speichern</translation> + <translation>Keuze voor gebruiker %1 opslaan</translation> </message> </context> <context> @@ -26,77 +26,77 @@ <message> <location filename="sharetray.cpp" line="160"/> <source>&Quit</source> - <translation>Be&enden</translation> + <translation>Be&eindigen</translation> </message> <message> <location filename="sharetray.cpp" line="108"/> <location filename="sharetray.cpp" line="337"/> <source>Error</source> - <translation>Fehler</translation> + <translation>Fout</translation> </message> <message> <location filename="sharetray.cpp" line="139"/> <source>Activate desktop sharing</source> - <translation>Desktopfreigabe aktivieren</translation> + <translation>Desktop delen aanzetten</translation> </message> <message> <location filename="sharetray.cpp" line="142"/> <source>Deactivate desktop sharing</source> - <translation>Desktopfreigabe deaktivieren</translation> + <translation>Desktop delen uitzetten</translation> </message> <message> <location filename="sharetray.cpp" line="403"/> <source>Access denied</source> - <translation>Zugriff verweigert</translation> + <translation>Toegang geweigerd</translation> </message> <message> <location filename="sharetray.cpp" line="396"/> <source>Remote connection</source> - <translation>Desktopverbindung</translation> + <translation>Desktop verbinding</translation> </message> <message> <location filename="sharetray.cpp" line="477"/> <source>User disconnected</source> - <translation>Verbindung getrennt</translation> + <translation>Verbinding verbroken</translation> </message> <message> <location filename="sharetray.cpp" line="133"/> <source>Granted users...</source> - <translation>Automatisch akzeptieren...</translation> + <translation>Toegestane gebruikers...</translation> </message> <message> <location filename="sharetray.cpp" line="135"/> <source>Banned users...</source> - <translation>Automatisch ablennen...</translation> + <translation>Geweigerde gebruikers...</translation> </message> <message> <location filename="sharetray.cpp" line="128"/> <source>X2Go desktop sharing application</source> - <translation>X2Go Desktopfreigabe</translation> + <translation>X2Go Desktop toegang</translation> </message> <message> <location filename="sharetray.cpp" line="335"/> <source>Can't listen on socket:</source> - <translation>Socket nicht erreichbar:</translation> + <translation>Socket is niet te gebruiken:</translation> </message> <message> <location filename="sharetray.cpp" line="101"/> <source>X2Go desktop sharing application is already active for this display if this application is no longer running, remove %1 and start again</source> - <translation>X2Go Desktopfreigabe läuft bereits -Falls beendet, %1 -entfernen und Dienst neu starten</translation> + <translation>X2Go Desktop loopt al +Indien de applicatie niet meer loopt, verwijder %1 +en start opnieuw</translation> </message> <message> <location filename="sharetray.cpp" line="404"/> <source>%1(%2): access denied</source> - <translation>%1(%2): Zugriff verweigert</translation> + <translation>%1(%2): Toegang geweigerd</translation> </message> <message> <location filename="sharetray.cpp" line="391"/> <source>Disconnect %1(%2)</source> - <translation>%1(%2) trennen</translation> + <translation>%1(%2) Verbreek verbinding</translation> </message> <message> <location filename="sharetray.cpp" line="68"/> @@ -106,46 +106,46 @@ entfernen und Dienst neu starten</translation> <message> <location filename="sharetray.cpp" line="398"/> <source>%1(%2) connected</source> - <translation>%1(%2) verbunden</translation> + <translation>%1(%2) verbonden</translation> </message> <message> <location filename="sharetray.cpp" line="479"/> <source>%1(%2) disconnected</source> - <translation>%1(%2) getrennt</translation> + <translation>%1(%2) verbroken</translation> </message> <message> <location filename="sharetray.cpp" line="515"/> <source>Banned users</source> - <translation>Automatisch ablennen</translation> + <translation>Geweigerde gebruikers</translation> </message> <message> <location filename="sharetray.cpp" line="522"/> <source>Granted users</source> - <translation>Automatisch akzeptieren</translation> + <translation>Toegestane gebruikers</translation> </message> <message> <source>X2GO DesktopSharing V. </source> - <translation type="obsolete">X2GO Desktopfreigabe V. </translation> + <translation type="obsolete">X2GO DesktopSharing V. </translation> </message> <message> <location filename="sharetray.cpp" line="147"/> <source>About X2GO Sharing</source> - <translation>Über X2Go Desktopfreigabe</translation> + <translation>Over X2Go desktopsharing</translation> </message> <message> <location filename="sharetray.cpp" line="371"/> <source>Access granted</source> - <translation>Zugriff erlaubt</translation> + <translation>Toegang toegestaan</translation> </message> <message> <location filename="sharetray.cpp" line="371"/> <source>%1(%2): access granted</source> - <translation>%1(%2): Zugriff erlaubt</translation> + <translation>%1(%2): Toegang toegestaan</translation> </message> <message> <location filename="sharetray.cpp" line="587"/> <source>X2Go Desktop Sharing</source> - <translation>X2Go Desktopfreigabe</translation> + <translation>X2Go Desktop Sharing<translation> </message> </context> <context> @@ -153,12 +153,12 @@ entfernen und Dienst neu starten</translation> <message> <location filename="dlg.ui" line="22"/> <source>X2Go Desktop Sharing</source> - <translation>X2Go Desktopfreigabe</translation> + <translation>X2Go Desktop Sharing</translation> </message> <message> <location filename="dlg.ui" line="34"/> <source>remove</source> - <translation>entfernen</translation> + <translation>verwijderen</translation> </message> <message> <location filename="dlg.ui" line="75"/> 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-3-g946c163
by git-admin＠x2go.org 26 Nov '12

26 Nov '12

The branch, master has been updated via 946c16314e840f368434207d1c39063f2d2148ec (commit) from ed684f537643e3b50baf40d7c43d7f64a0c29c0f (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 946c16314e840f368434207d1c39063f2d2148ec Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Nov 26 15:12:54 2012 +0100 Update German translation file (not much to do). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2godesktopsharing_de.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 29b4ac5..fac771f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ x2godesktopsharing (3.1.0.6-0~x2go1) UNRELEASED; urgency=low * New upstream version (3.1.0.6): - 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). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 13 Nov 2012 16:24:02 +0100 diff --git a/x2godesktopsharing_de.ts b/x2godesktopsharing_de.ts index 4811b0e..0b6a298 100644 --- a/x2godesktopsharing_de.ts +++ b/x2godesktopsharing_de.ts @@ -101,7 +101,7 @@ entfernen und Dienst neu starten</translation> <message> <location filename="sharetray.cpp" line="68"/> <source>X2GO DesktopSharing v</source> - <translation type="unfinished"></translation> + <translation>X2GO DesktopSharing v</translation> </message> <message> <location filename="sharetray.cpp" line="398"/> 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-2-ged684f5
by git-admin＠x2go.org 26 Nov '12

26 Nov '12

The branch, master has been updated via ed684f537643e3b50baf40d7c43d7f64a0c29c0f (commit) from db0b079d5320b0bc6b718428c9831775b3ba39a7 (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 ed684f537643e3b50baf40d7c43d7f64a0c29c0f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Nov 26 15:09:46 2012 +0100 Prepare for translating into the current project languages (da, de, es, fr, nb_no, ru, sv, zh_tw). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 +- qt_da.qm | Bin 0 -> 113560 bytes qt_de.qm | Bin 157137 -> 273787 bytes qt_es.qm | Bin 0 -> 82602 bytes qt_fr.qm | Bin 0 -> 161917 bytes qt_ru.qm | Bin 60815 -> 191977 bytes qt_sv.qm | Bin 0 -> 65830 bytes qt_zh_tw.qm | Bin 0 -> 112498 bytes resources.rcc | 11 +++ x2godesktopsharing.pro | 28 +++++++- x2godesktopsharing_da.ts | 163 +++++++++++++++++++++++++++++++++++++++++++ x2godesktopsharing_de.qm | Bin 6816 -> 0 bytes x2godesktopsharing_de.ts | 58 ++++++++------- x2godesktopsharing_es.ts | 163 +++++++++++++++++++++++++++++++++++++++++++ x2godesktopsharing_fr.ts | 163 +++++++++++++++++++++++++++++++++++++++++++ x2godesktopsharing_nb_no.ts | 163 +++++++++++++++++++++++++++++++++++++++++++ x2godesktopsharing_ru.qm | Bin 6961 -> 0 bytes x2godesktopsharing_ru.ts | 58 ++++++++------- x2godesktopsharing_sv.ts | 163 +++++++++++++++++++++++++++++++++++++++++++ x2godesktopsharing_zh_tw | 163 +++++++++++++++++++++++++++++++++++++++++++ 20 files changed, 1081 insertions(+), 56 deletions(-) create mode 100644 qt_da.qm create mode 100644 qt_es.qm create mode 100644 qt_fr.qm create mode 100644 qt_sv.qm create mode 100644 qt_zh_tw.qm create mode 100644 x2godesktopsharing_da.ts delete mode 100644 x2godesktopsharing_de.qm create mode 100644 x2godesktopsharing_es.ts create mode 100644 x2godesktopsharing_fr.ts create mode 100644 x2godesktopsharing_nb_no.ts delete mode 100644 x2godesktopsharing_ru.qm create mode 100644 x2godesktopsharing_sv.ts create mode 100644 x2godesktopsharing_zh_tw The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 85766c3..29b4ac5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ x2godesktopsharing (3.1.0.6-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (3.1.0.6): + - Prepare for translating into the current project + languages (da, de, es, fr, nb_no, ru, sv, zh_tw). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 13 Nov 2012 16:24:02 +0100 diff --git a/qt_da.qm b/qt_da.qm new file mode 100644 index 0000000..57a0aa7 Binary files /dev/null and b/qt_da.qm differ diff --git a/qt_de.qm b/qt_de.qm index 6b76d7b..28197e1 100644 Binary files a/qt_de.qm and b/qt_de.qm differ diff --git a/qt_es.qm b/qt_es.qm new file mode 100644 index 0000000..2c5e54f Binary files /dev/null and b/qt_es.qm differ diff --git a/qt_fr.qm b/qt_fr.qm new file mode 100644 index 0000000..fb29306 Binary files /dev/null and b/qt_fr.qm differ diff --git a/qt_ru.qm b/qt_ru.qm index 63b7b8b..0b1ac9e 100644 Binary files a/qt_ru.qm and b/qt_ru.qm differ diff --git a/qt_sv.qm b/qt_sv.qm new file mode 100644 index 0000000..b2c5557 Binary files /dev/null and b/qt_sv.qm differ diff --git a/qt_zh_tw.qm b/qt_zh_tw.qm new file mode 100644 index 0000000..09f82f8 Binary files /dev/null and b/qt_zh_tw.qm differ diff --git a/resources.rcc b/resources.rcc index 0767149..d218d9f 100644 --- a/resources.rcc +++ b/resources.rcc @@ -1,7 +1,12 @@ <RCC> <qresource> + <file>qt_da.qm</file> <file>qt_de.qm</file> + <file>qt_es.qm</file> + <file>qt_fr.qm</file> <file>qt_ru.qm</file> + <file>qt_sv.qm</file> + <file>qt_zh_tw.qm</file> <file>icons/22x22/x2godesktopsharing.png</file> <file>icons/22x22/accept.png</file> <file>icons/22x22/discard.png</file> @@ -13,7 +18,13 @@ <file>icons/32x32/wlist.png</file> <file>icons/32x32/x2godesktopsharing.png</file> <file>icons/128x128/x2godesktopsharing.png</file> + <file>x2godesktopsharing_da.qm</file> <file>x2godesktopsharing_de.qm</file> + <file>x2godesktopsharing_es.qm</file> + <file>x2godesktopsharing_fr.qm</file> + <file>x2godesktopsharing_nb_no.qm</file> <file>x2godesktopsharing_ru.qm</file> + <file>x2godesktopsharing_sv.qm</file> + <file>x2godesktopsharing_zh_tw.qm</file> </qresource> </RCC> diff --git a/x2godesktopsharing.pro b/x2godesktopsharing.pro index e8e821c..d51cb40 100644 --- a/x2godesktopsharing.pro +++ b/x2godesktopsharing.pro @@ -6,9 +6,35 @@ TEMPLATE = app TARGET = DEPENDPATH += . INCLUDEPATH += . -TRANSLATIONS += x2godesktopsharing_de.ts x2godesktopsharing_ru.ts +TRANSLATIONS += \ + x2godesktopsharing_da.ts \ + x2godesktopsharing_de.ts \ + x2godesktopsharing_es.ts \ + x2godesktopsharing_fr.ts \ + x2godesktopsharing_nb_no.ts \ + x2godesktopsharing_ru.ts \ + x2godesktopsharing_sv.ts \ + x2godesktopsharing_zh_tw RESOURCES += resources.rcc +!isEmpty(TRANSLATIONS) { + isEmpty(QMAKE_LRELEASE) { + win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe + else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease + } + + isEmpty(TS_DIR):TS_DIR = . + + TSQM.name = lrelease ${QMAKE_FILE_IN} + TSQM.input = TRANSLATIONS + TSQM.output = $$TS_DIR/${QMAKE_FILE_BASE}.qm + TSQM.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} + TSQM.CONFIG = no_link + QMAKE_EXTRA_COMPILERS += TSQM + PRE_TARGETDEPS += compiler_TSQM_make_all +} +else:message(No translation files in project) + # Input SOURCES += main.cpp \ sharetray.cpp \ diff --git a/x2godesktopsharing_da.ts b/x2godesktopsharing_da.ts new file mode 100644 index 0000000..61546f2 --- /dev/null +++ b/x2godesktopsharing_da.ts @@ -0,0 +1,163 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0" language="da_DK"> +<context> + <name>MessageBox</name> + <message> + <location filename="messagebox.cpp" line="20"/> + <source>Save selection for %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="messagebox.cpp" line="24"/> + <source>Accept %1 from %2 ?</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ShareTray</name> + <message> + <location filename="sharetray.cpp" line="68"/> + <source>X2GO DesktopSharing v</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="101"/> + <source>X2Go desktop sharing application is already active for this display +if this application is no longer running, remove %1 +and start again</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="108"/> + <location filename="sharetray.cpp" line="337"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="128"/> + <source>X2Go desktop sharing application</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="133"/> + <source>Granted users...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="135"/> + <source>Banned users...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="139"/> + <source>Activate desktop sharing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="142"/> + <source>Deactivate desktop sharing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="147"/> + <source>About X2GO Sharing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="160"/> + <source>&Quit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="335"/> + <source>Can't listen on socket:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="371"/> + <source>Access granted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="371"/> + <source>%1(%2): access granted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="391"/> + <source>Disconnect %1(%2)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="396"/> + <source>Remote connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="398"/> + <source>%1(%2) connected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="403"/> + <source>Access denied</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="404"/> + <source>%1(%2): access denied</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="477"/> + <source>User disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="479"/> + <source>%1(%2) disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="515"/> + <source>Banned users</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="522"/> + <source>Granted users</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="587"/> + <source>X2Go Desktop Sharing</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>mwnd</name> + <message> + <location filename="dlg.ui" line="22"/> + <source>X2Go Desktop Sharing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dlg.ui" line="34"/> + <source>remove</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dlg.ui" line="75"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'OpenSymbol'; font-size:9pt; font-weight:400; font-style:normal;"> +(C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) + This application enables you to share your running X-Session with other users over a local network or internet. You'll have the chance to allow or deny user connections and to save your preferences. A TrayBar Icon will inform you about the chosen configuration and you'll be informed about connection events. For further information, please visit + +<a href="http://www.x2go.org">http://www.x2go.org</a></body></html></source> + <translation type="unfinished"></translation> + </message> +</context> +</TS> diff --git a/x2godesktopsharing_de.qm b/x2godesktopsharing_de.qm deleted file mode 100644 index 3cbe137..0000000 Binary files a/x2godesktopsharing_de.qm and /dev/null differ diff --git a/x2godesktopsharing_de.ts b/x2godesktopsharing_de.ts index b923fc9..4811b0e 100644 --- a/x2godesktopsharing_de.ts +++ b/x2godesktopsharing_de.ts @@ -1,10 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS><TS version="1.1" language="de"> -<defaultcodec></defaultcodec> +<!DOCTYPE TS> +<TS version="2.0" language="de"> <context> <name>ListDialog</name> <message> - <location filename="listdialog.cpp" line="26"/> <source>remove</source> <translation type="obsolete">entfernen</translation> </message> @@ -25,62 +24,63 @@ <context> <name>ShareTray</name> <message> - <location filename="sharetray.cpp" line="123"/> + <location filename="sharetray.cpp" line="160"/> <source>&Quit</source> <translation>Be&enden</translation> </message> <message> - <location filename="sharetray.cpp" line="204"/> + <location filename="sharetray.cpp" line="108"/> + <location filename="sharetray.cpp" line="337"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="sharetray.cpp" line="102"/> + <location filename="sharetray.cpp" line="139"/> <source>Activate desktop sharing</source> <translation>Desktopfreigabe aktivieren</translation> </message> <message> - <location filename="sharetray.cpp" line="105"/> + <location filename="sharetray.cpp" line="142"/> <source>Deactivate desktop sharing</source> <translation>Desktopfreigabe deaktivieren</translation> </message> <message> - <location filename="sharetray.cpp" line="230"/> + <location filename="sharetray.cpp" line="403"/> <source>Access denied</source> <translation>Zugriff verweigert</translation> </message> <message> - <location filename="sharetray.cpp" line="243"/> + <location filename="sharetray.cpp" line="396"/> <source>Remote connection</source> <translation>Desktopverbindung</translation> </message> <message> - <location filename="sharetray.cpp" line="318"/> + <location filename="sharetray.cpp" line="477"/> <source>User disconnected</source> <translation>Verbindung getrennt</translation> </message> <message> - <location filename="sharetray.cpp" line="96"/> + <location filename="sharetray.cpp" line="133"/> <source>Granted users...</source> <translation>Automatisch akzeptieren...</translation> </message> <message> - <location filename="sharetray.cpp" line="98"/> + <location filename="sharetray.cpp" line="135"/> <source>Banned users...</source> <translation>Automatisch ablennen...</translation> </message> <message> - <location filename="sharetray.cpp" line="91"/> + <location filename="sharetray.cpp" line="128"/> <source>X2Go desktop sharing application</source> <translation>X2Go Desktopfreigabe</translation> </message> <message> - <location filename="sharetray.cpp" line="202"/> + <location filename="sharetray.cpp" line="335"/> <source>Can't listen on socket:</source> <translation>Socket nicht erreichbar:</translation> </message> <message> - <location filename="sharetray.cpp" line="77"/> + <location filename="sharetray.cpp" line="101"/> <source>X2Go desktop sharing application is already active for this display if this application is no longer running, remove %1 and start again</source> @@ -89,57 +89,61 @@ Falls beendet, %1 entfernen und Dienst neu starten</translation> </message> <message> - <location filename="sharetray.cpp" line="231"/> + <location filename="sharetray.cpp" line="404"/> <source>%1(%2): access denied</source> <translation>%1(%2): Zugriff verweigert</translation> </message> <message> - <location filename="sharetray.cpp" line="238"/> + <location filename="sharetray.cpp" line="391"/> <source>Disconnect %1(%2)</source> <translation>%1(%2) trennen</translation> </message> <message> - <location filename="sharetray.cpp" line="245"/> + <location filename="sharetray.cpp" line="68"/> + <source>X2GO DesktopSharing v</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="398"/> <source>%1(%2) connected</source> <translation>%1(%2) verbunden</translation> </message> <message> - <location filename="sharetray.cpp" line="320"/> + <location filename="sharetray.cpp" line="479"/> <source>%1(%2) disconnected</source> <translation>%1(%2) getrennt</translation> </message> <message> - <location filename="sharetray.cpp" line="356"/> + <location filename="sharetray.cpp" line="515"/> <source>Banned users</source> <translation>Automatisch ablennen</translation> </message> <message> - <location filename="sharetray.cpp" line="364"/> + <location filename="sharetray.cpp" line="522"/> <source>Granted users</source> <translation>Automatisch akzeptieren</translation> </message> <message> - <location filename="sharetray.cpp" line="57"/> <source>X2GO DesktopSharing V. </source> - <translation>X2GO Desktopfreigabe V. </translation> + <translation type="obsolete">X2GO Desktopfreigabe V. </translation> </message> <message> - <location filename="sharetray.cpp" line="110"/> + <location filename="sharetray.cpp" line="147"/> <source>About X2GO Sharing</source> <translation>Über X2Go Desktopfreigabe</translation> </message> <message> - <location filename="sharetray.cpp" line="224"/> + <location filename="sharetray.cpp" line="371"/> <source>Access granted</source> <translation>Zugriff erlaubt</translation> </message> <message> - <location filename="sharetray.cpp" line="226"/> + <location filename="sharetray.cpp" line="371"/> <source>%1(%2): access granted</source> <translation>%1(%2): Zugriff erlaubt</translation> </message> <message> - <location filename="sharetray.cpp" line="430"/> + <location filename="sharetray.cpp" line="587"/> <source>X2Go Desktop Sharing</source> <translation>X2Go Desktopfreigabe</translation> </message> diff --git a/x2godesktopsharing_es.ts b/x2godesktopsharing_es.ts new file mode 100644 index 0000000..5c7fb28 --- /dev/null +++ b/x2godesktopsharing_es.ts @@ -0,0 +1,163 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0" language="es_ES"> +<context> + <name>MessageBox</name> + <message> + <location filename="messagebox.cpp" line="20"/> + <source>Save selection for %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="messagebox.cpp" line="24"/> + <source>Accept %1 from %2 ?</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ShareTray</name> + <message> + <location filename="sharetray.cpp" line="68"/> + <source>X2GO DesktopSharing v</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="101"/> + <source>X2Go desktop sharing application is already active for this display +if this application is no longer running, remove %1 +and start again</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="108"/> + <location filename="sharetray.cpp" line="337"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="128"/> + <source>X2Go desktop sharing application</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="133"/> + <source>Granted users...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="135"/> + <source>Banned users...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="139"/> + <source>Activate desktop sharing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="142"/> + <source>Deactivate desktop sharing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="147"/> + <source>About X2GO Sharing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="160"/> + <source>&Quit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="335"/> + <source>Can't listen on socket:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="371"/> + <source>Access granted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="371"/> + <source>%1(%2): access granted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="391"/> + <source>Disconnect %1(%2)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="396"/> + <source>Remote connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="398"/> + <source>%1(%2) connected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="403"/> + <source>Access denied</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="404"/> + <source>%1(%2): access denied</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="477"/> + <source>User disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="479"/> + <source>%1(%2) disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="515"/> + <source>Banned users</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="522"/> + <source>Granted users</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="587"/> + <source>X2Go Desktop Sharing</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>mwnd</name> + <message> + <location filename="dlg.ui" line="22"/> + <source>X2Go Desktop Sharing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dlg.ui" line="34"/> + <source>remove</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dlg.ui" line="75"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'OpenSymbol'; font-size:9pt; font-weight:400; font-style:normal;"> +(C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) + This application enables you to share your running X-Session with other users over a local network or internet. You'll have the chance to allow or deny user connections and to save your preferences. A TrayBar Icon will inform you about the chosen configuration and you'll be informed about connection events. For further information, please visit + +<a href="http://www.x2go.org">http://www.x2go.org</a></body></html></source> + <translation type="unfinished"></translation> + </message> +</context> +</TS> diff --git a/x2godesktopsharing_fr.ts b/x2godesktopsharing_fr.ts new file mode 100644 index 0000000..bde94cf --- /dev/null +++ b/x2godesktopsharing_fr.ts @@ -0,0 +1,163 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0" language="fr_FR"> +<context> + <name>MessageBox</name> + <message> + <location filename="messagebox.cpp" line="20"/> + <source>Save selection for %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="messagebox.cpp" line="24"/> + <source>Accept %1 from %2 ?</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ShareTray</name> + <message> + <location filename="sharetray.cpp" line="68"/> + <source>X2GO DesktopSharing v</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="101"/> + <source>X2Go desktop sharing application is already active for this display +if this application is no longer running, remove %1 +and start again</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="108"/> + <location filename="sharetray.cpp" line="337"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="128"/> + <source>X2Go desktop sharing application</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="133"/> + <source>Granted users...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="135"/> + <source>Banned users...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="139"/> + <source>Activate desktop sharing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="142"/> + <source>Deactivate desktop sharing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="147"/> + <source>About X2GO Sharing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="160"/> + <source>&Quit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="335"/> + <source>Can't listen on socket:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="371"/> + <source>Access granted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="371"/> + <source>%1(%2): access granted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="391"/> + <source>Disconnect %1(%2)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="396"/> + <source>Remote connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="398"/> + <source>%1(%2) connected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="403"/> + <source>Access denied</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="404"/> + <source>%1(%2): access denied</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="477"/> + <source>User disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="479"/> + <source>%1(%2) disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="515"/> + <source>Banned users</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="522"/> + <source>Granted users</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="587"/> + <source>X2Go Desktop Sharing</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>mwnd</name> + <message> + <location filename="dlg.ui" line="22"/> + <source>X2Go Desktop Sharing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dlg.ui" line="34"/> + <source>remove</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dlg.ui" line="75"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'OpenSymbol'; font-size:9pt; font-weight:400; font-style:normal;"> +(C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) + This application enables you to share your running X-Session with other users over a local network or internet. You'll have the chance to allow or deny user connections and to save your preferences. A TrayBar Icon will inform you about the chosen configuration and you'll be informed about connection events. For further information, please visit + +<a href="http://www.x2go.org">http://www.x2go.org</a></body></html></source> + <translation type="unfinished"></translation> + </message> +</context> +</TS> diff --git a/x2godesktopsharing_nb_no.ts b/x2godesktopsharing_nb_no.ts new file mode 100644 index 0000000..3227f2b --- /dev/null +++ b/x2godesktopsharing_nb_no.ts @@ -0,0 +1,163 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0" language="nb_NO"> +<context> + <name>MessageBox</name> + <message> + <location filename="messagebox.cpp" line="20"/> + <source>Save selection for %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="messagebox.cpp" line="24"/> + <source>Accept %1 from %2 ?</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ShareTray</name> + <message> + <location filename="sharetray.cpp" line="68"/> + <source>X2GO DesktopSharing v</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="101"/> + <source>X2Go desktop sharing application is already active for this display +if this application is no longer running, remove %1 +and start again</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="108"/> + <location filename="sharetray.cpp" line="337"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="128"/> + <source>X2Go desktop sharing application</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="133"/> + <source>Granted users...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="135"/> + <source>Banned users...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="139"/> + <source>Activate desktop sharing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="142"/> + <source>Deactivate desktop sharing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="147"/> + <source>About X2GO Sharing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="160"/> + <source>&Quit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="335"/> + <source>Can't listen on socket:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="371"/> + <source>Access granted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="371"/> + <source>%1(%2): access granted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="391"/> + <source>Disconnect %1(%2)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="396"/> + <source>Remote connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="398"/> + <source>%1(%2) connected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="403"/> + <source>Access denied</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="404"/> + <source>%1(%2): access denied</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="477"/> + <source>User disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="479"/> + <source>%1(%2) disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="515"/> + <source>Banned users</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="522"/> + <source>Granted users</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="587"/> + <source>X2Go Desktop Sharing</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>mwnd</name> + <message> + <location filename="dlg.ui" line="22"/> + <source>X2Go Desktop Sharing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dlg.ui" line="34"/> + <source>remove</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dlg.ui" line="75"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'OpenSymbol'; font-size:9pt; font-weight:400; font-style:normal;"> +(C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) + This application enables you to share your running X-Session with other users over a local network or internet. You'll have the chance to allow or deny user connections and to save your preferences. A TrayBar Icon will inform you about the chosen configuration and you'll be informed about connection events. For further information, please visit + +<a href="http://www.x2go.org">http://www.x2go.org</a></body></html></source> + <translation type="unfinished"></translation> + </message> +</context> +</TS> diff --git a/x2godesktopsharing_ru.qm b/x2godesktopsharing_ru.qm deleted file mode 100644 index 1aded5d..0000000 Binary files a/x2godesktopsharing_ru.qm and /dev/null differ diff --git a/x2godesktopsharing_ru.ts b/x2godesktopsharing_ru.ts index 6708b26..5920292 100644 --- a/x2godesktopsharing_ru.ts +++ b/x2godesktopsharing_ru.ts @@ -1,10 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS><TS version="1.1" language="ru"> -<defaultcodec></defaultcodec> +<!DOCTYPE TS> +<TS version="2.0" language="ru"> <context> <name>ListDialog</name> <message> - <location filename="listdialog.cpp" line="26"/> <source>remove</source> <translation type="obsolete">удалить</translation> </message> @@ -25,62 +24,63 @@ <context> <name>ShareTray</name> <message> - <location filename="sharetray.cpp" line="204"/> + <location filename="sharetray.cpp" line="108"/> + <location filename="sharetray.cpp" line="337"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="sharetray.cpp" line="96"/> + <location filename="sharetray.cpp" line="133"/> <source>Granted users...</source> <translation>Автоматически разрешать доступ...</translation> </message> <message> - <location filename="sharetray.cpp" line="98"/> + <location filename="sharetray.cpp" line="135"/> <source>Banned users...</source> <translation>Автоматически запрещать доступ...</translation> </message> <message> - <location filename="sharetray.cpp" line="102"/> + <location filename="sharetray.cpp" line="139"/> <source>Activate desktop sharing</source> <translation>Активировать доступ к десктопу</translation> </message> <message> - <location filename="sharetray.cpp" line="105"/> + <location filename="sharetray.cpp" line="142"/> <source>Deactivate desktop sharing</source> <translation>Деактивировать доступ к десктопу</translation> </message> <message> - <location filename="sharetray.cpp" line="123"/> + <location filename="sharetray.cpp" line="160"/> <source>&Quit</source> <translation>&Выход</translation> </message> <message> - <location filename="sharetray.cpp" line="230"/> + <location filename="sharetray.cpp" line="403"/> <source>Access denied</source> <translation>В доступе отказано</translation> </message> <message> - <location filename="sharetray.cpp" line="243"/> + <location filename="sharetray.cpp" line="396"/> <source>Remote connection</source> <translation>Удаленное соединение</translation> </message> <message> - <location filename="sharetray.cpp" line="318"/> + <location filename="sharetray.cpp" line="477"/> <source>User disconnected</source> <translation>Пользователь отсоединился</translation> </message> <message> - <location filename="sharetray.cpp" line="91"/> + <location filename="sharetray.cpp" line="128"/> <source>X2Go desktop sharing application</source> <translation>Доступ к десктопу X2Go</translation> </message> <message> - <location filename="sharetray.cpp" line="202"/> + <location filename="sharetray.cpp" line="335"/> <source>Can't listen on socket:</source> <translation>Ошибка открытия сокета:</translation> </message> <message> - <location filename="sharetray.cpp" line="77"/> + <location filename="sharetray.cpp" line="101"/> <source>X2Go desktop sharing application is already active for this display if this application is no longer running, remove %1 and start again</source> @@ -89,57 +89,61 @@ and start again</source> и перезапустите приложение</translation> </message> <message> - <location filename="sharetray.cpp" line="231"/> + <location filename="sharetray.cpp" line="404"/> <source>%1(%2): access denied</source> <translation>%1(%2): в доступе отказано</translation> </message> <message> - <location filename="sharetray.cpp" line="238"/> + <location filename="sharetray.cpp" line="391"/> <source>Disconnect %1(%2)</source> <translation>Отсоединить %1(%2)</translation> </message> <message> - <location filename="sharetray.cpp" line="245"/> + <location filename="sharetray.cpp" line="68"/> + <source>X2GO DesktopSharing v</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="398"/> <source>%1(%2) connected</source> <translation>%1(%2) присоединился</translation> </message> <message> - <location filename="sharetray.cpp" line="320"/> + <location filename="sharetray.cpp" line="479"/> <source>%1(%2) disconnected</source> <translation>%1(%2) отсоединился</translation> </message> <message> - <location filename="sharetray.cpp" line="356"/> + <location filename="sharetray.cpp" line="515"/> <source>Banned users</source> <translation>Автоматически запрещать доступ</translation> </message> <message> - <location filename="sharetray.cpp" line="364"/> + <location filename="sharetray.cpp" line="522"/> <source>Granted users</source> <translation>Автоматически разрешать доступ</translation> </message> <message> - <location filename="sharetray.cpp" line="57"/> <source>X2GO DesktopSharing V. </source> - <translation>Доступ к десктопу X2Go V.</translation> + <translation type="obsolete">Доступ к десктопу X2Go V.</translation> </message> <message> - <location filename="sharetray.cpp" line="110"/> + <location filename="sharetray.cpp" line="147"/> <source>About X2GO Sharing</source> <translation>О программе</translation> </message> <message> - <location filename="sharetray.cpp" line="224"/> + <location filename="sharetray.cpp" line="371"/> <source>Access granted</source> <translation>Доступ разрешён</translation> </message> <message> - <location filename="sharetray.cpp" line="226"/> + <location filename="sharetray.cpp" line="371"/> <source>%1(%2): access granted</source> <translation>%1(%2): доступ разрешён</translation> </message> <message> - <location filename="sharetray.cpp" line="430"/> + <location filename="sharetray.cpp" line="587"/> <source>X2Go Desktop Sharing</source> <translation>Доступ к десктопу X2Go</translation> </message> diff --git a/x2godesktopsharing_sv.ts b/x2godesktopsharing_sv.ts new file mode 100644 index 0000000..2e17c06 --- /dev/null +++ b/x2godesktopsharing_sv.ts @@ -0,0 +1,163 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0" language="sv_SE"> +<context> + <name>MessageBox</name> + <message> + <location filename="messagebox.cpp" line="20"/> + <source>Save selection for %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="messagebox.cpp" line="24"/> + <source>Accept %1 from %2 ?</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ShareTray</name> + <message> + <location filename="sharetray.cpp" line="68"/> + <source>X2GO DesktopSharing v</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="101"/> + <source>X2Go desktop sharing application is already active for this display +if this application is no longer running, remove %1 +and start again</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="108"/> + <location filename="sharetray.cpp" line="337"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="128"/> + <source>X2Go desktop sharing application</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="133"/> + <source>Granted users...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="135"/> + <source>Banned users...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="139"/> + <source>Activate desktop sharing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="142"/> + <source>Deactivate desktop sharing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="147"/> + <source>About X2GO Sharing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="160"/> + <source>&Quit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="335"/> + <source>Can't listen on socket:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="371"/> + <source>Access granted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="371"/> + <source>%1(%2): access granted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="391"/> + <source>Disconnect %1(%2)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="396"/> + <source>Remote connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="398"/> + <source>%1(%2) connected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="403"/> + <source>Access denied</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="404"/> + <source>%1(%2): access denied</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="477"/> + <source>User disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="479"/> + <source>%1(%2) disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="515"/> + <source>Banned users</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="522"/> + <source>Granted users</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="587"/> + <source>X2Go Desktop Sharing</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>mwnd</name> + <message> + <location filename="dlg.ui" line="22"/> + <source>X2Go Desktop Sharing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dlg.ui" line="34"/> + <source>remove</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dlg.ui" line="75"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'OpenSymbol'; font-size:9pt; font-weight:400; font-style:normal;"> +(C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) + This application enables you to share your running X-Session with other users over a local network or internet. You'll have the chance to allow or deny user connections and to save your preferences. A TrayBar Icon will inform you about the chosen configuration and you'll be informed about connection events. For further information, please visit + +<a href="http://www.x2go.org">http://www.x2go.org</a></body></html></source> + <translation type="unfinished"></translation> + </message> +</context> +</TS> diff --git a/x2godesktopsharing_zh_tw b/x2godesktopsharing_zh_tw new file mode 100644 index 0000000..1801cb2 --- /dev/null +++ b/x2godesktopsharing_zh_tw @@ -0,0 +1,163 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0" language="zh_CN"> +<context> + <name>MessageBox</name> + <message> + <location filename="messagebox.cpp" line="20"/> + <source>Save selection for %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="messagebox.cpp" line="24"/> + <source>Accept %1 from %2 ?</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ShareTray</name> + <message> + <location filename="sharetray.cpp" line="68"/> + <source>X2GO DesktopSharing v</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="101"/> + <source>X2Go desktop sharing application is already active for this display +if this application is no longer running, remove %1 +and start again</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="108"/> + <location filename="sharetray.cpp" line="337"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="128"/> + <source>X2Go desktop sharing application</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="133"/> + <source>Granted users...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="135"/> + <source>Banned users...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="139"/> + <source>Activate desktop sharing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="142"/> + <source>Deactivate desktop sharing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="147"/> + <source>About X2GO Sharing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="160"/> + <source>&Quit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="335"/> + <source>Can't listen on socket:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="371"/> + <source>Access granted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="371"/> + <source>%1(%2): access granted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="391"/> + <source>Disconnect %1(%2)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="396"/> + <source>Remote connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="398"/> + <source>%1(%2) connected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="403"/> + <source>Access denied</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="404"/> + <source>%1(%2): access denied</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="477"/> + <source>User disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="479"/> + <source>%1(%2) disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="515"/> + <source>Banned users</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="522"/> + <source>Granted users</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="587"/> + <source>X2Go Desktop Sharing</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>mwnd</name> + <message> + <location filename="dlg.ui" line="22"/> + <source>X2Go Desktop Sharing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dlg.ui" line="34"/> + <source>remove</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="dlg.ui" line="75"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'OpenSymbol'; font-size:9pt; font-weight:400; font-style:normal;"> +(C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) + This application enables you to share your running X-Session with other users over a local network or internet. You'll have the chance to allow or deny user connections and to save your preferences. A TrayBar Icon will inform you about the chosen configuration and you'll be informed about connection events. For further information, please visit + +<a href="http://www.x2go.org">http://www.x2go.org</a></body></html></source> + <translation type="unfinished"></translation> + </message> +</context> +</TS> 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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits