x2go-commits September 2011

x2go-commits@lists.x2go.org

1 participants
268 discussions

x2godesktopsharing.git - master (branch) updated: 3.0.1.2-12-g37b57f6
by git-admin＠x2go.org 27 Sep '11

27 Sep '11

The branch, master has been updated via 37b57f64cab0f715aae80056a5c0053eafb3390d (commit) from 05b2d0b00809da05a1e9f30ea4b1fdb71612a861 (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 37b57f64cab0f715aae80056a5c0053eafb3390d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 27 21:01:03 2011 +0200 cosmetics on version info ----------------------------------------------------------------------- Summary of changes: sharetray.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/sharetray.cpp b/sharetray.cpp index 5563e2d..df08bf5 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -56,7 +56,7 @@ ShareTray::ShareTray() ui.icon->setPixmap ( QPixmap ( ":icons/128x128/x2godesktopsharing.png" ) ); - ui.text->setText ( tr ( "<b>X2GO DesktopSharing V. " ) +VERSION+ + ui.text->setText ( tr ( "<b>X2GO DesktopSharing v" ) +VERSION+ " </b >(Qt - "+qVersion() +")"+ ui.text->text() ); 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

python-x2go.git - master (branch) updated: 0.1.1.4-61-g6126afe
by git-admin＠x2go.org 27 Sep '11

27 Sep '11

The branch, master has been updated via 6126afedc1af9473b2b3581ac4f2c64663b9810e (commit) via ee2ce40e07dede7165912d0890f161780e946f2b (commit) from 7a7a93082f9791c56f5fc98b30562d0c4408e8be (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 6126afedc1af9473b2b3581ac4f2c64663b9810e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 27 20:48:38 2011 +0200 Always disconnect from X2goSession instance. commit ee2ce40e07dede7165912d0890f161780e946f2b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 27 20:47:53 2011 +0200 Catch failures on sftp_write in control session instance. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/backends/control/_stdout.py | 12 +++++++----- x2go/session.py | 3 +++ 3 files changed, 12 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 81122b0..b2c7439 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ python-x2go (0.1.1.8-0-x2go1) UNRELEASED; urgency=low - Unshare local folders during session cleanup. - Remove local session cache folders after sessions have terminated. - Fix missing import of socket module in backends/control/_stdout.py. + - Catch failures on sftp_write in control session instance. + - Always disconnect from X2goSession instance. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 25 Sep 2011 02:08:11 +0200 diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 5e7d2a3..0a61c50 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -160,10 +160,13 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): def _x2go_sftp_write(self, remote_path, content): self.logger('sFTP-write: opening remote file %s on host %s for writing' % (remote_path, self.get_transport().getpeername()), loglevel=log.loglevel_DEBUG) - remote_fileobj = self.sftp_client.open(remote_path, 'w') - self.logger('sFTP-write: writing content: %s' % content, loglevel=log.loglevel_DEBUG_SFTPXFER) - remote_fileobj.write(content) - remote_fileobj.close() + try: + remote_fileobj = self.sftp_client.open(remote_path, 'w') + self.logger('sFTP-write: writing content: %s' % content, loglevel=log.loglevel_DEBUG_SFTPXFER) + remote_fileobj.write(content) + remote_fileobj.close() + except SSHException: + self.logger('sFTP-write: opening remote file %s on host %s failed' % (remote_path, self.get_transport().getpeername()), loglevel=log.loglevel_WARN) def _x2go_sftp_remove(self, remote_path): @@ -495,7 +498,6 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): self.session_died = False if not self.home_exists(): - self.disconnect() raise x2go_exceptions.X2goRemoteHomeException('remote home directory does not exist') return (self.get_transport() is not None) diff --git a/x2go/session.py b/x2go/session.py index 65c9689..63cdd64 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -773,6 +773,9 @@ class X2goSession(object): **_params) except X2goControlSessionException, e: raise X2goSessionException(str(e)) + except X2goRemoteHomeException, e: + self.disconnect() + raise e except: # remove credentials immediately self.control_params['password'] = '' 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 - release/0.1.1.x (branch) updated: 0.1.1.7-11-g2eaa28d
by git-admin＠x2go.org 27 Sep '11

27 Sep '11

