[X2Go-Commits] python-x2go.git - build-main (branch) updated: 0.4.0.8-37-gd7ba282
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:15:19 CET 2014
The branch, build-main has been updated
via d7ba282d42c780a4ad914a449514aeee690199b0 (commit)
from 3d3a140596c65a10eaeb5d13c0ec949e5f973a82 (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 | 1 +
x2go/backends/control/_stdout.py | 4 ++--
x2go/sshproxy.py | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 9517c47..daaa010 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,7 @@ python-x2go (0.4.0.9-0x2go1) UNRELEASED; urgency=low
versions.
- Fix tests for two-factor authentication in control session and SSH proxy
code.
+ - Fix regression: Make password logins with PyHoca-CLI succeed again.
* debian/source/format:
+ Switch to format 1.0.
* python-x2go.spec:
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index 2bdc31c..1840e74 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -835,7 +835,7 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient):
pkey = None
_twofactorauth = False
- if not passphrase: passphrase = password
+ if password and (passphrase is None): passphrase = password
if use_sshproxy and sshproxy_host and sshproxy_user:
try:
@@ -936,7 +936,7 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient):
self.logger('X2Go Server requests two-factor authentication', loglevel=log.loglevel_NOTICE)
_twofactorauth = True
raise e
- if passphrase:
+ if passphrase is not None:
self.logger('unlock SSH private key file with provided password', loglevel=log.loglevel_INFO)
try:
if not password: password = None
diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py
index a4e61fe..b207f93 100644
--- a/x2go/sshproxy.py
+++ b/x2go/sshproxy.py
@@ -195,7 +195,7 @@ class X2GoSSHProxy(paramiko.SSHClient, threading.Thread):
if key_filename and "~" in key_filename:
key_filename = os.path.expanduser(key_filename)
- if not passphrase: passphrase = password
+ if password and (passphrase is None): passphrase = password
# enforce IPv4 for localhost addresses!!!
_hostname = self.hostname
@@ -268,7 +268,7 @@ class X2GoSSHProxy(paramiko.SSHClient, threading.Thread):
self.logger('SSH proxy host requests two-factor authentication', loglevel=log.loglevel_NOTICE)
raise x2go_exceptions.X2GoSSHProxyException(str(e))
- if passphrase:
+ if passphrase is None:
try:
if not password: password = None
if (key_filename and os.path.exists(os.path.normpath(key_filename))) or pkey:
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).
More information about the x2go-commits
mailing list