[X2Go-Commits] python-x2go.git - twofactorauth (branch) updated: c5136ce01cb6e6a9fca5a220fcfad65dfd27bf6e

[X2Go dev team]

The branch, twofactorauth has been updated
       via  c5136ce01cb6e6a9fca5a220fcfad65dfd27bf6e (commit)
      from  8a48d5b089dac3f9bc6bab2228ac77fac1bf033f (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/backends/control/_stdout.py |    2 +-
 x2go/backends/proxy/_nx3.py      |    2 +-
 x2go/sshproxy.py                 |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index 84d1324..011b5d4 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -334,7 +334,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
 
         self.logger('connecting to %s' % hostname, loglevel=log.loglevel_NOTICE)
 
-        if (key_filename or pkey):
+        if (key_filename and os.path.exists(os.path.normpath(key_filename))) or pkey:
             try:
                 self.logger('trying SSH pub/priv key authentication with server', loglevel=log.loglevel_DEBUG)
                 paramiko.SSHClient.connect(self, hostname, port=port, username=username, pkey=pkey,
diff --git a/x2go/backends/proxy/_nx3.py b/x2go/backends/proxy/_nx3.py
index c6f8701..4ce30dd 100644
--- a/x2go/backends/proxy/_nx3.py
+++ b/x2go/backends/proxy/_nx3.py
@@ -109,7 +109,7 @@ class X2goProxyNX3(base.X2goProxyBASE):
             options.write('%s:%s' % (','.join(self.PROXY_OPTIONS), self.PROXY_DISPLAY))
             options.close()
             self.PROXY_OPTIONS= [ 'nx/nx', 'options=%s' % os.path.join("\\", "..", "S-%s" % self.session_info.name, 'options'), ]
-            
+
         cmd_line = [ self.PROXY_CMD, ]
         cmd_line.append(self.PROXY_MODE)
         _proxy_options = "%s:%s" % (",".join(self.PROXY_OPTIONS), self.PROXY_DISPLAY)
diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py
index 035277b..c566543 100644
--- a/x2go/sshproxy.py
+++ b/x2go/sshproxy.py
@@ -111,7 +111,7 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread):
             self.set_missing_host_key_policy(paramiko.AutoAddPolicy())
 
         try:
-            if key_filename:
+            if key_filename and os.path.exists(os.path.normpath(key_filename)):
                 try:
                     self.connect(self.hostname, port=self.port, 
                                  username=self.username, 


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