[X2Go-Commits] [x2goclient] 01/01: FIXME: Disable PubkeyAuthentication _and_ PasswordAuthentication if GSSAPI authentication is activated. This is counter intuitive, though, and requires several other fixes in the authentication code.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 4d59fab3a22f75c71a7541f0470be01282699782
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Jan 10 01:33:57 2015 +0100

    FIXME: Disable PubkeyAuthentication _and_ PasswordAuthentication if GSSAPI authentication is activated. This is counter intuitive, though, and requires several other fixes in the authentication code.
---
 debian/changelog        |    3 +++
 sshmasterconnection.cpp |    2 +-
 sshprocess.cpp          |    6 +++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e9b5216..7118683 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,9 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium
     - Improve debugging/logging the SSH connections made by X2Go Client.
     - Fix quotes when calling remote commands via SSH (esp. allow same quoting/
       escaping style for libssh and openSSH+Krb based connections). (Fixes: #720).
+    - FIXME: Disable PubkeyAuthentication _and_ PasswordAuthentication if
+      GSSAPI authentication is activated. This is counter intuitive, though,
+      and requires several other fixes in the authentication code.
 
     [ Heinrich Schuchardt ]
     - Base the layout dialogue "Session ID" (which shows up when starting a
diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp
index b09f04f..ef0088a 100755
--- a/sshmasterconnection.cpp
+++ b/sshmasterconnection.cpp
@@ -1146,7 +1146,7 @@ bool SshMasterConnection::userAuthKrb()
            QString::number(port)+ shcmd;
 #else
     sshCmd="ssh -o GSSApiAuthentication=yes "+user+"@"+host+" -p "+
-           QString::number(port)+ " -o PasswordAuthentication=no "+shcmd;
+           QString::number(port)+ " -o PasswordAuthentication=no -o PubkeyAuthentication=no "+shcmd;
 #endif
 
 #ifdef DEBUG
diff --git a/sshprocess.cpp b/sshprocess.cpp
index f605eb9..50bd7ae 100755
--- a/sshprocess.cpp
+++ b/sshprocess.cpp
@@ -213,7 +213,7 @@ void SshProcess::startNormal(const QString& cmd)
         {
             krbDelegOption=" -K ";
         }
-        QString sshString=QString::null+"ssh"+ KEEPALIVE_OPTION +krbDelegOption+" -o GSSApiAuthentication=yes -o PasswordAuthentication=no -p "+
+        QString sshString=QString::null+"ssh"+ KEEPALIVE_OPTION +krbDelegOption+" -o GSSApiAuthentication=yes -o PasswordAuthentication=no -o PubkeyAuthentication=no -p "+
 #endif
                           QString::number(masterCon->getPort())+" -l "+
                           masterCon->getUser()+" "+ host +  " \""+shcmd+"\"";
@@ -262,7 +262,7 @@ void SshProcess::start_cp(QString src, QString dst)
 
         QString sshString="pscp -batch -P "+
 #else
-        QString sshString="scp -o GSSApiAuthentication=yes -o PasswordAuthentication=no -P "+
+        QString sshString="scp -o GSSApiAuthentication=yes -o PasswordAuthentication=no -o PubkeyAuthentication=no -P "+
 #endif
                           QString::number(masterCon->getPort())+" "+src+" "+
                           masterCon->getUser()+"@"+ masterCon->getHost()+":"+dst;
@@ -310,7 +310,7 @@ void SshProcess::startTunnel(const QString& forwardHost, uint forwardPort, const
 #ifdef Q_OS_WIN
         QString sshString="plink -batch -P "+
 #else
-        QString sshString=QString::null+"ssh"+ KEEPALIVE_OPTION +"-o GSSApiAuthentication=yes -o PasswordAuthentication=no -p "+
+        QString sshString=QString::null+"ssh"+ KEEPALIVE_OPTION +"-o GSSApiAuthentication=yes -o PasswordAuthentication=no -o PubkeyAuthentication=no -p "+
 #endif
                           QString::number(masterCon->getPort())+" "+
                           masterCon->getUser()+"@"+

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git