[X2Go-Commits] python-paramiko.git - x2go (branch) updated: ba0b5b1f27347a5a88ad86ae3569d17960fe99fe

[X2Go dev team]

The branch, x2go has been updated
       via  ba0b5b1f27347a5a88ad86ae3569d17960fe99fe (commit)
      from  e0cbe69fdfda2d989a947288d389c36bad0e8bf3 (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 -----------------------------------------------------------------
commit ba0b5b1f27347a5a88ad86ae3569d17960fe99fe
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Sep 14 15:07:43 2013 +0200

    Add patch: 005_fix-key-filename-with-two-factor-auth.patch

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    1 +
 ...005_fix-key-filename-with-two-factor-auth.patch |   24 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 26 insertions(+)
 create mode 100644 debian/patches/005_fix-key-filename-with-two-factor-auth.patch

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index b5bcc14..d49b0a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ paramiko (1.11.0-0) UNRELEASED; urgency=low
     + Add patch: 002_locked-keys-are-valid.patch
     + Add patch: 003_hash-hostnames.patch
     + Add patch: 004_password-passphrase-auth.patch
+    + Add patch: 005_fix-key-filename-with-two-factor-auth.patch
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 29 Apr 2013 13:08:38 +0200
 
diff --git a/debian/patches/005_fix-key-filename-with-two-factor-auth.patch b/debian/patches/005_fix-key-filename-with-two-factor-auth.patch
new file mode 100644
index 0000000..b402d65
--- /dev/null
+++ b/debian/patches/005_fix-key-filename-with-two-factor-auth.patch
@@ -0,0 +1,24 @@
+commit 160d31e30d0f1ef9b711294b6d75f97d42dfc858
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+Date:   Sat Sep 14 14:58:57 2013 +0200
+
+    Make evaluation of key auth available for two-factor auth analysis.
+    
+    When authenticating with an explicitly given key_filename, also evaluate
+    the key based authentication and check if two-factor auth is required.
+    
+    Without the fix shipped with this pull request, two-factor auth fails
+    whenever the SSH key is specified via the key_filename parameter in
+    SSHClient().connect().
+
+--- a/paramiko/client.py
++++ b/paramiko/client.py
+@@ -470,7 +470,7 @@
+                     try:
+                         key = pkey_class.from_private_key_file(key_filename, passphrase)
+                         self._log(DEBUG, 'Trying key %s from %s' % (hexlify(key.get_fingerprint()), key_filename))
+-                        self._transport.auth_publickey(username, key)
++                        allowed_types = self._transport.auth_publickey(username, key)
+                         two_factor = (allowed_types == ['password'])
+                         if not two_factor:
+                             return
diff --git a/debian/patches/series b/debian/patches/series
index 099958f..2b07f27 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 002_locked-keys-are-valid.patch
 003_hash-hostnames.patch
 004_password-passphrase-auth.patch
+005_fix-key-filename-with-two-factor-auth.patch


hooks/post-receive
-- 
python-paramiko.git (Debian package python-paramiko)

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-paramiko.git" (Debian package python-paramiko).