[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.2.1.1-21-g1d86929

[X2Go dev team]

The branch, build-baikal has been updated
       via  1d869290092c02881753955c061fa7f3ef085a62 (commit)
      from  7914c64237973c66222fc35094ccc34b6d921063 (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:
 x2go/checkhosts.py |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/x2go/checkhosts.py b/x2go/checkhosts.py
index f1bda26..d37b4a7 100644
--- a/x2go/checkhosts.py
+++ b/x2go/checkhosts.py
@@ -215,12 +215,14 @@ class X2goInteractiveAddPolicy(X2goMissingHostKeyPolicy):
                 if our_server_key is None:
                     if self.session_instance.control_session.unique_hostkey_aliases:
                         our_server_key = client._host_keys.get(self.session_instance.get_profile_id(), {}).get(keytype, None)
-                        self.session_instance.logger('SSH host key verification for SSH-proxied host %s with %s fingerprint ,,%s\'\' succeeded. This host is known by the X2Go session profile ID of profile »%s«.' % (self.fake_hostname, self.get_key_name(), self.get_key_fingerprint_with_colons(), self.session_instance.profile_name), loglevel=log.loglevel_NOTICE)
+                        if our_server_key is not None:
+                            self.session_instance.logger('SSH host key verification for SSH-proxied host %s with %s fingerprint ,,%s\'\' succeeded. This host is known by the X2Go session profile ID of profile »%s«.' % (self.fake_hostname, self.get_key_name(), self.get_key_fingerprint_with_colons(), self.session_instance.profile_name), loglevel=log.loglevel_NOTICE)
+                            return
                     else:
                         our_server_key = client._host_keys.get(self.fake_hostname, {}).get(keytype, None)
-                        self.session_instance.logger('SSH host key verification for SSH-proxied host %s with %s fingerprint ,,%s\'\' succeeded. This host is known by the address it has behind the SSH proxy host.' % (self.fake_hostname, self.get_key_name(), self.get_key_fingerprint_with_colons()), loglevel=log.loglevel_NOTICE)
-                if our_server_key is not None:
-                    return
+                        if our_server_key is not None:
+                            self.session_instance.logger('SSH host key verification for SSH-proxied host %s with %s fingerprint ,,%s\'\' succeeded. This host is known by the address it has behind the SSH proxy host.' % (self.fake_hostname, self.get_key_name(), self.get_key_fingerprint_with_colons()), loglevel=log.loglevel_NOTICE)
+                            return
 
             self.session_instance.logger('SSH host key verification for host %s with %s fingerprint ,,%s\'\' initiated. We are seeing this X2Go server for the first time.' % (self.get_hostname(), self.get_key_name(), self.get_key_fingerprint_with_colons()), loglevel=log.loglevel_NOTICE)
             _valid = self.session_instance.HOOK_check_host_dialog(self.get_hostname_name(),
@@ -229,7 +231,7 @@ class X2goInteractiveAddPolicy(X2goMissingHostKeyPolicy):
                                                                   fingerprint_type=self.get_key_name(),
                                                                  )
             if _valid:
-                if self.session_instance.control_session.unique_hostkey_aliases:
+                if self.session_instance.control_session.unique_hostkey_aliases and type(self.caller) not in (sshproxy.X2goSSHProxy, ):
                     paramiko.AutoAddPolicy().missing_host_key(client, self.session_instance.get_profile_id(), key)
                 else:
                     paramiko.AutoAddPolicy().missing_host_key(client, self.get_hostname(), key)


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).