x2go-commits September 2013

x2go-commits@lists.x2go.org

2 participants
2415 discussions

x2gobroker.git - master (branch) updated: 0.0.2.3-27-g39b8852
by git-admin＠x2go.org 25 Sep '13

25 Sep '13

The branch, master has been updated via 39b88526208c985c15e53703372223ebe09e6ff1 (commit) from a92b8af4f1d80add5363ec3ff967d916298721d4 (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 39b88526208c985c15e53703372223ebe09e6ff1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 25 09:48:16 2013 +0200 Re-order x2gobroker main file. Move logging further to the back to allow taking command-line options into account. ----------------------------------------------------------------------- Summary of changes: bin/x2gobroker | 89 +++++++++++++++++++++++++++++------------------------- debian/changelog | 2 ++ 2 files changed, 50 insertions(+), 41 deletions(-) The diff of changes is: diff --git a/bin/x2gobroker b/bin/x2gobroker index cb6062b..46c5103 100755 --- a/bin/x2gobroker +++ b/bin/x2gobroker @@ -28,6 +28,27 @@ import socket import logging import thread +def prep_http_mode(): + + global urls + global settings + + # import classes serving the different web.py URLs + import x2gobroker.web.plain + import x2gobroker.web.uccs + import x2gobroker.web.extras + + # define the web.py URLs + urls = ( ('/plain/(.*)', x2gobroker.web.plain.X2GoBrokerWeb,), + ('/uccs/[a-zA-Z]*(/*)$', x2gobroker.web.uccs.X2GoBrokerWeb,), + ('/uccs/(.*)/api/([0-9])(/*)$', x2gobroker.web.uccs.X2GoBrokerWebAPI,), + ('/pubkeys(/*)$', x2gobroker.web.extras.X2GoBrokerPubKeyService,), + ) + settings = { + 'log_function': tornado_log_request, + } + + try: import x2gobroker.defaults except ImportError: @@ -38,32 +59,10 @@ from x2gobroker import __VERSION__ from x2gobroker import __AUTHOR__ from x2gobroker.loggers import logger_broker, logger_access, logger_error, tornado_log_request -# raise log level to DEBUG if requested... -if x2gobroker.defaults.X2GOBROKER_DEBUG and not x2gobroker.defaults.X2GOBROKER_TESTSUITE: - logger_broker.setLevel(logging.DEBUG) - logger_access.setLevel(logging.DEBUG) - logger_error.setLevel(logging.DEBUG) - -logger_broker.info('X2Go Session Broker ({version}),'.format(version=__VERSION__)) -logger_broker.info(' written by {author}'.format(author=__AUTHOR__)) -logger_broker.info('Setting up the broker\'s environment...') -logger_broker.info(' X2GOBROKER_DEBUG: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_DEBUG)) -logger_broker.info(' X2GOBROKER_CONFIG: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_CONFIG)) -logger_broker.info(' X2GOBROKER_AGENT_CMD: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_AGENT_CMD)) -logger_broker.info(' X2GOBROKER_AUTHSERVICE_SOCKET: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_AUTHSERVICE_SOCKET)) -logger_broker.info(' X2GOBROKER_DEFAULT_BACKEND: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_DEFAULT_BACKEND)) -logger_broker.info(' X2GOBROKER_SSL_CERTFILE: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_SSL_CERTFILE)) -logger_broker.info(' X2GOBROKER_SSL_KEYFILE: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_SSL_KEYFILE)) - interactive_mode_warning = False # check effective UID the broker runs as and complain appropriately... if x2gobroker.defaults.X2GOBROKER_USER != x2gobroker.defaults.X2GOBROKER_DAEMON_USER and os.geteuid() != 0: interactive_mode_warning = True -elif x2gobroker.defaults.X2GOBROKER_DAEMON_USER != 'root' and os.geteuid() == 0: - logger_broker.warn('X2Go Session Broker should not be run as root,') - logger_broker.warn(' better run as user {daemon_username}.'.format(daemon_username=x2gobroker.defaults.X2GOBROKER_DAEMON_USER)) -elif os.geteuid() == 0: - logger_broker.warn('X2Go Session Broker should not be run as root, better run as non-privileged user') # parse-in potential command line options cmdline_args = None @@ -114,11 +113,12 @@ if __name__ == "__main__": elif cmdline_args.mode.upper() == 'SSH': if cmdline_args.bind: logger_broker.warn('ignoring non-valid option --bind for broker mode SSH...') if cmdline_args.profile_id and cmdline_args.task != 'selectsession': - logger_broker.warn('ignoring option --sid as it only has a meaning with ,,--task selectsession\'\'') + #logger_broker.warn('ignoring option --sid as it only has a meaning with ,,--task selectsession\'\'') + pass if cmdline_args.user is None: cmdline_args.user = os.environ['LOGNAME'] elif cmdline_args.user != x2gobroker.defaults.X2GOBROKER_DAEMON_USER: - logger_broker.warn('denying context change to user `{user}\', only allowed for magic user `{magic_user}\''.format(user=cmdline_args.user, magic_user=x2gobroker.defaults.X2GOBROKER_DAEMON_USER)) + #logger_broker.warn('denying context change to user `{user}\', only allowed for magic user `{magic_user}\''.format(user=cmdline_args.user, magic_user=x2gobroker.defaults.X2GOBROKER_DAEMON_USER)) cmdline_args.user = os.environ['LOGNAME'] if cmdline_args.task is None: print("") @@ -152,25 +152,32 @@ if __name__ == "__main__": urls = () settings = {} -def prep_http_mode(): - - global urls - global settings +# raise log level to DEBUG if requested... +if x2gobroker.defaults.X2GOBROKER_DEBUG and not x2gobroker.defaults.X2GOBROKER_TESTSUITE: + logger_broker.setLevel(logging.DEBUG) + logger_access.setLevel(logging.DEBUG) + logger_error.setLevel(logging.DEBUG) - # import classes serving the different web.py URLs - import x2gobroker.web.plain - import x2gobroker.web.uccs - import x2gobroker.web.extras +logger_broker.info('X2Go Session Broker ({version}),'.format(version=__VERSION__)) +logger_broker.info(' written by {author}'.format(author=__AUTHOR__)) +logger_broker.info('Setting up the broker\'s environment...') +logger_broker.info(' X2GOBROKER_DEBUG: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_DEBUG)) +logger_broker.info(' X2GOBROKER_CONFIG: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_CONFIG)) +logger_broker.info(' X2GOBROKER_AGENT_CMD: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_AGENT_CMD)) +logger_broker.info(' X2GOBROKER_AUTHSERVICE_SOCKET: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_AUTHSERVICE_SOCKET)) +logger_broker.info(' X2GOBROKER_DEFAULT_BACKEND: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_DEFAULT_BACKEND)) +logger_broker.info(' X2GOBROKER_SSL_CERTFILE: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_SSL_CERTFILE)) +logger_broker.info(' X2GOBROKER_SSL_KEYFILE: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_SSL_KEYFILE)) - # define the web.py URLs - urls = ( ('/plain/(.*)', x2gobroker.web.plain.X2GoBrokerWeb,), - ('/uccs/[a-zA-Z]*(/*)$', x2gobroker.web.uccs.X2GoBrokerWeb,), - ('/uccs/(.*)/api/([0-9])(/*)$', x2gobroker.web.uccs.X2GoBrokerWebAPI,), - ('/pubkeys(/*)$', x2gobroker.web.extras.X2GoBrokerPubKeyService,), - ) - settings = { - 'log_function': tornado_log_request, - } +interactive_mode_warning = False +# check effective UID the broker runs as and complain appropriately... +if x2gobroker.defaults.X2GOBROKER_USER != x2gobroker.defaults.X2GOBROKER_DAEMON_USER and os.geteuid() != 0: + interactive_mode_warning = True +elif x2gobroker.defaults.X2GOBROKER_DAEMON_USER != 'root' and os.geteuid() == 0: + logger_broker.warn('X2Go Session Broker should not be run as root,') + logger_broker.warn(' better run as user {daemon_username}.'.format(daemon_username=x2gobroker.defaults.X2GOBROKER_DAEMON_USER)) +elif os.geteuid() == 0: + logger_broker.warn('X2Go Session Broker should not be run as root, better run as non-privileged user') # run the web.py standalone daemon... if __name__ == "__main__": diff --git a/debian/changelog b/debian/changelog index 6ab85ea..37e0d60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low - When calling the agent's suspend_session function, make sure to pass on the remote_agent dictionary. - Provide empty directory /etc/x2go/broker/ssl. + - Re-order x2gobroker main file. Move logging further to the back to + allow taking command-line options into account. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. * /debian/x2gobroker-agent.dirs: 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.3-26-ga92b8af
by git-admin＠x2go.org 25 Sep '13

25 Sep '13

The branch, master has been updated via a92b8af4f1d80add5363ec3ff967d916298721d4 (commit) from ee9c899ffbca6ab0bc9fde82d30cdd4be449ac8f (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 a92b8af4f1d80add5363ec3ff967d916298721d4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 25 09:47:28 2013 +0200 /debian/x2gobroker-agent.dirs: Provide empty log file directory. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/x2gobroker-agent.dirs | 1 + 2 files changed, 3 insertions(+) create mode 100644 debian/x2gobroker-agent.dirs The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0bb6020..6ab85ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low - Provide empty directory /etc/x2go/broker/ssl. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + * /debian/x2gobroker-agent.dirs: + + Provide empty log file directory. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 07 Jun 2013 23:25:30 +0200 diff --git a/debian/x2gobroker-agent.dirs b/debian/x2gobroker-agent.dirs new file mode 100644 index 0000000..34804a2 --- /dev/null +++ b/debian/x2gobroker-agent.dirs @@ -0,0 +1 @@ +/var/log/x2gobroker \ No newline at end of file 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.3-25-gee9c899
by git-admin＠x2go.org 24 Sep '13

24 Sep '13

The branch, master has been updated via ee9c899ffbca6ab0bc9fde82d30cdd4be449ac8f (commit) from 64e8cf52fca271ad8bdccc24d858ec79d1bf7b6f (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 ee9c899ffbca6ab0bc9fde82d30cdd4be449ac8f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 24 13:02:00 2013 +0200 fix options in man page ----------------------------------------------------------------------- Summary of changes: man/man1/x2gobroker.1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/man/man1/x2gobroker.1 b/man/man1/x2gobroker.1 index 8d09fce..3e60084 100644 --- a/man/man1/x2gobroker.1 +++ b/man/man1/x2gobroker.1 @@ -30,10 +30,10 @@ See the included README and TODO for further information on \fBx2gobroker\fR. .SH GENERAL OPTIONS \fBx2gobroker\fR accepts the following common options: .TP -\*(T<\fB\-d, \-\-mode {HTTP|SSH}\fR\*(T> +\*(T<\fB\-M, \-\-mode {HTTP|SSH}\fR\*(T> Set X2Go Session Broker into HTTP or SSH mode. If this option is omitted, then SSH is the default mode.\fR. .TP -\*(T<\fB\-d, \-\-config FILENAME\fR\*(T> +\*(T<\fB\-C, \-\-config FILENAME\fR\*(T> Specify an alternative configuration file name, default is: \fI/etc/x2go/x2gobroker.conf\fR. .TP \*(T<\fB\-d, \-\-debug\fR\*(T> 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.3-24-g64e8cf5
by git-admin＠x2go.org 24 Sep '13

24 Sep '13

The branch, master has been updated via 64e8cf52fca271ad8bdccc24d858ec79d1bf7b6f (commit) from 05c5aac6426b3ff58746480f2273ac3135e39eea (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 64e8cf52fca271ad8bdccc24d858ec79d1bf7b6f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Sep 24 12:52:28 2013 +0200 Provide empty directory /etc/x2go/broker/ssl. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/x2gobroker-daemon.dirs | 1 + 2 files changed, 2 insertions(+) create mode 100644 debian/x2gobroker-daemon.dirs The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a7d89f6..0bb6020 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low X2GoBrokerAgentExceptions when pinging the remote agent. (Fixes: #306). - When calling the agent's suspend_session function, make sure to pass on the remote_agent dictionary. + - Provide empty directory /etc/x2go/broker/ssl. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. diff --git a/debian/x2gobroker-daemon.dirs b/debian/x2gobroker-daemon.dirs new file mode 100644 index 0000000..d1dc50a --- /dev/null +++ b/debian/x2gobroker-daemon.dirs @@ -0,0 +1 @@ +/etc/x2go/broker/ssl \ No newline at end of file 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.3-23-g05c5aac
by git-admin＠x2go.org 23 Sep '13

23 Sep '13

The branch, master has been updated via 05c5aac6426b3ff58746480f2273ac3135e39eea (commit) from 98a3df64e2c149490afa98293e22c3882f57b6f5 (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 05c5aac6426b3ff58746480f2273ac3135e39eea Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 23 23:06:23 2013 +0200 When calling the agent's suspend_session function, make sure to pass on the remote_agent dictionary. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2gobroker/brokers/base_broker.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1424b3f..a7d89f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low - Fix output of HTTP based connectivity test. - Do not let the broker crash if an agent is not reachable. Capture X2GoBrokerAgentExceptions when pinging the remote agent. (Fixes: #306). + - When calling the agent's suspend_session function, make sure to pass + on the remote_agent dictionary. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 7254377..5d4ada9 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -993,7 +993,7 @@ class X2GoBroker(object): session_info = suspended_sessions[0] else: session_info = running_sessions[0] - x2gobroker.agent.suspend_session(username=username, session_name=session_info.split('|')[1], query_mode=agent_query_mode) + x2gobroker.agent.suspend_session(username=username, session_name=session_info.split('|')[1], query_mode=agent_query_mode, remote_agent=remote_agent) # this is the turn-around in x2gocleansessions, so waiting as along as the daemon that will suspend the session time.sleep(2) session_info = session_info.replace('|R|', '|S|') 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

x2goserver.git - master (branch) updated: 3.1.1.3-213-ge6cdad1
by git-admin＠x2go.org 23 Sep '13

23 Sep '13

The branch, master has been updated via e6cdad130e1aebe7fa94022b3f7fe0d1cf6c4f8c (commit) from f7f414b7b87e13e89e9eb9109e00562fa6aecc86 (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 e6cdad130e1aebe7fa94022b3f7fe0d1cf6c4f8c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 23 23:02:25 2013 +0200 With PostgreSQL as session db backend, prevent the root user from launching sessions. Also, prevent x2gouser_root from being added as a PostgreSQL user. (Fixes: #310). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ x2goserver/bin/x2gostartagent | 5 +++++ x2goserver/sbin/x2godbadmin | 7 +++++-- 3 files changed, 13 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2b362eb..6a70599 100644 --- a/debian/changelog +++ b/debian/changelog @@ -70,6 +70,9 @@ x2goserver (4.0.1.7-0~x2go1) UNRELEASED; urgency=low (Fixes: #285). - Provide sudoers.d/x2goserver file that allows sudoed commands under KDE (by pertaining the env var QT_GRAPHICSSYSTEM. (Fixes: #276). + - With PostgreSQL as session db backend, prevent the root user from + launching sessions. Also, prevent x2gouser_root from being added as a + PostgreSQL user. (Fixes: #310). * /debian/control: - Update LONG_DESCRIPTIONS. - Move xfonts-base from Recommends: field to Depends: field (bin:package diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 1b3f454..607a35e 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -27,6 +27,11 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" X2GO_PORT=49 #First port for X2GO=50 SSH_PORT=30000 #First ssh port 30001 +if egrep "^backend[ ]*=[ ]*postgres" /etc/x2go/x2gosql/sql 1>/dev/null 2>/dev/null && [ "x$USER" = "xroot" ]; then + echo "The super-user \"root\" is not allowed to launch X2Go sessions." + exit -1 +fi + X2GO_ROOT="${HOME}/.x2go" export NX_ROOT=$X2GO_ROOT diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin index 5362905..4f10b02 100755 --- a/x2goserver/sbin/x2godbadmin +++ b/x2goserver/sbin/x2godbadmin @@ -308,9 +308,12 @@ sub add_user() { my $user=shift; my ($name, $pass, $uid, $pgid, $quota, $comment, $gcos, $dir, $shell, $expire) = getpwnam($user); - if (! $uid) + if (! $name) { - print "Can not find user ($user)\n"; + print "Cannot find user ($user)\n"; + return; + } elsif ($name == "root") { + print "The super-user \"root\" is not allowed to use X2Go\n"; return; } $pass=`makepasswd`; 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 - release/4.0.1.x (branch) updated: 4.0.1.6-9-g91230bd
by git-admin＠x2go.org 23 Sep '13

23 Sep '13

The branch, release/4.0.1.x has been updated via 91230bdaf3133ede8cd23612d4e6593b2c5a98cf (commit) from eff2d25a50671382d578e3fc9a9f0a1e04f75bb1 (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 91230bdaf3133ede8cd23612d4e6593b2c5a98cf Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Sep 23 23:02:25 2013 +0200 With PostgreSQL as session db backend, prevent the root user from launching sessions. Also, prevent x2gouser_root from being added as a PostgreSQL user. (Fixes: #310). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ x2goserver/bin/x2gostartagent | 5 +++++ x2goserver/sbin/x2godbadmin | 7 +++++-- 3 files changed, 13 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ae4f45c..67d32e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,9 @@ x2goserver (4.0.1.7-0~x2go1) UNRELEASED; urgency=low (Fixes: #285). - Provide sudoers.d/x2goserver file that allows sudoed commands under KDE (by pertaining the env var QT_GRAPHICSSYSTEM. (Fixes: #276). + - With PostgreSQL as session db backend, prevent the root user from + launching sessions. Also, prevent x2gouser_root from being added as a + PostgreSQL user. (Fixes: #310). * /debian/control: - Update LONG_DESCRIPTIONS. - Move xfonts-base from Recommends: field to Depends: field (bin:package diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index d25a48a..c02b7b9 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -27,6 +27,11 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" X2GO_PORT=49 #First port for X2GO=50 SSH_PORT=30000 #First ssh port 30001 +if egrep "^backend[ ]*=[ ]*postgres" /etc/x2go/x2gosql/sql 1>/dev/null 2>/dev/null && [ "x$USER" = "xroot" ]; then + echo "The super-user \"root\" is not allowed to launch X2Go sessions." + exit -1 +fi + X2GO_ROOT="${HOME}/.x2go" export NX_ROOT=$X2GO_ROOT diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin index f8eea83..00ce036 100755 --- a/x2goserver/sbin/x2godbadmin +++ b/x2goserver/sbin/x2godbadmin @@ -309,9 +309,12 @@ sub add_user() { my $user=shift; my ($name, $pass, $uid, $pgid, $quota, $comment, $gcos, $dir, $shell, $expire) = getpwnam($user); - if (! $uid) + if (! $name) { - print "Can not find user ($user)\n"; + print "Cannot find user ($user)\n"; + return; + } elsif ($name == "root") { + print "The super-user \"root\" is not allowed to use X2Go\n"; return; } $pass=`makepasswd`; 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

page changed: wiki:advanced:multi-node:x2goserver-pgsql
by wiki-admin＠x2go.org 23 Sep '13

23 Sep '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/09/23 19:22 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:23.0) Gecko/20100101 Firefox/23.0 Iceweasel/23.0 IP-Address : 217.233.231.190 Hostname : pD9E9E7BE.dip0.t-ipconnect.de Old Revision: http://wiki.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql?rev… New Revision: http://wiki.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql Edit Summary: User : sunweaver @@ -117,11 +117,13 @@ After that step users of the posix group ''x2gousers'' can create X2Go sessions. Of course, any other group could be used here, as well. ===== Database Structure and Troubleshooting ===== - In case it becomes necessary to edit the X2Go session database on the PostgreSQL server by hand, connect to the DB with this command: + In hopefully rare cases it may become necessary to fix the X2Go session database via standard PostgreSQL tools (e.g. ''psql''). This should not happen and please please please report the issue [[wiki:bugs|as a bug against the x2goserver]] X2Go component. However, if you are in the unlucky situation of having to fix up the session DB, then the below lines may render useful to you. ==== Connect to the database ==== + + In case it becomes necessary to edit the X2Go session database on the PostgreSQL server by hand, connect to the DB with this command: <code> $ psql --user x2godbuser --password -h localhost --dbname x2go_sessions </code> -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: wiki:advanced:multi-node:x2goserver-pgsql
by wiki-admin＠x2go.org 23 Sep '13

23 Sep '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/09/23 19:20 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:23.0) Gecko/20100101 Firefox/23.0 Iceweasel/23.0 IP-Address : 217.233.231.190 Hostname : pD9E9E7BE.dip0.t-ipconnect.de Old Revision: http://wiki.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql?rev… New Revision: http://wiki.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql Edit Summary: User : sunweaver @@ -114,6 +114,100 @@ $ x2godbadmin --addgroup x2gousers </code> After that step users of the posix group ''x2gousers'' can create X2Go sessions. Of course, any other group could be used here, as well. + + ===== Database Structure and Troubleshooting ===== + + In case it becomes necessary to edit the X2Go session database on the PostgreSQL server by hand, connect to the DB with this command: + + ==== Connect to the database ==== + + <code> + $ psql --user x2godbuser --password -h localhost --dbname x2go_sessions + </code> + + As password use the password found in ''/etc/x2go/x2gosql/passwords/x2goadmin''. + + + After successful login, the ''psql'' PostgreSQL client shows these lines: + + <file> + ts-01:~ # psql --user x2godbuser --password -h localhost --dbname x2go_sessions + Password for user x2godbuser: <hidden> + Welcome to psql <version>, the PostgreSQL interactive terminal. + + Type: \copyright for distribution terms + \h for help with SQL commands + \? for help with psql commands + \g or terminate with semicolon to execute query + \q to quit + + x2go_sessions=> + </file> + + ==== Database structure ==== + + The database has five tables: + + <file> + x2go_sessions=> \dt + List of relations + Schema | Name | Type | Owner + --------+---------------+-------+---------- + public | messages | table | postgres + public | mounts | table | postgres + public | sessions | table | postgres + public | used_ports | table | postgres + public | user_messages | table | postgres + (5 rows) + </file> + + Three of them are important for session management: sessions, used_ports, mounts. + + Furthermore, the database defined four views: + + <file> + x2go_sessions=> \dv + List of relations + Schema | Name | Type | Owner + --------+---------------+------+---------- + public | mounts_view | view | postgres + public | ports_view | view | postgres + public | servers_view | view | postgres + public | sessions_view | view | postgres + (4 rows) + + x2go_sessions=> + </file> + + If you want to show the content of a table or view, evoke this SQL command: + + <file> + x2go_sessions=> select * from used_ports; + server | session_id | creator_id | port + --------------+---------------------------------------+-----------------+------- + ts-01 | mike-57-1379961697_stRTERMINAL_dp24 | x2gouser_mike | 30019 + ts-01 | mike-57-1379961697_stRTERMINAL_dp24 | x2gouser_mike | 30018 + ts-01 | mike-57-1379961697_stRTERMINAL_dp24 | x2gouser_mike | 30020 + (3 rows) + </file> + + ==== Troubleshooting ==== + + If you want to remove these entries (because they are there but they by some reason should not be there), use this command set: + + <code> + x2go_sessions=> delete from used_ports where port=30020; + DELETE 1 + </code> + + ... or ... + + <code> + x2go_sessions=> delete from used_ports where session_id=mike-57-1379961697_stRTERMINAL_dp24; + DELETE 3 + </code> + + For further input on manipulating PostgreSQL database via the ''psql'' client tool, see the PostgreSQL reference. -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

x2goserver.git - build-baikal (branch) updated: 4.0.0.3-1-g38ac3f5
by git-admin＠x2go.org 23 Sep '13

23 Sep '13

The branch, build-baikal has been updated via 38ac3f57efedffcf00de618064bcc1da3169cfe7 (commit) from 8a82fe757e5b944d55441b9cf457a7879a9b4688 (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 ++++++++++ x2goserver/sbin/x2gocleansessions | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e34e253..e74feb7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +x2goserver (4.0.0.3-0~x2go2) UNRELEASED; urgency=low + + [ Jan Engelhardt ] + * New upstream version (4.0.0.4): + - Fix Perl include path for X2Go related Perl packages (which do + not get installed to some system default path for this version + of x2goserver). + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 10 Jun 2013 21:24:02 +0200 + x2goserver (4.0.0.3-0~x2go1) unstable; urgency=low * New upstream version (4.0.0.3): diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 6cc0edd..26ffb13 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -25,7 +25,7 @@ use Sys::Hostname; use Sys::Syslog qw( :standard :macros ); my $x2go_lib_path=`x2gopath libexec`; -use lib `x2gopath libexec`; +use lib `x2gopath lib`; use x2gologlevel; openlog($0,'cons,pid','user'); 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

← Newer
1
2
3
4
5
6
7
8
...
242
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits September 2013