[pkg-x2go-devel] Bug#780127: PyHoca-CLI fails to authenticate with username/password if default SSH key is locked with passphrase

[Mike Gabriel]

Package: python-x2go
Severity: important
Version: 0.5.0.2-2
Tag: patch fixed-upstream

If a user has locked his/her default SSH privkey with a passphrase,  
pyhoca-cli fails to authenticate using username and password (i.e. for  
servers where the priv SSH key does not match).

The issue could be tracked down and is in Python X2Go.

The attached patch from upstream fixes the issue.

Mike
-- 

DAS-NETZWERKTEAM
mike gabriel, herweg 7, 24357 fleckeby
fon: +49 (1520) 1976 148

GnuPG Key ID 0x25771B31
mail: mike.gabriel at das-netzwerkteam.de, http://das-netzwerkteam.de

freeBusy:
https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xfb
-------------- next part --------------
From: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed, 17 Dec 2014 15:30:51 +0000 (+0100)
Subject: Only sync password and passphrase if we do not enforce password authentication.
X-Git-Tag: 0.5.0.3~5
X-Git-Url: http://code.x2go.org/gitweb?p=python-x2go.git;a=commitdiff_plain;h=a74403b987b943b23cc76955766ba5e59202e359

Only sync password and passphrase if we do not enforce password authentication.
---

diff --git a/debian/changelog b/debian/changelog
index d197cfc..03fcf56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ python-x2go (0.5.0.3-0x2go1) UNRELEASED; urgency=medium
   * New upstream version (0.5.0.3):
     - Fix catching control session exceptions in X2GoSession class.
     - Catch EOFError in x2go_forward_tunnel_handle().
+    - Only sync password and passphrase if we do not enforce password
+      authentication.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 27 Nov 2014 13:15:44 +0100
 
diff --git a/x2go/backends/control/plain.py b/x2go/backends/control/plain.py
index ea5b6e1..5915fb2 100644
--- a/x2go/backends/control/plain.py
+++ b/x2go/backends/control/plain.py
@@ -909,7 +909,7 @@ class X2GoControlSession(paramiko.SSHClient):
             pkey = None
 
         _twofactorauth = False
-        if password and (passphrase is None): passphrase = password
+        if password and (passphrase is None) and not force_password_auth: passphrase = password
 
         if use_sshproxy and sshproxy_host and sshproxy_user:
             try:


-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: Digitale PGP-Signatur
URL: <http://lists.alioth.debian.org/pipermail/pkg-x2go-devel/attachments/20150309/3c774c1a/attachment.sig>