x2go-commits

x2go-commits@lists.x2go.org

37909 discussions

python-x2go.git - master (branch) updated: 0.1.1.4-31-g019e478
by git-admin＠x2go.org 14 Sep '11

14 Sep '11

The branch, master has been updated via 019e478b242d2879de567cbcf35d04b0b7a88799 (commit) from cf408110f4276e5451035ad59a389d726d46ed0a (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 ----------------------------------------------------------------- commit 019e478b242d2879de567cbcf35d04b0b7a88799 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 14 21:38:04 2011 +0200 release version 0.1.1.6 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 3d23291..c5c9f26 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,14 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 18 Jul 2011 13:51:09 +0200 -python-x2go (0.1.1.6-0~x2go1) UNRELEASED; urgency=low +python-x2go (0.1.1.7-0-x2go1) UNRELEASED; urgency=low + + * New upstream version (0.1.1.6), bugfix release for 0.1.1.x series: + - continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 14 Sep 2011 21:35:54 +0200 + +python-x2go (0.1.1.6-0~x2go1) unstable; urgency=low * New upstream version (0.1.1.6), bugfix release for 0.1.1.x series: - Fix IPv4 enforcement for localhost connections. @@ -12,7 +19,7 @@ python-x2go (0.1.1.6-0~x2go1) UNRELEASED; urgency=low - Fix handling of lists in session profiles (i.e. ini files). Fixes breakage with x2goclient's rootless vs. desktop mode after pyhoca-gui has been used. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 11 Sep 2011 18:37:02 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 14 Sep 2011 21:35:54 +0200 python-x2go (0.1.1.5-0~x2go1) unstable; urgency=low 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).

1 0

python-x2go.git - build-main (branch) updated: 0.1.1.5-5-gc20bb5b
by git-admin＠x2go.org 14 Sep '11

14 Sep '11

The branch, build-main has been updated via c20bb5b5be476562ddb64b7064a375986f8955bb (commit) from a462d315a76b877535aaadc4e799d268e6a4bf29 (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 | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 91485a2..858e98e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-x2go (0.1.1.6-0~x2go1) UNRELEASED; urgency=low +python-x2go (0.1.1.6-0~x2go1) unstable; urgency=low * New upstream version (0.1.1.6), bugfix release for 0.1.1.x series: - Fix IPv4 enforcement for localhost connections. @@ -6,7 +6,7 @@ python-x2go (0.1.1.6-0~x2go1) UNRELEASED; urgency=low - Fix handling of lists in session profiles (i.e. ini files). Fixes breakage with x2goclient's rootless vs. desktop mode after pyhoca-gui has been used. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 11 Sep 2011 18:37:02 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 14 Sep 2011 21:35:54 +0200 python-x2go (0.1.1.5-0~x2go1) unstable; urgency=low 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).

1 0

python-x2go.git - release/0.1.1.x (branch) updated: 0.1.1.5-5-gc20bb5b
by git-admin＠x2go.org 14 Sep '11

14 Sep '11

The branch, release/0.1.1.x has been updated via c20bb5b5be476562ddb64b7064a375986f8955bb (commit) from a462d315a76b877535aaadc4e799d268e6a4bf29 (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 ----------------------------------------------------------------- commit c20bb5b5be476562ddb64b7064a375986f8955bb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 14 21:38:04 2011 +0200 release version 0.1.1.6 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 91485a2..858e98e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-x2go (0.1.1.6-0~x2go1) UNRELEASED; urgency=low +python-x2go (0.1.1.6-0~x2go1) unstable; urgency=low * New upstream version (0.1.1.6), bugfix release for 0.1.1.x series: - Fix IPv4 enforcement for localhost connections. @@ -6,7 +6,7 @@ python-x2go (0.1.1.6-0~x2go1) UNRELEASED; urgency=low - Fix handling of lists in session profiles (i.e. ini files). Fixes breakage with x2goclient's rootless vs. desktop mode after pyhoca-gui has been used. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 11 Sep 2011 18:37:02 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 14 Sep 2011 21:35:54 +0200 python-x2go (0.1.1.5-0~x2go1) unstable; urgency=low 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).

1 0

python-x2go.git - build-main (branch) updated: 0.1.1.5-4-ga462d31
by git-admin＠x2go.org 14 Sep '11

14 Sep '11

The branch, build-main has been updated via a462d315a76b877535aaadc4e799d268e6a4bf29 (commit) via 29297e679ea9c13051bd89a037e8d260a5d4b572 (commit) via 18903032511f7a0865600cbb5da78fc9382db069 (commit) via 19db0a0ec580c83bd216c6524367c2c7646ea541 (commit) from fa3e51faff8c4a00a6beb998dd671d8c3a61e4f1 (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 | 10 ++++++++++ x2go/__init__.py | 2 +- x2go/backends/control/_stdout.py | 12 +++++++++++- x2go/defaults.py | 2 +- x2go/inifiles.py | 7 +++++-- x2go/sshproxy.py | 21 +++++++++++++++++---- 6 files changed, 45 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 78343dd..91485a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +python-x2go (0.1.1.6-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (0.1.1.6), bugfix release for 0.1.1.x series: + - Fix IPv4 enforcement for localhost connections. + - Be tolerant against trailing whitespaces in hostnames. + - Fix handling of lists in session profiles (i.e. ini files). Fixes breakage + with x2goclient's rootless vs. desktop mode after pyhoca-gui has been used. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 11 Sep 2011 18:37:02 +0200 + python-x2go (0.1.1.5-0~x2go1) unstable; urgency=low * New upstream version (0.1.1.5), bugfix release for 0.1.1.x series: diff --git a/x2go/__init__.py b/x2go/__init__.py index 31ff130..576547d 100644 --- a/x2go/__init__.py +++ b/x2go/__init__.py @@ -158,7 +158,7 @@ Contact """ __NAME__ = 'python-x2go' -__VERSION__ = '0.1.1.5' +__VERSION__ = '0.1.1.6' from gevent import monkey monkey.patch_all() diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 2f14082..4936189 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -280,6 +280,13 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): Wraps around a Paramiko/SSH host key check. """ + # trailing whitespace tolerance + hostname = hostname.strip() + + # force into IPv4 for localhost connections + if hostname in ('localhost', 'localhost.localdomain'): + hostname = '127.0.0.1' + return checkhosts.check_ssh_host_key(self, hostname, port=port) def connect(self, hostname, port=22, username='', password='', pkey=None, @@ -389,13 +396,16 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): key_filename = None pkey = None + # trailing whitespace tolerance in hostname + hostname = hostname.strip() + self.logger('connecting to [%s]:%s' % (hostname, port), loglevel=log.loglevel_NOTICE) self.load_session_host_keys() _hostname = hostname # enforce IPv4 for localhost address - if _hostname == 'localhost': + if _hostname in ('localhost', 'localhost.localdomain'): _hostname = '127.0.0.1' if (key_filename and os.path.exists(os.path.normpath(key_filename))) or pkey: diff --git a/x2go/defaults.py b/x2go/defaults.py index c3627af..9d60613 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -276,7 +276,7 @@ X2GO_SESSIONPROFILE_DEFAULTS = { 'sound':False, 'soundsystem': 'pulse', 'startsoundsystem': False, 'soundtunnel':True, 'defsndport':True, 'sndport':4713, 'name': 'NEW_PROFILE', 'icon': ':icons/128x128/x2gosession.png', 'host': '', 'user': CURRENT_LOCAL_USER, 'key': '', 'sshport': 22, - 'rootless': True, 'applications': str(X2GO_GENERIC_APPLICATIONS), 'command':'TERMINAL', + 'rootless': True, 'applications': X2GO_GENERIC_APPLICATIONS, 'command':'TERMINAL', 'rdpoptions': '-u X2GO_USER -p X2GO_PASSWORD', 'rdpserver': '', 'print': False, 'xdmcpserver': 'localhost', diff --git a/x2go/inifiles.py b/x2go/inifiles.py index 3269483..6c2afae 100644 --- a/x2go/inifiles.py +++ b/x2go/inifiles.py @@ -156,9 +156,10 @@ class X2goIniFile(object): """ if type(value) == type(u''): value = value.encode(utils.get_encoding()) - if type(value) is types.BooleanType: self.iniConfig.set(section, key, str(int(value))) + elif type(value) in (types.ListType, types.TupleType): + self.iniConfig.set(section, key, ", ".join(value)) else: self.iniConfig.set(section, key, str(value)) @@ -249,8 +250,10 @@ class X2goIniFile(object): val = self.iniConfig.get(section, key) if val.startswith('[') and val.endswith(']'): return eval(val) + elif ',' in val: + val = [ v.strip() for v in val.split(',') ] else: - raise TypeError + val = [ val ] else: _val = self.iniConfig.get(section, key) return _val.decode(utils.get_encoding()) diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py index dcf7f51..cd51afe 100644 --- a/x2go/sshproxy.py +++ b/x2go/sshproxy.py @@ -151,13 +151,18 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread): self.remote_host = remote_host self.remote_port = int(remote_port) + # allow more trailing whitespace tolerance in hostnames + self.hostname = self.hostname.strip() + self.local_host = self.local_host.strip() + self.remote_host = self.remote_host.strip() + # enforce IPv4 for localhost addresses!!! _hostname = self.hostname - if _hostname == 'localhost': + if _hostname in ('localhost', 'localhost.localdomain'): _hostname = '127.0.0.1' - if self.local_host == 'localhost': + if self.local_host in ('localhost', 'localhost.localdomain'): self.local_host = '127.0.0.1' - if self.remote_host == 'localhost': + if self.remote_host in ('localhost', 'localhost.localdomain'): self.remote_host = '127.0.0.1' if username is None: @@ -230,8 +235,16 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread): Wraps around a Paramiko/SSH host key check. """ + + # hostname rewrite for localhost, force to IPv4 + _hostname = self.hostname + + # force into IPv4 for localhost connections + if _hostname in ('localhost', 'localhost.localdomain'): + _hostname = '127.0.0.1' + _valid = False - (_valid, _hostname, _port, _fingerprint, _fingerprint_type) = checkhosts.check_ssh_host_key(self, self.hostname, port=self.port) + (_valid, _hostname, _port, _fingerprint, _fingerprint_type) = checkhosts.check_ssh_host_key(self, _hostname, port=self.port) if not _valid and self.session_instance: _valid = self.session_instance.HOOK_check_host_dialog(_hostname, _port, fingerprint=_fingerprint, fingerprint_type=_fingerprint_type) return _valid 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).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.6-26-g5d6108f
by git-admin＠x2go.org 14 Sep '11

14 Sep '11

The branch, master has been updated via 5d6108fbe12a940e961e3ff70d497cc0a98d05c6 (commit) from 209f58795491f69c5422e2015cfda26a4b500f8c (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 ----------------------------------------------------------------- commit 5d6108fbe12a940e961e3ff70d497cc0a98d05c6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 14 21:34:33 2011 +0200 x2goclient compat fix: make sure applications property in session profiles gets always set. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ pyhoca/wxgui/profilemanager.py | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 19ca6a0..0e54e7c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ pyhoca-gui (0.1.0.8-0~x2go1) UNRELEASED; urgency=low non-rootless sessions, fixes problems with x2goclient after pyhoca-gui has been used on session profiles that have been switched from desktop to rootless to desktop. + - x2goclient compat fix: make sure applications property in session + profiles gets always set. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 14 Sep 2011 15:46:07 +0200 diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 6d1305e..0cce214 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -952,6 +952,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): ) self.profile_config['sshproxykeyfile'] = self.SSHProxyKeyFile.GetValue() + self.profile_config['applications'] = self.applicationChoices.keys() _session_type = [ s for s in self.sessionChoices.keys() if self.sessionChoices[s] == self.SessionType.GetValue() ][0] if _session_type == 'APPLICATION': _command = [ a for a in self.applicationChoices.keys() if self.applicationChoices[a] == self.Application.GetValue() ][0] hooks/post-receive -- pyhoca-gui.git (Python X2go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2go Client (wxPython GUI)).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-264-gc10acfd
by git-admin＠x2go.org 14 Sep '11

14 Sep '11

The branch, master has been updated via c10acfd3aedaa8ca2b5a31eb8e4bdeed427442b4 (commit) from 7a1fb5126e83f8ba2a4e140f8a8c84ff6122f2cf (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 ----------------------------------------------------------------- commit c10acfd3aedaa8ca2b5a31eb8e4bdeed427442b4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 14 18:34:32 2011 +0200 Present an ISO-8601 compliant datetime string in session lists rendered by x2golistsessions (and similar) command(s). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/lib/x2godbwrapper.pm | 16 ++++++++-------- x2goserver/lib/x2gosqlitewrapper.pl | 16 ++++++++-------- 3 files changed, 18 insertions(+), 16 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index fda1a9a..58cfe0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -59,6 +59,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low * Add real error message if client fails to resume/suspend/terminate a session. * SQLite DB backend: Fix typo in date format template. + * Present an ISO-8601 compliant datetime string in session lists + rendered by x2golistsessions (and similar) command(s). [ Ivan Kabaivanov ] * Makefile fix around man page installation in x2goserver-compat package. diff --git a/x2goserver/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm index cf514e4..10a1b1e 100644 --- a/x2goserver/lib/x2godbwrapper.pm +++ b/x2goserver/lib/x2godbwrapper.pm @@ -117,8 +117,8 @@ sub dbsys_listsessionsroot "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, - to_char(init_time,'DD.MM.YY*HH24:MI:SS'),cookie,client,gr_port, - sound_port,to_char(last_time,'DD.MM.YY*HH24:MI:SS'),uname, + to_char(init_time,'YYYY-MM-DDTHH24:MI:SS'),cookie,client,gr_port, + sound_port,to_char(last_time,'YYYY-MM-DDTHH24:MI:SS'),uname, to_char(now()-init_time,'SSSS'),fs_port from sessions where server='$server' order by status desc"); $sth->execute()or die; @@ -145,8 +145,8 @@ sub dbsys_listsessionsroot_all my @strings; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, - to_char(init_time,'DD.MM.YY*HH24:MI:SS'),cookie,client,gr_port, - sound_port,to_char(last_time,'DD.MM.YY*HH24:MI:SS'),uname, + to_char(init_time,'YYYY-MM-DDTHH24:MI:SS'),cookie,client,gr_port, + sound_port,to_char(last_time,'YYYY-MM-DDTHH24:MI:SS'),uname, to_char(now()-init_time,'SSSS'),fs_port from sessions order by status desc"); $sth->execute()or die; @@ -534,8 +534,8 @@ sub db_listsessions my @strings; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, - to_char(init_time,'DD.MM.YY*HH24:MI:SS'), cookie, client, gr_port, - sound_port, to_char( last_time, 'DD.MM.YY*HH24:MI:SS'), uname, + to_char(init_time,'YYYY-MM-DDTHH24:MI:SS'), cookie, client, gr_port, + sound_port, to_char( last_time, 'YYYY-MM-DDTHH24:MI:SS'), uname, to_char(now()- init_time,'SSSS'), fs_port from sessions_view where status !='F' and server='$server' and (session_id not like '%XSHAD%') order by status desc"); @@ -563,8 +563,8 @@ sub db_listsessions_all my @strings; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, - to_char(init_time,'DD.MM.YY*HH24:MI:SS'), cookie, client, gr_port, - sound_port, to_char( last_time, 'DD.MM.YY*HH24:MI:SS'), uname, + to_char(init_time,'YYYY-MM-DDTHH24:MI:SS'), cookie, client, gr_port, + sound_port, to_char( last_time, 'YYYY-MM-DDTHH24:MI:SS'), uname, to_char(now()- init_time,'SSSS'), fs_port from sessions_view where status !='F' and (session_id not like '%XSHAD%') order by status desc"); diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl index 551cab1..c7ba72b 100755 --- a/x2goserver/lib/x2gosqlitewrapper.pl +++ b/x2goserver/lib/x2gosqlitewrapper.pl @@ -52,9 +52,9 @@ elsif($cmd eq "listsessionsroot") my $server=shift or die "argument \"server\" missed"; my @strings; my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, - substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),9,11), + strftime('%Y-%m-%dT%H:%M:%S',init_time), cookie,client,gr_port,sound_port, - substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),9,11), + strftime('%Y-%m-%dT%H:%M:%S',last_time), uname, strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions where server=? order by status desc"); @@ -67,9 +67,9 @@ elsif($cmd eq "listsessionsroot_all") checkroot(); my @strings; my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, - substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),9,11), + strftime('%Y-%m-%dT%H:%M:%S',init_time), cookie,client,gr_port,sound_port, - substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),9,11), + strftime('%Y-%m-%dT%H:%M:%S',last_time), uname, strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions order by status desc"); @@ -265,9 +265,9 @@ elsif($cmd eq "listsessions") my $server=shift or die "argument \"server\" missed"; my @strings; my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, - substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),9,11), + strftime('%Y-%m-%dT%H:%M:%S',init_time), cookie,client,gr_port,sound_port, - substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),9,11), + strftime('%Y-%m-%dT%H:%M:%S',last_time), uname, strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions where status !='F' and server=? and uname=? @@ -280,9 +280,9 @@ elsif($cmd eq "listsessions_all") { my @strings; my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, - substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),0,6)||substr(strftime('%d.%m.%Y*.%H:%M:%S',init_time),9,11), + strftime('%Y-%m-%dT%H:%M:%S',init_time), cookie,client,gr_port,sound_port, - substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),0,6)||substr(strftime('%d.%m.%Y*.%H:%M:%S',last_time),9,11), + strftime('%Y-%m-%dT%H:%M:%S',last_time), uname, strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions where status !='F' and uname=? and ( session_id not like '%XSHAD%') order by status desc"); hooks/post-receive -- x2goserver.git (X2go Server) 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 "x2goserver.git" (X2go Server).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-263-g7a1fb51
by git-admin＠x2go.org 14 Sep '11

