[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.4.0.8-12-g0ed9ba9

X2Go dev team git-admin at x2go.org
Wed Jan 8 15:31:37 CET 2014


The branch, build-baikal has been updated
       via  0ed9ba982fd0bb59d1a6c9a529004fcbe0c84387 (commit)
      from  1b463da78fdd7fca76e27c44f41e3f02fcd20622 (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 |    5 +++++
 x2go/sshproxy.py                 |    4 ++++
 3 files changed, 10 insertions(+)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 76a4f9b..0e364be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ python-x2go (0.4.0.9-0~x2go1) UNRELEASED; urgency=low
     - Keep private key information even if force_password_auth is set in the
       control session's connect() method.
     - Fix parameter handling in X2GoSession.connect().
+    - Rewrite passwords that are not string/unicode to an empty string.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 07 Aug 2013 12:18:46 +0200
 
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index f3999d3..22bc014 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -771,6 +771,11 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient):
         """
         _fake_hostname = None
 
+        if type(password) not in (types.StringType, types.UnicodeType):
+            password = ''
+        if type(sshproxy_password) not in (types.StringType, types.UnicodeType):
+            sshproxy_password = ''
+
         if unique_hostkey_aliases is not None:
             self.unique_hostkey_aliases = unique_hostkey_aliases
             # prep the fake hostname with the real hostname, so we trigger the corresponding code path in 
diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py
index 3cdf26b..e2b62d9 100644
--- a/x2go/sshproxy.py
+++ b/x2go/sshproxy.py
@@ -29,6 +29,7 @@ import os
 import copy
 import paramiko
 import threading
+import types
 
 import string
 import random
@@ -196,6 +197,9 @@ class X2GoSSHProxy(paramiko.SSHClient, threading.Thread):
         if username is None:
             username = _CURRENT_LOCAL_USER
 
+        if type(password) not in (types.StringType, types.UnicodeType):
+            password = ''
+
         self._keepalive = True
         self.session_instance = session_instance
 


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