x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

x2gobroker.git - statusflag (branch) updated: 0.0.2.2-16-g70b42c5
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag has been updated via 70b42c517cfe898af2fab2c06fbedb625c3909d2 (commit) from 0560f43d1fffc74435248349721c7bfc21b8a25c (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 70b42c517cfe898af2fab2c06fbedb625c3909d2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 4 22:15:23 2013 +0200 fix has_sessions() agent call ----------------------------------------------------------------------- Summary of changes: x2gobroker/agent.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index 0b6d94b..1a169b4 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -190,7 +190,7 @@ def has_sessions(username, query_mode='LOCAL', remote_agent=None): """ _session_list = list_sessions(username, query_mode=query_mode, remote_agent=remote_agent) - return ([ s[3] for s in _session_list if s.split('|')[4] == 'R' ], [ s[3] for s in _session_list if s.split('|')[4] == 'S' ]) + return ([ s.split('|')[3] for s in _session_list if s.split('|')[4] == 'R' ], [ s.split('|')[3] for s in _session_list if s.split('|')[4] == 'S' ]) def find_busy_servers(username, query_mode='LOCAL', remote_agent=None): """\ 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 - statusflag (branch) updated: 0.0.2.2-15-g0560f43
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag has been updated via 0560f43d1fffc74435248349721c7bfc21b8a25c (commit) from 91513a529b3ce9f1aacfe88c039e78489eae710e (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 0560f43d1fffc74435248349721c7bfc21b8a25c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 4 21:59:25 2013 +0200 consider hostname when evaluating the list of running/suspended sessions ----------------------------------------------------------------------- Summary of changes: x2gobroker/agent.py | 2 +- x2gobroker/brokers/base_broker.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index af179b4..0b6d94b 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -190,7 +190,7 @@ def has_sessions(username, query_mode='LOCAL', remote_agent=None): """ _session_list = list_sessions(username, query_mode=query_mode, remote_agent=remote_agent) - return (bool([ s for s in _session_list if s.split('|')[4] == 'R' ]), bool([ s for s in _session_list if s.split('|')[4] == 'S' ])) + return ([ s[3] for s in _session_list if s.split('|')[4] == 'R' ], [ s[3] for s in _session_list if s.split('|')[4] == 'S' ]) def find_busy_servers(username, query_mode='LOCAL', remote_agent=None): """\ diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 8ceacd7..446fb69 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -855,8 +855,8 @@ class X2GoBroker(object): agent_query_mode = ( remote_agent == u'LOCAL') and u'LOCAL' or u'SSH' if remote_agent: running_sessions, suspended_sessions = x2gobroker.agent.has_sessions(username, query_mode=agent_query_mode, remote_agent=remote_agent) - if running_sessions: profile['status'] = u'R' - if suspended_sessions: profile['status'] = u'S' + if set(profile['host']).intersection(set(running_sessions)): profile['status'] = u'R' + if set(profile['host']).intersection(set(suspended_sessions)): profile['status'] = u'S' list_of_profiles.update({profile_id: profile, }) 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 - statusflag (branch) updated: 0.0.2.2-14-g91513a5
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag has been updated via 91513a529b3ce9f1aacfe88c039e78489eae710e (commit) from a856cf9c04098e9510b4122adb8ff7fc45414cc2 (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 91513a529b3ce9f1aacfe88c039e78489eae710e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 4 21:49:38 2013 +0200 fix Boolean evaluation ----------------------------------------------------------------------- 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 679600e..8ceacd7 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -852,7 +852,7 @@ class X2GoBroker(object): if self.check_profile_acls(username, acls): remote_agent = self.get_remote_agent(profile_id) - agent_query_mode = ( remote_agent == u'LOCAL') or u'SSH' + agent_query_mode = ( remote_agent == u'LOCAL') and u'LOCAL' or u'SSH' if remote_agent: running_sessions, suspended_sessions = x2gobroker.agent.has_sessions(username, query_mode=agent_query_mode, remote_agent=remote_agent) if running_sessions: profile['status'] = u'R' 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 - statusflag (branch) updated: 0.0.2.2-13-ga856cf9
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag has been updated via a856cf9c04098e9510b4122adb8ff7fc45414cc2 (commit) from fbc66ef6eb8ae946d405060acd446d9a3a92be2e (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 a856cf9c04098e9510b4122adb8ff7fc45414cc2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 4 21:45:16 2013 +0200 make sure the upper() method is applied to a unicode object ----------------------------------------------------------------------- Summary of changes: x2gobroker/agent.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index e3cb489..af179b4 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -150,7 +150,7 @@ def ping(query_mode='LOCAL', remote_agent=None): """ username='foo' - if query_mode.upper() == u'LOCAL': + if unicode(query_mode).upper() == u'LOCAL': return call_local_broker_agent(username, mode='ping') else: return call_remote_broker_agent(username, mode='ping', remote_agent=remote_agent) @@ -168,7 +168,7 @@ def list_sessions(username, query_mode='LOCAL', remote_agent=None): @type remote_agent: C{dict} """ - if query_mode.upper() == u'LOCAL': + if unicode(query_mode).upper() == u'LOCAL': return call_local_broker_agent(username, mode='listsessions') else: return call_remote_broker_agent(username, mode='listsessions', remote_agent=remote_agent) @@ -208,7 +208,7 @@ def find_busy_servers(username, query_mode='LOCAL', remote_agent=None): @type remote_agent: C{dict} """ - if query_mode.upper() == u'LOCAL': + if unicode(query_mode).upper() == u'LOCAL': server_list = call_local_broker_agent(username, mode='findbusyservers') else: server_list = call_remote_broker_agent(username, mode='findbusyservers', remote_agent=remote_agent) @@ -240,7 +240,7 @@ def add_authorized_key(username, pubkey_hash, authorized_keys_file='%h/.x2go/aut @type remote_agent: C{dict} """ - if query_mode.upper() == u'LOCAL': + if unicode(query_mode).upper() == u'LOCAL': return call_local_broker_agent(username, mode='addauthkey', cmdline_args=[pubkey_hash, authorized_keys_file, ]) else: return call_remote_broker_agent(username, mode='addauthkey', cmdline_args=[pubkey_hash, authorized_keys_file, ], remote_agent=remote_agent) @@ -272,7 +272,7 @@ def delete_authorized_key(username, pubkey_hash, authorized_keys_file='%h/.x2go/ delayed_execution(delete_authorized_key, delay=delay_deletion, username=username, pubkey_hash=pubkey_hash, authorized_keys_file=authorized_keys_file, query_mode=query_mode, remote_agent=remote_agent, ) logger_broker.debug('Scheduled deletion of authorized key in {delay}s: user={user}, host={host}'.format(delay=delay_deletion, user=username, host=_hostname)) else: - if query_mode.upper() == u'LOCAL': + if unicode(query_mode).upper() == u'LOCAL': return call_local_broker_agent(username, mode='delauthkey', cmdline_args=[pubkey_hash, authorized_keys_file, ]) else: return call_remote_broker_agent(username, mode='delauthkey', cmdline_args=[pubkey_hash, authorized_keys_file, ], remote_agent=remote_agent) @@ -292,7 +292,7 @@ def get_servers(username, query_mode='LOCAL', remote_agent=None): @type remote_agent: C{dict} """ - if query_mode.upper() == u'LOCAL': + if unicode(query_mode).upper() == u'LOCAL': return call_local_broker_agent(username, mode='getservers') else: return call_local_broker_agent(username, mode='getservers', remote_agent=remote_agent) 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 - statusflag (branch) updated: 0.0.2.2-12-gfbc66ef
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag has been updated via fbc66ef6eb8ae946d405060acd446d9a3a92be2e (commit) from 28f540af3974fd5506336c3ab64c6101cd0b71d5 (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 fbc66ef6eb8ae946d405060acd446d9a3a92be2e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 4 21:28:24 2013 +0200 syntax 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 2131a55..679600e 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -852,7 +852,7 @@ class X2GoBroker(object): if self.check_profile_acls(username, acls): remote_agent = self.get_remote_agent(profile_id) - agent_query_mode = ( remote_agent = u'LOCAL') or u'SSH' + agent_query_mode = ( remote_agent == u'LOCAL') or u'SSH' if remote_agent: running_sessions, suspended_sessions = x2gobroker.agent.has_sessions(username, query_mode=agent_query_mode, remote_agent=remote_agent) if running_sessions: profile['status'] = u'R' 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 - statusflag (branch) updated: 0.0.2.2-11-g28f540a
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag has been updated via 28f540af3974fd5506336c3ab64c6101cd0b71d5 (commit) from 98aa2af23baee3aab8d5633f5cc19a0ed98fa703 (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 28f540af3974fd5506336c3ab64c6101cd0b71d5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 4 21:27:21 2013 +0200 fix undefined variable ----------------------------------------------------------------------- Summary of changes: x2gobroker/brokers/base_broker.py | 1 + 1 file changed, 1 insertion(+) The diff of changes is: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 2784f8d..2131a55 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -852,6 +852,7 @@ class X2GoBroker(object): if self.check_profile_acls(username, acls): remote_agent = self.get_remote_agent(profile_id) + agent_query_mode = ( remote_agent = u'LOCAL') or u'SSH' if remote_agent: running_sessions, suspended_sessions = x2gobroker.agent.has_sessions(username, query_mode=agent_query_mode, remote_agent=remote_agent) if running_sessions: profile['status'] = u'R' 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 - statusflag (branch) updated: 0.0.2.2-10-g98aa2af
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag has been updated via 98aa2af23baee3aab8d5633f5cc19a0ed98fa703 (commit) from 9a50744749881a91422b397c2985ed3f35bc8175 (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 98aa2af23baee3aab8d5633f5cc19a0ed98fa703 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 4 21:21:19 2013 +0200 syntax 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 c01a76a..2784f8d 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -810,7 +810,7 @@ class X2GoBroker(object): remote_agent_port = profile[u'sshport'] remote_agent = {u'hostname': remote_agent_server, u'port': remote_agent_port, } - if x2gobroker.agent.ping(query_mode=agent_query_mode, remote_agent=remote_agent) + if x2gobroker.agent.ping(query_mode=agent_query_mode, remote_agent=remote_agent): break server_list = server_list[0:-1] 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 - statusflag (branch) updated: 0.0.2.2-4-geb38dff
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag 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 ----------------------------------------------------------------- ----------------------------------------------------------------------- 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 - statusflag (branch) updated: 0.0.2.2-1-g285e9cc
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag has been updated via 285e9cc89d32b49996954fd4a3f6e4f4ad3b4ee0 (commit) from 6a16a5739fc702c12d3cc8738837a8a29cae8c12 (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 | 6 ++++++ sbin/x2gobroker-pubkeyauthorizer | 2 +- x2gobroker/__init__.py | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e887cc5..a6b1619 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2gobroker (0.0.2.3-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 May 2013 17:42:12 +0200 + x2gobroker (0.0.2.2-0~x2go1) unstable; urgency=low * New upstream version (0.0.2.2): diff --git a/sbin/x2gobroker-pubkeyauthorizer b/sbin/x2gobroker-pubkeyauthorizer index ec593e4..3adccc0 100755 --- a/sbin/x2gobroker-pubkeyauthorizer +++ b/sbin/x2gobroker-pubkeyauthorizer @@ -36,7 +36,7 @@ import logging.config from pwd import getpwnam from grp import getgrnam -__VERSION__ = '0.0.2.2' +__VERSION__ = '0.0.2.3' __AUTHOR__ = 'Mike Gabriel (X2Go Project) <mike.gabriel(a)das-netzwerkteam.de>' PROG_NAME = os.path.basename(sys.argv[0]) diff --git a/x2gobroker/__init__.py b/x2gobroker/__init__.py index 1a37a25..72336db 100644 --- a/x2gobroker/__init__.py +++ b/x2gobroker/__init__.py @@ -18,5 +18,5 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.0.2.2' +__VERSION__ = '0.0.2.3' __AUTHOR__ = 'Mike Gabriel (X2Go Project) <mike.gabriel(a)das-netzwerkteam.de>' 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 - statusflag (branch) updated: 0.0.2.2-6-g851439d
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag 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 ----------------------------------------------------------------- ----------------------------------------------------------------------- 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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits