x2go-commits

x2go-commits@lists.x2go.org

1 participants
37903 discussions

x2goserver.git - master (branch) updated: 3.1.1.3-62-ge010395
by git-admin＠x2go.org 26 Sep '12

26 Sep '12

The branch, master has been updated via e010395a46a9cd11293956919d606a8841ed7fd6 (commit) from 5a6639b5618a1c5a2f36d2a946bb26b2ca72c1be (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 e010395a46a9cd11293956919d606a8841ed7fd6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 26 08:53:48 2012 +0200 Add a very basic SIGCHLD handler to x2gocleansessions. on SIGCHLD let the script wait for cleaning up after its children. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 ++++- x2goserver/sbin/x2gocleansessions | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4e33f13..ddae529 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,7 +32,10 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low x2goserver (3.1.1.5-0~x2go1) UNRELEASED; urgency=low - * Continue development... + [ Stéphane Graber ] + * New upstream version (3.1.1.5): + - Add a very basic SIGCHLD handler to x2gocleansessions. on SIGCHLD + let the script wait for cleaning up after its children. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 25 Sep 2012 15:03:32 +0200 diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 1019314..3eb8722 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -88,6 +88,7 @@ elsif ($pid == 0 ) for (glob "/proc/$$/fd/*") { POSIX::close($1) if m{/(\d+)$}; } $SIG{TERM}=\&catch_term; + $SIG{CHLD} = sub { wait }; while(sleep 5) { 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

x2goserver.git - release/3.1.1.x (branch) updated: 3.1.1.4-2-g8da7d30
by git-admin＠x2go.org 26 Sep '12

26 Sep '12

The branch, release/3.1.1.x has been updated via 8da7d3082b406641fa2d4f363b51300b1c639bfa (commit) from 97ae712cc1fbfab753c0a0a1634550e97cc9aac7 (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 8da7d3082b406641fa2d4f363b51300b1c639bfa Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 26 08:53:48 2012 +0200 Add a very basic SIGCHLD handler to x2gocleansessions. on SIGCHLD let the script wait for cleaning up after its children. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 ++++- x2goserver/sbin/x2gocleansessions | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 14e3268..a8465cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ x2goserver (3.1.1.5-0~x2go1) UNRELEASED; urgency=low - * Continue development... + [ Stéphane Graber ] + * New upstream version (3.1.1.5): + - Add a very basic SIGCHLD handler to x2gocleansessions. on SIGCHLD + let the script wait for cleaning up after its children. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 25 Sep 2012 15:03:32 +0200 diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index aaed31d..8d52d85 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -90,6 +90,7 @@ elsif ($pid == 0 ) for (glob "/proc/$$/fd/*") { POSIX::close($1) if m{/(\d+)$}; } $SIG{TERM}=\&catch_term; + $SIG{CHLD} = sub { wait }; while(sleep 5) { 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

x2goclient.git - master (branch) updated: 3.99.2.2-52-g52b42f8
by git-admin＠x2go.org 26 Sep '12

26 Sep '12

The branch, master has been updated via 52b42f87ea27940300e1c3821d2919ef917d36a7 (commit) via 33c6eeb64f212bc2ffbd43b6b6cd2d52276425ff (commit) from 795c6a2a57077e7d09cc0bf9e8bdca9e6a4b9f95 (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 52b42f87ea27940300e1c3821d2919ef917d36a7 Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Date: Wed Sep 26 07:40:59 2012 +0200 add support for SSH proxy in class SshMasterConnection commit 33c6eeb64f212bc2ffbd43b6b6cd2d52276425ff Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Date: Tue Sep 25 12:53:46 2012 +0200 add support for HTTP proxy - developed by Heinrich Schuchardt (xypron.glpk(a)gmx.de) ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 + onmainwindow.cpp | 71 ++++++------ onmainwindow.h | 13 +-- sshmasterconnection.cpp | 273 ++++++++++++++++++++++++++++++++++++++++++----- sshmasterconnection.h | 55 ++++++++-- sshprocess.cpp | 15 +++ sshprocess.h | 1 + 7 files changed, 352 insertions(+), 78 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f0e871c..8f9d35a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -55,6 +55,8 @@ x2goclient (3.99.3.0-0~x2go1) UNRELEASED; urgency=low - Fixing kbd focus issue for all kinds of sessions in thinclient mode - Add command line parameter --ssh-key and --autologin - disable check box "use default sound port" if sound disabled + - add support for HTTP proxy - developed by Heinrich Schuchardt (xypron.glpk(a)gmx.de) + - add support for SSH proxy in class SshMasterConnection [ Ricardo Diaz ] * New upstream version (3.99.3.0): diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 6af31d4..8bf7a9e 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -96,7 +96,6 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) LDAPPrintSupport=false; managedMode=false; brokerMode=false; - sshProxy.use=false; startEmbedded=false; sshConnection=0; sessionStatusDlg=0; @@ -1269,6 +1268,7 @@ void ONMainWindow::closeClient() x2goDebug<<"waiting sshConnection to finish\n"; sshConnection->wait ( 10000 ); x2goDebug<<"sshConnection is closed\n"; + sshConnection=0; } if (useLdap) { @@ -2769,14 +2769,17 @@ SshMasterConnection* ONMainWindow::startSshConnection ( QString host, QString po { autologin=true; } - con=new SshMasterConnection ( host, port.toInt(),acceptUnknownHosts, - login, password,currentKey, autologin,krbLogin, this ); + + + con=new SshMasterConnection (this, host, port.toInt(),acceptUnknownHosts, + login, password,currentKey, autologin, krbLogin); if (!getSrv) connect ( con, SIGNAL ( connectionOk(QString) ), this, SLOT ( slotSshConnectionOk() ) ); else connect ( con, SIGNAL ( connectionOk(QString)), this, SLOT ( slotServSshConnectionOk(QString) ) ); - connect ( con, SIGNAL ( serverAuthError ( int,QString ) ),this,SLOT ( slotSshServerAuthError ( int,QString ) ) ); + connect ( con, SIGNAL ( serverAuthError ( int,QString, SshMasterConnection* ) ),this, + SLOT ( slotSshServerAuthError ( int,QString, SshMasterConnection* ) ) ); connect ( con, SIGNAL ( userAuthError ( QString ) ),this,SLOT ( slotSshUserAuthError ( QString ) ) ); connect ( con, SIGNAL ( connectionError ( QString,QString ) ), this, SLOT ( slotSshConnectionError ( QString,QString ) ) ); @@ -2861,7 +2864,7 @@ void ONMainWindow::slotServSshConnectionOk(QString server) lproc->startNormal ( "export HOSTNAME && x2golistsessions" ); } -void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage ) +void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage, SshMasterConnection* connection ) { if ( startHidden ) { @@ -2877,12 +2880,14 @@ void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage ) case SSH_SERVER_KNOWN_CHANGED: errMsg=tr ( "Host key for server changed.\nIt is now: " ) +sshMessage+"\n"+ tr ( "For security reasons, connection will be stopped" ); - if ( sshConnection ) + connection->writeKnownHosts(false); + connection->wait(); + if(sshConnection && sshConnection !=connection) { sshConnection->wait(); delete sshConnection; - sshConnection=0l; } + sshConnection=0; slotSshUserAuthError ( errMsg ); return; @@ -2890,23 +2895,27 @@ void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage ) errMsg=tr ( "The host key for this server was not found but an other" "type of key exists.An attacker might change the default server key to" "confuse your client into thinking the key does not exist" ); - if ( sshConnection ) + connection->writeKnownHosts(false); + connection->wait(); + if(sshConnection && sshConnection !=connection) { sshConnection->wait(); delete sshConnection; - sshConnection=0l; } + sshConnection=0; slotSshUserAuthError ( errMsg ); return ; case SSH_SERVER_ERROR: - if ( sshConnection ) + connection->writeKnownHosts(false); + connection->wait(); + if(sshConnection && sshConnection !=connection) { sshConnection->wait(); delete sshConnection; - sshConnection=0l; } - slotSshUserAuthError ( errMsg ); + sshConnection=0; + slotSshUserAuthError ( sshMessage ); return ; case SSH_SERVER_FILE_NOT_FOUND: errMsg=tr ( "Could not find known host file." @@ -2920,17 +2929,20 @@ void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage ) if ( QMessageBox::warning ( this, tr ( "Host key verification failed" ),errMsg,tr ( "Yes" ), tr ( "No" ) ) !=0 ) { - if ( sshConnection ) + connection->writeKnownHosts(false); + connection->wait(); + if(sshConnection && sshConnection !=connection) { sshConnection->wait(); delete sshConnection; - sshConnection=0l; } + sshConnection=0; slotSshUserAuthError ( tr ( "Host key verification failed" ) ); return; } - sshConnection->setAcceptUnknownServers ( true ); - sshConnection->start(); + connection->writeKnownHosts(true); + connection->wait(); + connection->start(); } void ONMainWindow::slotSshUserAuthError ( QString error ) @@ -5124,6 +5136,8 @@ void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus ) } #endif x2goDebug<<"proxy deleted"<<endl; + sshConnection->disconnectSession(); + sshConnection=0; spoolTimer=0l; tunnel=sndTunnel=fsTunnel=0l; soundServer=0l; @@ -5143,7 +5157,10 @@ void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus ) ( config.checkexitstatus==false ) ) ) check_cmd_status(); else + { sshConnection->disconnectSession(); + sshConnection=0; + } if ( startHidden ) close(); @@ -6599,7 +6616,10 @@ void ONMainWindow::slotGetServers ( bool result, QString output, listedSessions.clear(); retSessions=0; if (sshConnection) + { sshConnection->disconnectSession(); + sshConnection=0; + } QString passwd; QString user=getCurrentUname(); passwd=getCurrentPass(); @@ -8128,6 +8148,7 @@ void ONMainWindow::slotCmdMessage ( bool result,QString output, pass->setFocus(); pass->selectAll(); sshConnection->disconnectSession(); + sshConnection=0; return; } if ( output.indexOf ( "X2GORUNCOMMAND ERR NOEXEC:" ) !=-1 ) @@ -8140,6 +8161,7 @@ void ONMainWindow::slotCmdMessage ( bool result,QString output, QMessageBox::NoButton ); } sshConnection->disconnectSession(); + sshConnection=0; } @@ -9568,7 +9590,6 @@ void ONMainWindow::slotEmbedIntoParentWindow() void ONMainWindow::processSessionConfig() { - sshProxy.use=false; bool haveKey=false; config.command="KDE"; @@ -9797,22 +9818,6 @@ void ONMainWindow::processCfgLine ( QString line ) managedMode=true; acceptRsa=true; } - if ( lst[0]=="proxy" ) - { - config.proxy=sshProxy.host=lst[1]; - sshProxy.use=true; -#ifdef Q_OS_WIN - sshProxy.bin=cygwinPath ( wapiShortFileName ( appDir ) ) +"/ssh"; -#else - sshProxy.bin="ssh"; -#endif - return; - } - if ( lst[0]=="proxysshport" ) - { - config.proxyport=sshProxy.port=lst[1]; - return; - } if ( lst[0]=="cookie" ) { config.cookie=lst[1]; diff --git a/onmainwindow.h b/onmainwindow.h index 528df0b..412c00f 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -205,14 +205,6 @@ struct ConfigFile // }; -struct SshProxy -{ - bool use; - QString host; - QString port; - QString bin; -}; - //wrapper to send mouse events under windows in embedded mode #ifdef Q_OS_WIN @@ -302,6 +294,7 @@ public: { return &sessions; } + static bool isServerRunning ( int port ); void startNewSession(); void suspendSession ( QString sessId ); bool termSession ( QString sessId, @@ -524,7 +517,6 @@ private: bool cleanAllFiles; bool PGPInited; bool resumeAfterSuspending; - struct SshProxy sshProxy; QString sshPort; QString clientSshPort; QString defaultSshPort; @@ -887,7 +879,7 @@ private slots: void displayToolBar ( bool ); void showSessionStatus(); void slotSshConnectionError ( QString message, QString lastSessionError ); - void slotSshServerAuthError ( int error, QString sshMessage ); + void slotSshServerAuthError ( int error, QString sshMessage, SshMasterConnection* connection ); void slotSshUserAuthError ( QString error ); void slotSshConnectionOk(); void slotServSshConnectionOk(QString server); @@ -1038,7 +1030,6 @@ private: #ifdef Q_OS_LINUX void startDirectRDP(); #endif - bool isServerRunning ( int port ); void filterDesktops ( const QString& filter, bool strict=false ); void generateHostDsaKey(); diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp index bac6bf8..fc4d333 100644 --- a/sshmasterconnection.cpp +++ b/sshmasterconnection.cpp @@ -19,6 +19,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ + #include "x2goclientconfig.h" #include "x2gologdebug.h" #include "sshmasterconnection.h" @@ -26,6 +27,9 @@ #include <stdio.h> #include "sshprocess.h" +#include <sys/socket.h> /* for socket(), connect(), send(), and recv() */ +#include <arpa/inet.h> /* for sockaddr_in and inet_addr() */ + #include <QStringList> #include <QFile> #include <QDir> @@ -38,11 +42,15 @@ #ifndef Q_OS_WIN #include <arpa/inet.h> #include <netinet/tcp.h> +#include <qt4/QtNetwork/qabstractsocket.h> #endif #include "onmainwindow.h" + +#define PROXYTUNNELPORT 44444 + #undef DEBUG //#define DEBUG @@ -51,15 +59,23 @@ static bool isLibSshInited=false; - -SshMasterConnection::SshMasterConnection ( QString host, int port, bool acceptUnknownServers, QString user, - QString pass, QString key,bool autologin, bool krblogin, QObject* parent ) : QThread ( parent ) +SshMasterConnection::SshMasterConnection (QObject* parent, QString host, int port, bool acceptUnknownServers, QString user, + QString pass, QString key, bool autologin, bool krblogin, + bool useproxy, ProxyType type, QString proxyserver, quint16 proxyport, + QString proxylogin, QString proxypassword, QString proxykey, + bool proxyautologin ) : QThread ( parent ) { #if defined ( Q_OS_DARWIN ) // Mac OS X provides only 512KB stack space for secondary threads. // As we put a 512KB buffer on the stack later on, we need a bigger stack space. setStackSize (sizeof (char) * 1024 * 1024 * 2); #endif + tcpProxySocket = NULL; + tcpNetworkProxy = NULL; + sshProxy= NULL; + sshProxyReady=false; + + breakLoop=false; this->host=host; this->port=port; this->user=user; @@ -67,6 +83,14 @@ SshMasterConnection::SshMasterConnection ( QString host, int port, bool acceptUn this->key=key; this->autologin=autologin; this->acceptUnknownServers=acceptUnknownServers; + this->useproxy=useproxy; + this->proxytype=type; + this->proxyautologin=proxyautologin; + this->proxykey=proxykey; + this->proxyserver=proxyserver; + this->proxyport=proxyport; + this->proxylogin=proxylogin; + this->proxypassword=proxypassword; reverseTunnel=false; mainWnd=(ONMainWindow*) parent; kerberos=krblogin; @@ -77,16 +101,24 @@ SshMasterConnection::SshMasterConnection ( QString host, int port, bool acceptUn x2goDebug<<"starting ssh connection without kerberos authentication"<<endl; #endif kerberos=false; + } -SshMasterConnection::SshMasterConnection ( QString host, int port, bool acceptUnknownServers, QString user, - QString pass, QString key, bool autologin, +SshMasterConnection::SshMasterConnection (QObject* parent, ONMainWindow* mwd, QString host, int port, bool acceptUnknownServers, + QString user, QString pass, QString key,bool autologin, int remotePort, QString localHost, int localPort, SshProcess* creator, - QObject* parent, ONMainWindow* mwd ) : QThread ( parent ) + bool useproxy, ProxyType type, QString proxyserver, quint16 proxyport, + QString proxylogin, QString proxypassword, QString proxykey, + bool proxyautologin, int localProxyPort) : QThread ( parent ) { #if defined ( Q_OS_DARWIN ) setStackSize (sizeof (char) * 1024 * 1024 * 2); #endif + tcpProxySocket = NULL; + tcpNetworkProxy = NULL; + sshProxy= NULL; + sshProxyReady=false; + breakLoop=false; this->host=host; this->port=port; this->user=user; @@ -94,6 +126,15 @@ SshMasterConnection::SshMasterConnection ( QString host, int port, bool acceptUn this->key=key; this->autologin=autologin; this->acceptUnknownServers=acceptUnknownServers; + this->useproxy=useproxy; + this->proxyserver=proxyserver; + this->proxyport=proxyport; + this->proxylogin=proxylogin; + this->proxypassword=proxypassword; + this->proxytype=type; + this->proxyautologin=proxyautologin; + this->proxykey=proxykey; + this->localProxyPort=localProxyPort; reverseTunnelLocalHost=localHost; reverseTunnelLocalPort=localPort; reverseTunnelCreator=creator; @@ -102,12 +143,68 @@ SshMasterConnection::SshMasterConnection ( QString host, int port, bool acceptUn mainWnd=mwd; } +void SshMasterConnection::slotSshProxyConnectionOk() +{ +#ifdef DEBUG + x2goDebug<<"sshproxy connected"; +#endif + SshProcess* tunnel=new SshProcess ( sshProxy, this ); + + connect ( tunnel,SIGNAL ( sshFinished ( bool, QString, SshProcess* ) ), + this,SLOT ( slotSshProxyTunnelFailed(bool,QString,SshProcess*))); + connect ( tunnel,SIGNAL ( sshTunnelOk() ), + this,SLOT ( slotSshProxyTunnelOk()) ); + + localProxyPort=PROXYTUNNELPORT; + while ( ONMainWindow::isServerRunning ( localProxyPort ) ) + ++localProxyPort; + + tunnel->startTunnel ( host, port, "localhost",localProxyPort); + +} + + +void SshMasterConnection::slotSshProxyConnectionError(QString err1, QString err2) +{ + breakLoop=true; + emit connectionError(tr("SSH proxy connection error"),err1+" "+err2); +} + +void SshMasterConnection::slotSshProxyServerAuthError(int errCode, QString err, SshMasterConnection* con) +{ + emit serverAuthError(errCode, tr("SSH proxy connection error: ")+err, con); +} + +void SshMasterConnection::slotSshProxyUserAuthError(QString err) +{ + breakLoop=true; + emit userAuthError(tr("SSH proxy connection error: ")+err); +} + + +void SshMasterConnection::slotSshProxyTunnelOk() +{ +#ifdef DEBUG + x2goDebug<<"Ssh proxy tunnel established"; +#endif + sshProxyReady=true; +} + +void SshMasterConnection::slotSshProxyTunnelFailed(bool , QString output, + SshProcess*) +{ + breakLoop=true; + emit connectionError(tr("Failed to create SSH proxy tunnel"), output); +} + + SshMasterConnection* SshMasterConnection::reverseTunnelConnection ( SshProcess* creator, int remotePort, QString localHost, int localPort ) { - SshMasterConnection* con=new SshMasterConnection ( host,port,acceptUnknownServers,user,pass, + SshMasterConnection* con=new SshMasterConnection (this, mainWnd, host,port,acceptUnknownServers,user,pass, key,autologin, remotePort,localHost, - localPort,creator,this, mainWnd); + localPort,creator, useproxy, proxytype, proxyserver, proxyport, proxylogin, + proxypassword, proxykey, proxyautologin, localProxyPort ); con->kerberos=kerberos; connect ( con,SIGNAL ( ioErr ( SshProcess*,QString,QString ) ),this,SIGNAL ( ioErr ( SshProcess*,QString,QString ) ) ); @@ -120,8 +217,41 @@ SshMasterConnection* SshMasterConnection::reverseTunnelConnection ( SshProcess* return con; } +void SshMasterConnection::slotSshProxyServerAuthAborted() +{ + breakLoop=true; +} + void SshMasterConnection::run() { + if(useproxy && proxytype==PROXYSSH && !reverseTunnel) + { + + sshProxy=new SshMasterConnection (0, proxyserver, proxyport,acceptUnknownServers, + proxylogin, proxypassword, proxykey, proxyautologin, kerberos, false); + connect ( sshProxy, SIGNAL ( connectionOk(QString) ), this, SLOT ( slotSshProxyConnectionOk() ) ); + + connect ( sshProxy, SIGNAL ( serverAuthError ( int,QString,SshMasterConnection* ) ),this, + SLOT ( slotSshProxyServerAuthError ( int,QString, SshMasterConnection* ) ) ); + connect ( sshProxy, SIGNAL ( serverAuthAborted()),this, + SLOT ( slotSshProxyServerAuthAborted()) ); + connect ( sshProxy, SIGNAL ( userAuthError ( QString ) ),this,SLOT ( slotSshProxyUserAuthError ( QString ) ) ); + connect ( sshProxy, SIGNAL ( connectionError ( QString,QString ) ), this, + SLOT ( slotSshProxyConnectionError ( QString,QString ) ) ); + + sshProxyReady=false; + sshProxy->start(); + + while(! sshProxyReady) + { + if(breakLoop) + { + quit(); + return; + } + this->usleep(200); + } + } disconnectSessionFlag=false; if ( !isLibSshInited ) { @@ -164,6 +294,7 @@ void SshMasterConnection::run() quit(); return; } + #ifdef Q_OS_WIN ssh_options_set ( my_ssh_session, SSH_OPTIONS_SSH_DIR, (mainWnd->getHomeDirectory()+"/ssh").toAscii()); #endif @@ -171,10 +302,40 @@ void SshMasterConnection::run() ssh_options_set(my_ssh_session, SSH_OPTIONS_TIMEOUT, &timeout); + if (useproxy && proxytype == PROXYHTTP) + { + socket_t proxysocket = SSH_INVALID_SOCKET; + + tcpNetworkProxy = new QNetworkProxy( QNetworkProxy::HttpProxy, + proxyserver, proxyport, proxylogin, proxypassword); + tcpProxySocket = new QTcpSocket(); + tcpProxySocket->setProxy( *tcpNetworkProxy ); + tcpProxySocket->connectToHost(host, port); + proxysocket = tcpProxySocket->socketDescriptor(); + if (!tcpProxySocket->waitForConnected(30000)) + { + QString message=tr ( "Can not connect to proxy server" ); + x2goDebug<<message<<endl; + emit connectionError ( "Proxy", message ); + ssh_free ( my_ssh_session ); + quit(); + return; + } +#ifdef DEBUG + x2goDebug << "Created HTTP proxy socket " << proxysocket << endl; +#endif + ssh_options_set( my_ssh_session, SSH_OPTIONS_FD, &proxysocket); + ssh_set_fd_toread( my_ssh_session); +#ifdef DEBUG + x2goDebug<<"Connected to HTTP proxy server " << proxyserver << ":" + << proxyport <<endl; +#endif + } + if ( !sshConnect() ) { QString err=ssh_get_error ( my_ssh_session ); - QString message=tr ( "Can not connect to " ) +host+QString::number ( port ); + QString message=tr ( "Can not connect to " ) +host+":"+QString::number ( port ); x2goDebug<<message<<" - "<<err; emit connectionError ( message, err ); if ( reverseTunnel ) @@ -187,10 +348,23 @@ void SshMasterConnection::run() int state=serverAuth ( errMsg ); if ( state != SSH_SERVER_KNOWN_OK ) { - emit serverAuthError ( state,errMsg ); + writeHostKey=writeHostKeyReady=false; + emit serverAuthError ( state,errMsg, this ); + for(;;) + { + this->usleep(100); + writeHostKeyMutex.lock(); + if(writeHostKeyReady) + { + if(writeHostKey) + ssh_write_knownhost(my_ssh_session); + writeHostKeyMutex.unlock(); + break; + } + writeHostKeyMutex.unlock(); + } ssh_disconnect ( my_ssh_session ); ssh_free ( my_ssh_session ); - quit(); return; } @@ -261,8 +435,11 @@ void SshMasterConnection::run() SshMasterConnection::~SshMasterConnection() { - /* ssh_disconnect(my_ssh_session); - ssh_free(my_ssh_session);*/ + + if (tcpProxySocket != NULL) + delete tcpProxySocket; + if (tcpNetworkProxy != NULL) + delete tcpNetworkProxy; } @@ -286,16 +463,47 @@ bool SshMasterConnection::sshConnect() { int rc; QByteArray tmpBA = host.toLocal8Bit(); - ssh_options_set ( my_ssh_session, SSH_OPTIONS_HOST, tmpBA.data() ); - ssh_options_set ( my_ssh_session, SSH_OPTIONS_PORT, &port ); + if(useproxy && proxytype==PROXYSSH) + { + ssh_options_set ( my_ssh_session, SSH_OPTIONS_HOST, "localhost" ); + ssh_options_set ( my_ssh_session, SSH_OPTIONS_PORT, &localProxyPort ); + + } + else + { + ssh_options_set ( my_ssh_session, SSH_OPTIONS_HOST, tmpBA.data() ); + ssh_options_set ( my_ssh_session, SSH_OPTIONS_PORT, &port ); + } rc = ssh_connect ( my_ssh_session ); if ( rc != SSH_OK ) + { return false; - return true; + } +//set values for remote host for proper server authentication + if(useproxy && proxytype==PROXYSSH) + { + ssh_options_set ( my_ssh_session, SSH_OPTIONS_HOST, tmpBA.data() ); + ssh_options_set ( my_ssh_session, SSH_OPTIONS_PORT, &port ); + } + return true; } +void SshMasterConnection::writeKnownHosts(bool write) +{ + writeHostKeyMutex.lock(); + writeHostKeyReady=true; + writeHostKey=write; + if(!write) + { + breakLoop=true; + emit serverAuthAborted(); + } + writeHostKeyMutex.unlock(); + +} + int SshMasterConnection::serverAuth ( QString& errorMsg ) { @@ -326,7 +534,7 @@ int SshMasterConnection::serverAuth ( QString& errorMsg ) case SSH_SERVER_KNOWN_CHANGED: hexa = ssh_get_hexa ( hash, hlen ); - errorMsg=hexa; + errorMsg=host+":"+QString::number(port)+" - "+hexa; free ( hexa ); break; case SSH_SERVER_FOUND_OTHER: @@ -336,7 +544,7 @@ int SshMasterConnection::serverAuth ( QString& errorMsg ) if ( !acceptUnknownServers ) { hexa = ssh_get_hexa ( hash, hlen ); - errorMsg=hexa; + errorMsg=host+":"+QString::number(port)+" - "+hexa; free ( hexa ); break; } @@ -345,7 +553,7 @@ int SshMasterConnection::serverAuth ( QString& errorMsg ) break; case SSH_SERVER_ERROR: - errorMsg=ssh_get_error ( my_ssh_session ); + errorMsg=host+":"+QString::number(port)+" - "+ssh_get_error ( my_ssh_session ); break; } free ( hash ); @@ -524,15 +732,17 @@ void SshMasterConnection::addCopyRequest ( SshProcess* creator, QString src, QSt void SshMasterConnection::disconnectSession() { + disconnectFlagMutex.lock(); disconnectSessionFlag=true; disconnectFlagMutex.unlock(); + } void SshMasterConnection::copy() { - for ( int i=copyRequests.size()-1;i>=0;--i ) + for ( int i=copyRequests.size()-1; i>=0; --i ) { QStringList lst=copyRequests[i].dst.split ( "/" ); QString dstFile=lst.last(); @@ -634,13 +844,13 @@ void SshMasterConnection::channelLoop() inet_aton ( reverseTunnelLocalHost.toAscii(), &address.sin_addr ); #else address.sin_addr.s_addr=inet_addr ( - reverseTunnelLocalHost.toAscii() ); + reverseTunnelLocalHost.toAscii() ); #endif if ( ::connect ( sock, ( struct sockaddr * ) &address,sizeof ( address ) ) !=0 ) { QString errMsg=tr ( "can not connect to " ) + - reverseTunnelLocalHost+":"+QString::number ( reverseTunnelLocalPort ); + reverseTunnelLocalHost+":"+QString::number ( reverseTunnelLocalPort ); x2goDebug<<errMsg<<endl; emit ioErr ( reverseTunnelCreator, errMsg, "" ); continue; @@ -676,12 +886,20 @@ void SshMasterConnection::channelLoop() if ( disconnect ) { + + if (useproxy && proxytype==PROXYSSH&&sshProxy) + { + sshProxy->disconnectSession(); + sshProxy->wait ( 10000 ); + sshProxy=0; + } + #ifdef DEBUG if ( !reverseTunnel ) x2goDebug<<"Disconnecting..."<<endl; #endif reverseTunnelConnectionsMutex.lock(); - for ( int i=0;i<reverseTunnelConnections.size();++i ) + for ( int i=0; i<reverseTunnelConnections.size(); ++i ) { reverseTunnelConnections[i]->disconnectSession(); reverseTunnelConnections[i]->wait ( 10000 ); @@ -690,7 +908,7 @@ void SshMasterConnection::channelLoop() reverseTunnelConnectionsMutex.unlock(); channelConnectionsMutex.lock(); - for ( int i=0;i<channelConnections.size();++i ) + for ( int i=0; i<channelConnections.size(); ++i ) { finalize ( i ); } @@ -721,7 +939,7 @@ void SshMasterConnection::channelLoop() FD_ZERO ( &rfds ); - for ( int i=0;i<channelConnections.size();++i ) + for ( int i=0; i<channelConnections.size(); ++i ) { int tcpSocket=channelConnections.at ( i ).sock; if ( tcpSocket>0 ) @@ -805,7 +1023,7 @@ void SshMasterConnection::channelLoop() // x2goDebug<<"select exited"<<endl; channelConnectionsMutex.lock(); - for ( int i=channelConnections.size()-1;i>=0;--i ) + for ( int i=channelConnections.size()-1; i>=0; --i ) { int tcpSocket=channelConnections.at ( i ).sock; ssh_channel channel=channelConnections.at ( i ).channel; @@ -937,9 +1155,12 @@ void SshMasterConnection::finalize ( int item ) } if ( tcpSocket>0 ) { + shutdown(tcpSocket, SHUT_RDWR); close ( tcpSocket ); } SshProcess* proc=channelConnections[item].creator; + proc->shutdownSocket(); channelConnections.removeAt ( item ); emit channelClosed ( proc ); } + diff --git a/sshmasterconnection.h b/sshmasterconnection.h index 379b6b2..6a46d28 100644 --- a/sshmasterconnection.h +++ b/sshmasterconnection.h @@ -28,6 +28,8 @@ #include <QMutex> #include <QThread> #include <QStringList> +#include <QTcpSocket> +#include <QNetworkProxy> class ONMainWindow; class SshProcess; @@ -54,14 +56,17 @@ struct CopyRequest QString dst; }; - class SshMasterConnection: public QThread { Q_OBJECT public: + enum ProxyType {PROXYSSH, PROXYHTTP}; void run(); - SshMasterConnection(QString host, int port, bool acceptUnknownServers, QString user, - QString pass, QString key, bool autologin, bool krblogin, QObject* parent = 0); + SshMasterConnection(QObject* parent, QString host, int port, bool acceptUnknownServers, QString user, + QString pass, QString key, bool autologin, bool krblogin=false, + bool useproxy=false, ProxyType type=PROXYSSH, QString proxyserver=QString::null, quint16 proxyport=0, + QString proxylogin=QString::null, QString proxypassword=QString::null, QString proxyKey=QString::null, + bool proxyAutologin=false); ~SshMasterConnection(); static void finalizeLibSsh(); void addChannelConnection(SshProcess* creator, int sock, QString forwardHost, @@ -69,6 +74,7 @@ public: void addChannelConnection(SshProcess* creator, QString cmd); void addCopyRequest(SshProcess* creator, QString src, QString dst); void disconnectSession(); + void writeKnownHosts(bool); void setAcceptUnknownServers(bool accept) { acceptUnknownServers=accept; @@ -92,12 +98,13 @@ public: return kerberos; }; - private: - SshMasterConnection(QString host, int port, bool acceptUnknownServers, QString user, QString pass, QString key, - bool autologin, + SshMasterConnection(QObject* parent, ONMainWindow* parWnd, QString host, int port, bool acceptUnknownServers, + QString user, QString pass, QString key,bool autologin, int remotePort, QString localHost, int localPort, SshProcess* creator, - QObject* parent, ONMainWindow* parWnd); + bool useproxy=false, ProxyType type=PROXYSSH, QString proxyserver=QString::null, quint16 proxyport=0, + QString proxylogin=QString::null, QString proxypassword=QString::null, QString proxyKey=QString::null, + bool proxyAutologin=false, int localProxyPort=0); bool sshConnect(); bool userAuthWithPass(); bool userAuthAuto(); @@ -111,6 +118,19 @@ private: void parseKnownHosts(); #endif +private slots: + + void slotSshProxyServerAuthError ( int,QString, SshMasterConnection* ); + void slotSshProxyServerAuthAborted (); + void slotSshProxyUserAuthError ( QString ); + void slotSshProxyConnectionError ( QString,QString ); + + + void slotSshProxyConnectionOk(); + void slotSshProxyTunnelOk(); + void slotSshProxyTunnelFailed(bool result, QString output, + SshProcess*); + private: ssh_session my_ssh_session; QList<ChannelConnection> channelConnections; @@ -120,16 +140,29 @@ private: QMutex copyRequestMutex; QMutex disconnectFlagMutex; QMutex reverseTunnelConnectionsMutex; + QMutex writeHostKeyMutex; + bool writeHostKey; + bool writeHostKeyReady; + QString host; int port; QString user; QString pass; QString key; + bool useproxy; + QString proxyserver; + quint16 proxyport; + QString proxylogin; + QString proxypassword; + ProxyType proxytype; + bool proxyautologin; + QString proxykey; QStringList authErrors; bool autologin; bool disconnectSessionFlag; bool reverseTunnel; int reverseTunnelRemotePort; + int localProxyPort; int reverseTunnelLocalPort; bool acceptUnknownServers; QString reverseTunnelLocalHost; @@ -137,6 +170,11 @@ private: ONMainWindow* mainWnd; bool kerberos; QString sshProcErrString; + QTcpSocket *tcpProxySocket; + QNetworkProxy *tcpNetworkProxy; + SshMasterConnection* sshProxy; + bool sshProxyReady; + bool breakLoop; signals: void stdErr(SshProcess* caller, QByteArray data); @@ -147,7 +185,8 @@ signals: void channelClosed(SshProcess* caller); void connectionError(QString message, QString lastSessionError); - void serverAuthError(int errCode, QString lastSessionError); + void serverAuthError(int errCode, QString lastSessionError, SshMasterConnection*); + void serverAuthAborted(); void userAuthError(QString error); void newReverceTunnelConnection(SshProcess* creator, void* newChannel); diff --git a/sshprocess.cpp b/sshprocess.cpp index 5ee5a72..11f342c 100644 --- a/sshprocess.cpp +++ b/sshprocess.cpp @@ -60,6 +60,21 @@ SshProcess::~SshProcess() } } +void SshProcess::shutdownSocket() +{ + if (serverSocket>0) + { +#ifdef Q_OS_WIN + closesocket(serverSocket); + WSACleanup(); + +#else + close(serverSocket); +#endif + serverSocket=0; + + } +} void SshProcess::slotCheckNewConnection() { diff --git a/sshprocess.h b/sshprocess.h index 54e94b5..5b9dad4 100644 --- a/sshprocess.h +++ b/sshprocess.h @@ -45,6 +45,7 @@ public: void startTunnel(const QString& forwardHost, uint forwardPort, const QString& localHost, uint localPort, bool reverse=false); void start_cp(QString src, QString dst); + void shutdownSocket(); QString getSource() { return scpSource; 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