The branch, release/0.1.1.x has been updated via 2eaa28d9aac14d7aa40f315084013bf2346665a5 (commit) via c19244a46d5323607653a98d186d9f370efcbbd9 (commit) from da6002f82aca5764b23e1bd0cf6b55fc50fe0be7 (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 2eaa28d9aac14d7aa40f315084013bf2346665a5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 27 20:48:38 2011 +0200 Always disconnect from X2goSession instance. commit c19244a46d5323607653a98d186d9f370efcbbd9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 27 20:47:53 2011 +0200 Catch failures on sftp_write in control session instance. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/backends/control/_stdout.py | 12 +++++++----- x2go/session.py | 3 +++ 3 files changed, 12 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 3cea1fb..bdb7124 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ python-x2go (0.1.1.8-0-x2go1) UNRELEASED; urgency=low - Unshare local folders during session cleanup. - Remove local session cache folders after sessions have terminated. - Fix missing import of socket module in backends/control/_stdout.py. + - Catch failures on sftp_write in control session instance. + - Always disconnect from X2goSession instance. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 25 Sep 2011 02:08:11 +0200 diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 25c2068..57df4f7 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -160,10 +160,13 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): def _x2go_sftp_write(self, remote_path, content): self.logger('sFTP-write: opening remote file %s on host %s for writing' % (remote_path, self.get_transport().getpeername()), loglevel=log.loglevel_DEBUG) - remote_fileobj = self.sftp_client.open(remote_path, 'w') - self.logger('sFTP-write: writing content: %s' % content, loglevel=log.loglevel_DEBUG_SFTPXFER) - remote_fileobj.write(content) - remote_fileobj.close() + try: + remote_fileobj = self.sftp_client.open(remote_path, 'w') + self.logger('sFTP-write: writing content: %s' % content, loglevel=log.loglevel_DEBUG_SFTPXFER) + remote_fileobj.write(content) + remote_fileobj.close() + except SSHException: + self.logger('sFTP-write: opening remote file %s on host %s failed' % (remote_path, self.get_transport().getpeername()), loglevel=log.loglevel_WARN) def _x2go_sftp_remove(self, remote_path): @@ -495,7 +498,6 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): self.session_died = False if not self.home_exists(): - self.disconnect() raise x2go_exceptions.X2goRemoteHomeException('remote home directory does not exist') return (self.get_transport() is not None) diff --git a/x2go/session.py b/x2go/session.py index f700c03..f8d2ace 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -773,6 +773,9 @@ class X2goSession(object): **_params) except X2goControlSessionException, e: raise X2goSessionException(str(e)) + except X2goRemoteHomeException, e: + self.disconnect() + raise e except: # remove credentials immediately self.control_params['password'] = '' 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.0.1.2-11-g05b2d0b
by git-admin＠x2go.org 27 Sep '11

27 Sep '11

