x2go-commits

x2go-commits@lists.x2go.org

1 participants
37914 discussions

x2gobroker.git - master (branch) updated: 0.0.2.2-6-g851439d
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, master has been updated via 851439d5d8a8f2235957dbf45955dc2f68c193dc (commit) from 650012f7f71d2e983369fd826d716be8a77da109 (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 851439d5d8a8f2235957dbf45955dc2f68c193dc Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 4 17:20:42 2013 +0200 typo fix ----------------------------------------------------------------------- Summary of changes: x2gobroker/brokers/base_broker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index def2d50..efa164e 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -801,7 +801,7 @@ class X2GoBroker(object): # make sure that desktop sessions (that we know by name) do run with rootless=false if profile['command'] in x2gobroker.defaults.X2GO_DESKTOP_SESSIONS: - profile['rootless'] = false + profile['rootless'] = False acls = self.get_profile_acls(profile_id) hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.2-5-g650012f
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, master has been updated via 650012f7f71d2e983369fd826d716be8a77da109 (commit) from eb38dffa485257cdd3d74af7bbff1ce1aa7eaf3d (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 650012f7f71d2e983369fd826d716be8a77da109 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 4 16:58:19 2013 +0200 Make enable-plain-output, enable-uccs-output functional. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2gobroker/web/plain.py | 4 ++++ x2gobroker/web/uccs.py | 4 ++++ 3 files changed, 9 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 180b5af..505affa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ x2gobroker (0.0.2.3-0~x2go1) UNRELEASED; urgency=low x2gobroker-sessionprofiles.conf. - Handle the rootless property automatically for know-by-name desktop sessions. + - Make enable-plain-output, enable-uccs-output functional. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 May 2013 17:42:12 +0200 diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py index d3718ec..6fdfffe 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/web/plain.py @@ -71,6 +71,10 @@ class X2GoBrokerWeb(tornado.web.RequestHandler): global_config = broker_backend.get_global_config() + # throw a 404 if the WebUI is not enabled + if not global_config['enable-plain-output']: + raise tornado.web.HTTPError(404) + # if the broker backend is disabled in the configuration, pretend to have nothing on offer if not broker_backend.is_enabled(): raise tornado.web.HTTPError(404) diff --git a/x2gobroker/web/uccs.py b/x2gobroker/web/uccs.py index e518640..2f5864b 100644 --- a/x2gobroker/web/uccs.py +++ b/x2gobroker/web/uccs.py @@ -102,6 +102,10 @@ class X2GoBrokerWebAPI(tornado.web.RequestHandler): global_config = self.broker_backend.get_global_config() + # throw a 404 if the WebUI is not enabled + if not global_config['enable-uccs-output']: + raise tornado.web.HTTPError(404) + # if the broker backend is disabled in the configuration, pretend to have nothing on offer if not self.broker_backend.is_enabled(): raise tornado.web.HTTPError(404) hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.2-4-geb38dff
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, master has been updated via eb38dffa485257cdd3d74af7bbff1ce1aa7eaf3d (commit) from e1c9f59fd8e23d0ac0e9fa7926058df415858ca8 (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 eb38dffa485257cdd3d74af7bbff1ce1aa7eaf3d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 4 13:21:18 2013 +0200 Handle the rootless property automatically for know-by-name desktop sessions. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2gobroker/brokers/base_broker.py | 4 ++++ x2gobroker/defaults.py | 13 +++++++++++++ 3 files changed, 19 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1e42d52..180b5af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ x2gobroker (0.0.2.3-0~x2go1) UNRELEASED; urgency=low »<hostname> (<address>)« in host= session profile field. (Fixes: #218). - Add rootless=false to example session profiles for all Desktop sessions in x2gobroker-sessionprofiles.conf. + - Handle the rootless property automatically for know-by-name desktop + sessions. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 May 2013 17:42:12 +0200 diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index bb1656b..def2d50 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -799,6 +799,10 @@ class X2GoBroker(object): profile['autologin'] = True profile['key'] = 'key-comes-later' + # make sure that desktop sessions (that we know by name) do run with rootless=false + if profile['command'] in x2gobroker.defaults.X2GO_DESKTOP_SESSIONS: + profile['rootless'] = false + acls = self.get_profile_acls(profile_id) if self.check_profile_acls(username, acls): diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index 65b84b4..3ce7269 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -159,6 +159,19 @@ X2GOBROKER_CONFIG_DEFAULTS = { }, } +X2GO_DESKTOP_SESSIONS= [ + 'KDE', + 'GNOME', + 'XFCE', + 'CINNAMON', + 'MATE', + 'XFCE', + 'LXDE', + 'TRINITY', + 'UNITY', + 'XDMCP', +] + # defaults for X2Go Sessino Broker session profiles file X2GOBROKER_SESSIONPROFILE_DEFAULTS = { u'DEFAULT': { hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.2-3-ge1c9f59
by git-admin＠x2go.org 31 May '13

31 May '13

The branch, master has been updated via e1c9f59fd8e23d0ac0e9fa7926058df415858ca8 (commit) from b0cefb72b896ea34c724d0a8b79f9f8edadff7b5 (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 e1c9f59fd8e23d0ac0e9fa7926058df415858ca8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Jun 1 01:34:54 2013 +0200 Add rootless=false to example session profiles for all Desktop sessions in x2gobroker-sessionprofiles.conf. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ etc/broker/x2gobroker-sessionprofiles.conf | 5 +++++ 2 files changed, 7 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d9e5f35..1e42d52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ x2gobroker (0.0.2.3-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.0.2.3): - inifile broker: Allow explicit specification combinations of »<hostname> (<address>)« in host= session profile field. (Fixes: #218). + - Add rootless=false to example session profiles for all Desktop sessions in + x2gobroker-sessionprofiles.conf. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 May 2013 17:42:12 +0200 diff --git a/etc/broker/x2gobroker-sessionprofiles.conf b/etc/broker/x2gobroker-sessionprofiles.conf index 6656d9a..c45060d 100644 --- a/etc/broker/x2gobroker-sessionprofiles.conf +++ b/etc/broker/x2gobroker-sessionprofiles.conf @@ -89,6 +89,7 @@ user= host=server-a.pool-a.domain.local name=GNOME - pool-A (srv-A) command=GNOME +rootless=false acl-groups-allow=gnome-users,admins acl-groups-deny=ALL acl-clients-deny=ALL @@ -101,6 +102,7 @@ user= host=server-b.pool-a.domain.local name=GNOME - pool-A (srv-B) command=GNOME +rootless=false acl-groups-allow=gnome-users,admins acl-groups-deny=ALL acl-clients-deny=ALL @@ -113,6 +115,7 @@ user= host=server-c.pool-a.domain.local name=KDE - pool-A (srv-C) command=KDE +rootless=false acl-groups-allow=kde-users,admins acl-groups-deny=ALL acl-any-order=deny-allow @@ -137,6 +140,7 @@ user= host=server-d (server-d.domain.internet) name=LXDE - srv-D command=LXDE +rootless=false acl-groups-allow=admins acl-groups-deny=ALL ## make sure hostnames in client ACLs are resolvable via libnss!!! @@ -173,6 +177,7 @@ user= host=s-E1 (10.0.2.11),s-E2 (10.0.2.12),s-E3 (10.0.2.13),s-E4 (10.0.2.14),s-E5 (10.0.2.15) name=XFCE - pool-C command=XFCE +rootless=false acl-users-allow=testuser-A,testuser-B acl-users-deny=ALL acl-groups-allow=students,admins hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

python-x2go.git - master (branch) updated: 0.4.0.3-9-g989c3d6
by git-admin＠x2go.org 31 May '13

31 May '13

The branch, master has been updated via 989c3d6b0396d48e32ec346c7bc98cf01360a883 (commit) from 4ef900de0380f23eabf121d7182178f6b05e3838 (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 989c3d6b0396d48e32ec346c7bc98cf01360a883 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri May 31 08:41:43 2013 +0200 Enable keepalive callbacks on open SSH client connections. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/backends/control/_stdout.py | 2 ++ 2 files changed, 3 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ebea3ab..7caf2b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ python-x2go (0.4.0.4-0~x2go1) UNRELEASED; urgency=low - Ignore KeyError exceptions in session cache for suddenly removed cache items. Silence/fix some race conditions on connection failures. - Support mounting client-side folders on UNC paths. + - Enable keepalive callbacks on open SSH client connections. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 21 Apr 2013 23:21:29 +0200 diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 0050147..4a9fbb8 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -877,6 +877,8 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient): t = self.get_transport() if x2go._paramiko.PARAMIKO_FEATURE['use-compression']: t.use_compression(compress=True) + # enable keep alive callbacks + t.set_keepalive(5) except paramiko.AuthenticationException, e: self.close() 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

x2gobroker.git - master (branch) updated: 0.0.2.2-2-gb0cefb7
by git-admin＠x2go.org 29 May '13

29 May '13

The branch, master has been updated via b0cefb72b896ea34c724d0a8b79f9f8edadff7b5 (commit) from 285e9cc89d32b49996954fd4a3f6e4f4ad3b4ee0 (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 b0cefb72b896ea34c724d0a8b79f9f8edadff7b5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu May 30 00:33:04 2013 +0200 inifile broker: Allow explicit specification combinations of »<hostname> (<address>)« in host= session profile field. (Fixes: #218). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++- etc/broker/x2gobroker-sessionprofiles.conf | 8 +++--- x2gobroker/brokers/base_broker.py | 12 +++++++++ x2gobroker/brokers/inifile_broker.py | 22 +++++++++++++++++ x2gobroker/tests/test_broker_inifile.py | 37 ++++++++++++++++++++++++++++ 5 files changed, 79 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a6b1619..d9e5f35 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ x2gobroker (0.0.2.3-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (0.0.2.3): + - inifile broker: Allow explicit specification combinations of + »<hostname> (<address>)« in host= session profile field. (Fixes: #218). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 May 2013 17:42:12 +0200 diff --git a/etc/broker/x2gobroker-sessionprofiles.conf b/etc/broker/x2gobroker-sessionprofiles.conf index 84bfc44..6656d9a 100644 --- a/etc/broker/x2gobroker-sessionprofiles.conf +++ b/etc/broker/x2gobroker-sessionprofiles.conf @@ -134,7 +134,7 @@ broker-session-autologin=true [pool-B-server-D-LXDE] user= -host=server-d.domain.internet +host=server-d (server-d.domain.internet) name=LXDE - srv-D command=LXDE acl-groups-allow=admins @@ -156,7 +156,9 @@ acl-any-order=deny-allow ## get this session profile into their X2Go Clients. ## ## The pool-C contains 6 X2Go Servers that serve all students users together -## as a load balance server farm. +## as a load balance server farm. The servers' hostnames are s-E1, s-E2, ... +## (as found in /etc/hostname). The hosts, however, are not configured in DNS +## so we give their IPs explicitly (also works for IPv6). ## ## Make sure to install x2gobroker-agent on all these 6 X2Go Servers. Also make ## sure to once run the script x2gobroker-keygen on the broker host and once @@ -168,7 +170,7 @@ acl-any-order=deny-allow [pool-C-XFCE] user= -host=s-E1.pool-c.domain.local,s-E2.pool-c.domain.local,s-E3.pool-c.domain.local,s-E4.pool-c.domain.local,s-E5.pool-c.domain.local,s-E6.pool-c.domain.local +host=s-E1 (10.0.2.11),s-E2 (10.0.2.12),s-E3 (10.0.2.13),s-E4 (10.0.2.14),s-E5 (10.0.2.15) name=XFCE - pool-C command=XFCE acl-users-allow=testuser-A,testuser-B diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 2750b43..bb1656b 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -928,6 +928,12 @@ class X2GoBroker(object): if server_list: best_server = server_list[0] else: return { 'server': 'no-server-available', 'port': profile[u'sshport'], } + # if we have an explicit IP address for best_server, let's use that instead... + try: + best_server = profile['host={hostname}'.format(hostname=best_server)] + except KeyError: + pass + selected_session = { 'server': best_server, 'port': profile[u'sshport'], @@ -944,6 +950,12 @@ class X2GoBroker(object): server_name = session_list[0].split('|')[3] session_info = session_list[0] + # if we have an explicit IP address for server_name, let's use that instead... + try: + server_name = profile['host={hostname}'.format(hostname=server_name)] + except KeyError: + pass + selected_session.update({ 'server': server_name, 'session_info': session_info, diff --git a/x2gobroker/brokers/inifile_broker.py b/x2gobroker/brokers/inifile_broker.py index 7ab229f..a7c6537 100644 --- a/x2gobroker/brokers/inifile_broker.py +++ b/x2gobroker/brokers/inifile_broker.py @@ -26,6 +26,9 @@ and does not support load balancing. __NAME__ = 'x2gobroker-pylib' # modules +import copy +import netaddr +import re # Python X2GoBroker modules import base_broker as base @@ -76,6 +79,25 @@ class X2GoBroker(base.X2GoBroker): del profile[key] if key == 'default': del profile[key] + if key == 'host': + _hosts = copy.deepcopy(profile[key]) + profile[key] = [] + for host in _hosts: + if re.match('^.*\ $.*$$', host): + _hostname = host.split(' ')[0] + _address = host.split(' ')[1][1:-1] + + # test if _address is a valid hostname, a valid DNS name or an IPv4/IPv6 address + if (re.match('(?!-)[A-Z\d-]{1,63}(?<!-)$', _hostname, flags=re.IGNORECASE) or \ + re.match('(?=^.{1,254}$)(^(?:(?!\d|-)[a-zA-Z0-9\-]{1,63}(?<!-)\.?)+(?:[a-zA-Z]{2,})$)', _hostname, flags=re.IGNORECASE)) and \ + (re.match('(?=^.{1,254}$)(^(?:(?!\d|-)[a-zA-Z0-9\-]{1,63}(?<!-)\.?)+(?:[a-zA-Z]{2,})$)', _address, flags=re.IGNORECASE) or \ + netaddr.valid_ipv4(_address) or netaddr.valid_ipv6(_address)): + + profile["host={hostname}".format(hostname=_hostname)] = _address + + profile[key].append(_hostname) + else: + profile[key].append(host) return profile def get_profile_broker(self, profile_id): diff --git a/x2gobroker/tests/test_broker_inifile.py b/x2gobroker/tests/test_broker_inifile.py index b7181a4..5952f35 100644 --- a/x2gobroker/tests/test_broker_inifile.py +++ b/x2gobroker/tests/test_broker_inifile.py @@ -455,6 +455,23 @@ host = test-2.local name = TEST-3 host = test-3.local sshport = 44566 + +[testprofile4] +name = TEST-4 +host = test-4 (10.0.2.4) + +[testprofile5] +name = TEST-5 +host = test-5.local (10.0.2.5) + +[testprofile6] +name = TEST-6 +host = test-6.local (test-6.extern) + +[testprofile7] +name = TEST-7 +host = test-7 (-test-6.extern) + """ tfs = tempfile.NamedTemporaryFile() print >> tfs, _session_profiles @@ -472,9 +489,29 @@ sshport = 44566 'server': 'test-3.local', 'port': 44566, } + _expected_result_4 = { + 'server': '10.0.2.4', + 'port': 22, + } + _expected_result_5 = { + 'server': '10.0.2.5', + 'port': 22, + } + _expected_result_6 = { + 'server': 'test-6.extern', + 'port': 22, + } + _expected_result_7 = { + 'server': 'test-7', + 'port': 22, + } self.assertEqual(inifile_backend.select_session('testprofile1'), _expected_result_1) self.assertEqual(inifile_backend.select_session('testprofile2'), _expected_result_2) self.assertEqual(inifile_backend.select_session('testprofile3'), _expected_result_3) + self.assertEqual(inifile_backend.select_session('testprofile4'), _expected_result_4) + self.assertEqual(inifile_backend.select_session('testprofile5'), _expected_result_5) + self.assertEqual(inifile_backend.select_session('testprofile6'), _expected_result_6) + self.assertEqual(inifile_backend.select_session('testprofile7'), _expected_result_7) def test_suite(): hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.2-2-gb0cefb7
by git-admin＠x2go.org 29 May '13

29 May '13

1 0

nx-libs.git - master (branch) updated: redist-client/3.5.0.20-11-gd90c457
by git-admin＠x2go.org 29 May '13

29 May '13

The branch, master has been updated via d90c457c4dd216c1baa11c8d1a991e21e83562bf (commit) from ead1e823aeb71e0e2e6742124cc485252699b22a (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 d90c457c4dd216c1baa11c8d1a991e21e83562bf Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed May 29 19:02:02 2013 +0200 Use a keystrokes.cfg that reflects the normally hard-coded defaults of a vanilla nxagent. (Fixes: #223). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/keystrokes.cfg | 24 ++++++++++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ee527a7..32c4712 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ nx-libs (2:3.5.0.21-0) UNRELEASED; urgency=low * Provide a default keystrokes.cfg in /etc/nx (for nxagent) and /etc/x2go (for x2goagent). (Fixes: #199). + * Use a keystrokes.cfg that reflects the normally hard-coded defaults of + a vanilla nxagent. (Fixes: #223). * Set NXAGENT_KEYSTROKEFILE to /etc/x2go/keystrokes.cfg for wrapper x2goagent. * For vanilla nxagent move keystrokes.cfg from /etc/nx to /etc/nxagent. * Tarball roller script: diff --git a/debian/keystrokes.cfg b/debian/keystrokes.cfg index 734293a..9385459 100644 --- a/debian/keystrokes.cfg +++ b/debian/keystrokes.cfg @@ -1,11 +1,19 @@ <!DOCTYPE NXKeystroke> <keystrokes> -<keystroke action="fullscreen" AltMeta="1" Control="1" key="b" /> -<keystroke action="minimize" AltMeta="1" Control="1" key="space" /> -<keystroke action="minimize" key="Escape" Shift="1" /> -<keystroke action="close_session" key="F7" /> -<keystroke action="fullscreen" key="F7" Mod1="1" /> -<keystroke action="fullscreen" key="F6" Mod1="1" /> -<keystroke action="force_synchronization" key="f" /> -<keystroke action="fullscreen" key="space" Mod1="0" Mod2="0" Control="0" Shift="0" AltMeta="0" /> +<keystroke action="close_session" Control="1" key="t" /> +<keystroke action="switch_all_screens" Control="1" key="f" /> +<keystroke action="minimize" Control="1" key="m" /> +<keystroke action="resize" Control="1" key="r" /> +<keystroke action="defer" Control="1" key="e" /> +<keystroke action="ignore" Control="1" key="BackSpace" /> +<keystroke action="force_synchronization" Control="1" key="j" /> +<keystroke action="debug_tree" Control="1" key="q" /> +<keystroke action="regions_on_screen" Control="1" key="a" /> +<keystroke action="test_input" Control="1" key="x" /> +<keystroke action="deactivate_input_devices_grab" Control="1" key="y" /> +<keystroke action="fullscreen" Control="1" Shift="1" key="f" /> +<keystroke action="viewport_move_left" Control="1" Shift="1" key="Left" /> +<keystroke action="viewport_move_up" Control="1" key="Up" /> +<keystroke action="viewport_move_right" Control="1" key="Right" /> +<keystroke action="viewport_move_down" Control="1" key="Down" /> </keystrokes> hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)).

1 0

python-x2go.git - master (branch) updated: 0.4.0.3-8-g4ef900d
by git-admin＠x2go.org 28 May '13

28 May '13

The branch, master has been updated via 4ef900de0380f23eabf121d7182178f6b05e3838 (commit) from f1dc23233c1f0b9df67844a8245744e71c00b472 (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 4ef900de0380f23eabf121d7182178f6b05e3838 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed May 29 00:19:15 2013 +0200 Support mounting client-side folders on UNC paths. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/backends/terminal/_stdout.py | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4e98b34..ebea3ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ python-x2go (0.4.0.4-0~x2go1) UNRELEASED; urgency=low monkey patching those methods that got fixed in 1.11.0. - Ignore KeyError exceptions in session cache for suddenly removed cache items. Silence/fix some race conditions on connection failures. + - Support mounting client-side folders on UNC paths. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 21 Apr 2013 23:21:29 +0200 diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index aeead53..b1a3f28 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -840,9 +840,17 @@ class X2GoTerminalSessionSTDOUT(object): _server_encoding = self.params.server_encoding if _X2GOCLIENT_OS == 'Windows': - local_path = local_path.replace('\\', '/') - local_path = local_path.replace(':', '') - local_path = '/windrive/%s' % local_path + if local_path.startswith('\\\\'): + # we are on a UNC path + if 'X2GO_MOUNT_UNCPATHS' in self.control_session.get_server_features(): + local_path = local_path.repalce('\\\\', '/uncpath/') + else: + local_path = local_path.repalce('\\\\', '/windrive/') + local_path = local_path.replace('\\', '/') + else: + local_path = local_path.replace('\\', '/') + local_path = local_path.replace(':', '') + local_path = '/windrive/%s' % local_path _convert_encoding = True _client_encoding = 'WINDOWS-1252' 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 - master (branch) updated: 0.4.0.3-7-gf1dc232
by git-admin＠x2go.org 28 May '13

28 May '13

The branch, master has been updated via f1dc23233c1f0b9df67844a8245744e71c00b472 (commit) from b4335679fa7400e2e57c3992f9f25c4d1b719f3c (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 f1dc23233c1f0b9df67844a8245744e71c00b472 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 28 22:54:50 2013 +0200 Ignore KeyError exceptions in session cache for suddenly removed cache items. Silence/fix some race conditions on connection failures. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/cache.py | 6 ++++++ 2 files changed, 8 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 589f0b9..4e98b34 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ python-x2go (0.4.0.4-0~x2go1) UNRELEASED; urgency=low session profile configuration if unavailable. (Fixes: #192). - Become aware of fixed paramiko features since paramiko 1.11.0. Stop monkey patching those methods that got fixed in 1.11.0. + - Ignore KeyError exceptions in session cache for suddenly removed cache items. + Silence/fix some race conditions on connection failures. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 21 Apr 2013 23:21:29 +0200 diff --git a/x2go/cache.py b/x2go/cache.py index 389d71a..757b827 100644 --- a/x2go/cache.py +++ b/x2go/cache.py @@ -161,6 +161,8 @@ class X2GoListSessionsCache(object): raise x2go_exceptions.X2GoControlSessionException except x2go_exceptions.X2GoTimeOutException: pass + except KeyError: + pass def _update_desktops(self, profile_name, control_session): """\ @@ -183,6 +185,8 @@ class X2GoListSessionsCache(object): raise x2go_exceptions.X2GoControlSessionException except x2go_exceptions.X2GoTimeOutException: pass + except KeyError: + pass def _update_sessions(self, profile_name, control_session): """\ @@ -201,6 +205,8 @@ class X2GoListSessionsCache(object): del self.x2go_listsessions_cache[profile_name] self.protected = False raise x2go_exceptions.X2GoControlSessionException + except KeyError: + pass def list_sessions(self, session_uuid): """\ 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