14 Sep '11

The branch, master has been updated via 7a1fb5126e83f8ba2a4e140f8a8c84ff6122f2cf (commit) from 12caae569515ad64e779d5945d4d3eb11c960a30 (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 ----------------------------------------------------------------- commit 7a1fb5126e83f8ba2a4e140f8a8c84ff6122f2cf Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 14 16:23:07 2011 +0200 SQLite DB backend: Fix typo in date format template. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver/lib/x2gosqlitewrapper.pl | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 883e014..fda1a9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -58,6 +58,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low * x2goserver.postinst: fix home path updates if new home path already exists * Add real error message if client fails to resume/suspend/terminate a session. + * SQLite DB backend: Fix typo in date format template. [ Ivan Kabaivanov ] * Makefile fix around man page installation in x2goserver-compat package. diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl index 641cb9c..551cab1 100755 --- a/x2goserver/lib/x2gosqlitewrapper.pl +++ b/x2goserver/lib/x2gosqlitewrapper.pl @@ -280,9 +280,9 @@ elsif($cmd eq "listsessions_all") { my @strings; my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, - substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),9,11), + substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),0,6)||substr(strftime('%d.%m.%Y*.%H:%M:%S',init_time),9,11), cookie,client,gr_port,sound_port, - substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),9,11), + substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),0,6)||substr(strftime('%d.%m.%Y*.%H:%M:%S',last_time),9,11), uname, strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions where status !='F' and uname=? and ( session_id not like '%XSHAD%') order by status desc"); hooks/post-receive -- x2goserver.git (X2go Server) 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 "x2goserver.git" (X2go Server).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-262-g12caae5
by git-admin＠x2go.org 14 Sep '11

