The branch, build-baikal has been updated
via d3378ca11d1cc32dcdc81a5890d011cf958a0df8 (commit)
from 52b1c85cf8fad6c0b4e2afb8bd26d576dcd2852e (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/…
[View More]changelog | 2 ++
x2go/backends/control/_stdout.py | 5 -----
2 files changed, 2 insertions(+), 5 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 4c675f2..669f8da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ python-x2go (0.4.0.9-0~x2go1) UNRELEASED; urgency=low
as well as SSH proxy connections).
- Invalidate SSH private keys (filename, pkey object) when look_for_keys is
requested.
+ - Keep private key information even if force_password_auth is set in the
+ control session's connect() method.
-- Mike Gabriel <mike.gabriel(a)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 733b16d..f3999d3 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -827,11 +827,6 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient):
if add_to_known_hosts:
self.set_missing_host_key_policy(checkhosts.X2GoAutoAddPolicy(caller=self, session_instance=session_instance, fake_hostname=_fake_hostname))
- # disable pub/priv key authentication if forced
- if force_password_auth:
- key_filename = None
- pkey = None
-
# trailing whitespace tolerance in hostname
hostname = hostname.strip()
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).
[View Less]
The branch, build-baikal has been updated
via 058bc7b3d319e91a07c39804aaa9e118dc116334 (commit)
from 0ed9ba982fd0bb59d1a6c9a529004fcbe0c84387 (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/…
[View More]changelog | 1 +
x2go/checkhosts.py | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 0e364be..8c6ee9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ python-x2go (0.4.0.9-0~x2go1) UNRELEASED; urgency=low
control session's connect() method.
- Fix parameter handling in X2GoSession.connect().
- Rewrite passwords that are not string/unicode to an empty string.
+ - No Unicode chars in log messages. Eliminated one more in checkhosts.py.
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Aug 2013 12:18:46 +0200
diff --git a/x2go/checkhosts.py b/x2go/checkhosts.py
index 192850a..abebdd9 100644
--- a/x2go/checkhosts.py
+++ b/x2go/checkhosts.py
@@ -216,7 +216,7 @@ class X2GoInteractiveAddPolicy(X2GoMissingHostKeyPolicy):
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)
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)
+ 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)
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).
[View Less]
The branch, build-baikal has been updated
via 732635efb177910d23b544d2e05e09559c8af5ff (commit)
from 058bc7b3d319e91a07c39804aaa9e118dc116334 (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/…
[View More]changelog | 7 +++++++
x2go/utils.py | 9 ++++++---
2 files changed, 13 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 8c6ee9e..de471fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
python-x2go (0.4.0.9-0~x2go1) UNRELEASED; urgency=low
+ [ Mike Gabriel ]
* New upstream version (0.4.0.9):
- Agent channels in Paramiko can raise an EOFError if the connection
has got disrupted. Ignoring this.
@@ -16,6 +17,12 @@ python-x2go (0.4.0.9-0~x2go1) UNRELEASED; urgency=low
- Rewrite passwords that are not string/unicode to an empty string.
- No Unicode chars in log messages. Eliminated one more in checkhosts.py.
+ [ Kenneth Pedersen ]
+ * New upstream version (0.4.0.9):
+ - Color depth detection: Stop using win32api.GetSystemMetrics(2) which actually
+ returns the width of a vertical scroll bar in pixels. Instead, create a screen
+ display context and query it for the color depth. (Fixes: #330).
+
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Aug 2013 12:18:46 +0200
python-x2go (0.4.0.8-0~x2go1) unstable; urgency=low
diff --git a/x2go/utils.py b/x2go/utils.py
index e8d80bc..c6db2de 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -46,8 +46,9 @@ if _X2GOCLIENT_OS != 'Windows':
from defaults import X_DISPLAY as _X_DISPLAY
if _X2GOCLIENT_OS == 'Windows':
- import win32api
import win32gui
+ import win32print
+ import win32con
def is_in_nx3packmethods(method):
@@ -555,8 +556,10 @@ def local_color_depth():
return 24
else:
- return win32api.GetSystemMetrics(2)
-
+ # This gets the color depth of the primary monitor. All monitors need not have the same color depth.
+ dc = win32gui.GetDC(None)
+ _depth = win32print.GetDeviceCaps(dc, win32con.BITSPIXEL) * win32print.GetDeviceCaps(dc, win32con.PLANES)
+ win32gui.ReleaseDC(None, dc)
def is_color_depth_ok(depth_session, depth_local):
"""\
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).
[View Less]
The branch, build-baikal has been updated
via 486fa4f1d591502b3311630f6ba8ab44e1c70918 (commit)
from 436a770160211b9c89abe24a27ceb7ec8b79dc7b (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/…
[View More]changelog | 1 +
x2go/tests/runalltests.py | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 5417219..c21b5c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ python-x2go (0.4.0.8-0~x2go1) UNRELEASED; urgency=low
status in the session registry is something appropriate to do.
- Do not overwrite not-yet-suspended terminal session objects during
session resumption.
+ - Remove shbang from x2go/tests/runalltests.py, as well.
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 03 Aug 2013 22:32:30 +0200
diff --git a/x2go/tests/runalltests.py b/x2go/tests/runalltests.py
index a4320b8..60e3a28 100644
--- a/x2go/tests/runalltests.py
+++ b/x2go/tests/runalltests.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
# Copyright (C) 2010 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
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).
[View Less]
The branch, build-baikal has been updated
via 60eebc868465959b63f36c49f54ce73b00cce1e2 (commit)
from 0c579d265133d482eae4e9a20928965ed3e177b8 (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/…
[View More]changelog | 3 ++-
x2go/backends/profiles/_file.py | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 5c32913..9f930ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
python-x2go (0.4.0.8-0~x2go1) UNRELEASED; urgency=low
- * Continue development...
+ * New upstream version (0.4.0.8):
+ - Fix session profile updates with changes to the host parameter.
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 03 Aug 2013 22:32:30 +0200
diff --git a/x2go/backends/profiles/_file.py b/x2go/backends/profiles/_file.py
index 0b9eedb..31a11f3 100644
--- a/x2go/backends/profiles/_file.py
+++ b/x2go/backends/profiles/_file.py
@@ -346,7 +346,7 @@ class X2GoSessionProfilesFILE(inifiles.X2GoIniFile):
else:
return ''
- def add_profile(self, profile_id=None, **kwargs):
+ def add_profile(self, profile_id=None, force_add=False, **kwargs):
"""\
Add a new session profile.
@@ -365,7 +365,7 @@ class X2GoSessionProfilesFILE(inifiles.X2GoIniFile):
if 'name' not in kwargs.keys():
raise X2GoProfileException('session profile parameter ,,name\'\' is missing in method parameters')
- if kwargs['name'] in self.profile_names:
+ if kwargs['name'] in self.profile_names and not force_add:
raise X2GoProfileException('a profile of name ,,%s\'\' already exists' % kwargs['name'])
for key, value in kwargs.items():
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).
[View Less]
The branch, build-baikal has been updated
via 19da038a1e697321203f2aaf9ac5138270ea296b (commit)
from ed9005dad8ef2de3c820aa82d9e61887ddb64b54 (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/…
[View More]changelog | 4 +++-
x2go/backends/control/_stdout.py | 5 ++++-
2 files changed, 7 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 0993fda..1302c02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
python-x2go (0.4.0.9-0~x2go1) UNRELEASED; urgency=low
- * Continue development...
+ * New upstream version (0.4.0.9):
+ - Agent channels in Paramiko can raise an EOFError if the connection
+ has got disrupted. Ignoring this.
-- Mike Gabriel <mike.gabriel(a)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 480dcdc..292c50b 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -1013,7 +1013,10 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient):
self.agent_handler.close()
if self.agent_chan is not None:
- self.agent_chan.close()
+ try:
+ self.agent_chan.close()
+ except EOFError:
+ pass
retval = False
try:
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).
[View Less]
The branch, build-baikal has been updated
via ed9005dad8ef2de3c820aa82d9e61887ddb64b54 (commit)
from 000e5e38e26713f485314365486d05b93100a189 (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/…
[View More]changelog | 6 ++++++
x2go/__init__.py | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 0d44145..0993fda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-x2go (0.4.0.9-0~x2go1) UNRELEASED; urgency=low
+
+ * Continue development...
+
+ -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Aug 2013 12:18:46 +0200
+
python-x2go (0.4.0.8-0~x2go1) unstable; urgency=low
* New upstream version (0.4.0.8):
diff --git a/x2go/__init__.py b/x2go/__init__.py
index 0c40bef..65bd8c7 100644
--- a/x2go/__init__.py
+++ b/x2go/__init__.py
@@ -183,7 +183,7 @@ Contact
"""
__NAME__ = 'python-x2go'
-__VERSION__ = '0.4.0.8'
+__VERSION__ = '0.4.0.9'
from gevent import monkey
monkey.patch_all()
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).
[View Less]
The branch, build-baikal has been updated
via b435cdc1d7980d8dec33f1e05cb3947ecf08dd07 (commit)
from 81c41bdee16b575584f158c4a27893adfeb371c4 (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/…
[View More]changelog | 2 ++
x2go/registry.py | 3 +++
x2go/session.py | 13 +++++++++++++
3 files changed, 18 insertions(+)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 9f930ea..8f78fb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ python-x2go (0.4.0.8-0~x2go1) UNRELEASED; urgency=low
* New upstream version (0.4.0.8):
- Fix session profile updates with changes to the host parameter.
+ - Use the session object's lock to detect if updating the session
+ status in the session registry is something appropriate to do.
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 03 Aug 2013 22:32:30 +0200
diff --git a/x2go/registry.py b/x2go/registry.py
index 2bd2d14..0b46661 100644
--- a/x2go/registry.py
+++ b/x2go/registry.py
@@ -271,6 +271,9 @@ class X2GoSessionRegistry(object):
if type(self(_session_uuid)) != session.X2GoSession:
continue
+ if self(_session_uuid).is_locked():
+ continue
+
if not self(_session_uuid).update_status(session_list=session_list, force_update=force_update):
# skip this run, as nothing has changed since the last time...
continue
diff --git a/x2go/session.py b/x2go/session.py
index 6302363..237e84b 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -1799,7 +1799,9 @@ class X2GoSession(object):
self._progress_status = 10
progress_event.set()
+ self._lock.release()
gevent.sleep(5)
+ self._lock.acquire()
self._progress_status = 15
progress_event.set()
@@ -2754,3 +2756,14 @@ class X2GoSession(object):
self.terminal_session = None
__session_cleanup = session_cleanup
+ def is_locked(self):
+ """\
+ Test if the session is lock at the moment. This normally occurs
+ if there is some action running that will result in a session status
+ change.
+
+ @return: returns C{True} if the session is locked
+ @rtype: C{bool}
+
+ """
+ self._lock.locked()
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).
[View Less]
The branch, build-baikal has been updated
via 436a770160211b9c89abe24a27ceb7ec8b79dc7b (commit)
from b435cdc1d7980d8dec33f1e05cb3947ecf08dd07 (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/…
[View More]changelog | 2 ++
x2go/session.py | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 8f78fb2..5417219 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ python-x2go (0.4.0.8-0~x2go1) UNRELEASED; urgency=low
- Fix session profile updates with changes to the host parameter.
- Use the session object's lock to detect if updating the session
status in the session registry is something appropriate to do.
+ - Do not overwrite not-yet-suspended terminal session objects during
+ session resumption.
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 03 Aug 2013 22:32:30 +0200
diff --git a/x2go/session.py b/x2go/session.py
index 237e84b..065e85f 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -1759,7 +1759,8 @@ class X2GoSession(object):
@raise Exception: any exception that occurs during published application menu retrieval is passed through
"""
- self.terminal_session = 'PENDING'
+ if self.terminal_session is None:
+ self.terminal_session = 'PENDING'
# initialize a dummy event to avoid many if clauses further down in the code
self.reset_progress_status()
@@ -1795,6 +1796,7 @@ class X2GoSession(object):
try:
self._suspend()
+ self.terminal_session = 'PENDING'
self._progress_status = 10
progress_event.set()
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).
[View Less]
The branch, build-baikal has been updated
via 81c41bdee16b575584f158c4a27893adfeb371c4 (commit)
from 60eebc868465959b63f36c49f54ce73b00cce1e2 (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/…
[View More]backends/profiles/_file.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
The diff of changes is:
diff --git a/x2go/backends/profiles/_file.py b/x2go/backends/profiles/_file.py
index 31a11f3..ac0c380 100644
--- a/x2go/backends/profiles/_file.py
+++ b/x2go/backends/profiles/_file.py
@@ -154,7 +154,7 @@ class X2GoSessionProfilesFILE(inifiles.X2GoIniFile):
self.iniConfig.remove_section(profile_id)
try: self._cached_profile_ids.remove(profile_id)
except ValueError: pass
- self.add_profile(profile_id=None, **_config)
+ self.add_profile(profile_id=None, force_add=True, **_config)
self._profiles_need_profile_id_renewal = []
self._cached_profile_ids = []
self._cached_profile_names = []
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).
[View Less]