[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.4.0.8-36-g3d3a140
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:27:44 CET 2014
The branch, build-baikal has been updated
via 3d3a140596c65a10eaeb5d13c0ec949e5f973a82 (commit)
from 0756645157c8971156a65215d5bc4786979ccd3a (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 | 2 ++
x2go/backends/control/_stdout.py | 2 +-
x2go/sshproxy.py | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 9b658e8..9517c47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,8 @@ python-x2go (0.4.0.9-0x2go1) UNRELEASED; urgency=low
- Import python-x2go-py3.patch from Fedora. Thanks to Orion!!!
- Improve setup.py script: make it run with Python3 and older Python2
versions.
+ - Fix tests for two-factor authentication in control session and SSH proxy
+ code.
* 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 88b07de..2bdc31c 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -932,7 +932,7 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient):
except (paramiko.PasswordRequiredException, paramiko.SSHException), e:
self.close()
- if type(e) == paramiko.SSHException and not str(e).startswith('Two-factor authentication requires a password'):
+ if type(e) == paramiko.SSHException and str(e).startswith('Two-factor authentication requires a password'):
self.logger('X2Go Server requests two-factor authentication', loglevel=log.loglevel_NOTICE)
_twofactorauth = True
raise e
diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py
index 79b69c0..a4e61fe 100644
--- a/x2go/sshproxy.py
+++ b/x2go/sshproxy.py
@@ -264,7 +264,7 @@ class X2GoSSHProxy(paramiko.SSHClient, threading.Thread):
except (paramiko.PasswordRequiredException, paramiko.SSHException), e:
self.close()
- if type(e) == paramiko.SSHException and not str(e).startswith('Two-factor authentication requires a password'):
+ if type(e) == paramiko.SSHException and str(e).startswith('Two-factor authentication requires a password'):
self.logger('SSH proxy host requests two-factor authentication', loglevel=log.loglevel_NOTICE)
raise x2go_exceptions.X2GoSSHProxyException(str(e))
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