14 Sep '11

The branch, master has been updated via 12caae569515ad64e779d5945d4d3eb11c960a30 (commit) from a0a8126b3e594c84a6443d4e1839a6b73249315c (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 ----------------------------------------------------------------- commit 12caae569515ad64e779d5945d4d3eb11c960a30 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 14 16:20:36 2011 +0200 Add real error message if client fails to resume/suspend/terminate a session. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/bin/x2goresume-session | 10 +++++++--- x2goserver/bin/x2gosuspend-session | 10 +++++++--- x2goserver/bin/x2goterminate-session | 10 +++++++--- 4 files changed, 23 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 3aebfcf..883e014 100644 --- a/debian/changelog +++ b/debian/changelog @@ -56,6 +56,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low people do not get the idea to put users in x2gouser group. * Makefile and man page area fix for x2goserver-extensions. * x2goserver.postinst: fix home path updates if new home path already exists + * Add real error message if client fails to resume/suspend/terminate + a session. [ Ivan Kabaivanov ] * Makefile fix around man page installation in x2goserver-compat package. diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index 4c01828..49880e0 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -83,6 +83,10 @@ echo "$NEWOPTIONS" >${SESSION_DIR}/options $X2GO_LIB_PATH/x2goresume $X2GO_CLIENT $SESSION_NAME > /dev/null -kill -HUP $X2GO_AGENT_PID && \ - $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "client $X2GO_CLIENT successfully resumed session with ID $SESSION_NAME" || \ - $X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: client $X2GO_CLIENT failed to resume session with ID $SESSION_NAME" +kill -HUP $X2GO_AGENT_PID &>/dev/null && \ + $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "client $X2GO_CLIENT successfully resumed session with ID $SESSION_NAME" || { +} || { + err_msg="ERROR: failed to resume session with ID $SESSION_NAME" + echo err_$msg 1>&2 + $X2GO_LIB_PATH/x2gosyslog "$0" "err" "$err_msg" +} diff --git a/x2goserver/bin/x2gosuspend-session b/x2goserver/bin/x2gosuspend-session index ca342e4..139d0df 100755 --- a/x2goserver/bin/x2gosuspend-session +++ b/x2goserver/bin/x2gosuspend-session @@ -39,9 +39,13 @@ killall -HUP knotify $X2GO_LIB_PATH/x2gochangestatus 'S' $SESSION_NAME > /dev/null -kill -HUP $X2GO_AGENT_PID && \ - $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID $SESSION_NAME has successfully been suspended" || \ - $X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: failed to suspend session with ID $SESSION_NAME" +kill -HUP $X2GO_AGENT_PID &>/dev/null && { + $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID $SESSION_NAME has successfully been suspended" || { +} || { + err_msg="ERROR: failed to suspend session with ID $SESSION_NAME" + echo err_$msg 1>&2 + $X2GO_LIB_PATH/x2gosyslog "$0" "err" "$err_msg"B +} export HOSTNAME x2goumount-session $SESSION_NAME diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session index 3d8872e..75bf277 100755 --- a/x2goserver/bin/x2goterminate-session +++ b/x2goserver/bin/x2goterminate-session @@ -35,9 +35,13 @@ X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}` $X2GO_LIB_PATH/x2gochangestatus 'F' $SESSION_NAME > /dev/null -kill -TERM $X2GO_AGENT_PID && \ - $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID $SESSION_NAME has successfully been terminated" || \ - $X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: failed to terminate session with ID $SESSION_NAME" +kill -TERM $X2GO_AGENT_PID &>/dev/null && \ + $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID $SESSION_NAME has successfully been terminated" || { +} || { + err_msg="ERROR: failed to terminate session with ID $SESSION_NAME" + echo "err_$msg" 1>&2 + $X2GO_LIB_PATH/x2gosyslog "$0" "err" "$err_msg" +} export HOSTNAME x2goumount-session $SESSION_NAME hooks/post-receive -- x2goserver.git (X2go Server) 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 "x2goserver.git" (X2go Server).

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-30-gcf40811
by git-admin＠x2go.org 14 Sep '11

14 Sep '11

The branch, master has been updated via cf408110f4276e5451035ad59a389d726d46ed0a (commit) from a20193b34efb6722373e08ee2f9e7b201eb4ae45 (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 ----------------------------------------------------------------- commit cf408110f4276e5451035ad59a389d726d46ed0a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 14 16:18:24 2011 +0200 Fix handling of lists in session profiles (i.e. ini files). Fixes breakage with x2goclient's rootless vs. desktop mode after pyhoca-gui has been used. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/defaults.py | 2 +- x2go/inifiles.py | 7 +++++-- 3 files changed, 8 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e0a0c59..3d23291 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ python-x2go (0.1.1.6-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.1.1.6), bugfix release for 0.1.1.x series: - Fix IPv4 enforcement for localhost connections. - Be tolerant against trailing whitespaces in hostnames. + - Fix handling of lists in session profiles (i.e. ini files). Fixes breakage + with x2goclient's rootless vs. desktop mode after pyhoca-gui has been used. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 11 Sep 2011 18:37:02 +0200 diff --git a/x2go/defaults.py b/x2go/defaults.py index 17be0f1..b4a284c 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -276,7 +276,7 @@ X2GO_SESSIONPROFILE_DEFAULTS = { 'sound':False, 'soundsystem': 'pulse', 'startsoundsystem': False, 'soundtunnel':True, 'defsndport':True, 'sndport':4713, 'name': 'NEW_PROFILE', 'icon': ':icons/128x128/x2gosession.png', 'host': '', 'user': CURRENT_LOCAL_USER, 'key': '', 'sshport': 22, - 'rootless': True, 'applications': str(X2GO_GENERIC_APPLICATIONS), 'command':'TERMINAL', + 'rootless': True, 'applications': X2GO_GENERIC_APPLICATIONS, 'command':'TERMINAL', 'rdpoptions': '-u X2GO_USER -p X2GO_PASSWORD', 'rdpserver': '', 'print': False, 'xdmcpserver': 'localhost', diff --git a/x2go/inifiles.py b/x2go/inifiles.py index cd5f21f..c95b2b2 100644 --- a/x2go/inifiles.py +++ b/x2go/inifiles.py @@ -156,9 +156,10 @@ class X2goIniFile(object): """ if type(value) == type(u''): value = value.encode(utils.get_encoding()) - if type(value) is types.BooleanType: self.iniConfig.set(section, key, str(int(value))) + elif type(value) in (types.ListType, types.TupleType): + self.iniConfig.set(section, key, ", ".join(value)) else: self.iniConfig.set(section, key, str(value)) @@ -249,8 +250,10 @@ class X2goIniFile(object): val = self.iniConfig.get(section, key) if val.startswith('[') and val.endswith(']'): return eval(val) + elif ',' in val: + val = [ v.strip() for v in val.split(',') ] else: - raise TypeError + val = [ val ] else: _val = self.iniConfig.get(section, key) return _val.decode(utils.get_encoding()) 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).

1 0

python-x2go.git - release/0.1.1.x (branch) updated: 0.1.1.5-4-ga462d31
by git-admin＠x2go.org 14 Sep '11

14 Sep '11

The branch, release/0.1.1.x has been updated via a462d315a76b877535aaadc4e799d268e6a4bf29 (commit) from 29297e679ea9c13051bd89a037e8d260a5d4b572 (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 ----------------------------------------------------------------- commit a462d315a76b877535aaadc4e799d268e6a4bf29 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 14 16:18:24 2011 +0200 Fix handling of lists in session profiles (i.e. ini files). Fixes breakage with x2goclient's rootless vs. desktop mode after pyhoca-gui has been used. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/defaults.py | 2 +- x2go/inifiles.py | 7 +++++-- 3 files changed, 8 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2d8524e..91485a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ python-x2go (0.1.1.6-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.1.1.6), bugfix release for 0.1.1.x series: - Fix IPv4 enforcement for localhost connections. - Be tolerant against trailing whitespaces in hostnames. + - Fix handling of lists in session profiles (i.e. ini files). Fixes breakage + with x2goclient's rootless vs. desktop mode after pyhoca-gui has been used. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 11 Sep 2011 18:37:02 +0200 diff --git a/x2go/defaults.py b/x2go/defaults.py index c3627af..9d60613 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -276,7 +276,7 @@ X2GO_SESSIONPROFILE_DEFAULTS = { 'sound':False, 'soundsystem': 'pulse', 'startsoundsystem': False, 'soundtunnel':True, 'defsndport':True, 'sndport':4713, 'name': 'NEW_PROFILE', 'icon': ':icons/128x128/x2gosession.png', 'host': '', 'user': CURRENT_LOCAL_USER, 'key': '', 'sshport': 22, - 'rootless': True, 'applications': str(X2GO_GENERIC_APPLICATIONS), 'command':'TERMINAL', + 'rootless': True, 'applications': X2GO_GENERIC_APPLICATIONS, 'command':'TERMINAL', 'rdpoptions': '-u X2GO_USER -p X2GO_PASSWORD', 'rdpserver': '', 'print': False, 'xdmcpserver': 'localhost', diff --git a/x2go/inifiles.py b/x2go/inifiles.py index 3269483..6c2afae 100644 --- a/x2go/inifiles.py +++ b/x2go/inifiles.py @@ -156,9 +156,10 @@ class X2goIniFile(object): """ if type(value) == type(u''): value = value.encode(utils.get_encoding()) - if type(value) is types.BooleanType: self.iniConfig.set(section, key, str(int(value))) + elif type(value) in (types.ListType, types.TupleType): + self.iniConfig.set(section, key, ", ".join(value)) else: self.iniConfig.set(section, key, str(value)) @@ -249,8 +250,10 @@ class X2goIniFile(object): val = self.iniConfig.get(section, key) if val.startswith('[') and val.endswith(']'): return eval(val) + elif ',' in val: + val = [ v.strip() for v in val.split(',') ] else: - raise TypeError + val = [ val ] else: _val = self.iniConfig.get(section, key) return _val.decode(utils.get_encoding()) 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).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits