[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.1.1.2-7-gd843f23
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:30:38 CET 2014
The branch, build-baikal has been updated
via d843f23c1e4d2df3cccb1ede0ce67653309f7898 (commit)
from dfb613dbfe8c96c12d1150c64bc86368b8cb70a5 (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 | 1 +
x2go/backends/control/_stdout.py | 7 +++++--
x2go/session.py | 2 ++
3 files changed, 8 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 442ec5a..7a6bd30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ python-x2go (0.1.1.3-0~x2go1) UNRELEASED; urgency=low
- Stabilize desktop sharing if the remote session is not available.
- Enforce IPv4 on all SSH proxy and other SSHClient connections when connecting to
''localhost''.
+ - Detect SFTP client connections failures, abort session if that happens.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Fri, 01 Jul 2011 14:53:48 +0200
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index c369680..4b6c947 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -454,8 +454,11 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
self.hostname = hostname
self.port = port
- # if we succeed, we immediately grab us an sFTP client session
- self.sftp_client = self.open_sftp()
+ # if we succeed, we immediately grab us an sFTP client session
+ try:
+ self.sftp_client = self.open_sftp()
+ except:
+ raise x2go_exceptions.X2goControlSessionException('could not invoke server-side SFTP subsystem')
# preparing reverse tunnels
ssh_transport = self.get_transport()
diff --git a/x2go/session.py b/x2go/session.py
index d4500d1..11f0cdd 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -755,6 +755,8 @@ class X2goSession(object):
use_sshproxy=self.use_sshproxy,
session_instance=self,
**_params)
+ except X2goControlSessionException, e:
+ raise X2goSessionException(str(e))
except:
# remove credentials immediately
self.control_params['password'] = ''
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