Merge branch '2.0' of github.com:paramiko/paramiko into 2.0

1 files changed, 38 insertions, 7 deletions

diff --git a/tests/test_ssh_gss.py b/tests/test_ssh_gss.py
index 967b3b81..d8d05d2b 100644
--- a/tests/test_ssh_gss.py
+++ b/tests/test_ssh_gss.py
@@ -29,11 +29,13 @@ import unittest
 
 import paramiko
 
+from tests.util import test_path
+from tests.test_client import FINGERPRINTS
 
 class NullServer (paramiko.ServerInterface):
 
     def get_allowed_auths(self, username):
-        return 'gssapi-with-mic'
+        return 'gssapi-with-mic,publickey'
 
     def check_auth_gssapi_with_mic(self, username,
                                    gss_authenticated=paramiko.AUTH_FAILED,
@@ -45,6 +47,16 @@ class NullServer (paramiko.ServerInterface):
     def enable_auth_gssapi(self):
         return True
 
+    def check_auth_publickey(self, username, key):
+        try:
+            expected = FINGERPRINTS[key.get_name()]
+        except KeyError:
+            return paramiko.AUTH_FAILED
+        else:
+            if key.get_fingerprint() == expected:
+                return paramiko.AUTH_SUCCESSFUL
+        return paramiko.AUTH_FAILED
+
     def check_channel_request(self, kind, chanid):
         return paramiko.OPEN_SUCCEEDED
 
@@ -85,19 +97,21 @@ class GSSAuthTest(unittest.TestCase):
         server = NullServer()
         self.ts.start_server(self.event, server)
 
-    def test_1_gss_auth(self):
+    def _test_connection(self, **kwargs):
         """
-        Verify that Paramiko can handle SSHv2 GSS-API / SSPI authentication
-        (gssapi-with-mic) in client and server mode.
+        (Most) kwargs get passed directly into SSHClient.connect().
+
+        The exception is ... no exception yet
         """
         host_key = paramiko.RSAKey.from_private_key_file('tests/test_rsa.key')
         public_host_key = paramiko.RSAKey(data=host_key.asbytes())
 
         self.tc = paramiko.SSHClient()
-        self.tc.get_host_keys().add('[%s]:%d' % (self.hostname, self.port),
+        self.tc.set_missing_host_key_policy(paramiko.WarningPolicy())
+        self.tc.get_host_keys().add('[%s]:%d' % (self.addr, self.port),
                                     'ssh-rsa', public_host_key)
-        self.tc.connect(self.hostname, self.port, username=self.username,
-                        gss_auth=True)
+        self.tc.connect(hostname=self.addr, port=self.port, username=self.username, gss_host=self.hostname,
+                        gss_auth=True, **kwargs)
 
         self.event.wait(1.0)
         self.assert_(self.event.is_set())
@@ -120,3 +134,20 @@ class GSSAuthTest(unittest.TestCase):
         stdin.close()
         stdout.close()
         stderr.close()
+
+    def test_1_gss_auth(self):
+        """
+        Verify that Paramiko can handle SSHv2 GSS-API / SSPI authentication
+        (gssapi-with-mic) in client and server mode.
+        """
+        self._test_connection(allow_agent=False,
+                              look_for_keys=False)
+
+    def test_2_auth_trickledown(self):
+        """
+        Failed gssapi-with-mic auth doesn't prevent subsequent key auth from succeeding
+        """
+        self.hostname = "this_host_does_not_exists_and_causes_a_GSSAPI-exception"
+        self._test_connection(key_filename=[test_path('test_rsa.key')],
+                              allow_agent=False,
+                              look_for_keys=False)