x2go-commits June 2013

x2go-commits@lists.x2go.org

1 participants
1546 discussions

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

04 Jun '13

The branch, statusflag has been updated via 6227df06f2da16aa426ac25c7c007ec9f65a30dd (commit) from fd0cd769f9392ca232ab281fceafa28beb13ba1f (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 6227df06f2da16aa426ac25c7c007ec9f65a30dd Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jun 5 00:00:56 2013 +0200 fix x2gobroker.agent.suspend_session call ----------------------------------------------------------------------- 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 153ab70..db1ffb3 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -977,7 +977,7 @@ class X2GoBroker(object): session_info = suspended_sessions[0] else: session_info = running_sessions[0] - x2gobroker.agent.suspend_session(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) server_name = session_info.split('|')[3] # if we have an explicit IP address for server_name, let's use that instead... 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-22-gce08dfb
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag has been updated via ce08dfb62d7dc63eb9fa4def310047d9ed3b1486 (commit) from 57f6f46492bf568fbcc23c7fae84f57cff8b0971 (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 ce08dfb62d7dc63eb9fa4def310047d9ed3b1486 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 4 23:55:43 2013 +0200 add support for suspending/terminating sessions via the X2Go Session Broker ----------------------------------------------------------------------- Summary of changes: lib/x2gobroker-agent.pl | 12 ++++++++++-- x2gobroker/agent.py | 37 +++++++++++++++++++++++++++++++++++++ x2gobroker/brokers/base_broker.py | 1 + 3 files changed, 48 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl index c5310b2..79d2d1f 100755 --- a/lib/x2gobroker-agent.pl +++ b/lib/x2gobroker-agent.pl @@ -187,12 +187,20 @@ if($mode eq 'delauthkey') DelAuthKey($uid, $uidNumber, $gidNumber, $home, $pubkey, $authkeyfile); } -if($mode eq 'suspend') +if($mode eq 'suspendsession') { InitX2GoUser($uid, $uidNumber, $gidNumber, $home); print "OK\n"; my $sid=shift; - exec ("/bin/su - $uid -c \"x2gosuspend-session $sid\""); + exec ("/bin/su - $uid -c \"$(x2gopath lib)/x2gochangestatus S $sid\""); +} + +if($mode eq 'terminatesession') +{ + InitX2GoUser($uid, $uidNumber, $gidNumber, $home); + print "OK\n"; + my $sid=shift; + exec ("/bin/su - $uid -c \"$(x2gopath lib)/x2gochangestatus T $sid\""); } if($mode eq 'ping') diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index 2f2b2d2..e88c805 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -173,6 +173,43 @@ def list_sessions(username, query_mode='LOCAL', remote_agent=None): else: return call_remote_broker_agent(username, mode='listsessions', remote_agent=remote_agent) + +def suspend_session(username, session_name, query_mode='LOCAL', remote_agent=None): + """\ + Trigger a session suspensions via the X2Go Broker Agent. + + @param username: suspend the session on behalf of this username + @type username: C{unicode} + @param query_mode: query mode used when calling X2Go Broker Agent (C{LOCAL} or C{SSH}) + @type query_mode: C{unicode} + @param remote_agent: information about the remote agent that is to be called. + @type remote_agent: C{dict} + + """ + if unicode(query_mode).upper() == u'LOCAL': + return call_local_broker_agent(username, mode='suspendsession', cmdline_args=[session_name, ], ) + else: + return call_remote_broker_agent(username, mode='suspendsession', cmdline_args=[session_name, ], remote_agent=remote_agent) + + +def terminate_session(username, session_name, query_mode='LOCAL', remote_agent=None): + """\ + Trigger a session termination via the X2Go Broker Agent. + + @param username: terminate the session on behalf of this username + @type username: C{unicode} + @param query_mode: query mode used when calling X2Go Broker Agent (C{LOCAL} or C{SSH}) + @type query_mode: C{unicode} + @param remote_agent: information about the remote agent that is to be called. + @type remote_agent: C{dict} + + """ + if unicode(query_mode).upper() == u'LOCAL': + return call_local_broker_agent(username, mode='terminatesession', cmdline_args=[session_name, ], ) + else: + return call_remote_broker_agent(username, mode='terminatesession', cmdline_args=[session_name, ], remote_agent=remote_agent) + + def has_sessions(username, query_mode='LOCAL', remote_agent=None): """\ Query X2Go Broker Agent to detect running/suspended sessions on diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 52e68c6..153ab70 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -977,6 +977,7 @@ class X2GoBroker(object): session_info = suspended_sessions[0] else: session_info = running_sessions[0] + x2gobroker.agent.suspend_session(session_name=session_info.split('|')[1], query_mode=agent_query_mode) server_name = session_info.split('|')[3] # if we have an explicit IP address for server_name, let's use that instead... 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-23-gfd0cd76
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag has been updated via fd0cd769f9392ca232ab281fceafa28beb13ba1f (commit) from ce08dfb62d7dc63eb9fa4def310047d9ed3b1486 (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 fd0cd769f9392ca232ab281fceafa28beb13ba1f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 4 23:56:34 2013 +0200 the new suspend/terminate feature requires x2goserver (>= 4.0.0.3) ----------------------------------------------------------------------- Summary of changes: debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/control b/debian/control index cfe63c6..a55d7b3 100644 --- a/debian/control +++ b/debian/control @@ -194,7 +194,7 @@ Depends: python-paramiko, perl, adduser, - x2goserver, + x2goserver (>= 4.0.0.3-0~), Description: X2Go http(s) based session broker (common files) X2Go is a server based computing environment with - session resuming 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-165-gccb0ef3
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, master has been updated via ccb0ef3eb32d66055dc9af9bf2f4bad9323b0266 (commit) from 34e0dfba2da093cf5dffc501666cd6c35b859cc9 (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 ccb0ef3eb32d66055dc9af9bf2f4bad9323b0266 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 4 23:39:42 2013 +0200 Add support for terminating sessions via the session DB. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver/bin/x2goterminate-session | 1 - x2goserver/sbin/x2gocleansessions | 10 ++++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index cc9fbbe..cadc41c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -58,6 +58,7 @@ x2goserver (4.0.0.3-0~x2go1) UNRELEASED; urgency=low - Make x2gomountdirs / x2goumount-session UNC path aware. - Add support to x2gocleansessions to suspend session via state changes in the session DB. + - Add support for terminating sessions via the session DB. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 19 May 2013 15:02:53 +0200 diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session index 2570220..a4beeca 100755 --- a/x2goserver/bin/x2goterminate-session +++ b/x2goserver/bin/x2goterminate-session @@ -69,4 +69,3 @@ kill -TERM $X2GO_AGENT_PID &>/dev/null && { } - diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 76ab52b..76f3cd4 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -158,6 +158,16 @@ elsif ($pid == 0 ) syslog('debug', "@sinfo[1] was found running and has now been suspended"); } } + if (@sinfo[4]eq 'T') + { + if (!has_terminated(@sinfo[1],@sinfo[11])) + { + syslog('debug', "@sinfo[1]: unmounting all shares"); + system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); + system("su @sinfo[11] -c \"x2goterminate-session @sinfo[1] \" > /dev/null"); + syslog('debug', "@sinfo[1] has been requested for termination via the session DB"); + } + } } } } 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.0.x (branch) updated: 4.0.0.2-6-gcc0d730
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, release/4.0.0.x has been updated via cc0d73077ae178488672ae919e7225a8ac5415b1 (commit) from 1f4efc0c05a04ed91fe59d0cdf823a80cae7d003 (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 cc0d73077ae178488672ae919e7225a8ac5415b1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 4 23:39:42 2013 +0200 Add support for terminating sessions via the session DB. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver/bin/x2goterminate-session | 1 - x2goserver/sbin/x2gocleansessions | 10 ++++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4012bda..9754354 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ x2goserver (4.0.0.3-0~x2go1) UNRELEASED; urgency=low - Make x2gomountdirs / x2goumount-session UNC path aware. - Add support to x2gocleansessions to suspend session via state changes in the session DB. + - Add support for terminating sessions via the session DB. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 19 May 2013 15:02:53 +0200 diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session index 9819498..f8b3881 100755 --- a/x2goserver/bin/x2goterminate-session +++ b/x2goserver/bin/x2goterminate-session @@ -60,4 +60,3 @@ kill -TERM $X2GO_AGENT_PID &>/dev/null && { } - diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 0be7cee..d9f26a9 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -160,6 +160,16 @@ elsif ($pid == 0 ) syslog('debug', "@sinfo[1] was found running and has now been suspended"); } } + if (@sinfo[4]eq 'T') + { + if (!has_terminated(@sinfo[1],@sinfo[11])) + { + syslog('debug', "@sinfo[1]: unmounting all shares"); + system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); + system("su @sinfo[11] -c \"x2goterminate-session @sinfo[1] \" > /dev/null"); + syslog('debug', "@sinfo[1] has been requested for termination via the session DB"); + } + } } } } hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-164-g34e0dfb
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, master has been updated via 34e0dfba2da093cf5dffc501666cd6c35b859cc9 (commit) from 0e218dfba1d0d8b5a4df7bed58720d63259328d1 (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 34e0dfba2da093cf5dffc501666cd6c35b859cc9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 4 23:21:12 2013 +0200 Add support to x2gocleansessions to suspend session via state changes in the session DB. Conflicts (resolved by Mike Gabriel): debian/changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/sbin/x2gocleansessions | 44 +++++++++++++++++++++++++++++++++---- 2 files changed, 42 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 43bf919..cc9fbbe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -56,6 +56,8 @@ x2goserver (4.0.0.3-0~x2go1) UNRELEASED; urgency=low - Make pre-set DESTDIR and PREFIX traverse through all Makefiles. Do not include DESTDIR in Makefile-hard-coded path in x2gosqlitewrapper. - Make x2gomountdirs / x2goumount-session UNC path aware. + - Add support to x2gocleansessions to suspend session via state changes + in the session DB. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 19 May 2013 15:02:53 +0200 diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 1988c09..76ab52b 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -49,7 +49,20 @@ sub check_pid return 0; } -sub check_stat +sub has_terminated +{ + my $sess=shift; + my $user=shift; + my $log="/tmp/.x2go-${user}/session-C-${sess}.log"; + my $text=`tail -1 $log 2>/dev/null`; + if ($text =~ m/Session terminated/) + { + return 1; + } + return 0; +} + +sub is_suspended { my $sess=shift; my $user=shift; @@ -57,9 +70,22 @@ sub check_stat my $text=`tail -1 $log 2>/dev/null`; if ($text =~ m/Session suspended/) { - return 0; + return 1; + } + return 0; +} + +sub is_running +{ + my $sess=shift; + my $user=shift; + my $log="/tmp/.x2go-${user}/session-C-${sess}.log"; + my $text=`tail -1 $log 2>/dev/null`; + if (!is_suspended($sess, $user) && !has_terminated($sess, $user)) + { + return 1; } - return 1; + return 0; } sub catch_term @@ -114,7 +140,7 @@ elsif ($pid == 0 ) { if (@sinfo[4]eq 'R') { - if (!check_stat(@sinfo[1],@sinfo[11])) + if (is_suspended(@sinfo[1],@sinfo[11])) { system("su @sinfo[11] -c \"$x2go_lib_path/x2gochangestatus 'S' @sinfo[1] \" > /dev/null"); syslog('debug', "@sinfo[1] is suspended, changing status from @sinfo[4] to S"); @@ -122,6 +148,16 @@ elsif ($pid == 0 ) system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); } } + if (@sinfo[4]eq 'S') + { + if (is_running(@sinfo[1],@sinfo[11])) + { + syslog('debug', "@sinfo[1]: unmounting all shares"); + system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); + system("su @sinfo[11] -c \"x2gosuspend-session @sinfo[1] \" > /dev/null"); + syslog('debug', "@sinfo[1] was found running and has now been suspended"); + } + } } } } 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.0.x (branch) updated: 4.0.0.2-5-g1f4efc0
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, release/4.0.0.x has been updated via 1f4efc0c05a04ed91fe59d0cdf823a80cae7d003 (commit) from 9d05c077283673a2386d07e678d54a0057e37f73 (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 1f4efc0c05a04ed91fe59d0cdf823a80cae7d003 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed May 29 00:14:50 2013 +0200 Make x2gomountdirs / x2goumount-session UNC path aware. Conflicts (resolved by Mike Gabriel): debian/changelog x2goserver/share/x2gofeature.d/x2goserver.features ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver/bin/x2gomountdirs | 2 ++ x2goserver/bin/x2goumount-session | 13 ++++++++++--- x2goserver/share/x2gofeature.d/x2goserver.features | 1 + 4 files changed, 14 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 3648e93..4012bda 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ x2goserver (4.0.0.3-0~x2go1) UNRELEASED; urgency=low * New upstream version (4.0.0.3): - Make pre-set DESTDIR and PREFIX traverse through all Makefiles. Do not include DESTDIR in Makefile-hard-coded path in x2gosqlitewrapper. + - Make x2gomountdirs / x2goumount-session UNC path aware. - Add support to x2gocleansessions to suspend session via state changes in the session DB. diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index d151255..4c6d6b4 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -259,6 +259,7 @@ for (my $i=0;$i<@dirs;$i++) $p=~s/ /_/g; $p=~s/~_cygdrive_//; $p=~s/~_windrive_//; + $p=~s/~_uncpath_//; $p=~s/~//g; mkdir("$this_mdir/$p"); $mntpath="$this_mdir/$p"; @@ -317,6 +318,7 @@ for (my $i=0;$i<@dirs;$i++) my $p=@dirs[$i]; $p=~s/\/cygdrive\///; $p=~s/\/windrive\///; + $p=~s/\/uncpath\///; $p=~s/ /_/g; $p=~s/\//_/g; $fname="$fname/$p"; diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index 2d10c26..095fa22 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -123,19 +123,25 @@ for ($i=0;$i<@outp;$i++) { if (@line[1] ne $only_path) { - # this is for Python X2Go, the base of Windows mounted shares starts with _windrive, not _cygdrive + # this is for Python X2Go, the base of Windows mounted shares starts with _windrive or _uncpath, not _cygdrive my $only_path_windrive=$only_path; + my $only_path_uncpath=$only_path; $only_path_windrive=~ s/_cygdrive_/_windrive_/; + $only_path_uncpath=~ s/_cygdrive_/_uncpath_/; - if (@line[1] ne $only_path_windrive) + if ((@line[1] ne $only_path_windrive) && (@line[1] ne $only_path_uncpath)) { syslog('debug', "skipping non-requested path @line[1]"); goto cont; } - else + if (@line[1] e $only_path_windrive) { $only_path = $only_path_windrive; } + if (@line[1] e $only_path_uncpath) + { + $only_path = $only_path_uncpath; + } } } my $j; @@ -178,6 +184,7 @@ break: $remote=~s/\/cygdrive\///; $remote=~s/\/windrive\///; + $remote=~s/\/uncpath\///; $remote=~s/\//_/g; $remote=~s/ /_/g; $remote=~s/\\040/_/g; diff --git a/x2goserver/share/x2gofeature.d/x2goserver.features b/x2goserver/share/x2gofeature.d/x2goserver.features index 1d23695..24fd41a 100755 --- a/x2goserver/share/x2gofeature.d/x2goserver.features +++ b/x2goserver/share/x2gofeature.d/x2goserver.features @@ -36,6 +36,7 @@ case "$X2GO_FEATURE" in "X2GO_PUBLISHED_APPLICATIONS") echo "ok"; exit 0;; "X2GO_SERVERSIDE_DESKTOPCOMMANDS") echo "ok"; exit 0;; "X2GO_SET_KEYBOARD") echo "ok"; exit 0;; + "X2GO_MOUNT_UNCPATHS") echo "ok"; exit 0;; *) exit -1;; esac 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.0.x (branch) updated: 4.0.0.2-4-g9d05c07
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, release/4.0.0.x has been updated via 9d05c077283673a2386d07e678d54a0057e37f73 (commit) from 82ff682e9e52aaa158f35ec3b615580f57fd3419 (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 9d05c077283673a2386d07e678d54a0057e37f73 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 4 23:21:12 2013 +0200 Add support to x2gocleansessions to suspend session via state changes in the session DB. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/sbin/x2gocleansessions | 44 +++++++++++++++++++++++++++++++++---- 2 files changed, 42 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 56eb297..3648e93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ x2goserver (4.0.0.3-0~x2go1) UNRELEASED; urgency=low * New upstream version (4.0.0.3): - Make pre-set DESTDIR and PREFIX traverse through all Makefiles. Do not include DESTDIR in Makefile-hard-coded path in x2gosqlitewrapper. + - Add support to x2gocleansessions to suspend session via state changes + in the session DB. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 19 May 2013 15:02:53 +0200 diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 6cc0edd..0be7cee 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -51,7 +51,20 @@ sub check_pid return 0; } -sub check_stat +sub has_terminated +{ + my $sess=shift; + my $user=shift; + my $log="/tmp/.x2go-${user}/session-C-${sess}.log"; + my $text=`tail -1 $log 2>/dev/null`; + if ($text =~ m/Session terminated/) + { + return 1; + } + return 0; +} + +sub is_suspended { my $sess=shift; my $user=shift; @@ -59,9 +72,22 @@ sub check_stat my $text=`tail -1 $log 2>/dev/null`; if ($text =~ m/Session suspended/) { - return 0; + return 1; + } + return 0; +} + +sub is_running +{ + my $sess=shift; + my $user=shift; + my $log="/tmp/.x2go-${user}/session-C-${sess}.log"; + my $text=`tail -1 $log 2>/dev/null`; + if (!is_suspended($sess, $user) && !has_terminated($sess, $user)) + { + return 1; } - return 1; + return 0; } sub catch_term @@ -116,7 +142,7 @@ elsif ($pid == 0 ) { if (@sinfo[4]eq 'R') { - if (!check_stat(@sinfo[1],@sinfo[11])) + if (is_suspended(@sinfo[1],@sinfo[11])) { system("su @sinfo[11] -c \"$x2go_lib_path/x2gochangestatus 'S' @sinfo[1] \" > /dev/null"); syslog('debug', "@sinfo[1] is suspended, changing status from @sinfo[4] to S"); @@ -124,6 +150,16 @@ elsif ($pid == 0 ) system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); } } + if (@sinfo[4]eq 'S') + { + if (is_running(@sinfo[1],@sinfo[11])) + { + syslog('debug', "@sinfo[1]: unmounting all shares"); + system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); + system("su @sinfo[11] -c \"x2gosuspend-session @sinfo[1] \" > /dev/null"); + syslog('debug', "@sinfo[1] was found running and has now been suspended"); + } + } } } } hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-163-g0e218df
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, master has been updated via 0e218dfba1d0d8b5a4df7bed58720d63259328d1 (commit) from ef59c6497e89c1c82a624ff25c5da26723d8438f (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 0e218dfba1d0d8b5a4df7bed58720d63259328d1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 4 23:05:02 2013 +0200 typo fix in x2gosuspend-session comment ----------------------------------------------------------------------- Summary of changes: x2goserver/bin/x2gosuspend-session | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2goserver/bin/x2gosuspend-session b/x2goserver/bin/x2gosuspend-session index 2e6917d..fd97742 100755 --- a/x2goserver/bin/x2gosuspend-session +++ b/x2goserver/bin/x2gosuspend-session @@ -65,7 +65,7 @@ kill -HUP $X2GO_AGENT_PID &>/dev/null && { $X2GO_LIB_PATH/x2gosyslog "$0" "err" "$err_msg" # If we reach here it means that the x2goagent process of the session has vanisshed - # If this happens than we mark the session as finished... + # If this happens then we mark the session as finished... $X2GO_LIB_PATH/x2gochangestatus 'F' "$SESSION_NAME" > /dev/null # run x2goserver-extensions for fail-suspend 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.0.x (branch) updated: 4.0.0.2-3-g82ff682
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, release/4.0.0.x has been updated via 82ff682e9e52aaa158f35ec3b615580f57fd3419 (commit) from 2aabac70cc2137fe7e0377f6d2ac257841186507 (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 82ff682e9e52aaa158f35ec3b615580f57fd3419 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 4 23:05:02 2013 +0200 typo fix in x2gosuspend-session comment ----------------------------------------------------------------------- Summary of changes: x2goserver/bin/x2gosuspend-session | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2goserver/bin/x2gosuspend-session b/x2goserver/bin/x2gosuspend-session index 645c352..46b6210 100755 --- a/x2goserver/bin/x2gosuspend-session +++ b/x2goserver/bin/x2gosuspend-session @@ -56,7 +56,7 @@ kill -HUP $X2GO_AGENT_PID &>/dev/null && { $X2GO_LIB_PATH/x2gosyslog "$0" "err" "$err_msg" # If we reach here it means that the x2goagent process of the session has vanisshed - # If this happens than we mark the session as finished... + # If this happens then we mark the session as finished... $X2GO_LIB_PATH/x2gochangestatus 'F' "$SESSION_NAME" > /dev/null # run x2goserver-extensions for fail-suspend 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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits June 2013