This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 3794014 last commit is not fix for #720 new 1f8821e typo fix in log message new b19e015 improve debugging messages new 023a1b9 Revert "last commit is not fix for #720" new bdae523 Revert "SSH with GSSAPI: Don't assume the broker-side user has /bin/sh (or compatible) set as default shell. (Fixes: #720)." new 89105aa Fix quotes when calling remote commands via SSH. Use single backslash to quote quotation marks. (Fixes: #720). The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 4 ++-- httpbrokerclient.cpp | 6 +++--- sshprocess.cpp | 8 +++++--- 3 files changed, 10 insertions(+), 8 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 1f8821e3f9fcee1ee373b94d9cf789129ad498fc Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jan 9 21:14:30 2015 +0100 typo fix in log message --- httpbrokerclient.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/httpbrokerclient.cpp b/httpbrokerclient.cpp index 71c7153..9eb7a43 100644 --- a/httpbrokerclient.cpp +++ b/httpbrokerclient.cpp @@ -279,7 +279,7 @@ void HttpBrokerClient::getUserSessions() void HttpBrokerClient::selectUserSession(const QString& session) { - x2goDebug<<"called selectUserSessions"; + x2goDebug<<"called selectUserSession"; QString brokerUser=config->brokerUser; if(mainWindow->getUsePGPCard()) brokerUser=mainWindow->getCardLogin(); -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit b19e0152a3eebd53cdb8c94380d47860dcc2caec Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jan 9 21:29:51 2015 +0100 improve debugging messages --- httpbrokerclient.cpp | 2 +- sshprocess.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/httpbrokerclient.cpp b/httpbrokerclient.cpp index 9eb7a43..736f5e7 100644 --- a/httpbrokerclient.cpp +++ b/httpbrokerclient.cpp @@ -279,7 +279,7 @@ void HttpBrokerClient::getUserSessions() void HttpBrokerClient::selectUserSession(const QString& session) { - x2goDebug<<"called selectUserSession"; + x2goDebug<<"Called selectUserSession for session "<<session<<"."; QString brokerUser=config->brokerUser; if(mainWindow->getUsePGPCard()) brokerUser=mainWindow->getCardLogin(); diff --git a/sshprocess.cpp b/sshprocess.cpp index 6ad7579..5fa43d6 100755 --- a/sshprocess.cpp +++ b/sshprocess.cpp @@ -217,6 +217,8 @@ void SshProcess::startNormal(const QString& cmd) #endif QString::number(masterCon->getPort())+" -l "+ masterCon->getUser()+" "+ host + " \""+shcmd+"\""; + + x2goDebug<<"evoking ssh command via SshProcess object ("<<pid<<"): "<<sshString<<endl; procUuid=uuidStr; proc->start(sshString); @@ -224,7 +226,7 @@ void SshProcess::startNormal(const QString& cmd) { stdErrString=proc->errorString(); #ifdef DEBUG - x2goDebug<<"ssh start failed:" <<stdErrString<<endl; + //x2goDebug<<"ssh start failed:" <<stdErrString<<endl; #endif slotChannelClosed(this, uuidStr); return; -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 023a1b9d598eee40d00fd04ce0e89e8ec4cf0e4d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jan 9 21:31:23 2015 +0100 Revert "last commit is not fix for #720" This reverts commit 379401496951e72c6dfcafc1e3144360f5e6f8a7. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 459e12f..8820888 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,7 +27,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium occur. - Improve debugging/logging the SSH connections made by X2Go Client. - SSH with GSSAPI: Don't assume the broker-side user has /bin/sh (or - compatible) set as default shell. + compatible) set as default shell. (Fixes: #720). [ Jason Alavaliant ] * New upstream verson (4.0.3.2): -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit bdae523b7363f53dfee7854dcb4d44699a6c7e88 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jan 9 21:31:41 2015 +0100 Revert "SSH with GSSAPI: Don't assume the broker-side user has /bin/sh (or compatible) set as default shell. (Fixes: #720)." This reverts commit ccb864b0bf57785d4405f9bc4947ffb9897a4351. --- debian/changelog | 2 -- sshmasterconnection.cpp | 2 +- sshprocess.cpp | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8820888..3e67cf4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,8 +26,6 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Fix string concatenation/layout of error message when tunnel I/O errors occur. - Improve debugging/logging the SSH connections made by X2Go Client. - - SSH with GSSAPI: Don't assume the broker-side user has /bin/sh (or - compatible) set as default shell. (Fixes: #720). [ Jason Alavaliant ] * New upstream verson (4.0.3.2): diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp index b09f04f..9ad8c1f 100755 --- a/sshmasterconnection.cpp +++ b/sshmasterconnection.cpp @@ -1139,7 +1139,7 @@ bool SshMasterConnection::userAuthKrb() QUuid uuid = QUuid::createUuid(); QString uuidStr = uuid.toString().mid(1, 36).toLower(); - QString shcmd = "sh -c 'echo X2GODATABEGIN:" + uuidStr + "; whoami; echo X2GODATAEND:" + uuidStr +";'"; + QString shcmd = " echo X2GODATABEGIN:" + uuidStr + "; whoami; echo X2GODATAEND:" + uuidStr ; #ifdef Q_OS_WIN sshCmd="plink -batch "+user+"@"+host+" -P "+ diff --git a/sshprocess.cpp b/sshprocess.cpp index 5fa43d6..451425f 100755 --- a/sshprocess.cpp +++ b/sshprocess.cpp @@ -198,7 +198,7 @@ void SshProcess::startNormal(const QString& cmd) else { QString host=masterCon->getHost(); - QString shcmd = "sh -c 'echo X2GODATABEGIN:" + uuidStr + "; PATH=/usr/local/bin:/usr/bin:/bin "+cmd+"; echo X2GODATAEND:" + uuidStr +"';"; + QString shcmd = "echo X2GODATABEGIN:" + uuidStr + "; PATH=/usr/local/bin:/usr/bin:/bin "+cmd+"; echo X2GODATAEND:" + uuidStr; proc=new QProcess(this); #ifdef Q_OS_WIN if(masterCon->get_kerberosDelegation()) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 89105aa63ae77a40327fa680bc71e852957911c5 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jan 9 21:34:13 2015 +0100 Fix quotes when calling remote commands via SSH. Use single backslash to quote quotation marks. (Fixes: #720). --- debian/changelog | 2 ++ httpbrokerclient.cpp | 4 ++-- sshmasterconnection.cpp | 2 +- sshprocess.cpp | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3e67cf4..f16eca7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,8 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Fix string concatenation/layout of error message when tunnel I/O errors occur. - Improve debugging/logging the SSH connections made by X2Go Client. + - Fix quotes when calling remote commands via SSH. Use single backslash + to quote quotation marks. (Fixes: #720). [ Jason Alavaliant ] * New upstream verson (4.0.3.2): diff --git a/httpbrokerclient.cpp b/httpbrokerclient.cpp index 736f5e7..5f009d4 100644 --- a/httpbrokerclient.cpp +++ b/httpbrokerclient.cpp @@ -302,10 +302,10 @@ void HttpBrokerClient::selectUserSession(const QString& session) else { if (nextAuthId.length() > 0) { - sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --authid "+nextAuthId+ " --task selectsession --sid \\\""+session+"\\\"", + sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --authid "+nextAuthId+ " --task selectsession --sid \""+session+"\"", this,SLOT ( slotSelectSession(bool,QString,int))); } else { - sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --task selectsession --sid \\\""+session+"\\\"", + sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --task selectsession --sid \""+session+"\"", this,SLOT ( slotSelectSession(bool,QString,int))); } } diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp index 9ad8c1f..b09f04f 100755 --- a/sshmasterconnection.cpp +++ b/sshmasterconnection.cpp @@ -1139,7 +1139,7 @@ bool SshMasterConnection::userAuthKrb() QUuid uuid = QUuid::createUuid(); QString uuidStr = uuid.toString().mid(1, 36).toLower(); - QString shcmd = " echo X2GODATABEGIN:" + uuidStr + "; whoami; echo X2GODATAEND:" + uuidStr ; + QString shcmd = "sh -c 'echo X2GODATABEGIN:" + uuidStr + "; whoami; echo X2GODATAEND:" + uuidStr +";'"; #ifdef Q_OS_WIN sshCmd="plink -batch "+user+"@"+host+" -P "+ diff --git a/sshprocess.cpp b/sshprocess.cpp index 451425f..f605eb9 100755 --- a/sshprocess.cpp +++ b/sshprocess.cpp @@ -190,7 +190,7 @@ void SshProcess::startNormal(const QString& cmd) // #endif if(!masterCon->useKerberos()) { - QString shcmd = "sh -c \"echo X2GODATABEGIN:" + uuidStr + "; PATH=/usr/local/bin:/usr/bin:/bin "+cmd+"; echo X2GODATAEND:" + uuidStr +"\";"; + QString shcmd = "sh -c 'echo X2GODATABEGIN:" + uuidStr + "; PATH=/usr/local/bin:/usr/bin:/bin "+cmd+"; echo X2GODATAEND:" + uuidStr +";'"; masterCon->addChannelConnection(this, uuidStr, shcmd); connect(masterCon,SIGNAL(stdOut(SshProcess*,QByteArray)),this,SLOT(slotStdOut(SshProcess*,QByteArray))); connect(masterCon,SIGNAL(channelClosed(SshProcess*,QString)), this,SLOT(slotChannelClosed(SshProcess*,QString))); @@ -198,7 +198,7 @@ void SshProcess::startNormal(const QString& cmd) else { QString host=masterCon->getHost(); - QString shcmd = "echo X2GODATABEGIN:" + uuidStr + "; PATH=/usr/local/bin:/usr/bin:/bin "+cmd+"; echo X2GODATAEND:" + uuidStr; + QString shcmd = "sh -c 'echo X2GODATABEGIN:" + uuidStr + "; PATH=/usr/local/bin:/usr/bin:/bin "+cmd+"; echo X2GODATAEND:" + uuidStr +";'"; proc=new QProcess(this); #ifdef Q_OS_WIN if(masterCon->get_kerberosDelegation()) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org