The branch, master has been updated via 05b2d0b00809da05a1e9f30ea4b1fdb71612a861 (commit) from 3f8822957798a3b61415f9bf358fd08266144854 (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 05b2d0b00809da05a1e9f30ea4b1fdb71612a861 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 27 20:24:43 2011 +0200 Now x2godesktopsharing shows correct remote usernames. ----------------------------------------------------------------------- Summary of changes: sharetray.cpp | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/sharetray.cpp b/sharetray.cpp index 4bdca29..5563e2d 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -257,8 +257,8 @@ QString ShareTray::getSocketAnswer ( QString message ) } QString client=lst[0]; QString user=params[1]; - QString remote_user=params[10]; - if ( getAccess ( user, client ) ==QMessageBox::Yes ) + QString remote_user=lst[10]; + if ( getAccess ( remote_user, client ) ==QMessageBox::Yes ) { trayMessage ( tr ( "Access granted" ),QString ( tr ( "%1(%2): access granted" ) ).arg (remote_user ).arg ( client ) ); //start agent @@ -280,7 +280,7 @@ QString ShareTray::getSocketAnswer ( QString message ) pid=lines[2]; qDebug() <<"agent pid: "<<pid; AccessAction *act=new AccessAction ( - pid,user,client, + pid,remote_user,client, QString ( tr ( "Disconnect %1(%2)" ) ).arg ( remote_user ).arg ( client ), this ); menu->insertAction ( menu->actions() [0],act ); @@ -323,21 +323,21 @@ void ShareTray::slotCloseConnection ( AccessAction* action ) } -int ShareTray::getAccess ( QString user, QString host ) +int ShareTray::getAccess ( QString remote_user, QString host ) { - if ( whiteList.contains ( user ) ) + if ( whiteList.contains ( remote_user ) ) return QMessageBox::Yes; - if ( blackList.contains ( user ) ) + if ( blackList.contains ( remote_user ) ) return QMessageBox::No; - MessageBox m ( user, host, this ); + MessageBox m ( remote_user, host, this ); m.activateWindow(); m.raise(); int res=m.exec(); if ( m.isChecked() &&res==QMessageBox::Yes ) - whiteList<<user; + whiteList<<remote_user; if ( m.isChecked() &&res==QMessageBox::No ) - blackList<<user; + blackList<<remote_user; actBlack->setEnabled ( blackList.size() >0 ); actWhite->setEnabled ( whiteList.size() >0 ); return res; 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.0.1.2-10-g3f88229
by git-admin＠x2go.org 27 Sep '11

27 Sep '11

The branch, master has been updated via 3f8822957798a3b61415f9bf358fd08266144854 (commit) from e9168f26a14d6d2c5215285966a534b73b974118 (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 3f8822957798a3b61415f9bf358fd08266144854 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 27 19:55:13 2011 +0200 cannot count... ----------------------------------------------------------------------- Summary of changes: sharetray.cpp | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/sharetray.cpp b/sharetray.cpp index dafb0e1..4bdca29 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -257,16 +257,13 @@ QString ShareTray::getSocketAnswer ( QString message ) } QString client=lst[0]; QString user=params[1]; - QString remote_user=params[11]; + QString remote_user=params[10]; if ( getAccess ( user, client ) ==QMessageBox::Yes ) { - trayMessage ( tr ( "Access granted" ),QString ( - tr ( - "%1(%2): access granted" ) ).arg ( - user ).arg ( client ) ); + trayMessage ( tr ( "Access granted" ),QString ( tr ( "%1(%2): access granted" ) ).arg (remote_user ).arg ( client ) ); //start agent QProcess proc ( this ); - lst.removeAt ( 11 );; + lst.removeAt ( 10 );; lst.removeAt ( 0 );; proc.start ( "x2gostartagent",lst ); if ( !proc.waitForFinished ( 5000 ) ) 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.0.1.2-9-ge9168f2
by git-admin＠x2go.org 27 Sep '11

27 Sep '11

The branch, master has been updated via e9168f26a14d6d2c5215285966a534b73b974118 (commit) from 4b8c2abb58aa34828aed15d5d7b336a785ca8bc9 (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 e9168f26a14d6d2c5215285966a534b73b974118 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 27 19:10:19 2011 +0200 Differentiate between local and remote user, fixes display of wrong user name for remote user (2). ----------------------------------------------------------------------- Summary of changes: Doxyfile | 6 +++--- VERSION.x2godesktopsharing | 2 +- sharetray.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/Doxyfile b/Doxyfile index 03042a9..fc8159f 100644 --- a/Doxyfile +++ b/Doxyfile @@ -4,7 +4,7 @@ # Project related configuration options #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 -PROJECT_NAME = x2godesktopshare +PROJECT_NAME = x2godesktopsharing PROJECT_NUMBER = 1 OUTPUT_DIRECTORY = CREATE_SUBDIRS = NO @@ -93,7 +93,7 @@ WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = /usr/src.cur/db-builds/x2godesktopshare/x2godesktopshare-3.0.1 +INPUT = /usr/src.cur/db-builds/x2godesktopsharing/x2godesktopsharing-3.0.1.3 INPUT_ENCODING = UTF-8 FILE_PATTERNS = *.c \ *.cc \ @@ -272,7 +272,7 @@ SKIP_FUNCTION_MACROS = YES # Configuration::additions related to external references #--------------------------------------------------------------------------- TAGFILES = -GENERATE_TAGFILE = x2godesktopshare.tag +GENERATE_TAGFILE = x2godesktopsharing.tag ALLEXTERNALS = NO EXTERNAL_GROUPS = YES PERL_PATH = /usr/bin/perl diff --git a/VERSION.x2godesktopsharing b/VERSION.x2godesktopsharing index cd0a3b6..e9aef23 100644 --- a/VERSION.x2godesktopsharing +++ b/VERSION.x2godesktopsharing @@ -1 +1 @@ -3.0.1.2 +3.0.1.3 diff --git a/sharetray.cpp b/sharetray.cpp index ca0f3a8..dafb0e1 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -440,7 +440,7 @@ void ShareTray::showList() void ShareTray::loadSettings() { - QSettings st ( QDir::homePath() +"/.x2godesktopshare/settings", + QSettings st ( QDir::homePath() +"/.x2godesktopsharing/settings", QSettings::NativeFormat ); blackList= st.value ( "blacklist" ).toStringList(); @@ -452,7 +452,7 @@ void ShareTray::loadSettings() void ShareTray::saveSettings() { - QSettings st ( QDir::homePath() +"/.x2godesktopshare/settings", + QSettings st ( QDir::homePath() +"/.x2godesktopsharing/settings", QSettings::NativeFormat ); st.setValue ( "blacklist",blackList ); 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

x2goserver.git - master (branch) updated: 3.0.99-2-314-g5838372
by git-admin＠x2go.org 27 Sep '11

27 Sep '11

The branch, master has been updated via 5838372eb96984eb8985b34c21962e8701e22a08 (commit) from 39d5a358ac37db30d62e89a65ecf70c5329307a6 (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 5838372eb96984eb8985b34c21962e8701e22a08 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 27 16:52:42 2011 +0200 Syntax fix in x2golistsessions_sql, hopefully fixes broken x2gocleansessions. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver/lib/x2golistsessions_sql | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 072608d..ab491b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -94,6 +94,7 @@ x2goserver (3.0.99.6-0~x2go1) UNRELEASED; urgency=low * Change of Desktop icons for shared folders. This change is needed for parallel installation of x2gognomebindings and x2golxdebindings. * Only remove server-side session directory if x2goruncommand has not failed. + * Syntax fix in x2golistsessions_sql, hopefully fixes broken x2gocleansessions. [ Ivan Kabaivanov ] * Makefile fix around man page installation in x2goserver-compat package. diff --git a/x2goserver/lib/x2golistsessions_sql b/x2goserver/lib/x2golistsessions_sql index 6d13e7b..bde7a25 100755 --- a/x2goserver/lib/x2golistsessions_sql +++ b/x2goserver/lib/x2golistsessions_sql @@ -47,7 +47,7 @@ for ( $i=0;$i<@array;$i++) my @ln=split('\|',@array[$i]); if (@ln[4] eq "F") { - my $sid = @ln[1] + my $sid = @ln[1]; dbsys_rmsessionsroot($sid); syslog('debug', "Purging finished session from X2go db, session ID: $sid"); } hooks/post-receive -- x2goserver.git (X2go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2go Server).

1 0

x2godesktopsharing.git - master (branch) updated: 3.0.1.2-8-g4b8c2ab
by git-admin＠x2go.org 27 Sep '11

27 Sep '11

The branch, master has been updated via 4b8c2abb58aa34828aed15d5d7b336a785ca8bc9 (commit) from 91e0971284d686e42f444e312cf3220ea22ea6f9 (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 4b8c2abb58aa34828aed15d5d7b336a785ca8bc9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 27 09:40:43 2011 +0200 Differentiate between local and remote user, fixes display of wrong user name for remote user. Depend on x2goserver (>=3.0.99.6). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 14 +++++++++----- debian/control | 2 +- main.cpp | 2 +- sharetray.cpp | 10 ++++++---- 4 files changed, 17 insertions(+), 11 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b0d3854..5967ad9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ x2godesktopsharing (3.0.1.3-0~x2go1) UNRELEASED; urgency=low - * Fix incomplete DENY statement in main.cpp. - * System group for x2godesktopsharing change from x2gousers -> - x2godesktopsharing. - * Make sure postinst script does not fail when checking for existence - of group x2godesktopsharing. + New upstream version (3.0.1.3): + - Fix incomplete DENY statement in main.cpp. + - System group for x2godesktopsharing change from x2gousers -> + x2godesktopsharing. + - Make sure postinst script does not fail when checking for existence + of group x2godesktopsharing. + - Differentiate between local and remote user, fixes display of wrong + user name for remote user. + Depend on x2goserver (>=3.0.99.6). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 13 Jun 2011 20:39:33 +0200 diff --git a/debian/control b/debian/control index 028fb3e..94119f0 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, - x2goserver (>= 3.0.99), + x2goserver (>= 3.0.99.6-0~), libqt4-gui, Recommends: Description: share X2go desktops with other users (via shadow sessions) diff --git a/main.cpp b/main.cpp index 22dad15..7917c66 100644 --- a/main.cpp +++ b/main.cpp @@ -33,7 +33,7 @@ using namespace std; void client ( const QStringList & cmd ) { - if ( cmd.size() !=10 ) + if ( cmd.size() !=11 ) { cerr<<"wrong parameters"<<endl; cout<<"DENY"; diff --git a/sharetray.cpp b/sharetray.cpp index 9f42997..ca0f3a8 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -244,7 +244,7 @@ QString ShareTray::getSocketAnswer ( QString message ) { qDebug() <<"message: "<<message; QStringList lst=message.split ( ' ' ); - if ( lst.size() !=10 ) + if ( lst.size() !=11 ) { qDebug() <<"wrong parameters"; return "DENY"; @@ -257,6 +257,7 @@ QString ShareTray::getSocketAnswer ( QString message ) } QString client=lst[0]; QString user=params[1]; + QString remote_user=params[11]; if ( getAccess ( user, client ) ==QMessageBox::Yes ) { trayMessage ( tr ( "Access granted" ),QString ( @@ -265,6 +266,7 @@ QString ShareTray::getSocketAnswer ( QString message ) user ).arg ( client ) ); //start agent QProcess proc ( this ); + lst.removeAt ( 11 );; lst.removeAt ( 0 );; proc.start ( "x2gostartagent",lst ); if ( !proc.waitForFinished ( 5000 ) ) @@ -282,20 +284,20 @@ QString ShareTray::getSocketAnswer ( QString message ) qDebug() <<"agent pid: "<<pid; AccessAction *act=new AccessAction ( pid,user,client, - QString ( tr ( "Disconnect %1(%2)" ) ).arg ( user ).arg ( client ), + QString ( tr ( "Disconnect %1(%2)" ) ).arg ( remote_user ).arg ( client ), this ); menu->insertAction ( menu->actions() [0],act ); connect ( act,SIGNAL ( actionActivated ( AccessAction* ) ),this, SLOT ( slotCloseConnection ( AccessAction* ) ) ); trayMessage ( tr ( "Remote connection" ), QString ( - tr ( "%1(%2) connected" ) ).arg ( user ).arg ( client ) ); + tr ( "%1(%2) connected" ) ).arg ( remote_user ).arg ( client ) ); setTrayIcon(); return output; } } trayMessage ( tr ( "Access denied" ),QString ( - tr ( "%1(%2): access denied" ) ).arg ( params[1] ).arg ( client ) ); + tr ( "%1(%2): access denied" ) ).arg ( remote_user ).arg ( client ) ); return "DENY"; } hooks/post-receive -- x2godesktopsharing.git (Desktop Sharing for X2go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2godesktopsharing.git" (Desktop Sharing for X2go).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.6-47-gd3d4cb0
by git-admin＠x2go.org 26 Sep '11

26 Sep '11

The branch, master has been updated via d3d4cb09361adb59a30be1f13a09272090bfd631 (commit) from 27ec5cc630337191abc7404f62dbd62ae2e8a24f (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 d3d4cb09361adb59a30be1f13a09272090bfd631 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 26 21:24:08 2011 +0200 Spanish i18n update. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + po/es.po | 86 +++++++++++++++++++++++++---------------------------- 2 files changed, 42 insertions(+), 45 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 72fc91f..61cbcf6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ pyhoca-gui (0.1.0.9-0~x2go1) UNRELEASED; urgency=low - Only offer foldering sharing in menus if server provides it. - Add error message in case logon fails due to a missing home directory on the remote X2go server. + - Spanish i18n update. * Depend on python-x2go (>=0.1.1.8). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 14 Sep 2011 21:49:08 +0200 diff --git a/po/es.po b/po/es.po index e47d248..2f7fe31 100644 --- a/po/es.po +++ b/po/es.po @@ -2,16 +2,17 @@ # Copyright (C) 2010-2011 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # Dick Kniep <dick.kniep(a)lindix.nl> # This file is distributed under the same license as the PyHoca-GUI package. -# Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, 2011. # +# Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, 2011. +# Ricardo Diaz Martin, 2011. msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-09-25 02:37+0200\n" -"PO-Revision-Date: 2011-06-23 15:48+0100\n" -"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" -"Language-Team: Spanish Team <oceanosoftlapalma(a)gmail.com>\n" +"PO-Revision-Date: 2011-09-26 17:36+0200\n" +"Last-Translator: Ricardo Diaz Martin\n" +"Language-Team: Spanish <x2go-dev(a)lists.berlios.de>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,6 +20,8 @@ msgstr "" "X-Poedit-Language: Spanish\n" "X-Poedit-Country: SPAIN\n" "X-Poedit-SourceCharset: utf-8\n" +"X-Generator: Lokalize 1.2\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../pyhoca/wxgui/logon.py:80 #, python-format @@ -114,11 +117,11 @@ msgstr "" #: ../pyhoca/wxgui/logon.py:355 ../pyhoca/wxgui/frontend.py:435 #, python-format msgid "%s - missing home directory" -msgstr "" +msgstr "%s - carpeta home desconocida" #: ../pyhoca/wxgui/logon.py:356 ../pyhoca/wxgui/frontend.py:435 msgid "The remote user's home directory does not exist." -msgstr "" +msgstr "La carpeta home del usuario no existe en el servidor" #: ../pyhoca/wxgui/logon.py:363 #, python-format @@ -126,9 +129,9 @@ msgid "%s - key error" msgstr "%s - error en la clave" #: ../pyhoca/wxgui/logon.py:372 ../pyhoca/wxgui/frontend.py:442 -#, fuzzy, python-format +#, python-format msgid "%s - auth error" -msgstr "%s - error en la clave de identificación" +msgstr "%s - error en la autenticación" #: ../pyhoca/wxgui/logon.py:381 msgid "An unknown error occured during authentication!" @@ -182,9 +185,8 @@ msgid "Lightweight X Desktop (LXDE)" msgstr "Lightweight X Desktop (LXDE)" #: ../pyhoca/wxgui/profilemanager.py:75 -#, fuzzy msgid "Trinity X Desktop (KDE3-like)" -msgstr "Trinity X Desktop (KDE3-like)" +msgstr "Trinity X Desktop (similar a KDE3)" #: ../pyhoca/wxgui/profilemanager.py:76 msgid "Unity X Desktop Shell (UNITY)" @@ -454,12 +456,11 @@ msgstr "Añadir" #: ../pyhoca/wxgui/profilemanager.py:251 msgid "Local Path" -msgstr "" +msgstr "Ruta Local" #: ../pyhoca/wxgui/profilemanager.py:252 -#, fuzzy msgid "Connect Method" -msgstr "Conexión" +msgstr "Método de Conexión" #: ../pyhoca/wxgui/profilemanager.py:253 msgid "Delete" @@ -478,9 +479,8 @@ msgid "Server encoding" msgstr "Codificación del Servidor" #: ../pyhoca/wxgui/profilemanager.py:261 -#, fuzzy msgid "Use file MIME box for local file import" -msgstr "Usar arrastrar archivos para la importar archivos locales" +msgstr "Usar tipo de archivo MIME para la importación local" #: ../pyhoca/wxgui/profilemanager.py:262 msgid "Extensions" @@ -505,11 +505,11 @@ msgstr "Reiniciar" #: ../pyhoca/wxgui/profilemanager.py:313 ../pyhoca/wxgui/profilemanager.py:924 #: ../pyhoca/wxgui/profilemanager.py:1409 msgid "automatically" -msgstr "" +msgstr "automáticamente" #: ../pyhoca/wxgui/profilemanager.py:315 ../pyhoca/wxgui/profilemanager.py:926 msgid "manually" -msgstr "" +msgstr "manualmente" #: ../pyhoca/wxgui/profilemanager.py:320 msgid "PyHoca-GUI Profile Manager - new profile" @@ -578,14 +578,13 @@ msgstr "¡¡¡Nombre de pefil no encontrado o no válido!!!" #: ../pyhoca/wxgui/profilemanager.py:1459 #, python-format msgid "Profile name %s already exists!!!" -msgstr "" +msgstr "El perfil de usuario %s ya existe!!!" #: ../pyhoca/wxgui/profilemanager.py:1464 -#, fuzzy msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" -"¡El protocolo de autenticación de comunicaciones está incompleto! Inténtalo " -"otra vez..." +"El protocolo de autenticación de comunicaciones está incompleto. Inténtalo " +"otra vez." #: ../pyhoca/wxgui/profilemanager.py:1474 #, python-format @@ -594,6 +593,9 @@ msgid "" "proxy to.\n" "Please change the SSH proxy settings accordingly." msgstr "" +"Existe otro perfil de sesión (%s) que ya está usando [%s]:%s para el enlace " +"al proxy SSH local.\n" +"Por favor, cambia los parámetros del proxy SSH en base a esta información." #: ../pyhoca/wxgui/profilemanager.py:1494 #, python-format @@ -643,18 +645,16 @@ msgid "Resume Session" msgstr "Retomar Sesión" #: ../pyhoca/wxgui/menus_taskbar.py:161 -#, fuzzy msgid "Resume Session (not possible)" -msgstr "Retomar Sesión" +msgstr "Retomar Sesión (no disponible)" #: ../pyhoca/wxgui/menus_taskbar.py:169 msgid "Transfer Session" msgstr "Transferir Sesión" #: ../pyhoca/wxgui/menus_taskbar.py:171 -#, fuzzy msgid "Transfer Session (not possible)" -msgstr "Transferir Sesión" +msgstr "Transferir Sesión (no disponible)" #: ../pyhoca/wxgui/menus_taskbar.py:174 msgid "Suspend Session" @@ -665,23 +665,20 @@ msgid "Terminate Session" msgstr "Finalizar Sesión" #: ../pyhoca/wxgui/menus_taskbar.py:206 -#, fuzzy msgid "&Share custom local folder" -msgstr "Compartir &Carpeta local" +msgstr "Compartir carpeta per&sonalizada local" #: ../pyhoca/wxgui/menus_taskbar.py:229 -#, fuzzy msgid "Share:" -msgstr "Compartir" +msgstr "Compartir:" #: ../pyhoca/wxgui/menus_taskbar.py:240 msgid "Unshare:" -msgstr "" +msgstr "No compartido:" #: ../pyhoca/wxgui/menus_taskbar.py:250 -#, fuzzy msgid "Unshare &all local folders" -msgstr "Compartir &Carpeta local" +msgstr "Dejar de compartir tod&as las carpetas locales" #: ../pyhoca/wxgui/menus_taskbar.py:290 msgid "Start &new Session" @@ -704,9 +701,8 @@ msgid "Customize &profile" msgstr "Configurar &perfil" #: ../pyhoca/wxgui/menus_taskbar.py:325 -#, fuzzy msgid "Shared &folders" -msgstr "Compartir &Carpeta local" +msgstr "Compartir &carpetas" #: ../pyhoca/wxgui/menus_taskbar.py:333 msgid "&Disconnect from Server" @@ -755,7 +751,6 @@ msgid "%s - auth key error" msgstr "%s - error en la clave de identificación" #: ../pyhoca/wxgui/frontend.py:449 -#, fuzzy msgid "An unknown error occurred during authentication!" msgstr "" "¡Error desconocido al tratar de validar el nombre de usuario y la contraseña!" @@ -778,9 +773,9 @@ msgid "New Session Profile" msgstr "Nuevo Perfil de Sesión" #: ../pyhoca/wxgui/frontend.py:613 -#, fuzzy, python-format +#, python-format msgid "Really Delete Session Profile ,,%s''?" -msgstr "Nuevo Perfil de Sesión" +msgstr "Eliminar el Perfil de Sesión \"%s''?" #: ../pyhoca/wxgui/frontend.py:619 #, python-format @@ -835,16 +830,13 @@ msgid "%s - session failure" msgstr "%s - fallo en la sesión" #: ../pyhoca/wxgui/frontend.py:749 -#, fuzzy msgid "The session startup failed." -msgstr "Nuevo Perfil de Sesión" +msgstr "El inicio de sesión ha fallado" #: ../pyhoca/wxgui/frontend.py:756 -#, fuzzy, python-format +#, python-format msgid "The command ,,%s'' is not available on X2go server." -msgstr "" -"El comando ,,%s'' no está presente en el servidor X2go\n" -"%s." +msgstr "El comando \"%s'' no está presente en el servidor X2go." #: ../pyhoca/wxgui/frontend.py:758 #, python-format @@ -1037,7 +1029,7 @@ msgstr "" msgid "" "Are you really sure you want to\n" "delete the session profile ,,%s''?" -msgstr "" +msgstr "¿Eliminar el perfil de sesión \"%s\"?" #: ../pyhoca/wxgui/messages.py:54 #, python-format @@ -1048,6 +1040,10 @@ msgid "" "user. The PyHoca-GUI icon can be found in your desktops's\n" "notification area/systray." msgstr "" +"¡PyHoca-GUI ya está siendo usado para el usuario \"%s\"!\n" +"\n" +"Sólo se permite una instancia de PyHoca-GUI por usuario.\n" +"El icono de PyHoca-GUI se encuentra en el area de notificación." #: ../pyhoca/wxgui/messages.py:87 msgid "Yes" @@ -1133,7 +1129,7 @@ msgstr "Imprimir" #: ../pyhoca/wxgui/printingprefs.py:227 msgid "- print system is not available -" -msgstr "" +msgstr "- el sistema de impresión no está disponible -" #: ../pyhoca/wxgui/printingprefs.py:334 msgid "Choose PDF viewer application" hooks/post-receive -- pyhoca-gui.git (Python X2go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2go Client (wxPython GUI)).

1 0

python-x2go.git - release/0.1.1.x (branch) updated: 0.1.1.7-9-gda6002f
by git-admin＠x2go.org 26 Sep '11

26 Sep '11

The branch, release/0.1.1.x has been updated via da6002f82aca5764b23e1bd0cf6b55fc50fe0be7 (commit) via c4c01249d7b06320e284f33b53d00038c34a20fa (commit) via ac72309392b1eb54273b47dc83f6af6828dee146 (commit) via 38414aa7189e0043d65911aebcd7ba4303ecfadb (commit) from cdeb38f6ada3cdc38b5095e76993b6773b2a340b (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 da6002f82aca5764b23e1bd0cf6b55fc50fe0be7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 26 20:27:05 2011 +0200 Fix missing import of socket module in backends/control/_stdout.py. commit c4c01249d7b06320e284f33b53d00038c34a20fa Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 23:40:02 2011 +0200 Improve local session cache dir removal. commit ac72309392b1eb54273b47dc83f6af6828dee146 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 23:38:56 2011 +0200 provide better __repr__ output for debugging session infos commit 38414aa7189e0043d65911aebcd7ba4303ecfadb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 21:35:06 2011 +0200 Remove local session cache folders after sessions have terminated. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/backends/control/_stdout.py | 10 ++++++---- x2go/backends/info/_stdout.py | 11 ++++++++++- x2go/backends/terminal/_stdout.py | 37 ++++++++++++++++++++++++++++++++++++- x2go/client.py | 4 +++- x2go/session.py | 14 +++++++++++--- 6 files changed, 68 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 62718c6..3cea1fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ python-x2go (0.1.1.8-0-x2go1) UNRELEASED; urgency=low * New upstream version (0.1.1.8), bugfix release for 0.1.1.x series: - Bugfix for: Test for existence of remote home directory on connect. - Unshare local folders during session cleanup. + - Remove local session cache folders after sessions have terminated. + - Fix missing import of socket module in backends/control/_stdout.py. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 25 Sep 2011 02:08:11 +0200 diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index b5313a8..25c2068 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -37,6 +37,8 @@ import binascii import string import random +from gevent import socket + # Python X2go modules import x2go.sshproxy as sshproxy import x2go.log as log @@ -758,7 +760,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): return _listsessions - def clean_sessions(self): + def clean_sessions(self, destroy_terminals=True): """\ Find X2go terminals that have previously been started by the connected user on the remote X2go server and terminate them. @@ -766,7 +768,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): """ session_list = self.list_sessions() for session_name in session_list.keys(): - self.terminate(session_name=session_name) + self.terminate(session_name=session_name, destroy_terminals=destroy_terminals) def is_connected(self): """\ @@ -873,7 +875,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): return _ret - def terminate(self, session_name): + def terminate(self, session_name, destroy_terminals=True): """\ Terminate either this or another available X2go session on the connected server. @@ -898,7 +900,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): dummy_stdout = stdout.read() dummy_stderr = stderr.read() if self.associated_terminals.has_key(session_name): - if self.associated_terminals[session_name] is not None: + if self.associated_terminals[session_name] is not None and destroy_terminals: self.associated_terminals[session_name].__del__() try: del self.associated_terminals[session_name] except KeyError: pass diff --git a/x2go/backends/info/_stdout.py b/x2go/backends/info/_stdout.py index 5cae736..c03d1b3 100644 --- a/x2go/backends/info/_stdout.py +++ b/x2go/backends/info/_stdout.py @@ -27,6 +27,11 @@ via server-side STDOUT. """ __NAME__ = 'x2goserversessioninfo-pylib' + +# modules +import types + + class X2goServerSessionInfoSTDOUT(object): """\ L{X2goServerSessionInfo} is used to store all information @@ -37,7 +42,11 @@ class X2goServerSessionInfoSTDOUT(object): def __str__(self): return self.name def __repr__(self): - return "<%s instance: %s>" % (self.__class__, self.name) + result = 'X2goServerSessionInfoSTDOUT(' + for p in dir(self): + if '__' in p or not p in self.__dict__ or type(p) is types.InstanceType: continue + result += p + '=' + str(self.__dict__[p]) +',' + return result.strip(',') + ')' def _parse_x2golistsessions_line(self, x2go_output): """\ diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 0a0f025..e0eb3f1 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -35,6 +35,7 @@ import threading import signal import cStringIO import copy +import shutil # Python X2go modules import x2go.rforward as rforward @@ -325,6 +326,8 @@ class X2goTerminalSessionSTDOUT(object): else: self.session_info = info_backend() + self._cleaned_up = False + def __del__(self): self._x2go_tidy_up() @@ -363,6 +366,16 @@ class X2goTerminalSessionSTDOUT(object): else: raise OSError, e + def _rm_session_dirtree(self): + + if self.session_info.name: + shutil.rmtree('%s/S-%s' % (self.params.rootdir, self.session_info), ignore_errors=True) + + def _rm_desktop_dirtree(self): + + if self.session_info.display: + shutil.rmtree('%s/S-%s' % (self.params.rootdir, self.session_info.display), ignore_errors=True) + def get_session_name(self): """\ STILL UNDOCUMENTED @@ -1022,8 +1035,10 @@ class X2goTerminalSessionSTDOUT(object): @rtype: bool """ - self.control_session.terminate(session_name=self.session_info.name) + self.control_session.terminate(session_name=self.session_info.name, destroy_terminals=False) self.release_proxy() + self.post_terminate_cleanup() + self.__del__() # TODO: check if session has really suspended _ret = True @@ -1038,3 +1053,23 @@ class X2goTerminalSessionSTDOUT(object): if self.proxy is not None: self.proxy.__del__() + def post_terminate_cleanup(self): + """\ + STILL UNDOCUMENTED + + """ + # this method might be called twice (directly and from update_status in the session + # registry instance. So we have to make sure, that this code will not fail + # if called twice. + if not self._cleaned_up and self.session_info.name: + + # otherwise we wipe the session files locally + self.logger('cleaning up session %s after termination' % self.session_info, loglevel=log.loglevel_NOTICE) + + # if we run in debug mode, we keep local session directories + if self.logger.get_loglevel() & log.loglevel_DEBUG != log.loglevel_DEBUG: + + self._rm_session_dirtree() + self._rm_desktop_dirtree() + + self._cleaned_up = True diff --git a/x2go/client.py b/x2go/client.py index 37ec3bd..8f3a4f9 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -319,6 +319,7 @@ class X2goClient(object): refresh_interval=refresh_interval, logger=self.logger ) + self.auto_update_sessionregistry = auto_update_sessionregistry if use_listsessions_cache: self.listsessions_cache = X2goListSessionsCache(self, logger=self.logger) @@ -2010,8 +2011,9 @@ class X2goClient(object): @type session_uuid: C{str} """ + _destroy_terminals = not ( self.auto_update_sessionregistry == True) session = self.session_registry(session_uuid) - session.clean_sessions() + session.clean_sessions(destroy_terminals=_destroy_terminals) __clean_sessions = clean_sessions def list_sessions(self, session_uuid=None, diff --git a/x2go/session.py b/x2go/session.py index c623214..f700c03 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -853,13 +853,13 @@ class X2goSession(object): return self.connected __is_alive = is_alive - def clean_sessions(self): + def clean_sessions(self, destroy_terminals=True): """\ Clean all running sessions for the authenticated user on the remote X2go server. """ if self.is_alive(): - self.control_session.clean_sessions() + self.control_session.clean_sessions(destroy_terminals=destroy_terminals) else: self._X2goSession__disconnect() __clean_sessions = clean_sessions @@ -1514,9 +1514,17 @@ class X2goSession(object): self.terminal_session.release_proxy() # unmount shared folders - self.unshare_all_local_folders() + try: + self.unshare_all_local_folders() + except X2goSessionException: + pass + + # remove client-side session cache + if self.terminated and self.has_terminal_session(): + self.terminal_session.post_terminate_cleanup() # destroy terminal session if self.has_terminal_session(): self.terminal_session.__del__() + self.terminal_session = None 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

← Newer
1
2
3
4
5
6
7
8
...
27
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits September 2011