x2go-commits June 2013

x2go-commits@lists.x2go.org

1 participants
1546 discussions

x2gobroker.git - statusflag (branch) updated: 3098bed45d56262d5de490d5fa45f51fb13b975c
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag has been updated via 3098bed45d56262d5de490d5fa45f51fb13b975c (commit) from 9efd0dcf3ea924d2049ff027b854d1159c29c617 (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: Makefile | 41 +++++++++++ lib/{x2gobroker-command => x2gobroker-command.pl} | 2 +- src/x2gobroker-command.c | 77 +++++++++++++++++++++ 3 files changed, 119 insertions(+), 1 deletion(-) create mode 100755 Makefile rename lib/{x2gobroker-command => x2gobroker-command.pl} (98%) create mode 100644 src/x2gobroker-command.c The diff of changes is: diff --git a/Makefile b/Makefile new file mode 100755 index 0000000..4d798c6 --- /dev/null +++ b/Makefile @@ -0,0 +1,41 @@ +#!/usr/bin/make -f + +SRC_DIR=$(CURDIR) +SHELL=/bin/bash + +INSTALL_DIR=install -d -o root -g root -m 755 +INSTALL_FILE=install -o root -g root -m 644 +INSTALL_PROGRAM=install -o root -g root -m 755 + +RM_FILE=rm -f +RM_DIR=rmdir -p --ignore-fail-on-non-empty + +DESTDIR= +PREFIX=/usr/local +ETCDIR=/etc/x2go +BINDIR=$(PREFIX)/bin +SBINDIR=$(PREFIX)/sbin +LIBDIR=$(PREFIX)/lib/x2go +MANDIR=$(PREFIX)/share/man +SHAREDIR=$(PREFIX)/share/x2go + +BIN_SCRIPTS=$(shell cd bin && echo *) +SBIN_SCRIPTS=$(shell cd sbin && echo *) +LIB_FILES=$(shell cd lib && echo *) + +all: clean build + +build: build-arch build-indep + +build-arch: build_setgidwrappers + +build_setgidwrappers: + gcc -fPIE -pie -o x2gobroker-command x2gobroker-command.c + +build-indep: + +clean: clean_arch + +clean_arch: + rm -f src/x2gobroker-command + diff --git a/lib/x2gobroker-command b/lib/x2gobroker-command.pl similarity index 98% rename from lib/x2gobroker-command rename to lib/x2gobroker-command.pl index 425a5cf..ead8242 100755 --- a/lib/x2gobroker-command +++ b/lib/x2gobroker-command.pl @@ -1,4 +1,4 @@ -#!/usr/bin/suidperl -TU +#!/usr/bin/perl use strict; sub initUser diff --git a/src/x2gobroker-command.c b/src/x2gobroker-command.c new file mode 100644 index 0000000..36ba83d --- /dev/null +++ b/src/x2gobroker-command.c @@ -0,0 +1,77 @@ +/* + * This file is part of the X2Go Project - http://www.x2go.org + * Copyright (C) 2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + * + * + */ + +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <libgen.h> +#include <errno.h> + +int main( int argc, char *argv[] ) { + char * x2gobrokercmdpl = NULL; + size_t path_max; + +/* + The following snippet is taken from the realpath manpage +*/ +#ifdef PATH_MAX + path_max = PATH_MAX; +#else + path_max = pathconf (".", _PC_PATH_MAX); + if (path_max <= 0){ + path_max = 4096; + } +#endif + { + // allocate dynamic buffer in stack: this needs C99 or gnu?? + char buffer[path_max]; + ssize_t rvrl; + int rvap; + + // resolve link of /proc/self/exe to find out where we are + rvrl = readlink("/proc/self/exe", buffer, path_max); + if(rvrl == -1){ + perror("readlink(\"/proc/self/exe\",buffer,path_max)"); + exit(EXIT_FAILURE); + } + if(rvrl >= path_max){ + fprintf(stderr, "Could not resolve the path of this file using \"/proc/self/exe\". The path is too long (> %i)", path_max); + exit(EXIT_FAILURE); + } + + // derive the full path of x2gobroker-command.pl from path of this binary + rvap = asprintf(&x2gobrokercmdpl, "%s/%s", dirname(buffer), "x2gobroker-command.pl"); + if(rvap == -1){ + fprintf(stderr, "Failed to allocate memory calling asprintf\n"); + exit(EXIT_FAILURE); + } + + // execute the script, running with user-rights of this binary + execv(x2gobrokercmdpl, argv); + + } + + // ...fail + fprintf(stderr, "Failed to execute %s: %s\n", x2gobrokercmdpl, strerror(errno)); + return EXIT_FAILURE; + +} 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-7-gc6e2cc4
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, master has been updated via c6e2cc412e1906e9b1ebc986622bc666fe47cd48 (commit) from 851439d5d8a8f2235957dbf45955dc2f68c193dc (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 c6e2cc412e1906e9b1ebc986622bc666fe47cd48 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 4 19:47:33 2013 +0200 test rootless parameter override for DESKTOP sessions ----------------------------------------------------------------------- Summary of changes: x2gobroker/tests/test_broker_inifile.py | 33 +++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) The diff of changes is: diff --git a/x2gobroker/tests/test_broker_inifile.py b/x2gobroker/tests/test_broker_inifile.py index 5952f35..809dc7a 100644 --- a/x2gobroker/tests/test_broker_inifile.py +++ b/x2gobroker/tests/test_broker_inifile.py @@ -333,6 +333,39 @@ fullscreen = true list_of_profile_ids.sort() self.assertEqual(profile_ids, list_of_profile_ids) + ### TEST: list_profiles() method, check override of rootless param for DESKTOP sessions + + def test_listprofiles_rootlessoverride(self): + username = 'foo' + _session_profiles = """ +[DEFAULT] +rootless = true +command = TERMINAL + +[testprofile1] +user = + +[testprofile2] +user = +command = XFCE + +[testprofile3] +user = +command = KDE +rootless = false +""" + tf = tempfile.NamedTemporaryFile() + print >> tf, _session_profiles + tf.seek(0) + inifile_backend = inifile.X2GoBroker(profile_config_file=tf.name) + profiles = inifile_backend.list_profiles(username) + self.assertEqual(profiles['testprofile1']['command'], 'TERMINAL') + self.assertEqual(profiles['testprofile1']['rootless'], True) + self.assertEqual(profiles['testprofile2']['command'], 'XFCE') + self.assertEqual(profiles['testprofile2']['rootless'], False) + self.assertEqual(profiles['testprofile3']['command'], 'KDE') + self.assertEqual(profiles['testprofile3']['rootless'], False) + ### TEST: list_profiles() method check acl capability def test_listprofileswithacls(self): 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-8-gf51f163
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, master has been updated via f51f163d2e8ade102a8a3d7484e0abe22f2ab4f3 (commit) from c6e2cc412e1906e9b1ebc986622bc666fe47cd48 (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 f51f163d2e8ade102a8a3d7484e0abe22f2ab4f3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 4 19:52:55 2013 +0200 Add agent-quer-mode »NONE«. Disable X2Go Broker Agent calls completely. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + etc/x2gobroker.conf | 13 +++++++++---- x2gobroker/brokers/base_broker.py | 12 ++++++------ 3 files changed, 16 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 505affa..009de91 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ x2gobroker (0.0.2.3-0~x2go1) UNRELEASED; urgency=low - Handle the rootless property automatically for know-by-name desktop sessions. - Make enable-plain-output, enable-uccs-output functional. + - Add agent-quer-mode »NONE«. Disable X2Go Broker Agent calls completely. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 May 2013 17:42:12 +0200 diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf index 275a486..c98b6e1 100644 --- a/etc/x2gobroker.conf +++ b/etc/x2gobroker.conf @@ -112,16 +112,21 @@ # on the local system (mode: LOCAL) or on all X2Go Servers (mode: SSH) in a # multi-server farm. # -# So, there are two query modes for the X2GO Broker Agent: LOCAL and SSH. +# So, there are three query modes for the X2GO Broker Agent: NONE, LOCAL and +# SSH. +# +# NONE - Try to get along without X2Go Broker Agent queries. For simple +# broker setups this may suffice. For load-balancing or reliable +# session suspending and resuming the broker agent is a must!!! # # LOCAL - This LOCAL mode only works for _one_ configured multi-server farm. -# If the locally installed X2Go Session Broker is to server many -# different multi-server farms, then the LOCAL mode will not work!!! +# If this X2Go Session Broker is supposed to serve many different +# multi-server farms, then the LOCAL mode will not work!!! # # How it works: Assume that the local system has an X2Go Broker Agent # that knows about the multi-server setup. This means: X2Go Server # has to be installed locally and the X2Go Server has to be -# configured to use the multi-server farms PostgreSQL session DB +# configured to use the multi-server farm's PostgreSQL session DB # backend. # # The local system that is running the broker does not necessarily diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index efa164e..2738105 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -853,14 +853,14 @@ class X2GoBroker(object): # if we have more than one server, pick one server randomly for X2Go Broker Agent queries server_list = profile[u'host'] random.shuffle(server_list) - agent_query_mode = self.get_agent_query_mode() + agent_query_mode = self.get_agent_query_mode().upper() remote_agent = None - if agent_query_mode.upper() == u'SSH': + if agent_query_mode == u'SSH': remote_agent = self.random_remote_agent(profile_id) # detect best X2Go server for this user if load balancing is configured - if len(server_list) >= 2 and username: + if agent_query_mode != u'NONE' and len(server_list) >= 2 and username: # query remote agent for session info, if one of the server's is down, we will try the next one... busy_servers = None @@ -872,7 +872,7 @@ class X2GoBroker(object): except x2gobroker.x2gobroker_exceptions.X2GoBrokerAgentException: logger_broker.warning('base_broker.X2GoBroker.select_session(): failed to query broker agent (quey-mode: {query_mode}, remote_agent: {remote_agent})'.format(query_mode=agent_query_mode, remote_agent=remote_agent)) - if agent_query_mode.upper() == u'SSH': + if agent_query_mode == u'SSH': # mark this agent as bad exclude_agents.append(remote_agent) # also remove this agent from the list of available servers as the machine is probably down @@ -944,7 +944,7 @@ class X2GoBroker(object): } # find already running sessions and resume the first one found - if len(server_list) >= 2 and username: + if agent_query_mode != u'NONE' and len(server_list) >= 2 and username: session_list = x2gobroker.agent.list_sessions(username=username, query_mode=agent_query_mode, remote_agent=remote_agent) if session_list: @@ -972,7 +972,7 @@ class X2GoBroker(object): # session autologin feature - if self.use_session_autologin(profile_id): + if agent_query_mode != u'NONE' and self.use_session_autologin(profile_id): # FIXME: we somehow have to find out about the username of the person at the broker client-side... # using the username used for broker login for now... 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-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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits June 2013