pyhoca-cli.git - master (branch) updated: 0.2.0.4-4-g84999ab
by git-admin＠x2go.org 25 Sep '12

25 Sep '12

The branch, master has been updated via 84999ab5f157d234b1854aa8b7f3ca13bdbcd9cb (commit) via 83a392d159e4f817b3977ae274a80489e8d5b50b (commit) from f1fa7df429bbd37e146b36f688ad32dc0a16889d (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 84999ab5f157d234b1854aa8b7f3ca13bdbcd9cb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 25 20:19:21 2012 +0200 Reduce python version in Build-Depends to allow build on Ubuntu 10.04. commit 83a392d159e4f817b3977ae274a80489e8d5b50b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 15 21:28:29 2012 +0200 /debian/control: fix typo in longdescs ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 +++- debian/control | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 37c267a..089eb78 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ pyhoca-cli (0.2.0.5-0~x2go1) UNRELEASED; urgency=low - * Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + * /debian/control: + + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + + Reduce python version in Build-Depends to allow build on Ubuntu 10.04. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 17 Aug 2012 16:38:54 +0200 diff --git a/debian/control b/debian/control index e1f3320..0d721d1 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Uploaders: Build-Depends: debhelper (>= 7.0.50~), man2html-base | man2html, - python (>=2.6.6-3~), + python (>=2.6.5-0~), python-setuptools, python-x2go Standards-Version: 3.9.3 @@ -28,7 +28,7 @@ Depends: Description: Command line X2Go client written in Python X2Go is a server based computing environment with - session resuming - - low bandwith support + - low bandwidth support - LDAP support - client side mass storage mounting support - client side printing support hooks/post-receive -- pyhoca-cli.git (Python X2Go Client (command line 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 "pyhoca-cli.git" (Python X2Go Client (command line client)).

1 0

python-x2go.git - build-main (branch) updated: 0.2.0.10-2-g38373f3
by git-admin＠x2go.org 25 Sep '12

25 Sep '12

The branch, build-main has been updated via 38373f3f05f4b34858f236f48c23e56b370112b8 (commit) via bea7041afde2938a28024a368062895ec724d12d (commit) from 0773ad2a0b153ff0cc15cbd35d3e0686e65596d9 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 +++++++ debian/control | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1093874..f82a5fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-x2go (0.2.0.10-0~x2go2) unstable; urgency=low + + * /debian/control: + + Allow build on Ubuntu 10.04 (reduce Python version in Build-Depends). + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 25 Sep 2012 20:14:03 +0200 + python-x2go (0.2.0.10-0~x2go1) unstable; urgency=low * New upstream version (0.2.0.10): diff --git a/debian/control b/debian/control index b65ce81..36f017e 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,8 @@ Uploaders: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Build-Depends: debhelper (>= 7.0.50~), - python (>= 2.6.6-3~), +# python (>= 2.6.6-3~), + python (>= 2.6.5-0~), python-setuptools, python-epydoc, python-gevent, 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-2-g38373f3
by git-admin＠x2go.org 25 Sep '12

25 Sep '12

The branch, master has been updated via 38373f3f05f4b34858f236f48c23e56b370112b8 (commit) via bea7041afde2938a28024a368062895ec724d12d (commit) from 0773ad2a0b153ff0cc15cbd35d3e0686e65596d9 (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 38373f3f05f4b34858f236f48c23e56b370112b8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 25 20:15:01 2012 +0200 package revision 0~x2go2 commit bea7041afde2938a28024a368062895ec724d12d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 25 20:13:57 2012 +0200 /debian/control: Allow build on Ubuntu 10.04 (reduce Python version in Build-Depends). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 +++++++ debian/control | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1093874..f82a5fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-x2go (0.2.0.10-0~x2go2) unstable; urgency=low + + * /debian/control: + + Allow build on Ubuntu 10.04 (reduce Python version in Build-Depends). + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 25 Sep 2012 20:14:03 +0200 + python-x2go (0.2.0.10-0~x2go1) unstable; urgency=low * New upstream version (0.2.0.10): diff --git a/debian/control b/debian/control index b65ce81..36f017e 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,8 @@ Uploaders: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Build-Depends: debhelper (>= 7.0.50~), - python (>= 2.6.6-3~), +# python (>= 2.6.6-3~), + python (>= 2.6.5-0~), python-setuptools, python-epydoc, python-gevent, 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 - build-main (branch) updated: 0.2.0.10
by git-admin＠x2go.org 25 Sep '12

25 Sep '12

The branch, build-main has been updated via 0773ad2a0b153ff0cc15cbd35d3e0686e65596d9 (commit) via 3283c8321733ce800331d3ba1cfd8de9c1c1bc3a (commit) via 2ab6c71eeea4a425ad327c9233969dd7994c6aee (commit) via 5a0dd6c27283830e1b18034d88b1af69cbfb6a8d (commit) via 2442e74331d5199bb3e7b816d7a703738ad3578c (commit) via b9fffc03639a59e55d0e18d2cb5782bed8d51524 (commit) via 06e08a443f6c067ee48423ebb3d6fbda265478fd (commit) via aa9d494e669606926afaa0e7fbf78769596a771d (commit) via f60c4d39335fd135c16ab66803340b3b1ae7be34 (commit) via 8c8e216f3e29879791955e46d415348cea4944e1 (commit) via bcd2472dcb7607546a1f801cf862661b50f0cad2 (commit) via 60d5a88d02fbf006f76219e8aae57e0d9a081eee (commit) from 187ce289743a817b1b11e1422e37a4b8968df03e (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 17 +++++++++++++++++ debian/control | 6 +++--- x2go/__init__.py | 2 +- x2go/backends/terminal/_stdout.py | 11 +++++------ x2go/defaults.py | 3 ++- x2go/utils.py | 6 ++++++ 6 files changed, 34 insertions(+), 11 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ae02401..1093874 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +python-x2go (0.2.0.10-0~x2go1) unstable; urgency=low + + * New upstream version (0.2.0.10): + - Use session type 'D' for X2Go-proxied RDP session when run in + fullscreen mode. Fixes upstream issue #27. + - Indentation fix in defaults.py. + - Make Python X2Go aware of DirectRDP settings in session profiles. + - Ignore DirectRDP options in session profile config for now. + - Remove bashism from X2Go server command calls. Caused servers + with no installed x2goserver-xsession package to crash desktop + sessions (observed with KDE4 on Ubuntu 12.04). + - Handle 16bit and 17bit colour depth (Windows clients) as + equal when resuming sessions. + * Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 25 Sep 2012 16:03:24 +0200 + python-x2go (0.2.0.9-0~x2go2) unstable; urgency=low * Make sure we can build against python-gevent provided on diff --git a/debian/control b/debian/control index cc1a956..b65ce81 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: python-x2go Section: python Priority: optional -Maintainer: X2Go Packaging Team <pkg-x2go-devel(a)lists.alioth.debian.org> +Maintainer: X2Go Packaging Team <x2go-dev(a)lists.berlios.de> Uploaders: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Build-Depends: @@ -35,7 +35,7 @@ Recommends: Description: Python module providing X2Go client API X2Go is a server based computing environment with - session resuming - - low bandwith support + - low bandwidth support - LDAP support - client side mass storage mounting support - audio support @@ -53,7 +53,7 @@ Depends: Description: Python module providing X2Go client API (documentation) X2Go is a server based computing environment with - session resuming - - low bandwith support + - low bandwidth support - LDAP support - client side mass storage mounting support - audio support diff --git a/x2go/__init__.py b/x2go/__init__.py index 11643bf..706d488 100644 --- a/x2go/__init__.py +++ b/x2go/__init__.py @@ -178,7 +178,7 @@ Contact """ __NAME__ = 'python-x2go' -__VERSION__ = '0.2.0.9' +__VERSION__ = '0.2.0.10' from gevent import monkey monkey.patch_all() diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index bcd6771..3df1491 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -143,10 +143,9 @@ class X2goSessionParams(object): self.session_type = 'P' self.cmd = 'PUBLISHED' else: - if cmd == 'RDP': - self.session_type = 'R' - elif cmd.startswith('rdesktop'): - self.session_type = 'R' + if cmd == 'RDP' or cmd.startswith('rdesktop') or cmd.startswith('xfreedrp'): + if self.geometry == 'fullscreen': self.session_type = 'D' + else: self.session_type = 'R' elif cmd == 'XDMCP': self.session_type = 'D' elif cmd in _X2GO_DESKTOPSESSIONS.keys(): @@ -1193,7 +1192,7 @@ class X2goTerminalSessionSTDOUT(object): _rewrite_blanks(_rewrite_cmd(cmd, params=self.params)), str(self.params.snd_system), str(self.params.session_type), - "&> /dev/null & exit", + "1>/dev/null 2>/dev/null & exit", ] if self.params.snd_system == 'pulse': @@ -1297,7 +1296,7 @@ class X2goTerminalSessionSTDOUT(object): cmd_line.extend( [ "setsid %s" % exec_name, - "&> /dev/null & exit", + "1>/dev/null 2>/dev/null & exit", ] ) diff --git a/x2go/defaults.py b/x2go/defaults.py index 350a288..a9562bf 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -41,7 +41,7 @@ if X2GOCLIENT_OS != 'Windows': try: X_DISPLAY = Xlib.display.Display() except Xlib.error.DisplayNameError: - X_DISPLAY = None + X_DISPLAY = None except Xlib.error.DisplayConnectionError: X_DISPLAY = None @@ -305,6 +305,7 @@ X2GO_SESSIONPROFILE_DEFAULTS = { 'name': 'NEW_PROFILE', 'icon': ':icons/128x128/x2gosession.png', 'host': '', 'user': CURRENT_LOCAL_USER, 'key': '', 'sshport': 22, 'krblogin': False, 'rootless': True, 'applications': X2GO_GENERIC_APPLICATIONS, 'command':'TERMINAL', 'published': False, + 'directrdp': False, 'directrdpsettings': '', 'rdpclient': 'rdesktop', 'rdpport': 3389, 'rdpoptions': '-u X2GO_USER -p X2GO_PASSWORD', 'rdpserver': '', 'print': False, 'xdmcpserver': 'localhost', diff --git a/x2go/utils.py b/x2go/utils.py index bae73a1..9dc38c4 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -315,6 +315,10 @@ def _convert_SessionProfileOptions_2_SessionParams(options): 'xinerama', 'multidisp', 'krblogin', + 'directrdp', + 'directrdpsettings', + 'rdpclient', + 'rdpport', ] for i in _ignored_options: del _params[i] @@ -538,6 +542,8 @@ def is_color_depth_ok(depth_session, depth_local): return True if ( ( depth_session == 24 or depth_session == 32 ) and ( depth_local == 24 or depth_local == 32 ) ): return True; + if ( ( depth_session == 16 or depth_session == 17 ) and ( depth_local == 16 or depth_local == 17 ) ): + return True; 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

python-x2go.git - master (branch) updated: 0.2.0.9-16-g0773ad2
by git-admin＠x2go.org 25 Sep '12

25 Sep '12

The branch, master has been updated via 0773ad2a0b153ff0cc15cbd35d3e0686e65596d9 (commit) from 3283c8321733ce800331d3ba1cfd8de9c1c1bc3a (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 0773ad2a0b153ff0cc15cbd35d3e0686e65596d9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 25 16:09:35 2012 +0200 release 0.2.0.10 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a4ef284..1093874 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-x2go (0.2.0.10-0~x2go1) UNRELEASED; urgency=low +python-x2go (0.2.0.10-0~x2go1) unstable; urgency=low * New upstream version (0.2.0.10): - Use session type 'D' for X2Go-proxied RDP session when run in @@ -13,7 +13,7 @@ python-x2go (0.2.0.10-0~x2go1) UNRELEASED; urgency=low equal when resuming sessions. * Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 17 Aug 2012 18:29:04 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 25 Sep 2012 16:03:24 +0200 python-x2go (0.2.0.9-0~x2go2) unstable; urgency=low 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.9-16-g94d6922
by git-admin＠x2go.org 25 Sep '12

25 Sep '12

The branch, master has been updated via 94d692294ad91ee36fd0543465812c51fa2c5970 (commit) from 3283c8321733ce800331d3ba1cfd8de9c1c1bc3a (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 94d692294ad91ee36fd0543465812c51fa2c5970 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 25 16:03:45 2012 +0200 release 0.2.0.10 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- x2go/backends/proxy/_nx3.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a4ef284..1093874 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-x2go (0.2.0.10-0~x2go1) UNRELEASED; urgency=low +python-x2go (0.2.0.10-0~x2go1) unstable; urgency=low * New upstream version (0.2.0.10): - Use session type 'D' for X2Go-proxied RDP session when run in @@ -13,7 +13,7 @@ python-x2go (0.2.0.10-0~x2go1) UNRELEASED; urgency=low equal when resuming sessions. * Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 17 Aug 2012 18:29:04 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 25 Sep 2012 16:03:24 +0200 python-x2go (0.2.0.9-0~x2go2) unstable; urgency=low diff --git a/x2go/backends/proxy/_nx3.py b/x2go/backends/proxy/_nx3.py index 22ba3ef..25d4c5e 100644 --- a/x2go/backends/proxy/_nx3.py +++ b/x2go/backends/proxy/_nx3.py @@ -74,6 +74,7 @@ class X2goProxyNX3(base.X2goProxyBASE): "retry=5", "composite=1", "connect=127.0.0.1", + "loopback=1", "clipboard=1", "cookie=%s" % self.session_info.cookie, "port=%d" % self.session_info.graphics_port, @@ -85,6 +86,7 @@ class X2goProxyNX3(base.X2goProxyBASE): "retry=5", "composite=1", "connect=127.0.0.1", + "loopback=1", "clipboard=1", "cookie=%s" % self.session_info.cookie, "port=%d" % self.session_info.graphics_port, 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

cups-x2go.git - build-main (branch) updated: 3.0.0.4
by git-admin＠x2go.org 25 Sep '12

25 Sep '12

The branch, build-main has been updated via 25c010ff996d90a904bed9ce225be76e7393911c (commit) via 90bc39eb514ea22e3848144c3690e33094fd26ee (commit) via d1b85e1ea683f5efecde43b34cefd339b63398b7 (commit) via 7be426bcf5b604d2229dd8321a6d21f570a89483 (commit) via 86e725ac8e514d40abcef9db2367be05736d0604 (commit) via 6a7c597b3fa5004c1d24640c48dbca4bf718c180 (commit) via ea845a5c5a6c5ff3dfabfe7a77e4a0d120d8f57a (commit) via 57cfdc83af8b5fd2a7e330c6c1af2fe93767190c (commit) from eeb0842b295fb02d1a58611cecab640a65bb1300 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: CUPS-X2GO.ppd | 8 ++++---- VERSION.cups-x2go | 2 +- cups-x2go | 31 +++++++++++++++++++------------ cups-x2go.conf | 8 ++++---- debian/changelog | 14 ++++++++++++++ debian/control | 16 +++++++++------- 6 files changed, 51 insertions(+), 28 deletions(-) The diff of changes is: diff --git a/CUPS-X2GO.ppd b/CUPS-X2GO.ppd index 7ecd5e6..d3d5207 100644 --- a/CUPS-X2GO.ppd +++ b/CUPS-X2GO.ppd @@ -28,10 +28,10 @@ *PCFileName: "CUPS-X2GO.PPD" *Manufacturer: "Generic" *Product: "(CUPS v1.1)" -*ModelName: "Generic CUPS-X2GO Printer" -*ShortNickName: "Generic CUPS-X2GO Printer" -*NickName: "Generic CUPS-X2GO Printer" -*1284DeviceID: "MFG:Generic;MDL:CUPS-X2GO Printer;DES:Generic CUPS-X2GO Printer;CLS:PRINTER;CMD:POSTSCRIPT;" +*ModelName: "Generic CUPS-X2Go Printer" +*ShortNickName: "Generic CUPS-X2Go Printer" +*NickName: "Generic CUPS-X2Go Printer" +*1284DeviceID: "MFG:Generic;MDL:CUPS-X2Go Printer;DES:Generic CUPS-X2Go Printer;CLS:PRINTER;CMD:POSTSCRIPT;" *% cupsFilter: "application/vnd.cups-postscript 0 pstitleiconv" *PSVersion: "(2017.000) 0" *LanguageLevel: "2" diff --git a/VERSION.cups-x2go b/VERSION.cups-x2go index ea258a6..6f3d48d 100644 --- a/VERSION.cups-x2go +++ b/VERSION.cups-x2go @@ -1 +1 @@ -3.0.0.3 +3.0.0.4 diff --git a/cups-x2go b/cups-x2go index 2275525..967c9ee 100755 --- a/cups-x2go +++ b/cups-x2go @@ -1,6 +1,6 @@ #!/usr/bin/perl -# X2go CUPS backend +# X2Go CUPS backend # Copyright 2009-2011 Obviously Nice # # This program is free software; you can redistribute it and/or modify it @@ -26,20 +26,20 @@ use strict; openlog($0,'cons,pid','user'); -## if the CUPS server is X2go server at the same time, use ,,local'' here, otherwise -## name the hostname of your master X2go server within in your X2go cluster. This +## if the CUPS server is X2Go server at the same time, use ,,local'' here, otherwise +## name the hostname of your master X2Go server within in your X2Go cluster. This ## host then is used for querying session information. my $x2goserver = "local"; ## DSA key for user x2goprint (new path and filename, default in cups-x2go backend) -## this private key has to be valid for all X2go servers that print via the CUPS +## this private key has to be valid for all X2Go servers that print via the CUPS ## server that cups-x2go is installed on. The corresponding public key has to ## be installed in <remote-x2goserverX>:~x2goprint/.ssh/authorized_keys my $printdsa = "/root/.ssh/id_dsa-x2goprint"; # PS2PDF command -my $ps2pdf = "/usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f \"%s\""; -#my $ps2pdf = "/usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f /usr/bin/margin-offset.ps \"%s\""; +my $ps2pdf = "/usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -dDoNumCopies -c .setpdfwrite -f \"%s\""; +#my $ps2pdf = "/usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -dDoNumCopies -c .setpdfwrite -f /usr/bin/margin-offset.ps \"%s\""; ## loglevel for cups-x2go, possible values: emerg, alert, crit, err, warning, notice, info, debug my $strloglevel = "notice"; @@ -70,6 +70,7 @@ sub readconfig { $x2goserver=$value; $x2goserver=~s/ //g; + $x2goserver=~s/\"//g; } if($option eq "printdsa") { @@ -108,15 +109,19 @@ sub getsessions my $sesslist; if ( $x2goserver eq "local" ) { + syslog("debug", "Querying local X2Go server for a session list..."); + # run x2golistsessions locally $sesslist=`su $userName -c "x2golistsessions --all-servers"`; } else { - # Calling x2goprint with a single parameter <username> will result in an x2golistsessions --all-servers command on the - # remote X2go server. + syslog("debug", "Querying remote X2Go server $x2goserver for a session list..."); + # Calling x2goprint with a single parameter <username> will result in an + # x2golistsessions --all-servers command on the remote X2Go server. $sesslist=`ssh -i $printdsa x2goprint\@$x2goserver "sudo x2goprint $userName"`; } + syslog("debug", $sesslist); @sessions=split("\n",$sesslist); } @@ -136,12 +141,12 @@ sub printfile # log that we are about to process a print job syslog('debug', "x2goprint $userName $sess ${sess}_$bname ${sess}_$bname.title"); - # process print job + # process print job system( "x2goprint $userName $sess ${sess}_$bname ${sess}_$bname.title" ); } else { - # push spool job to remote X2go server... and launch x2goprint there (with sudo!!!) + # push spool job to remote X2Go server... and launch x2goprint there (with sudo!!!) # PDF file syslog('debug', "scp -i $printdsa $pfile x2goprint\@$x2gosession_host:~x2goprint/${sess}_$bname"); @@ -149,7 +154,7 @@ sub printfile # title file syslog('debug', "scp -i $printdsa $tfile x2goprint\@$x2gosession_host:~x2goprint/${sess}_$bname.title"); system ("scp -i $printdsa $tfile x2goprint\@$x2gosession_host:~x2goprint/${sess}_$bname.title"); - # run x2goprint on remote X2go server + # run x2goprint on remote X2Go server syslog('debug', "ssh -i $printdsa x2goprint\@$x2gosession_host \"sudo x2goprint $userName $sess ${sess}_$bname ${sess}_$bname.title\"" ); system( "ssh -i $printdsa x2goprint\@$x2gosession_host \"sudo x2goprint $userName $sess ${sess}_$bname ${sess}_$bname.title\"" ); @@ -161,7 +166,7 @@ sub printfile if (!$ARGV[0]) { - print "file cups-x2go:/ \"Virtual X2GO Printer\" \"CUPS-X2GO\" \"MFG:Generic;MDL:CUPS-X2GO Printer;DES:Generic CUPS-X2GO Printer;CLS:PRINTER;CMD:POSTSCRIPT;\"\n"; + print "file cups-x2go:/ \"Virtual X2Go Printer\" \"CUPS-X2Go\" \"MFG:Generic;MDL:CUPS-X2Go Printer;DES:Generic CUPS-X2Go Printer;CLS:PRINTER;CMD:POSTSCRIPT;\"\n"; exit 0; } @@ -221,6 +226,8 @@ print TITLE $jobTitle; close (TITLE); getsessions(); +syslog('debug', "Retrieved session list: @sessions\n"); + for(my $i=0; $i<scalar(@sessions);$i++ ) { my @sinfo=split("\\|",@sessions[$i]); diff --git a/cups-x2go.conf b/cups-x2go.conf index e44f6dc..89ed3ce 100644 --- a/cups-x2go.conf +++ b/cups-x2go.conf @@ -2,19 +2,19 @@ ### cups-x2go.conf -- CUPS Backend Configuration ### -## if the CUPS server is X2go server at the same time, use ,,local'' here, otherwise -## name the hostname of your master X2go server within in your X2go cluster. This +## if the CUPS server is X2Go server at the same time, use ,,local'' here, otherwise +## name the hostname of your master X2Go server within in your X2Go cluster. This ## host then is used for querying session information. #x2goserver = local ## DSA key for user x2goprint (new path and filename, default in cups-x2go backend) -## this private key has to be valid for all X2go servers that print via the CUPS +## this private key has to be valid for all X2Go servers that print via the CUPS ## server that cups-x2go is installed on. The corresponding public key has to ## be installed in <remote-x2goserverX>:~x2goprint/.ssh/authorized_keys #printdsa = /root/.ssh/id_dsa-x2goprint ## command to generate PDF file -#ps2pdf = /usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f \"%s\" +#ps2pdf = /usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -dDoNumCopies -c .setpdfwrite -f \"%s\" ## loglevel for cups-x2go, possible values: emerg, alert, crit, err, warning, notice, info, debug #loglevel = notice diff --git a/debian/changelog b/debian/changelog index 1847fe7..5fc5b5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +cups-x2go (3.0.0.4-0~x2go1) unstable; urgency=low + + [ Mike Gabriel ] + * New upstream version (3.0.0.4): + - Add more debug messages. + - Use proper project name where appropriate and possible (,,X2Go''). + * Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + + [ Helmer Teles ] + * New upstream version (3.0.0.4): + - Fix ignoring number of copies to be printed for single pages. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 25 Sep 2012 15:59:04 +0200 + cups-x2go (3.0.0.3-0~x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/debian/control b/debian/control index efc9df0..aa4948f 100644 --- a/debian/control +++ b/debian/control @@ -1,8 +1,10 @@ Source: cups-x2go Section: x11 -Priority: extra -Maintainer: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -Uploaders: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +Priority: optional +Maintainer: X2Go Developers <x2go-dev(a)lists.berlios.de> +Uploaders: + Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, + Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, Build-Depends: debhelper (>= 7) Standards-Version: 3.9.1 @@ -17,13 +19,13 @@ Depends: ghostscript, cups-client, cups -Description: X2GO printer for CUPS - X2go is a server based computing environment with +Description: Virtual X2Go printer for CUPS + X2Go is a server based computing environment with - session resuming - - low bandwith support + - low bandwidth support - LDAP support - client side mass storage mounting support - audio support - authentication by smartcard and USB stick . - CUPS-X2GO provides an X2go backend to CUPS. + CUPS-X2Go provides a CUPS-backend for X2Go printing. hooks/post-receive -- cups-x2go.git (CUPS Backend for X2Go Printing) 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 "cups-x2go.git" (CUPS Backend for X2Go Printing).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits