x2go-commits January 2014

x2go-commits@lists.x2go.org

2 participants
8921 discussions

x2goserver.git - build-baikal (branch) updated: 3.0.99-1
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via 643997dc42f0d3c41b99393bd989d315febe6cd9 (commit) from 9d54d62536cb70a10e9f6705182688fc66c0f82b (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: INSTALL | 38 --- debian/docs => cd | 0 debian/changelog | 7 + debian/control | 2 +- debian/copyright | 6 +- debian/dirs | 2 + debian/{postinst.ex => postinst} | 3 + debian/{preinst => preinst.bc} | 15 +- debian/rules | 23 +- sql | 10 +- x2gochangestatus | 11 + x2gocleansessions | 4 +- x2gocreatebase.sh | 42 --- x2gocreatesession | 17 ++ x2godbadmin | 472 ++++++++++++++++++++++++++++++++ x2godbwrapper.pm | 553 ++++++++++++++++++++++++++++++++++++++ x2gogetagent | 8 + x2gogetdisplays | 9 + x2gogetports | 9 + x2gogetservers | 8 +- x2goinsertport | 14 + x2goinsertsession | 13 + x2golistsessions | 15 +- x2golistsessions_root | 2 +- x2golistsessions_sql | 21 +- x2gomountdirs | 10 +- x2gopgwrapper | 37 --- x2gopgwrapper_local | 175 ------------ x2gopgwrapper_net | 183 ------------- x2gopgwrapper_sqlite | 201 -------------- x2goresume | 11 + x2goresume-session | 8 +- x2goruncommand | 2 +- x2goshowblocks | 13 +- x2gosqlite.sh | 54 ---- x2gosqlitewrapper | 321 ++++++++++++++++++++++ x2gostartagent | 24 +- x2gosuspend-session | 7 +- x2goterminate-session | 4 +- x2goumount | 5 +- x2goumount_session | 14 +- 41 files changed, 1558 insertions(+), 815 deletions(-) delete mode 100644 INSTALL copy debian/docs => cd (100%) copy debian/{postinst.ex => postinst} (87%) mode change 100644 => 100755 rename debian/{preinst => preinst.bc} (84%) create mode 100755 x2gochangestatus delete mode 100755 x2gocreatebase.sh create mode 100755 x2gocreatesession create mode 100755 x2godbadmin create mode 100644 x2godbwrapper.pm create mode 100755 x2gogetagent create mode 100755 x2gogetdisplays create mode 100755 x2gogetports create mode 100755 x2goinsertport create mode 100755 x2goinsertsession delete mode 100755 x2gopgwrapper delete mode 100755 x2gopgwrapper_local delete mode 100755 x2gopgwrapper_net delete mode 100755 x2gopgwrapper_sqlite create mode 100755 x2goresume delete mode 100755 x2gosqlite.sh create mode 100755 x2gosqlitewrapper The diff of changes is: diff --git a/INSTALL b/INSTALL deleted file mode 100644 index 15df0dc..0000000 --- a/INSTALL +++ /dev/null @@ -1,38 +0,0 @@ -install sudo,fuse,sshfs - -use visudo and add string in sudoers: -%users ALL=(ALL) NOPASSWD: /usr/bin/x2gopgwrapper - -if you want to allow only users from group x2gousers use X2GO system, -#add group "x2gousers" -and change in sudoers %users to %x2gousers - -INSTALL server scripts: - -mkdir /etc/x2go -cp sql /etc/x2go/ -copy x2go* in any directory in $PATH -daemon x2gocleansessions - clean all finished sessions, enable it by system start - -IF YOU WANT TO USE LOCAL DATABASE: -you need to install postgresql - -echo -n local > /etc/x2go/sql - -use x2gocreatebase.sh to create database for x2go - -IF YOU WANT TO USE REMOTE DATABASE: -echo -n "sqlserver address" > /etc/x2go/sql - -you need to creata DSA key for ssh connection with database server -mkdirhier /root/.x2go/ssh/.pg/ -ssh-keygen -t dsa -f /root/.x2go/ssh/.pg/id_dsa -press "Enter" for empty passphrase - -copy public part "/root/.x2go/ssh/.pg/id_dsa.pub" on computer with running sql server -(for example with scp) -and add it to ~postgres/.ssh/authorized_keys -cat id_dsa.pub >> ~postgres/.ssh/authorized_keys - -IF YOU WANT TO USE SQLITE -echo -n sqlite > /etc/x2go/sql diff --git a/debian/docs b/cd similarity index 100% copy from debian/docs copy to cd diff --git a/debian/changelog b/debian/changelog index 7e4db68..fdb9d32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +x2goserver (3.0.99-1) unstable; urgency=low + + * not use sudo with postgresql, wrappers in perl instead of bash + * use unprivileged user x2gouser with sqlite + + -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Tue, 25 Jan 2011 17:09:01 +0100 + x2goserver (3.0.1-9) unstable; urgency=low * changes in x2gomountdir to use with plasmoid diff --git a/debian/control b/debian/control index b0e9cce..db467de 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.7.2 Package: x2goserver Architecture: all -Depends: x2goagent, sudo, lsof, openssh-client, openssh-server, libconfig-simple-perl +Depends: x2goagent, sudo, lsof, openssh-client, openssh-server, libconfig-simple-perl, makepasswd, libdbd-pg-perl, libdbd-sqlite3-perl Recommends: sshfs Description: x2goserver (daemon and tools) x2go is a serverbased computing environment with diff --git a/debian/copyright b/debian/copyright index 4a7fdf6..487b08b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,7 +5,7 @@ It was downloaded from www.obviously-nice.de Upstream Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -Copyright (C) 2007 obviously nice - http://www.obviouslynice.de +Copyright (C) 2007-2011 obviously nice - http://www.obviouslynice.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 @@ -22,7 +22,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -Copyright (C) 2007 Oleksandr Shneyder +Copyright (C) 2007-2011 Oleksandr Shneyder oleksandr.shneyder(a)obviously-nice.de On Debian systems, the complete text of the GNU General @@ -30,6 +30,6 @@ Public License can be found in `/usr/share/common-licenses/GPL'. -The Debian packaging is (C) 2007, Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> and +The Debian packaging is (C) 2007-2011, Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> and is licensed under the GPL, see above. diff --git a/debian/dirs b/debian/dirs index f2b2ebc..8d37723 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1,5 +1,7 @@ usr/bin usr/sbin etc/x2go +etc/x2go/x2gosql +etc/x2go/x2gosql/passwords usr/lib/x2go/script var/db/x2go \ No newline at end of file diff --git a/debian/postinst.ex b/debian/postinst old mode 100644 new mode 100755 similarity index 87% copy from debian/postinst.ex copy to debian/postinst index 5a6a780..67086e0 --- a/debian/postinst.ex +++ b/debian/postinst @@ -20,6 +20,9 @@ set -e case "$1" in configure) + chmod 700 /etc/x2go/x2gosql/passwords + touch /etc/x2go/x2gosql/passwords/pgadmin + chmod 600 /etc/x2go/x2gosql/passwords/pgadmin ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/preinst b/debian/preinst.bc similarity index 84% rename from debian/preinst rename to debian/preinst.bc index 1f73c6b..054e1f1 100755 --- a/debian/preinst +++ b/debian/preinst.bc @@ -66,16 +66,13 @@ Press Enter to continue addgroup --system x2gousers fi - SUDOCONF=`cat /etc/sudoers | grep x2gopgwrapper | grep x2gousers` - if [ "$SUDOCONF" == "" ] - then - echo " -#### X2GO section -%x2gousers ALL=(ALL) NOPASSWD: /usr/bin/x2gopgwrapper -" >> /etc/sudoers + X2GOUSR=`getent passwd | grep x2gouser` + + if [ "$X2GOUSR" == "" ] + then + useradd -r -d /var/db/x2go/ x2gouser fi - - echo "Attention: If you want to allow users to log into the x2go system, you'll need to add them to the \"x2gousers\" group" + ;; abort-upgrade) diff --git a/debian/rules b/debian/rules index 983e78f..ac4ff98 100755 --- a/debian/rules +++ b/debian/rules @@ -54,20 +54,25 @@ install: build dh_installdirs # Add here commands to install the package into debian/x2goserver. + install x2gochangestatus $(CURDIR)/debian/x2goserver/usr/bin/ install x2gocmdexitmessage $(CURDIR)/debian/x2goserver/usr/bin/ + install x2gocreatesession $(CURDIR)/debian/x2goserver/usr/bin/ + install x2gogetagent $(CURDIR)/debian/x2goserver/usr/bin/ + install x2gogetdisplays $(CURDIR)/debian/x2goserver/usr/bin/ + install x2gogetports $(CURDIR)/debian/x2goserver/usr/bin/ install x2gogetservers $(CURDIR)/debian/x2goserver/usr/bin/ + install x2goinsertport $(CURDIR)/debian/x2goserver/usr/bin/ + install x2goinsertsession $(CURDIR)/debian/x2goserver/usr/bin/ install x2golistsessions $(CURDIR)/debian/x2goserver/usr/bin/ install x2golistdesktops $(CURDIR)/debian/x2goserver/usr/bin/ install x2golistsessions_root $(CURDIR)/debian/x2goserver/usr/bin/ install x2golistsessions_sql $(CURDIR)/debian/x2goserver/usr/bin/ install x2gomountdirs $(CURDIR)/debian/x2goserver/usr/bin/ - install x2gopgwrapper $(CURDIR)/debian/x2goserver/usr/bin/ - install x2gopgwrapper_local $(CURDIR)/debian/x2goserver/usr/bin/ - install x2gopgwrapper_sqlite $(CURDIR)/debian/x2goserver/usr/bin/ - install x2gopgwrapper_net $(CURDIR)/debian/x2goserver/usr/bin/ + install x2goresume $(CURDIR)/debian/x2goserver/usr/bin/ install x2goresume-session $(CURDIR)/debian/x2goserver/usr/bin/ install x2goruncommand $(CURDIR)/debian/x2goserver/usr/bin/ install x2goshowblocks $(CURDIR)/debian/x2goserver/usr/bin/ + install x2gosqlitewrapper $(CURDIR)/debian/x2goserver/usr/bin/ install x2gostartagent $(CURDIR)/debian/x2goserver/usr/bin/ install x2gosuspend-session $(CURDIR)/debian/x2goserver/usr/bin/ install x2gosuspend-agent $(CURDIR)/debian/x2goserver/usr/bin/ @@ -76,11 +81,15 @@ install: build install x2goumount $(CURDIR)/debian/x2goserver/usr/bin/ install x2goumount_session $(CURDIR)/debian/x2goserver/usr/bin/ install x2gosessionlimit $(CURDIR)/debian/x2goserver/usr/bin/ - cp sql $(CURDIR)/debian/x2goserver/etc/x2go/ + + + + + cp sql $(CURDIR)/debian/x2goserver/etc/x2go/x2gosql/ cp x2goserver.conf $(CURDIR)/debian/x2goserver/etc/x2go/ + cp x2godbwrapper.pm $(CURDIR)/debian/x2goserver/usr/lib/x2go/ install x2gocleansessions $(CURDIR)/debian/x2goserver/usr/sbin/ - install x2gocreatebase.sh $(CURDIR)/debian/x2goserver/usr/lib/x2go/script - install x2gosqlite.sh $(CURDIR)/debian/x2goserver/usr/lib/x2go/script + install x2godbadmin $(CURDIR)/debian/x2goserver/usr/lib/x2go/script diff --git a/sql b/sql index c2c027f..dfbfca0 100644 --- a/sql +++ b/sql @@ -1 +1,9 @@ -local \ No newline at end of file +#postgres or sqlite +backend=postgres + +[postgres] +host=localhost +port=5432 +#database admin (must have permissions to create databases and users) +dbadmin=postgres + diff --git a/x2gochangestatus b/x2gochangestatus new file mode 100755 index 0000000..f7ecfe9 --- /dev/null +++ b/x2gochangestatus @@ -0,0 +1,11 @@ +#!/usr/bin/perl +use strict; + + +use lib "/usr/lib/x2go"; +use x2godbwrapper; + +my $status=shift or die; +my $sid=shift or die; + +db_changestatus($status, $sid); diff --git a/x2gocleansessions b/x2gocleansessions index 52ee57d..373326d 100755 --- a/x2gocleansessions +++ b/x2gocleansessions @@ -82,7 +82,7 @@ elsif ($pid == 0 ) } elsif(! check_pid (@sinfo[0],@sinfo[1],@sinfo[12])) { - system("su @sinfo[11] -c \"sudo x2gopgwrapper changestatus 'F' @sinfo[1] \" > /dev/null"); + system("su @sinfo[11] -c \"x2gochangestatus 'F' @sinfo[1] \" > /dev/null"); #print "@sinfo[1], pid @sinfo[0] not exist, changing status from @sinfo[4] to F\n"; #print "(@sinfo[1])Unmounting all shares\n"; system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount_session @sinfo[1]\" 2> /dev/null"); @@ -93,7 +93,7 @@ elsif ($pid == 0 ) { if(!check_stat(@sinfo[1],@sinfo[11])) { - system("su @sinfo[11] -c \"sudo x2gopgwrapper changestatus 'S' @sinfo[1] \" > /dev/null"); + system("su @sinfo[11] -c \"x2gochangestatus 'S' @sinfo[1] \" > /dev/null"); #print "@sinfo[1], is suspended, changing status from @sinfo[4] to S\n"; #print "(@sinfo[1])Unmounting all shares\n"; system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount_session @sinfo[1]\" 2> /dev/null"); diff --git a/x2gocreatebase.sh b/x2gocreatebase.sh deleted file mode 100755 index 6bb025d..0000000 --- a/x2gocreatebase.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -su postgres -c "dropdb x2go_sessions" -su postgres -c "createdb x2go_sessions" -su postgres -c "echo \"create table sessions( - session_id varchar(500) primary key, - display integer not null, - uname varchar(100) not null, - server varchar(100) not null, - client inet, - status char(1) not null default 'R', - init_time timestamp not null default now(), - last_time timestamp not null default now(), - cookie char(33), - agent_pid int, - gr_port int, - sound_port int, - fs_port int, - unique(display) - )\" | psql x2go_sessions" - -su postgres -c "echo \"create table messages(mess_id varchar(20) primary key, message text)\" | psql x2go_sessions" - -su postgres -c "echo \"create table user_messages( - mess_id varchar(20) not null, - uname varchar(100) not null - )\" | psql x2go_sessions" - -su postgres -c "echo \"create table used_ports( - server varchar(100) not null, - session_id varchar(500) references sessions on delete cascade, - port integer primary key - )\" | psql x2go_sessions" - -su postgres -c "echo \"create table mounts( - session_id varchar(500) references sessions on delete restrict, - path varchar(512) not null, - client inet not null, - primary key(path,client) - )\" | psql x2go_sessions" - - diff --git a/x2gocreatesession b/x2gocreatesession new file mode 100755 index 0000000..7776e6e --- /dev/null +++ b/x2gocreatesession @@ -0,0 +1,17 @@ +#!/usr/bin/perl +use strict; + + +use lib "/usr/lib/x2go"; +use x2godbwrapper; + + +my $cookie=shift or die; +my $pid=shift or die; +my $client=shift or die; +my $gr_port=shift or die; +my $snd_port=shift or die; +my $fs_port=shift or die; +my $sid=shift or die; + +db_createsession($cookie,$pid,$client,$gr_port, $snd_port, $fs_port, $sid); diff --git a/x2godbadmin b/x2godbadmin new file mode 100755 index 0000000..6a93e05 --- /dev/null +++ b/x2godbadmin @@ -0,0 +1,472 @@ +#!/usr/bin/perl + +use strict; + +use Getopt::Long; +use Config::Simple; +use DBI; + + +sub show_usage() +{ + print "X2Go SQL admin interface. Use it to create x2go database and insert or remove users or groups in x2go database\n". + "Usage:\nx2godbadmin --createdb\n". + "x2godbadmin --listusers\n". + "x2godbadmin --adduser|rmuser <UNIX user>\n". + "x2godbadmin --addgroup|rmgroup <UNIX group>\n"; +} + +my $help=''; +my $createdb=''; +my $adduser=''; +my $rmuser=''; +my $addgroup=''; +my $rmgroup=''; +my $listusers=''; + +GetOptions('listusers' => \$listusers, 'createdb' => \$createdb, 'help' => \$help, 'adduser=s' => \$adduser, + 'addgroup=s' => \$addgroup, 'rmuser=s' => \$rmuser, 'rmgroup=s' => \$rmgroup); + +if ($help || ! ( $createdb || $adduser || $rmuser || $addgroup || $rmgroup || $listusers)) +{ + show_usage(); + exit(0); +} + + +my $Config = new Config::Simple(syntax=>'ini'); +$Config->read('/etc/x2go/x2gosql/sql' ) or die "Can't read config file /etc/x2go/x2gosql/sql"; +if($Config->param("backend") eq 'sqlite') +{ + my $user="x2gouser"; + my ($name, $pass, $uid, $pgid, $quota, $comment, $gcos, $dir, $shell, $expire) = getpwnam($user); + my $dbfile="$dir/x2go_sessions"; + + if(! $uid) + { + print "Can not find user ($user)\n"; + exit(-1); + } + + + + if($listusers|| $adduser||$addgroup||$rmuser||$rmgroup) + { + print "Only \"--createdb\" option is available with sqlite backend\n"; + exit(0); + } + if($createdb) + { + if (! -d "$dir" ) + { + mkdir("$dir"); + } + if( -e $dbfile) + { + unlink($dbfile); + } + my $dbh=DBI->connect( + "dbi:SQLite:dbname=$dbfile","","",{AutoCommit => 1}) or die $_; + + my $sth=$dbh->prepare("create table sessions( + session_id varchar(500) primary key, + display integer not null, + uname varchar(100) not null, + server varchar(100) not null, + client inet, + status char(1) not null default 'R', + init_time timestamp not null default CURRENT_TIMESTAMP, + last_time timestamp not null default CURRENT_TIMESTAMP, + cookie char(33), + agent_pid int, + gr_port int, + sound_port int, + fs_port int, + unique(display))"); + $sth->execute() or die; + + my $sth=$dbh->prepare("create table messages(mess_id varchar(20) primary key, message text)"); + $sth->execute() or die; + + my $sth=$dbh->prepare("create table user_messages( + mess_id varchar(20) not null, + uname varchar(100) not null)"); + $sth->execute() or die; + + my $sth=$dbh->prepare("create table used_ports( + server varchar(100) not null, + session_id varchar(500) references sessions on delete cascade, + port integer primary key)"); + $sth->execute() or die; + + my $sth=$dbh->prepare("create table mounts( + session_id varchar(500) references sessions on delete restrict, + path varchar(512) not null, + client inet not null, + primary key(path,client))"); + $sth->execute() or die; + + my $sth=$dbh->prepare("CREATE TRIGGER fkd_mounts_session_id + BEFORE DELETE ON sessions + FOR EACH ROW BEGIN + SELECT CASE + WHEN ((SELECT session_id FROM mounts WHERE session_id = OLD.session_id) IS NOT NULL) + THEN RAISE(ABORT, 'delete on table \"sessions\" violates foreign key on table \"mounts\"') + END; + END;"); + $sth->execute() or die; + + my $sth=$dbh->prepare("CREATE TRIGGER fkd_ports_session_id + BEFORE DELETE ON sessions + FOR EACH ROW + BEGIN + DELETE FROM used_ports WHERE session_id = OLD.session_id; + END; + END;"); + $sth->execute() or die; + + $sth->finish(); + $dbh->disconnect(); + chmod(0700,"$dir"); + chown($uid,$pgid,"$dir"); + chmod(0600,"$dbfile"); + chown($uid,$pgid,"$dbfile"); + + exit(0); + } +} + + my $host=$Config->param("postgres.host"); + my $port=$Config->param("postgres.port"); + my $dbadmin=$Config->param("postgres.dbadmin"); + my $x2goadmin="x2godbuser"; + my $x2goadminpass=`makepasswd`; + chomp($x2goadminpass); + my $db="x2go_sessions"; + + if(!$host) + { + $host='localhost'; + } + if(!$port) + { + $port='5432'; + } + if(!$dbadmin) + { + $dbadmin='postgres'; + } + + open (FL,"< /etc/x2go/x2gosql/passwords/pgadmin ") or die "Can't read password file /etc/x2go/x2gosql/passwords/pgadmin"; + my $dbadminpass=<FL>; + close(FL); + chomp($dbadminpass); + + my $dbh; + if($createdb) + { + $dbh=DBI->connect("dbi:Pg:;host=$host;port=$port;", "$dbadmin", "$dbadminpass",{AutoCommit => 1}) or die $_; + create_database(); + $dbh->disconnect(); + $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;", "$dbadmin", "$dbadminpass",{AutoCommit => 1}) or die $_; + create_tables(); + $dbh->disconnect(); + exit(0); + } + + if($listusers) + { + $dbh=DBI->connect("dbi:Pg:;host=$host;port=$port;", "$dbadmin", "$dbadminpass",{AutoCommit => 1}) or die $_; + list_users(); + $dbh->disconnect(); + exit(0); + } + + $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;", "$dbadmin", "$dbadminpass",{AutoCommit => 1}) or die $_; + if($adduser) + { + add_user($adduser); + } + + if($addgroup) + { + my ($name, $passwd, $gid, $members) = getgrnam( $addgroup); + my @grp_members=split(' ',$members); + foreach (@grp_members) + { + chomp($_); + add_user($_); + } + } + + if($rmuser) + { + rm_user($rmuser); + } + + if($rmgroup) + { + my ($name, $passwd, $gid, $members) = getgrnam( $rmgroup); + my @grp_members=split(' ',$members); + foreach (@grp_members) + { + chomp($_); + rm_user($_); + } + } + $dbh->disconnect(); + +sub list_users() +{ + my $sth=$dbh->prepare("select rolname from pg_roles where rolname like 'x2gouser_%'"); + $sth->execute()or die; + printf ("%-20s DB user\n","UNIX user"); + print "---------------------------------------\n"; + my @data; + while (@data = $sth->fetchrow_array) + { + @data[0]=~s/x2gouser_//; + printf ("%-20s x2gouser_@data[0]\n",@data[0]); + } + $sth->finish(); +} + +sub rm_user() +{ + my $user=shift; + + print ("rm DB user x2gouser_$user\n"); + + my $sth=$dbh->prepare("DROP OWNED BY x2gouser_$user"); + $sth->execute(); + + my $sth=$dbh->prepare("drop USER if exists x2gouser_$user"); + $sth->execute(); + $sth->finish(); + + my ($name, $pass, $uid, $pgid, $quota, $comment, $gcos, $dir, $shell, $expire) = getpwnam($user); + if(! $uid) + { + return; + } + if ( -e "$dir/.x2go/sqlpass" ) + { + unlink("$dir/.x2go/sqlpass"); + } +} + + +sub add_user() +{ + my $user=shift; + my ($name, $pass, $uid, $pgid, $quota, $comment, $gcos, $dir, $shell, $expire) = getpwnam($user); + if(! $uid) + { + print "Can not find user ($user)\n"; + return; + } + $pass=`makepasswd`; + chomp($pass); + + my $sth=$dbh->prepare("DROP OWNED BY x2gouser_$user"); + $sth->{Warn}=0; + $sth->{PrintError}=0; + $sth->execute(); + + $sth=$dbh->prepare("drop USER if exists x2gouser_$user"); + $sth->{Warn}=0; + $sth->{PrintError}=0; + $sth->execute(); + + print ("create DB user x2gouser_$user\n"); + $sth=$dbh->prepare("create USER x2gouser_$user WITH ENCRYPTED PASSWORD '$pass'"); + $sth->execute(); + + $sth=$dbh->prepare("GRANT INSERT, UPDATE, DELETE ON sessions, used_ports, mounts TO x2gouser_$user"); + $sth->execute(); + + $sth=$dbh->prepare("GRANT SELECT, UPDATE, DELETE ON sessions_view, mounts_view, servers_view, ports_view TO x2gouser_$user"); + $sth->execute(); + $sth->finish(); + + if (! -d "$dir/.x2go" ) + { + mkdir("$dir/.x2go"); + } + #save user password + open (FL,"> $dir/.x2go/sqlpass") or die "Can't open password file $dir/.x2go/sqlpass"; + print FL $pass; + close(FL); + chmod(0700,"$dir/.x2go"); + chown($uid,$pgid,"$dir/.x2go"); + chmod(0600,"$dir/.x2go/sqlpass"); + chown($uid,$pgid,"$dir/.x2go/sqlpass"); +} + +sub create_tables() +{ + my $sth=$dbh->prepare(" + create table sessions( + session_id text primary key, + display integer not null, + uname text not null, + server text not null, + client inet, + status char(1) not null default 'R', + init_time timestamp not null default now(), + last_time timestamp not null default now(), + cookie char(33), + agent_pid int, + gr_port int, + sound_port int, + fs_port int, + creator_id text NOT NULL default current_user, + unique(display)) + "); + $sth->execute() or die; + + $sth=$dbh->prepare(" + create VIEW sessions_view as + SELECT + agent_pid, session_id, display, server, status, init_time, cookie, client, gr_port, + sound_port, last_time, uname, fs_port from sessions + where creator_id = current_user"); + $sth->execute() or die; + + $sth=$dbh->prepare(" + create VIEW servers_view as + SELECT + server, display, status from sessions"); + $sth->execute() or die; + + + + $sth=$dbh->prepare("create or replace RULE update_sess_priv AS ON UPDATE + TO sessions where (OLD.creator_id <> current_user or OLD.creator_id <> NEW.creator_id) and current_user <> '$x2goadmin' + DO INSTEAD NOTHING"); + $sth->execute() or die; + + $sth=$dbh->prepare("create or replace RULE insert_sess_priv AS ON INSERT + TO sessions where NEW.creator_id <> current_user and current_user <> '$x2goadmin' + DO INSTEAD NOTHING"); + $sth->execute() or die; + + $sth=$dbh->prepare("create or replace RULE delete_sess_priv AS ON DELETE + TO sessions where OLD.creator_id <> current_user and current_user <> '$x2goadmin' + DO INSTEAD NOTHING"); + $sth->execute() or die; + + $sth=$dbh->prepare("create or replace RULE update_sess_view AS ON UPDATE + TO sessions_view DO INSTEAD + update sessions set + status=NEW.status, + last_time=NEW.last_time, + cookie=NEW.cookie, + agent_pid=NEW.agent_pid, + client=NEW.client, + gr_port=NEW.gr_port, + sound_port=NEW.sound_port, + fs_port=NEW.fs_port + where session_id=OLD.session_id and creator_id=current_user"); + $sth->execute() or die; + + $sth=$dbh->prepare("create table messages(mess_id varchar(20) primary key, message text)"); + $sth->execute() or die; + + $sth=$dbh->prepare("create table user_messages( + mess_id text not null, + uname text not null)"); + $sth->execute() or die; + + $sth=$dbh->prepare("create table used_ports( + server text not null, + session_id text references sessions on delete cascade, + creator_id text NOT NULL default current_user, + port integer primary key)"); + $sth->execute() or die; + + $sth=$dbh->prepare(" + create VIEW ports_view as + SELECT + server, port from used_ports"); + $sth->execute() or die; + + + $sth=$dbh->prepare("create or replace RULE insert_port_priv AS ON INSERT + TO used_ports where NEW.creator_id <> current_user and current_user <> '$x2goadmin' + DO INSTEAD NOTHING"); + $sth->execute() or die; + + $sth=$dbh->prepare("create or replace RULE update_port_priv AS ON UPDATE + TO used_ports where (NEW.creator_id <> current_user or OLD.creator_id <> current_user) and current_user <> '$x2goadmin' + DO INSTEAD NOTHING"); + $sth->execute() or die; + + $sth=$dbh->prepare("create or replace RULE delete_port_priv AS ON DELETE + TO used_ports where OLD.creator_id <> current_user and current_user <> '$x2goadmin' + DO INSTEAD NOTHING "); + $sth->execute() or die; + + $sth=$dbh->prepare("create table mounts( + session_id text references sessions on delete restrict, + path text not null, + client inet not null, + creator_id text NOT NULL default current_user, + primary key(path,client))"); + $sth->execute() or die; + + + $sth=$dbh->prepare(" + create VIEW mounts_view as + SELECT + client,path, session_id from mounts + where creator_id = current_user"); + $sth->execute() or die; + + $sth=$dbh->prepare("create or replace RULE delete_mounts_view AS ON DELETE + TO mounts_view DO INSTEAD + delete from mounts + where session_id=OLD.session_id and creator_id=current_user and path=OLD.path"); + $sth->execute() or die; + + + $sth=$dbh->prepare("create or replace RULE insert_mount_priv AS ON INSERT + TO mounts where NEW.creator_id <> current_user and current_user <> '$x2goadmin' + DO INSTEAD NOTHING"); + $sth->execute() or die; + + $sth=$dbh->prepare(" create or replace RULE update_mount_priv AS ON UPDATE + TO mounts where (NEW.creator_id <> current_user or OLD.creator_id <> current_user) and current_user <> '$x2goadmin' + DO INSTEAD NOTHING"); + $sth->execute() or die; + + $sth=$dbh->prepare(" create or replace RULE delete_mount_priv AS ON DELETE + TO mounts where OLD.creator_id <> current_user and current_user <> '$x2goadmin' + DO INSTEAD NOTHING"); + $sth->execute() or die; + + $sth=$dbh->prepare("GRANT ALL PRIVILEGES ON sessions, messages, user_messages, used_ports, mounts TO $x2goadmin"); + $sth->execute() or die; + $sth->finish(); +} + +sub create_database +{ + #drop db if exists + my $sth=$dbh->prepare("drop database if exists x2go_sessions"); + $sth->execute(); + #drop x2goadmin + $sth=$dbh->prepare("drop user if exists $x2goadmin"); + $sth->execute(); + #create db + $sth=$dbh->prepare("create database $db"); + $sth->execute() or die; + #create x2goadmin + $sth=$dbh->prepare("create USER $x2goadmin WITH ENCRYPTED PASSWORD '$x2goadminpass'"); + $sth->execute() or die; + #save x2goadmin password + open (FL,"> /etc/x2go/x2gosql/passwords/x2goadmin ") or die "Can't write password file /etc/x2go/x2gosql/passwords/x2goadmin"; + print FL $x2goadminpass; + close(FL); + $sth->finish(); +} \ No newline at end of file diff --git a/x2godbwrapper.pm b/x2godbwrapper.pm new file mode 100644 index 0000000..3d78b4b --- /dev/null +++ b/x2godbwrapper.pm @@ -0,0 +1,553 @@ +package x2godbwrapper; + +use strict; +use Config::Simple; +use DBI; + +use POSIX; + +use lib "/usr/lib/x2go"; +use x2godbwrapper; + +my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid(getuid()); + +my $Config = new Config::Simple(syntax=>'ini'); +$Config->read('/etc/x2go/x2gosql/sql' ) or die "Can't read config file /etc/x2go/x2gosql/sql"; +my $backend=$Config->param("backend"); + +my $host; +my $port; +my $db="x2go_sessions"; +my $dbpass; +my $dbuser; + + +if($backend ne 'postgres' && $backend ne 'sqlite') +{ + die "unknown backend $backend"; +} + +if($backend eq 'postgres') +{ + $host=$Config->param("postgres.host"); + $port=$Config->param("postgres.port"); + if(!$host) + { + $host='localhost'; + } + if(!$port) + { + $port='5432'; + } + my $passfile; + if($uname eq 'root') + { + $dbuser='x2godbuser'; + $passfile="/etc/x2go/x2gosql/passwords/x2goadmin"; + } + else + { + $dbuser="x2gouser_$uname"; + $passfile="$homedir/.x2go/sqlpass"; + } + + open (FL,"< $passfile") or die "Can't read password file $passfile<br><b>Use x2godbadmin on server to configure database access for user $uname</b><br>"; + $dbpass=<FL>; + close(FL); + chomp($dbpass); +} + +use base 'Exporter'; + +our @EXPORT=('db_listsessions','db_listsessions_all', 'db_getservers', 'db_getagent', 'db_resume', 'db_changestatus', + 'db_getdisplays', 'db_insertsession', 'db_getports', 'db_insertport', 'db_createsession', 'db_insertmount', + 'db_getmounts', 'db_deletemount', 'db_getdisplay', 'dbsys_getmounts', 'dbsys_listsessionsroot', + 'dbsys_listsessionsroot_all', 'dbsys_rmsessionsroot'); + + + + + +sub dbsys_rmsessionsroot +{ + my $sid=shift or die "argument \"session_id\" missed"; + if($backend eq 'postgres') + { + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + + my $sth=$dbh->prepare("delete from sessions where session_id='$sid'"); + $sth->execute()or die; + } + if($backend eq 'sqlite') + { + `sudo -u x2gouser x2gosqlitewrapper rmsessionsroot $sid`; + } +} + +sub dbsys_listsessionsroot +{ + my $server=shift or die "argument \"server\" missed"; + if($backend eq 'postgres') + { + my @strings; + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + + my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, + to_char(init_time,'DD.MM.YY*HH24:MI:SS'),cookie,client,gr_port, + sound_port,to_char(last_time,'DD.MM.YY*HH24:MI:SS'),uname, + to_char(now()-init_time,'SSSS'),fs_port from sessions + where server='$server' order by status desc"); + $sth->execute()or die; + my @data; + my $i=0; + while (@data = $sth->fetchrow_array) + { + @strings[$i++]=join('|',@data); + } + $sth->finish(); + $dbh->disconnect(); + return @strings; + } + if($backend eq 'sqlite') + { + return split("\n",`sudo -u x2gouser x2gosqlitewrapper listsessionsroot $server`); + } +} + +sub dbsys_listsessionsroot_all +{ + if($backend eq 'postgres') + { + my @strings; + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + + my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, + to_char(init_time,'DD.MM.YY*HH24:MI:SS'),cookie,client,gr_port, + sound_port,to_char(last_time,'DD.MM.YY*HH24:MI:SS'),uname, + to_char(now()-init_time,'SSSS'),fs_port from sessions + order by status desc"); + $sth->execute()or die; + my @data; + my $i=0; + while (@data = $sth->fetchrow_array) + { + @strings[$i++]=join('|',@data); + } + $sth->finish(); + $dbh->disconnect(); + return @strings; + } + if($backend eq 'sqlite') + { + return split("\n",`sudo -u x2gouser x2gosqlitewrapper listsessionsroot_all`); + } +} + + +sub dbsys_getmounts +{ + my $sid=shift or die "argument \"session_id\" missed"; + if($backend eq 'postgres') + { + my @strings; + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $sth=$dbh->prepare("select client, path from mounts where session_id='$sid'"); + $sth->execute()or die; + my @data; + my $i=0; + while (@data = $sth->fetchrow_array) + { + @strings[$i++]=join("|",@data); + } + $sth->finish(); + $dbh->disconnect(); + return @strings; + } + if($backend eq 'sqlite') + { + return split("\n",`sudo -u x2gouser x2gosqlitewrapper getmounts $sid`); + } + +} + +sub db_getmounts +{ + my $sid=shift or die "argument \"session_id\" missed"; + if($backend eq 'postgres') + { + my @strings; + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $sth=$dbh->prepare("select client, path from mounts_view where session_id='$sid'"); + $sth->execute()or die; + my @data; + my $i=0; + while (@data = $sth->fetchrow_array) + { + @strings[$i++]=join("|",@data); + } + $sth->finish(); + $dbh->disconnect(); + return @strings; + } + if($backend eq 'sqlite') + { + return split("\n",`sudo -u x2gouser x2gosqlitewrapper getmounts $sid`); + } +} + +sub db_deletemount +{ + my $sid=shift or die "argument \"session_id\" missed"; + my $path=shift or die "argument \"path\" missed"; + if($backend eq 'postgres') + { + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $sth=$dbh->prepare("delete from mounts_view where session_id='$sid' and path='$path'"); + $sth->execute(); + $sth->finish(); + $dbh->disconnect(); + } + if($backend eq 'sqlite') + { + `sudo -u x2gouser x2gosqlitewrapper deletemount $sid \"$path\"`; + } + +} + +sub db_insertmount +{ + my $sid=shift or die "argument \"session_id\" missed"; + my $path=shift or die "argument \"path\" missed"; + my $client=shift or die "argument \"client\" missed"; + my $res_ok=1; + if($backend eq 'postgres') + { + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $sth=$dbh->prepare("insert into mounts (session_id,path,client) values ('$sid','$path','$client')"); + $sth->execute(); + if(!$sth->err()) + { + $res_ok=1; + } + $sth->finish(); + $dbh->disconnect(); + } + if($backend eq 'sqlite') + { + if( `sudo -u x2gouser x2gosqlitewrapper insertmount $sid \"$path\" $client` eq "ok") + { + $res_ok=1; + } + } + return $res_ok; +} + + +sub db_insertsession +{ + my $display=shift or die "argument \"display\" missed"; + my $server=shift or die "argument \"server\" missed"; + my $sid=shift or die "argument \"session_id\" missed"; + if($backend eq 'postgres') + { + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $sth=$dbh->prepare("insert into sessions (display,server,uname,session_id) values ('$display','$server','$uname','$sid')"); + $sth->execute()or die $_; + $sth->finish(); + $dbh->disconnect(); + } + if($backend eq 'sqlite') + { + my $err=`sudo -u x2gouser x2gosqlitewrapper insertsession $display $server $sid`; + if($err ne "ok") + { + die "$err: x2gosqlitewrapper insertsession $display $server $sid"; + } + } + +} + +sub db_createsession +{ + my $cookie=shift or die"argument \"cookie\" missed"; + my $pid=shift or die"argument \"pid\" missed"; + my $client=shift or die"argument \"client\" missed"; + my $gr_port=shift or die"argument \"gr_port\" missed"; + my $snd_port=shift or die"argument \"snd_port\" missed"; + my $fs_port=shift or die"argument \"fs_port\" missed"; + my $sid=shift or die "argument \"session_id\" missed"; + if($backend eq 'postgres') + { + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $sth=$dbh->prepare("update sessions_view set status='R',last_time=now(), + cookie='$cookie',agent_pid='$pid',client='$client',gr_port='$gr_port', + sound_port='$snd_port',fs_port='$fs_port' where session_id='$sid'"); + $sth->execute()or die; + $sth->finish(); + $dbh->disconnect(); + } + if($backend eq 'sqlite') + { + my $err= `sudo -u x2gouser x2gosqlitewrapper createsession $cookie $pid $client $gr_port $snd_port $fs_port $sid`; + if($err ne "ok") + { + die $err; + } + } + +} + +sub db_insertport +{ + my $server=shift or die "argument \"server\" missed"; + my $sid=shift or die "argument \"session_id\" missed"; + my $sshport=shift or die "argument \"port\" missed"; + if($backend eq 'postgres') + { + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $sth=$dbh->prepare("insert into used_ports (server,session_id,port) values ('$server','$sid','$sshport')"); + $sth->execute()or die; + $sth->finish(); + $dbh->disconnect(); + } + if($backend eq 'sqlite') + { + `sudo -u x2gouser x2gosqlitewrapper insertport $server $sid $sshport`; + } + +} + + +sub db_resume +{ + my $client=shift or die "argument \"client\" missed"; + my $sid=shift or die "argument \"session_id\" missed"; + if($backend eq 'postgres') + { + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $sth=$dbh->prepare("update sessions_view set last_time=now(),status='R',client='$client' where session_id = '$sid'"); + $sth->execute()or die; + $sth->finish(); + $dbh->disconnect(); + } + if($backend eq 'sqlite') + { + `sudo -u x2gouser x2gosqlitewrapper resume $client $sid`; + } + +} + +sub db_changestatus +{ + my $status=shift or die "argument \"status\" missed"; + my $sid=shift or die "argument \"session_id\" missed"; + if($backend eq 'postgres') + { + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $sth=$dbh->prepare("update sessions_view set last_time=now(),status='$status' where session_id = '$sid'"); + $sth->execute()or die; + $sth->finish(); + $dbh->disconnect(); + } + if($backend eq 'sqlite') + { + `sudo -u x2gouser x2gosqlitewrapper changestatus $status $sid`; + } + +} + +sub db_getdisplays +{ + #ignore $server + my $server=shift or die "argument \"server\" missed"; + if($backend eq 'postgres') + { + my @strings; + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $sth=$dbh->prepare("select display from servers_view"); + $sth->execute()or die; + my @data; + my $i=0; + while (@data = $sth->fetchrow_array) + { + @strings[$i++]='|'.@data[0].'|'; + } + $sth->finish(); + $dbh->disconnect(); + return @strings; + } + if($backend eq 'sqlite') + { + return split("\n",`sudo -u x2gouser x2gosqlitewrapper getdisplays $server`); + } + +} + +sub db_getports +{ + #ignore $server + my $server=shift or die "argument \"server\" missed"; + if($backend eq 'postgres') + { + my @strings; + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + my $sth=$dbh->prepare("select port from ports_view"); + $sth->execute()or die; + my @data; + my $i=0; + while (@data = $sth->fetchrow_array) + { + @strings[$i++]='|'.@data[0].'|'; + } + $sth->finish(); + $dbh->disconnect(); + return @strings; + } + if($backend eq 'sqlite') + { + return split("\n",`sudo -u x2gouser x2gosqlitewrapper getports $server`); + } + +} + +sub db_getservers +{ + if($backend eq 'postgres') + { + my @strings; + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + + my $sth=$dbh->prepare("select server,count(*) from servers_view where status != 'F' group by server"); + $sth->execute()or die; + my @data; + my $i=0; + while (@data = $sth->fetchrow_array) + { + @strings[$i++]=@data[0]; + } + $sth->finish(); + $dbh->disconnect(); + return @strings; + } + if($backend eq 'sqlite') + { + return split("\n",`sudo -u x2gouser x2gosqlitewrapper getservers`); + } + +} + +sub db_getagent +{ + my $sid=shift or die "argument \"session_id\" missed"; + my $agent; + if($backend eq 'postgres') + { + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + + my $sth=$dbh->prepare("select agent_pid from sessions_view + where session_id ='$sid'"); + $sth->execute()or die; + my @data; + my $i=0; + if(@data = $sth->fetchrow_array) + { + $agent=@data[0]; + } + $sth->finish(); + $dbh->disconnect(); + } + if($backend eq 'sqlite') + { + $agent=`sudo -u x2gouser x2gosqlitewrapper getagent $sid`; + } + return $agent; +} + +sub db_getdisplay +{ + my $sid=shift or die "argument \"session_id\" missed"; + my $display; + if($backend eq 'postgres') + { + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + + my $sth=$dbh->prepare("select display from sessions_view + where session_id ='$sid'"); + $sth->execute()or die; + my @data; + my $i=0; + if(@data = $sth->fetchrow_array) + { + $display=@data[0]; + } + $sth->finish(); + $dbh->disconnect(); + } + if($backend eq 'sqlite') + { + $display=`sudo -u x2gouser x2gosqlitewrapper getdisplay $sid`; + } + return $display; +} +sub db_listsessions +{ + my $server=shift or die "argument \"server\" missed"; + if($backend eq 'postgres') + { + my @strings; + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + + my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, + to_char(init_time,'DD.MM.YY*HH24:MI:SS'), cookie, client, gr_port, + sound_port, to_char( last_time, 'DD.MM.YY*HH24:MI:SS'), uname, + to_char(now()- init_time,'SSSS'), fs_port from sessions_view + where status !='F' and server='$server' and + ( session_id not like '%XSHAD%') order by status desc"); + $sth->execute()or die; + my @data; + my $i=0; + while (@data = $sth->fetchrow_array) + { + @strings[$i++]=join('|',@data); + } + $sth->finish(); + $dbh->disconnect(); + return @strings; + } + if($backend eq 'sqlite') + { + return split("\n",`sudo -u x2gouser x2gosqlitewrapper listsessions $server`); + } + +} + +sub db_listsessions_all +{ + if($backend eq 'postgres') + { + my @strings; + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; + + my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, + to_char(init_time,'DD.MM.YY*HH24:MI:SS'), cookie, client, gr_port, + sound_port, to_char( last_time, 'DD.MM.YY*HH24:MI:SS'), uname, + to_char(now()- init_time,'SSSS'), fs_port from sessions_view + where status !='F' and + ( session_id not like '%XSHAD%') order by status desc"); + $sth->execute()or die; + my @data; + my $i=0; + while (@data = $sth->fetchrow_array) + { + @strings[$i++]=join('|',@data); + } + $sth->finish(); + $dbh->disconnect(); + return @strings; + } + if($backend eq 'sqlite') + { + return split("\n",`sudo -u x2gouser x2gosqlitewrapper listsessions_all`); + } + +} diff --git a/x2gogetagent b/x2gogetagent new file mode 100755 index 0000000..cf0b265 --- /dev/null +++ b/x2gogetagent @@ -0,0 +1,8 @@ +#!/usr/bin/perl +use strict; + +use lib "/usr/lib/x2go"; +use x2godbwrapper; + +my $sid=shift or die; +print db_getagent $sid; diff --git a/x2gogetdisplays b/x2gogetdisplays new file mode 100755 index 0000000..3e153e7 --- /dev/null +++ b/x2gogetdisplays @@ -0,0 +1,9 @@ +#!/usr/bin/perl +use strict; + + +use lib "/usr/lib/x2go"; +use x2godbwrapper; + +my $host=shift or die; +print join("\n", db_getdisplays($host)); diff --git a/x2gogetports b/x2gogetports new file mode 100755 index 0000000..0a1ec60 --- /dev/null +++ b/x2gogetports @@ -0,0 +1,9 @@ +#!/usr/bin/perl +use strict; + + +use lib "/usr/lib/x2go"; +use x2godbwrapper; + +my $host=shift or die; +print join("\n", db_getports($host)); diff --git a/x2gogetservers b/x2gogetservers index 02bf621..f81ed27 100755 --- a/x2gogetservers +++ b/x2gogetservers @@ -1,6 +1,8 @@ #!/usr/bin/perl use strict; -my $outp=`sudo x2gopgwrapper getservers`; -$outp=~s/\|//g; -print "$outp"; + +use lib "/usr/lib/x2go"; +use x2godbwrapper; + +print join("\n", db_getservers); diff --git a/x2goinsertport b/x2goinsertport new file mode 100755 index 0000000..128ac5e --- /dev/null +++ b/x2goinsertport @@ -0,0 +1,14 @@ +#!/usr/bin/perl +use strict; + + +use lib "/usr/lib/x2go"; +use x2godbwrapper; + +my $server=shift or die; +my $sid=shift or die; +my $port=shift or die; + +db_insertport($server,$sid,$port); +print "inserted"; + diff --git a/x2goinsertsession b/x2goinsertsession new file mode 100755 index 0000000..fc616d5 --- /dev/null +++ b/x2goinsertsession @@ -0,0 +1,13 @@ +#!/usr/bin/perl +use strict; + + +use lib "/usr/lib/x2go"; +use x2godbwrapper; + +my $display=shift or die; +my $server=shift or die; +my $sid=shift or die; + +db_insertsession($display, $server, $sid); +print "inserted"; diff --git a/x2golistsessions b/x2golistsessions index 7d53683..88fc44e 100755 --- a/x2golistsessions +++ b/x2golistsessions @@ -3,6 +3,10 @@ use Sys::Hostname; use strict; +use lib "/usr/lib/x2go"; +use x2godbwrapper; + + sub check_stat { my $sess=shift; @@ -20,18 +24,17 @@ if( ! $serv) { $serv=hostname; } -my $uname=$ENV{'USER'}; -my $outp; + +my @outp; if($serv eq "--all-servers") { - $outp=`sudo x2gopgwrapper listsessions_all`; + @outp=db_listsessions_all(); } else { - $outp=`sudo x2gopgwrapper listsessions $serv`; + @outp=db_listsessions($serv); } -my @outp=split("\n","$outp"); for(my $i=0;$i<@outp;$i++) { @outp[$i] =~ s/ //g; @@ -47,7 +50,7 @@ for(my $i=0;$i<@outp;$i++) { if(!check_stat(@sinfo[1])) { - system("sudo x2gopgwrapper changestatus 'S' @sinfo[1] > /dev/null"); + db_changestatus( 'S', @sinfo[1] ); @outp[$i] =~ s/\|R\|/\|S\|/; system( "x2goumount_session @sinfo[1]"); diff --git a/x2golistsessions_root b/x2golistsessions_root index efb71f3..c74cbfd 100755 --- a/x2golistsessions_root +++ b/x2golistsessions_root @@ -43,7 +43,7 @@ for(my $i=0;$i<@outp;$i++) { if(!check_stat(@sinfo[1],@sinfo[11])) { - system("su - @sinfo[11] -c \"sudo x2gopgwrapper changestatus 'S' @sinfo[1]\" > /dev/null"); + system("su - @sinfo[11] -c \"x2gochangestatus 'S' @sinfo[1]\" > /dev/null"); @outp[$i] =~ s/\|R\|/\|S\|/; } } diff --git a/x2golistsessions_sql b/x2golistsessions_sql index aa44679..071fac8 100755 --- a/x2golistsessions_sql +++ b/x2golistsessions_sql @@ -1,27 +1,30 @@ #!/usr/bin/perl use strict; + + + +use lib "/usr/lib/x2go"; +use x2godbwrapper; + + + my $serv=shift; -my $outp; +my @array; if($serv eq "--all-servers") { - $outp=`sudo x2gopgwrapper listsessionsroot_all`; + @array=dbsys_listsessionsroot_all(); } else { - $outp=`sudo x2gopgwrapper listsessionsroot $serv`; + @array=dbsys_listsessionsroot ($serv); } -$outp =~ s/ //g; -$outp =~ s/\*/ /g; - - -my @array=split("\n",$outp); my $i; for ( $i=0;$i<@array;$i++) { my @ln=split('\|',@array[$i]); if(@ln[4] eq "F") { - system("sudo x2gopgwrapper rmsessionsroot @ln[1]"); + dbsys_rmsessionsroot( @ln[1]); } print "@array[$i]\n"; } diff --git a/x2gomountdirs b/x2gomountdirs index 0a5bbb3..71c277a 100755 --- a/x2gomountdirs +++ b/x2gomountdirs @@ -1,6 +1,9 @@ #!/usr/bin/perl use strict; +use lib "/usr/lib/x2go"; +use x2godbwrapper; + my $type=shift; my $session=shift; my $user=shift; @@ -170,10 +173,7 @@ for(my $i=0;$i<@dirs;$i++) $mntpath="$mdir/$p"; } - print "starting:sudo x2gopgwrapper insertmount $session \"$mntpath\" $host\n"; - my $outp=`sudo x2gopgwrapper insertmount $session \"$mntpath\" $host`; - print "result: $outp"; - if($outp =~ m/INSERT/) + if(db_insertmount( $session, $mntpath, $host)) { my $code_conv=$ENV{'X2GO_ICONV'}; if($code_conv ne "") @@ -229,7 +229,7 @@ for(my $i=0;$i<@dirs;$i++) else { print "mount @dirs[$i] failed\n"; - `sudo x2gopgwrapper deletemount $session \"$mntpath\"`; + db_deletemount( $session, $mntpath); rmdir($mntpath); } } diff --git a/x2gopgwrapper b/x2gopgwrapper deleted file mode 100755 index bfad849..0000000 --- a/x2gopgwrapper +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -if [ "$1" == "startshadowagent" ] -then - - CLIENT=$2 - - SHADOW_SET=${11} - - SHADOW_MODE=`echo "$SHADOW_SET"|awk '{split($0,a,"XSHAD"); print a[1]}'` - SHADOW_USER=`echo "$SHADOW_SET"|awk '{split($0,a,"XSHAD"); print a[2]}'` - SHADOW_DESKTOP=`echo "$SHADOW_SET"|awk '{split($0,a,"XSHAD"); print a[3]}'` - - ANSWER=`su $SHADOW_USER -c "DISPLAY=$SHADOW_DESKTOP x2godesktopsharing client ACCESS $SUDO_USER $CLIENT"` - - if [ "$ANSWER" != "GRANT" ] - then - echo "DEN" - exit - fi - OUTPUT=`su $SHADOW_USER -c "SSH_CLIENT=$CLIENT x2gostartagent $3 $4 $5 $6 $7 $8 $9 ${10} ${11}"` - echo $OUTPUT - PID=`echo $OUTPUT | awk '{print $3}'` - ANSWER=`su $SHADOW_USER -c "DISPLAY=$SHADOW_DESKTOP x2godesktopsharing client AGENT $PID $SUDO_USER $CLIENT"` - exit -fi - -SQLHOST=`cat /etc/x2go/sql` -if [ "$SQLHOST" == "local" ] -then - x2gopgwrapper_local $@ 2> /dev/null -elif [ "$SQLHOST" == "sqlite" ] -then - x2gopgwrapper_sqlite $@ 2> /dev/null -else - x2gopgwrapper_net $SQLHOST $@ -fi \ No newline at end of file diff --git a/x2gopgwrapper_local b/x2gopgwrapper_local deleted file mode 100755 index 5f9abb1..0000000 --- a/x2gopgwrapper_local +++ /dev/null @@ -1,175 +0,0 @@ -#!/bin/su postgres -cd ~ -#use only with sudo !! - -UNAME=$SUDO_USER - -case "$1" in - -getdisplays) - echo "select '|'||display||'|' from sessions;"|psql -t x2go_sessions - ;; - -getports) - echo "select '|'||port||'|' from used_ports;"|psql -t x2go_sessions - ;; - -getservers) - echo "select server,count(*) from sessions where status != 'F' group by server;"|psql -t x2go_sessions - ;; - -listsessions) - echo "select agent_pid, session_id, display, server, status,\ - to_char(init_time,'DD.MM.YY*HH24:MI:SS'),cookie,client,gr_port,\ - sound_port,to_char(last_time,'DD.MM.YY*HH24:MI:SS'),uname,\ - to_char(now()-init_time,'SSSS'),fs_port from sessions \ - where status !='F' and server='$2' and uname='$UNAME' and ( session_id not like '%XSHAD%') order by status desc;"|psql -t x2go_sessions - ;; - -listsessions_all) - echo "select agent_pid, session_id, display, server, status,\ - to_char(init_time,'DD.MM.YY*HH24:MI:SS'),cookie,client,gr_port,\ - sound_port,to_char(last_time,'DD.MM.YY*HH24:MI:SS'),uname,\ - to_char(now()-init_time,'SSSS'),fs_port from sessions \ - where status !='F' and uname='$UNAME' and ( session_id not like '%XSHAD%') order by status desc;"|psql -t x2go_sessions - ;; - -listsessionsroot) - if [ "$UNAME" != "root" ] - then - echo "$UNAME, You have not permission to do this job!" - exit - fi - echo "select agent_pid, session_id, display, server, status,\ - to_char(init_time,'DD.MM.YY*HH24:MI:SS'),cookie,client,gr_port,\ - sound_port,to_char(last_time,'DD.MM.YY*HH24:MI:SS'),uname,\ - to_char(now()-init_time,'SSSS'),fs_port from sessions \ - where server='$2' order by status desc;"|psql -t x2go_sessions - ;; - -listsessionsroot_all) - if [ "$UNAME" != "root" ] - then - echo "$UNAME, You have not permission to do this job!" - exit - fi - echo "select agent_pid, session_id, display, server, status,\ - to_char(init_time,'DD.MM.YY*HH24:MI:SS'),cookie,client,gr_port,\ - sound_port,to_char(last_time,'DD.MM.YY*HH24:MI:SS'),uname,\ - to_char(now()-init_time,'SSSS'),fs_port from sessions \ - order by status desc;"|psql -t x2go_sessions - ;; - -listsusp) - if [ "$UNAME" != "root" ] - then - echo "$UNAME, You have not permission to do this job!" - exit - fi - echo "select session_id, display, uname, server,extract( day from now()-last_time)*24*60+extract(hour from now()-last_time)*60+extract(minute from now()-last_time)\ - from sessions where server='$2' and status='S';"|psql -t x2go_sessions - ;; - -listallrunning) - if [ "$UNAME" != "root" ] - then - echo "$UNAME, You have not permission to do this job!" - exit - fi - echo "select agent_pid, session_id, display, server, status,\ - to_char(init_time,'DD.MM.YY*HH24:MI:SS'),cookie,client,gr_port,\ - sound_port,to_char(last_time,'DD.MM.YY*HH24:MI:SS'),uname,\ - to_char(now()-init_time,'SSSS'),fs_port from sessions \ - where status='R';"|psql -t x2go_sessions - ;; - -listmails) - if [ "$UNAME" != "root" ] - then - echo "$UNAME, You have not permission to do this job!" - exit - fi - echo "select user_messages.mess_id,sessions.session_id,\ - sessions.uname,sessions.display from sessions,user_messages,\ - messages where sessions.uname=user_messages.uname and sessions.status!='F'\ - and messages.mess_id=user_messages.mess_id and sessions.server='$2';"|psql -t x2go_sessions - ;; - -getmail) - if [ "$UNAME" != "root" ] - then - echo "$UNAME, You have not permission to do this job!" - exit - fi - echo "select message from messages where mess_id='$2';"|psql -t x2go_sessions - ;; - -rmmail) - if [ "$UNAME" != "root" ] - then - echo "$UNAME, You have not permission to do this job!" - exit - fi - echo "delete from user_messages where mess_id='$2' and uname='$3';"|psql -t x2go_sessions - ;; - -rmsessionsroot) - if [ "$UNAME" != "root" ] - then - echo "$UNAME, You have not permission to do this job!" - exit - fi - echo "delete from sessions \ - where session_id='$2';"|psql -t x2go_sessions - ;; - -getagent) - echo "select agent_pid from sessions where session_id = '$2';"|psql -t x2go_sessions - ;; - -getdisplay) - echo "select display from sessions where session_id = '$2';"|psql -t x2go_sessions - ;; - -changestatus) - echo "update sessions set last_time=now(),status='$2' where session_id = '$3' and uname='$UNAME';"|psql -t x2go_sessions - ;; - -resume) - echo "update sessions set last_time=now(),status='R',client='$2' where session_id = '$3' and uname='$UNAME';"|psql -t x2go_sessions - ;; - -insertsession) - echo "insert into sessions (display,server,uname,session_id) values \ - ('$2','$3','$UNAME','$4');"|psql x2go_sessions - ;; - -createsession) - echo "update sessions set status='R',last_time=now(),cookie='$2',agent_pid='$3',\ - client='$4',gr_port='$5',sound_port='$6',fs_port='$7' where session_id='$8' and uname='$UNAME';"|psql x2go_sessions - ;; - -insertport) - echo "insert into used_ports (server,session_id,port) values \ - ('$2','$3','$4');"|psql x2go_sessions - ;; - -insertmount) - echo "insert into mounts (session_id,path,client) values \ - ('$2','$3','$4');"|psql x2go_sessions - ;; - -deletemount) - echo "delete from mounts where session_id='$2' and path='$3';"|psql x2go_sessions - ;; - -getmounts) - echo "select client,path from mounts where session_id = '$2';"|psql -t x2go_sessions - ;; - -*) - echo "$1: wrong argument" - ;; - -esac - diff --git a/x2gopgwrapper_net b/x2gopgwrapper_net deleted file mode 100755 index c779836..0000000 --- a/x2gopgwrapper_net +++ /dev/null @@ -1,183 +0,0 @@ -#!/bin/bash - -cd ~ -#use only with sudo !! - -SERVER=$1 -UNAME=$SUDO_USER - -case "$2" in - -getdisplays) - ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"select '|'||display||'|' from sessions;\"|psql -t x2go_sessions" - ;; - -getports) - ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"select '|'||port||'|' from used_ports;\"|psql -t x2go_sessions" - ;; - -getservers) - ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"select server,count(*) from sessions where status != 'F' group by server;\"|psql -t x2go_sessions" - ;; - -listsessions) - ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"select agent_pid, session_id, display, server, status,\ - to_char(init_time,'DD.MM.YY*HH24:MI:SS'),cookie,client,gr_port,\ - sound_port,to_char(last_time,'DD.MM.YY*HH24:MI:SS'),uname,\ - to_char(now()-init_time,'SSSS'),fs_port from sessions \ - where status !='F' and server='$3' and uname='$UNAME' and ( session_id not like '%XSHAD%') order by status desc;\"|psql -t x2go_sessions" - ;; - -listsessions_all) - ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"select agent_pid, session_id, display, server, status,\ - to_char(init_time,'DD.MM.YY*HH24:MI:SS'),cookie,client,gr_port,\ - sound_port,to_char(last_time,'DD.MM.YY*HH24:MI:SS'),uname,\ - to_char(now()-init_time,'SSSS'),fs_port from sessions \ - where status !='F' and uname='$UNAME' and ( session_id not like '%XSHAD%') order by status desc;\"|psql -t x2go_sessions" - ;; - -listsessionsroot) - if [ "$UNAME" != "root" ] - then - echo "$UNAME, You have not permission to do this job!" - exit - fi - ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"select agent_pid, session_id, display, server, status,\ - to_char(init_time,'DD.MM.YY*HH24:MI:SS'),cookie,client,gr_port,\ - sound_port,to_char(last_time,'DD.MM.YY*HH24:MI:SS'),uname,\ - to_char(now()-init_time,'SSSS'),fs_port from sessions \ - where server='$3' order by status desc;\"|psql -t x2go_sessions" - ;; - -listsessionsroot_all) - if [ "$UNAME" != "root" ] - then - echo "$UNAME, You have not permission to do this job!" - exit - fi - ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"select agent_pid, session_id, display, server, status,\ - to_char(init_time,'DD.MM.YY*HH24:MI:SS'),cookie,client,gr_port,\ - sound_port,to_char(last_time,'DD.MM.YY*HH24:MI:SS'),uname,\ - to_char(now()-init_time,'SSSS'),fs_port from sessions \ - order by status desc;\"|psql -t x2go_sessions" - ;; - -listsusp) - if [ "$UNAME" != "root" ] - then - echo "$UNAME, You have not permission to do this job!" - exit - fi - ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"select session_id, display, uname, server,extract( day from now()-last_time)*24*60+extract(hour from now()-last_time)*60+extract(minute from now()-last_time)\ - from sessions where server='$3' and status='S';\"|psql -t x2go_sessions" - ;; - - -listallrunning) - if [ "$UNAME" != "root" ] - then - echo "$UNAME, You have not permission to do this job!" - exit - fi - ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"select agent_pid, session_id, display, server, status,\ - to_char(init_time,'DD.MM.YY*HH24:MI:SS'),cookie,client,gr_port,\ - sound_port,to_char(last_time,'DD.MM.YY*HH24:MI:SS'),uname,\ - to_char(now()-init_time,'SSSS'),fs_port from sessions \ - where status='R';\"|psql -t x2go_sessions" - ;; - -listmails) - if [ "$UNAME" != "root" ] - then - echo "$UNAME, You have not permission to do this job!" - exit - fi - ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"select user_messages.mess_id,sessions.session_id,\ - sessions.uname,sessions.display from sessions,user_messages,\ - messages where sessions.uname=user_messages.uname and sessions.status!='F'\ - and messages.mess_id=user_messages.mess_id and sessions.server='$3';\"|psql -t x2go_sessions" - ;; - -getmail) - if [ "$UNAME" != "root" ] - then - echo "$UNAME, You have not permission to do this job!" - exit - fi - ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"select message\ - from messages where mess_id='$3';\"|psql -t x2go_sessions" - ;; - - -rmmail) - if [ "$UNAME" != "root" ] - then - echo "$UNAME, You have not permission to do this job!" - exit - fi - ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"delete from \ - user_messages where mess_id='$3' and uname='$4';\"|psql -t x2go_sessions" - ;; - - -rmsessionsroot) - if [ "$UNAME" != "root" ] - then - echo "$UNAME, You have not permission to do this job!" - exit - fi - ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"delete from sessions \ - where session_id='$3' ;\"|psql -t x2go_sessions" - ;; - - -getagent) - ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"select agent_pid from sessions where session_id = '$3';\"|psql -t x2go_sessions" - ;; - -getdisplay) - ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"select display from sessions where session_id = '$3';\"|psql -t x2go_sessions" - ;; - -changestatus) - ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"update sessions set last_time=now(),status='$3' where session_id = '$4' and uname='$UNAME';\"|psql -t x2go_sessions" - ;; - -resume) - ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"update sessions set last_time=now(),status='R',client='$3' where session_id = '$4' and uname='$UNAME';\"|psql -t x2go_sessions" - ;; - -insertsession) - ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"insert into sessions (display,server,uname,session_id) values \ - ('$3','$4','$UNAME','$5');\"|psql x2go_sessions" - ;; - -createsession) - ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"update sessions set status='R',last_time=now(),cookie='$3',agent_pid='$4',\ - client='$5',gr_port='$6',sound_port='$7',fs_port='$8' where session_id='$9' and uname='$UNAME';\"|psql x2go_sessions" - ;; - -insertport) - ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"insert into used_ports (server,session_id,port) values \ - ('$3','$4','$5');\"|psql x2go_sessions" - ;; - -insertmount) - ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"insert into mounts (session_id,path,client) values \ - ('$3','$4','$5');\"|psql x2go_sessions" - ;; - -deletemount) - ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"delete from mounts where session_id='$3' and path='$4';\"|psql x2go_sessions" - ;; - -getmounts) - ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"select client,path from mounts where session_id = '$3';\"|psql -t x2go_sessions" - ;; - -*) - echo "$2: wrong argument" - ;; - -esac - diff --git a/x2gopgwrapper_sqlite b/x2gopgwrapper_sqlite deleted file mode 100755 index 4c0bb32..0000000 --- a/x2gopgwrapper_sqlite +++ /dev/null @@ -1,201 +0,0 @@ -#!/bin/bash -#use only with sudo !! - -UNAME=$SUDO_USER - -DATABASE=/var/db/x2go/x2go_sessions - - -case "$1" in - -getdisplays) - echo "select '|'||display||'|' from sessions;"|sqlite $DATABASE - ;; - -getports) - echo "select '|'||port||'|' from used_ports;"|sqlite $DATABASE - ;; - -getservers) - echo "select server,count(*) from sessions where status != 'F' group by server;"|sqlite $DATABASE - ;; - -listsessions) - echo "select agent_pid, session_id, display, server, status,\ - substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),9,11),\ - cookie,client,gr_port,sound_port,\ - substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),9,11),\ - uname,\ - strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions \ - where status !='F' and server='$2' and uname='$UNAME' and ( session_id not like '%XSHAD%') order by status desc;"|sqlite $DATABASE - ;; - -listsessions_all) - echo "select agent_pid, session_id, display, server, status,\ - substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),9,11),\ - cookie,client,gr_port,sound_port,\ - substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),9,11),\ - uname,\ - strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions \ - where status !='F' and uname='$UNAME' and ( session_id not like '%XSHAD%') order by status desc;"|sqlite $DATABASE - ;; - -listsessionsroot) - if [ "$UNAME" != "root" ] - then - echo "$UNAME, You have not permission to do this job!" - exit - fi - echo "select agent_pid, session_id, display, server, status,\ - substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),9,11),\ - cookie,client,gr_port,sound_port,\ - substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),9,11),\ - uname,\ - strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions \ - where server='$2' order by status desc;"|sqlite $DATABASE - ;; - -listsessionsroot_all) - if [ "$UNAME" != "root" ] - then - echo "$UNAME, You have not permission to do this job!" - exit - fi - echo "select agent_pid, session_id, display, server, status,\ - substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),9,11),\ - cookie,client,gr_port,sound_port,\ - substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),9,11),\ - uname,\ - strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions \ - order by status desc;"|sqlite $DATABASE - ;; - -listsusp) - if [ "$UNAME" != "root" ] - then - echo "$UNAME, You have not permission to do this job!" - exit - fi - echo "select session_id, display, uname, server,round((strftime('%s','now','localtime') - strftime('%s',last_time))/60)\ - from sessions where server='$2' and status='S';"|sqlite $DATABASE - ;; - -listallrunning) - if [ "$UNAME" != "root" ] - then - echo "$UNAME, You have not permission to do this job!" - exit - fi - echo "select agent_pid, session_id, display, server, status,\ - substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),9,11),\ - cookie,client,gr_port,sound_port,\ - substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),9,11),\ - uname,\ - strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions \ - where status='R';"|sqlite $DATABASE - ;; - -listmails) - if [ "$UNAME" != "root" ] - then - echo "$UNAME, You have not permission to do this job!" - exit - fi - echo "select user_messages.mess_id,sessions.session_id,\ - sessions.uname,sessions.display from sessions,user_messages,\ - messages where sessions.uname=user_messages.uname and sessions.status!='F'\ - and messages.mess_id=user_messages.mess_id and sessions.server='$2';"|sqlite $DATABASE - ;; - -getmail) - if [ "$UNAME" != "root" ] - then - echo "$UNAME, You have not permission to do this job!" - exit - fi - echo "select message from messages where mess_id='$2';"|sqlite $DATABASE - ;; - -rmmail) - if [ "$UNAME" != "root" ] - then - echo "$UNAME, You have not permission to do this job!" - exit - fi - echo "delete from user_messages where mess_id='$2' and uname='$3';"|sqlite $DATABASE - ;; - -rmsessionsroot) - if [ "$UNAME" != "root" ] - then - echo "$UNAME, You have not permission to do this job!" - exit - fi - echo "delete from sessions \ - where session_id='$2';"|sqlite $DATABASE - echo "delete from used_ports \ - where session_id='$2';"|sqlite $DATABASE - ;; - -getagent) - echo "select agent_pid from sessions where session_id = '$2';"|sqlite $DATABASE - ;; - -getdisplay) - echo "select display from sessions where session_id = '$2';"|sqlite $DATABASE - ;; - -changestatus) - echo "update sessions set last_time=datetime('now','localtime'),status='$2' where session_id = '$3' and uname='$UNAME';"|sqlite $DATABASE - ;; - -resume) - echo "update sessions set last_time=datetime('now','localtime'),status='R',client='$2' where session_id = '$3' and uname='$UNAME';"|sqlite $DATABASE - ;; - -insertsession) - OUTP=`echo "insert into sessions (display,server,uname,session_id, init_time, last_time) values \ - ('$2','$3','$UNAME','$4', datetime('now','localtime'), datetime('now','localtime'));"|sqlite $DATABASE` - if [ "$OUTP" == "" ] - then - echo "INSERT 0 1" - fi - ;; - -createsession) - echo "update sessions set status='R',last_time=datetime('now','localtime'),cookie='$2',agent_pid='$3',\ - client='$4',gr_port='$5',sound_port='$6',fs_port='$7' where session_id='$8' and uname='$UNAME';"|sqlite $DATABASE - ;; - -insertport) - OUTP=`echo "insert into used_ports (server,session_id,port) values \ - ('$2','$3','$4');"|sqlite $DATABASE` - if [ "$OUTP" == "" ] - then - echo "INSERT 0 1" - fi - ;; - -insertmount) - OUTP=`echo "insert into mounts (session_id,path,client) values \ - ('$2','$3','$4');"|sqlite $DATABASE` - if [ "$OUTP" == "" ] - then - echo "INSERT 0 1" - fi - ;; - -deletemount) - echo "delete from mounts where session_id='$2' and path='$3';"|sqlite $DATABASE - ;; - -getmounts) - echo "select client,path from mounts where session_id = '$2';"|sqlite $DATABASE - ;; - -*) - echo "$1: wrong argument" - ;; - -esac - diff --git a/x2goresume b/x2goresume new file mode 100755 index 0000000..251fb5e --- /dev/null +++ b/x2goresume @@ -0,0 +1,11 @@ +#!/usr/bin/perl +use strict; + + +use lib "/usr/lib/x2go"; +use x2godbwrapper; + +my $client=shift or die; +my $sid=shift or die; + +db_resume($client, $sid); diff --git a/x2goresume-session b/x2goresume-session index bd14495..c9ca10a 100755 --- a/x2goresume-session +++ b/x2goresume-session @@ -10,9 +10,7 @@ X2GO_SET_KBD=$7 -X2GO_AGENT_PID=`sudo x2gopgwrapper getagent $SESSION_NAME` -X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}` - +X2GO_AGENT_PID=`x2gogetagent $SESSION_NAME` X2GO_ROOT=${HOME}/.x2go @@ -68,8 +66,6 @@ fi echo "$NEWOPTIONS" >${SESSION_DIR}/options - -sudo x2gopgwrapper resume $X2GO_CLIENT $SESSION_NAME > /dev/null - +x2goresume $X2GO_CLIENT $SESSION_NAME > /dev/null kill -HUP $X2GO_AGENT_PID diff --git a/x2goruncommand b/x2goruncommand index 7c0ac30..4c44833 100755 --- a/x2goruncommand +++ b/x2goruncommand @@ -112,6 +112,6 @@ else fi kill -TERM $X2GO_AGENT_PID -sudo x2gopgwrapper changestatus 'F' $X2GO_SESSION > /dev/null +x2gochangestatus 'F' $X2GO_SESSION > /dev/null export HOSTNAME x2goumount_session $X2GO_SESSION diff --git a/x2goshowblocks b/x2goshowblocks index e84dcc2..911ef48 100755 --- a/x2goshowblocks +++ b/x2goshowblocks @@ -1,16 +1,17 @@ #!/usr/bin/perl use strict; + + +use lib "/usr/lib/x2go"; +use x2godbwrapper; + + my $uname=shift; my $id=shift; my $tbl="mounts"; -my $outp=`sudo x2gopgwrapper getmounts '$id'`; -#print $outp; -$outp =~ s/ //g; - -my @outp=split("\n","$outp"); +my @outp=dbsys_getmounts( $id); for(my $i=0;$i<@outp;$i++) { my $path=(split("\\|",@outp[$i]))[1]; -# print $path; print `su $uname -c "lsof 2>/dev/null | grep $path"`; } diff --git a/x2gosqlite.sh b/x2gosqlite.sh deleted file mode 100755 index a42ecc1..0000000 --- a/x2gosqlite.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -DATABASE=/var/db/x2go/x2go_sessions - -#rm $DATABASE - -echo "create table sessions( - session_id varchar(500) primary key, - display integer not null, - uname varchar(100) not null, - server varchar(100) not null, - client inet, - status char(1) not null default 'R', - init_time timestamp not null default CURRENT_TIMESTAMP, - last_time timestamp not null default CURRENT_TIMESTAMP, - cookie char(33), - agent_pid int, - gr_port int, - sound_port int, - fs_port int, - unique(display) - );" | sqlite $DATABASE - - -echo "create table messages(mess_id varchar(20) primary key, message text);" | sqlite $DATABASE - -echo "create table user_messages( - mess_id varchar(20) not null, - uname varchar(100) not null - );" | sqlite $DATABASE - - -echo "create table used_ports( - server varchar(100) not null, - session_id varchar(500) references sessions on delete cascade, - port integer primary key - );" | sqlite $DATABASE - -echo "create table mounts( - session_id varchar(500) references sessions on delete restrict, - path varchar(512) not null, - client inet not null, - primary key(path,client) - );" | sqlite $DATABASE - -echo "CREATE TRIGGER fkd_mounts_session_id -BEFORE DELETE ON sessions -FOR EACH ROW BEGIN - SELECT CASE - WHEN ((SELECT session_id FROM mounts WHERE session_id = OLD.session_id) IS NOT NULL) - THEN RAISE(ABORT, 'delete on table \"sessions\" violates foreign key on table \"mounts\"') - END; -END;" | sqlite $DATABASE - diff --git a/x2gosqlitewrapper b/x2gosqlitewrapper new file mode 100755 index 0000000..70d1ac0 --- /dev/null +++ b/x2gosqlitewrapper @@ -0,0 +1,321 @@ +#!/usr/bin/perl +use strict; + +use DBI; +use POSIX; + +my $realuser=$ENV{SUDO_USER}; +my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid(getuid()); + +if($uname ne "x2gouser") +{ + die "Use \"sudo -u x2gouser\" to run this programm"; +} + +my $cmd=shift or die "command not specified"; + + +my $user="x2gouser"; +my ($name, $pass, $uid, $pgid, $quota, $comment, $gcos, $dir, $shell, $expire) = getpwnam($user); +my $dbfile="$dir/x2go_sessions"; +my $dbfile="/var/db/x2go/x2go_sessions"; + +my $dbh=DBI->connect("dbi:SQLite:dbname=$dbfile","","",{AutoCommit => 1}) or die $_; + + +if($cmd eq "rmsessionsroot") +{ + checkroot(); + my $sid=shift or die "argument \"session_id\" missed"; + my $sth=$dbh->prepare("delete from sessions where session_id='$sid'"); + $sth->execute()or die; + $sth->finish(); +} + +elsif($cmd eq "listsessionsroot") +{ + checkroot(); + my $server=shift or die "argument \"server\" missed"; + my @strings; + my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, + substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),9,11), + cookie,client,gr_port,sound_port, + substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),9,11), + uname, + strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions + where server='$server' order by status desc"); + $sth->execute()or die; + my @data; + my $i=0; + while (@data = $sth->fetchrow_array) + { + @strings[$i++]=join('|',@data); + } + $sth->finish(); + print join("\n",@strings); +} + +elsif($cmd eq "listsessionsroot_all") +{ + checkroot(); + my @strings; + my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, + substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),9,11), + cookie,client,gr_port,sound_port, + substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),9,11), + uname, + strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions + order by status desc"); + $sth->execute()or die; + my @data; + my $i=0; + while (@data = $sth->fetchrow_array) + { + @strings[$i++]=join('|',@data); + } + $sth->finish(); + print join("\n",@strings); +} + + +elsif($cmd eq "getmounts") +{ + my $sid=shift or die "argument \"session_id\" missed"; + my @strings; + my $sth=$dbh->prepare("select client, path from mounts where session_id='$sid'"); + $sth->execute()or die; + my @data; + my $i=0; + while (@data = $sth->fetchrow_array) + { + @strings[$i++]=join("|",@data); + } + $sth->finish(); + $dbh->disconnect(); + print join("\n",@strings); +} + +elsif($cmd eq "deletemount") +{ + my $sid=shift or die "argument \"session_id\" missed"; + my $path=shift or die "argument \"path\" missed"; + my $sth=$dbh->prepare("delete from mounts where session_id='$sid' and path='$path'"); + $sth->execute(); + $sth->finish(); +} + +elsif($cmd eq "insertmount") +{ + my $sid=shift or die "argument \"session_id\" missed"; + my $path=shift or die "argument \"path\" missed"; + my $client=shift or die "argument \"client\" missed"; + my $sth=$dbh->prepare("insert into mounts (session_id,path,client) values ('$sid','$path','$client')"); + $sth->execute(); + if(!$sth->err()) + { + print "ok"; + } + $sth->finish(); +} + +elsif($cmd eq "insertsession") +{ + my $display=shift or die "argument \"display\" missed"; + my $server=shift or die "argument \"server\" missed"; + my $sid=shift or die "argument \"session_id\" missed"; + my $sth=$dbh->prepare("insert into sessions (display,server,uname,session_id, init_time, last_time) values + ('$display','$server','$realuser','$sid', datetime('now','localtime'), datetime('now','localtime'))"); + $sth->execute()or die $_; + $sth->finish(); + print "ok"; +} + +elsif($cmd eq "createsession") +{ + my $cookie=shift or die"argument \"cookie\" missed"; + my $pid=shift or die"argument \"pid\" missed"; + my $client=shift or die"argument \"client\" missed"; + my $gr_port=shift or die"argument \"gr_port\" missed"; + my $snd_port=shift or die"argument \"snd_port\" missed"; + my $fs_port=shift or die"argument \"fs_port\" missed"; + my $sid=shift or die "argument \"session_id\" missed"; + my $sth=$dbh->prepare("update sessions set status='R',last_time=datetime('now','localtime'),cookie='$cookie',agent_pid='$pid', + client='$client',gr_port='$gr_port',sound_port='$snd_port',fs_port='$fs_port' where session_id='$sid' and uname='$realuser'"); + $sth->execute()or die; + $sth->finish(); + print "ok"; +} + +elsif($cmd eq "insertport") +{ + my $server=shift or die "argument \"server\" missed"; + my $sid=shift or die "argument \"session_id\" missed"; + my $sshport=shift or die "argument \"port\" missed"; + my $sth=$dbh->prepare("insert into used_ports (server,session_id,port) values ('$server','$sid','$sshport')"); + $sth->execute()or die; + $sth->finish(); + +} + + +elsif($cmd eq "resume") +{ + my $client=shift or die "argument \"client\" missed"; + my $sid=shift or die "argument \"session_id\" missed"; + my $sth=$dbh->prepare("update sessions set last_time=datetime('now','localtime'),status='R', + client='$client' where session_id = '$sid' and uname='$realuser'"); + $sth->execute()or die; + $sth->finish(); +} + +elsif($cmd eq "changestatus") +{ + my $status=shift or die "argument \"status\" missed"; + my $sid=shift or die "argument \"session_id\" missed"; + my $sth=$dbh->prepare("update sessions set last_time=datetime('now','localtime'), + status='$status' where session_id = '$sid' and uname='$realuser'"); + $sth->execute()or die; + $sth->finish(); +} + +elsif($cmd eq "getdisplays") +{ + #ignore $server + my @strings; + my $sth=$dbh->prepare("select display from sessions"); + $sth->execute()or die; + my @data; + my $i=0; + while (@data = $sth->fetchrow_array) + { + @strings[$i++]='|'.@data[0].'|'; + } + $sth->finish(); + print join("\n",@strings); +} + +elsif($cmd eq "getports") +{ + #ignore $server + my $server=shift or die "argument \"server\" missed"; + my @strings; + my $sth=$dbh->prepare("select port from used_ports"); + $sth->execute()or die; + my @data; + my $i=0; + while (@data = $sth->fetchrow_array) + { + @strings[$i++]='|'.@data[0].'|'; + } + $sth->finish(); + print join("\n",@strings); +} + +elsif($cmd eq "getservers") +{ + my @strings; + my $sth=$dbh->prepare("select server,count(*) from sessions where status != 'F' group by server"); + $sth->execute()or die; + my @data; + my $i=0; + while (@data = $sth->fetchrow_array) + { + @strings[$i++]=@data[0]; + } + $sth->finish(); + print join("\n",@strings); +} + +elsif($cmd eq "getagent") +{ + my $sid=shift or die "argument \"session_id\" missed"; + my $agent; + my $sth=$dbh->prepare("select agent_pid from sessions + where session_id ='$sid'"); + $sth->execute()or die; + my @data; + my $i=0; + if(@data = $sth->fetchrow_array) + { + $agent=@data[0]; + } + $sth->finish(); + print $agent; +} + +elsif($cmd eq "getdisplay") +{ + my $sid=shift or die "argument \"session_id\" missed"; + my $display; + my $sth=$dbh->prepare("select display from sessions + where session_id ='$sid'"); + $sth->execute()or die; + my @data; + my $i=0; + if(@data = $sth->fetchrow_array) + { + $display=@data[0]; + } + $sth->finish(); + print $display; +} + +elsif($cmd eq "listsessions") +{ + my $server=shift or die "argument \"server\" missed"; + my @strings; + my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, + substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),9,11), + cookie,client,gr_port,sound_port, + substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),9,11), + uname, + strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions + where status !='F' and server='$server' and uname='$realuser' + and ( session_id not like '%XSHAD%') order by status desc"); + $sth->execute()or die; + my @data; + my $i=0; + while (@data = $sth->fetchrow_array) + { + @strings[$i++]=join('|',@data); + } + $sth->finish(); + print join("\n",@strings); +} + +elsif($cmd eq "listsessions_all") +{ + my @strings; + my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, + substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),9,11), + cookie,client,gr_port,sound_port, + substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),9,11), + uname, + strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions + where status !='F' and uname='$realuser' and ( session_id not like '%XSHAD%') order by status desc"); + $sth->execute()or die; + my @data; + my $i=0; + while (@data = $sth->fetchrow_array) + { + @strings[$i++]=join('|',@data); + } + $sth->finish(); + print join("\n",@strings); +} +else +{ + print "unknown command $cmd\n"; +} + +$dbh->disconnect(); + + + +sub checkroot +{ + if ($realuser ne "root") + { + die "$realuser, you can not do this job"; + } +} \ No newline at end of file diff --git a/x2gostartagent b/x2gostartagent index 0dea745..75a5cc4 100755 --- a/x2gostartagent +++ b/x2gostartagent @@ -29,10 +29,11 @@ then if [ "$SHADOW_USER" != "$USER" ] then - OUTPUT=`sudo x2gopgwrapper startshadowagent $X2GO_CLIENT $@` - if [ "$OUTPUT" == "DEN" ] + + OUTPUT=`x2godesktopsharing client $X2GO_CLIENT $@` + if [ "$OUTPUT" == "DENY" ] then - echo "ACCESS DENIED" + echo "ACCESS DENIED" 1>&2 exit -1 fi X2GO_COOKIE=`echo $OUTPUT | awk '{print $2}'` @@ -56,7 +57,7 @@ LWORD=`echo $LIMIT | awk '{print $1}'` if [ "$LWORD" == "LIMIT" ] then - echo $LIMIT + echo $LIMIT 1>&2 exit -1 fi @@ -80,10 +81,10 @@ then fi -USED_DISPLAYS=`sudo x2gopgwrapper getdisplays $HOSTNAME` +USED_DISPLAYS=`x2gogetdisplays $HOSTNAME` -while [ "`echo \"$OUTPUT\" | awk '{print $1,$3}'`" != "INSERT 1" ] +while [ "$OUTPUT" != "inserted" ] do X2GO_PORT=$(($X2GO_PORT + 1)) X2GO_PORT=`echo "for(\\$i=$X2GO_PORT;\\$br ne \"true\";\\$i++){ if(\"$USED_DISPLAYS\" =~ m/\\|\\$i\\|/){\\$br=\"false\";}else{\\$br=\"true\";print \\$i;}}"|perl` @@ -98,18 +99,18 @@ do SESSION_NAME="$SESSION_NAME"_st${SESSION_TYPE}${X2GO_CMD}_dp${COLORDEPTH} SESSION_NAME=`echo "$SESSION_NAME" | sed -e "s/:/PP/g"` fi - OUTPUT=`sudo x2gopgwrapper insertsession $X2GO_PORT $HOSTNAME $SESSION_NAME` + OUTPUT=`x2goinsertsession $X2GO_PORT $HOSTNAME $SESSION_NAME` fi done -USED_PORTS=`sudo x2gopgwrapper getports $HOSTNAME` +USED_PORTS=`x2gogetports $HOSTNAME` while [ "$GR_PORT" == "" ] || [ "$SOUND_PORT" == "" ] || [ "$FS_PORT" == "" ] do OUTPUT="" - while [ "`echo \"$OUTPUT\" | awk '{print $1,$3}'`" != "INSERT 1" ] + while [ "$OUTPUT" != "inserted" ] do SSH_PORT=$(($SSH_PORT + 1)) @@ -124,7 +125,7 @@ do Proto => 'tcp',Listen => 1,Reuse =>1 ) or die ;print \"OK\";close(\\$sock);"|perl 2>/dev/null` if [ "$CR" == "OK" ] then - OUTPUT=`sudo x2gopgwrapper insertport $HOSTNAME $SESSION_NAME $SSH_PORT` + OUTPUT=`x2goinsertport $HOSTNAME $SESSION_NAME $SSH_PORT` fi fi done @@ -243,7 +244,8 @@ fi X2GO_AGENT_PID=$! X2GO_SND_PORT=1024 -sudo x2gopgwrapper createsession $X2GO_COOKIE $X2GO_AGENT_PID $X2GO_CLIENT $GR_PORT $SOUND_PORT $FS_PORT $SESSION_NAME > /dev/null + +x2gocreatesession $X2GO_COOKIE $X2GO_AGENT_PID $X2GO_CLIENT $GR_PORT $SOUND_PORT $FS_PORT $SESSION_NAME > /dev/null echo $X2GO_PORT echo $X2GO_COOKIE diff --git a/x2gosuspend-session b/x2gosuspend-session index db819f3..c79d490 100755 --- a/x2gosuspend-session +++ b/x2gosuspend-session @@ -3,17 +3,14 @@ SESSION_NAME=$1 -X2GO_AGENT_PID=`sudo x2gopgwrapper getagent $SESSION_NAME` -echo "agent: $X2GO_AGENT_PID" +X2GO_AGENT_PID=`x2gogetagent $SESSION_NAME` X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}` -echo "agent: $X2GO_AGENT_PID" - #workaround for knotify killall -HUP knotify -sudo x2gopgwrapper changestatus 'S' $SESSION_NAME > /dev/null +x2gochangestatus 'S' $SESSION_NAME > /dev/null kill -HUP $X2GO_AGENT_PID diff --git a/x2goterminate-session b/x2goterminate-session index 59560d4..5d31543 100755 --- a/x2goterminate-session +++ b/x2goterminate-session @@ -1,10 +1,10 @@ #!/bin/bash SESSION_NAME=$1 -X2GO_AGENT_PID=`sudo x2gopgwrapper getagent $SESSION_NAME` +X2GO_AGENT_PID=`x2gogetagent $SESSION_NAME` X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}` -sudo x2gopgwrapper changestatus 'F' $SESSION_NAME > /dev/null +x2gochangestatus 'F' $SESSION_NAME > /dev/null kill -TERM $X2GO_AGENT_PID export HOSTNAME diff --git a/x2goumount b/x2goumount index 928c3c1..c24fbeb 100755 --- a/x2goumount +++ b/x2goumount @@ -1,6 +1,9 @@ #!/usr/bin/perl use strict; +use lib "/usr/lib/x2go"; +use x2godbwrapper; + my $fname=shift; open(F,"<$fname") or die "can't open $fname"; my $dir=<F>; @@ -22,7 +25,7 @@ if($ENV{'GNOME_DESKTOP_SESSION_ID'} ne "") if(system( "fusermount -u $dir" ) == 0) { unlink($fname); - system("sudo x2gopgwrapper deletemount $session \"$dir\""); + db_deletemount( $session, $dir); rmdir ($dir); } else diff --git a/x2goumount_session b/x2goumount_session index 5e3da84..3b73702 100755 --- a/x2goumount_session +++ b/x2goumount_session @@ -2,6 +2,10 @@ use Sys::Hostname; use strict; +use lib "/usr/lib/x2go"; +use x2godbwrapper; + + my $session=shift; my $only_path=shift; @@ -18,14 +22,12 @@ if($only_path) } -my $outp=`sudo x2gopgwrapper getdisplay $session`; +my $display=db_getdisplay($session); -$outp=~s/ //g; -my $display=$outp; +print "DISPLAY=$display\n"; -$outp=`sudo x2gopgwrapper getmounts $session`; -my @outp=split("\n","$outp"); +my @outp=db_getmounts($session); my $i; @@ -108,7 +110,7 @@ break: unlink("$remote(sshfs-cdrom)"); } #print "$session \"@line[1]\"\n"; - system("sudo x2gopgwrapper deletemount $session \"@line[1]\"> /dev/null"); + db_deletemount ($session, @line[1]); rmdir (@line[1]); } cont: 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 - build-baikal (branch) updated: 3.0.0-1
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been updated via 24a8f38963badf1ba8a32276c5f67807cdf5148b (commit) from 235238a43856cfb66fb8a2a3ba46d7e54120d0f9 (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: INSTALL | 37 ++++++++++ debian/README.Debian | 6 ++ debian/changelog | 130 +++++++++++++++++++++++++++++++++ debian/compat | 1 + debian/control | 24 +++++++ debian/copyright | 35 +++++++++ debian/cron.d.ex | 4 ++ debian/dirs | 4 ++ debian/emacsen-install.ex | 45 ++++++++++++ debian/emacsen-remove.ex | 15 ++++ debian/emacsen-startup.ex | 25 +++++++ debian/init.d | 82 +++++++++++++++++++++ debian/init.d.ex | 81 +++++++++++++++++++++ debian/manpage.1.ex | 59 +++++++++++++++ debian/manpage.sgml.ex | 156 ++++++++++++++++++++++++++++++++++++++++ debian/manpage.xml.ex | 148 ++++++++++++++++++++++++++++++++++++++ debian/menu.ex | 2 + debian/postinst.ex | 41 +++++++++++ debian/postrm.ex | 39 ++++++++++ debian/preinst | 97 +++++++++++++++++++++++++ debian/preinst.ex | 38 ++++++++++ debian/prerm.ex | 40 +++++++++++ debian/rules | 119 ++++++++++++++++++++++++++++++ debian/watch.ex | 22 ++++++ debian/x2goserver-default.ex | 10 +++ debian/x2goserver.doc-base.EX | 22 ++++++ sql | 1 + x2gocleansessions | 48 ++++++++++--- x2gocmdexitmessage | 7 ++ x2gocreatebase.sh | 24 ++++--- x2golistsessions | 42 ++++------- x2golistsessions_root | 33 ++------- x2golistsessions_sql | 10 ++- x2gomountdirs | 160 +++++++++++++++++++++++++++++++++-------- x2gopgwrapper_local | 84 ++++++++++++++++++++-- x2gopgwrapper_net | 117 +++++++++++++++++++++++++----- x2goresume-session | 3 +- x2goruncommand | 97 +++++++++++++++++++++++-- x2gostartagent | 48 ++++++++++--- x2gosuspend-agent | 10 +++ x2gosuspend-session | 3 +- x2goterminate-session | 5 +- x2goumount | 18 ++++- x2goumount_session | 24 ++++++- 44 files changed, 1865 insertions(+), 151 deletions(-) create mode 100644 INSTALL create mode 100644 debian/README.Debian create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/cron.d.ex create mode 100644 debian/dirs create mode 100644 debian/docs create mode 100644 debian/emacsen-install.ex create mode 100644 debian/emacsen-remove.ex create mode 100644 debian/emacsen-startup.ex create mode 100644 debian/init.d create mode 100644 debian/init.d.ex create mode 100644 debian/manpage.1.ex create mode 100644 debian/manpage.sgml.ex create mode 100644 debian/manpage.xml.ex create mode 100644 debian/menu.ex create mode 100644 debian/postinst.ex create mode 100644 debian/postrm.ex create mode 100755 debian/preinst create mode 100644 debian/preinst.ex create mode 100644 debian/prerm.ex create mode 100755 debian/rules create mode 100644 debian/watch.ex create mode 100644 debian/x2goserver-default.ex create mode 100644 debian/x2goserver.doc-base.EX create mode 100644 sql create mode 100755 x2gocmdexitmessage create mode 100755 x2gosuspend-agent The diff of changes is: diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..953cc74 --- /dev/null +++ b/INSTALL @@ -0,0 +1,37 @@ +install sudo,fuse,sshfs + +use visudo and add string in sudoers: +%users ALL=(ALL) NOPASSWD: /usr/bin/x2gopgwrapper + +if you want to allow only users from group x2gousers use X2GO system, +#add group "x2gousers" +and change in sudoers %users to %x2gousers + +INSTALL server scripts: + +mkdir /etc/x2go +cp sql /etc/x2go/ +copy x2go* in any directory in $PATH +daemon x2gocleansessions - clean all finished sessions, enable it by system start + +IF YOU WANT TO USE LOCAL DATABASE: +you need to install postgresql + +echo -n local > /etc/x2go/sql + +use x2gocreatebase.sh to create database for x2go + +IF YOU WANT TO USE REMOTE DATABASE: +echo -n "sqlserver address" > /etc/x2go/sql + +you need to creata DSA key for ssh connection with database server +mkdirhier /root/.x2go/ssh/.pg/ +ssh-keygen -t dsa -f /root/.x2go/ssh/.pg/id_dsa +press "Enter" for empty passphrase + +copy public part "/root/.x2go/ssh/.pg/id_dsa.pub" on computer with running sql server +(for example with scp) +and add it to ~postgres/.ssh/authorized_keys +cat id_dsa.pub >> ~postgres/.ssh/authorized_keys + + diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..8325992 --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,6 @@ +x2goserver for Debian +--------------------- + +<possible notes regarding this package - if none, delete this file> + + -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Thu, 8 Feb 2007 15:21:30 +0100 diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..c6b7b40 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,130 @@ +x2goserver (3.0.0-1) unstable; urgency=low + + * Printing support (need x2goprint and cups-x2go) + * add group x2gousers and configure sudo in preinstall script + + -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Wed, 04 Mar 2009 16:49:59 +0100 + +x2goserver (2.0.1-19) unstable; urgency=low + + * fixed installinit script break if x2goserver not running + + -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Fri, 30 Jan 2009 08:38:03 +0100 + +x2goserver (2.0.1-18) unstable; urgency=low + + * fixed preinst script to work with ubuntu + + -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Thu, 29 Jan 2009 10:09:25 +0100 + +x2goserver (2.0.1-17) unstable; urgency=low + + * changes in database (start x2gocreatebase.sh): + * session_id - varchar(500) + * column "fsport" for fs tunnel + * changes in x2gostartagent: add fsport to session info + * changes in x2gopgwrapper_(local/net): fsport in listsessions + * changes in x2gomountdirs: mount using reverse ssh tun + + -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Thu, 15 Jan 2009 17:25:54 +0100 + +x2goserver (2.0.1-16) unstable; urgency=low + + * added x2gosuspend-agent to suspend session on clicking "close" button on x2goagent + + -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Mon, 03 Nov 2008 16:11:56 +0100 + +x2goserver (2.0.1-15) unstable; urgency=low + + * Fixed: run command with arguments + * Error message if command not exists + + -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Thu, 09 Oct 2008 15:42:29 +0000 + +x2goserver (2.0.1-14) unstable; urgency=low + + * added: list sessions from all servers + + -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Wed, 08 Oct 2008 10:16:18 +0200 + +x2goserver (2.0.1-13) unstable; urgency=low + + * changes to enable "rootless" mode + + -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Thu, 25 Sep 2008 17:33:18 +0200 + +x2goserver (2.0.1-12) unstable; urgency=low + + * changes in x2gomount/umount to use with gnome + + -- Oleksandr Shneyder <admin(a)power.obviously-nice.de> Fri, 29 Aug 2008 11:18:43 +0200 + +x2goserver (2.0.1-11) unstable; urgency=low + + * now x2gomountdirs can mount dirs on client hosts with ssh ports other then 22 + + -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Fri, 21 Sep 2007 12:12:34 +0200 + +x2goserver (2.0.1-10) unstable; urgency=low + + * x2gomountdirs fixed mounting directories with " " in path + * changed /bin/sh to /bin/bash in scripts + * x2gostartgent append color depth to session's name + + -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Thu, 13 Sep 2007 14:01:17 +0200 + +x2goserver (2.0.1-9) unstable; urgency=low + + * esd support + + -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Tue, 7 Aug 2007 15:31:51 +0200 + +x2goserver (2.0.1-8) unstable; urgency=low + + * changed architecture to "all" + + -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Thu, 28 Jun 2007 10:11:10 +0200 + +x2goserver (2.0.1-7) unstable; urgency=low + + * support for amd64 + + -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Tue, 26 Jun 2007 16:32:53 +0200 + +x2goserver (2.0.1-6) unstable; urgency=low + + * close std file descriptors in daemon + + -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Wed, 25 Apr 2007 10:40:22 +0200 + +x2goserver (2.0.1-5) unstable; urgency=low + + * fix listsusp in wrapper + + -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Tue, 20 Mar 2007 12:06:00 +0100 + +x2goserver (2.0.1-4) unstable; urgency=low + + * fix getdisplays and getports in wrapper + + -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Tue, 20 Mar 2007 12:06:54 +0100 + +x2goserver (2.0.1-3) unstable; urgency=low + + * listallrunning and listsusp in postgress wrapper + * changes in database template, unique display and ports + + -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Mon, 19 Mar 2007 15:13:32 +0100 + +x2goserver (2.0.1-2) unstable; urgency=low + + * get server name with `hostname` in cleansessions + + -- root <root(a)x2gotest1.x2go.obviously-nice.de> Wed, 28 Feb 2007 09:49:48 +0100 + +x2goserver (2.0.1-1) unstable; urgency=low + + * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP> + + -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Thu, 8 Feb 2007 15:21:30 +0100 + diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..9448d4b --- /dev/null +++ b/debian/control @@ -0,0 +1,24 @@ +Source: x2goserver +Section: x11 +Priority: extra +Maintainer: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +Build-Depends: debhelper (>= 5) +Standards-Version: 3.7.2 + +Package: x2goserver +Architecture: all +Depends: x2goagent, sudo, lsof, ssh +Recommends: sshfs, postgresql +Description: x2goserver (daemon and tools) + x2go is a serverbased computing environment with + - session resuming + - low bandwith support + - LDAP support + - client side mass storage mounting support + - audio/arts support + - authentification by smartcard and usb-stick + - kde control-center modules for administration + - kde based tools for just in time messaging and client surveillance + . + x2goserver contains the main daemon and tools for + session administrations (scripts). \ No newline at end of file diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..4a7fdf6 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,35 @@ +This package was debianized by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> on +Thu, 1 Feb 2007 14:11:03 +0100. + +It was downloaded from www.obviously-nice.de + +Upstream Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> + +Copyright (C) 2007 obviously nice - http://www.obviouslynice.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., +59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +Copyright (C) 2007 Oleksandr Shneyder +oleksandr.shneyder(a)obviously-nice.de + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + + + +The Debian packaging is (C) 2007, Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> and +is licensed under the GPL, see above. + diff --git a/debian/cron.d.ex b/debian/cron.d.ex new file mode 100644 index 0000000..88d0304 --- /dev/null +++ b/debian/cron.d.ex @@ -0,0 +1,4 @@ +# +# Regular cron jobs for the x2goserver package +# +0 4 * * * root x2goserver_maintenance diff --git a/debian/dirs b/debian/dirs new file mode 100644 index 0000000..b9b8278 --- /dev/null +++ b/debian/dirs @@ -0,0 +1,4 @@ +usr/bin +usr/sbin +etc/x2go +usr/lib/x2go/script diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..e69de29 diff --git a/debian/emacsen-install.ex b/debian/emacsen-install.ex new file mode 100644 index 0000000..0a9ed36 --- /dev/null +++ b/debian/emacsen-install.ex @@ -0,0 +1,45 @@ +#! /bin/sh -e +# /usr/lib/emacsen-common/packages/install/x2goserver + +# Written by Jim Van Zandt <jrv(a)debian.org>, borrowing heavily +# from the install scripts for gettext by Santiago Vila +# <sanvila(a)ctv.es> and octave by Dirk Eddelbuettel <edd(a)debian.org>. + +FLAVOR=$1 +PACKAGE=x2goserver + +if [ ${FLAVOR} = emacs ]; then exit 0; fi + +echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR} + +#FLAVORTEST=`echo $FLAVOR | cut -c-6` +#if [ ${FLAVORTEST} = xemacs ] ; then +# SITEFLAG="-no-site-file" +#else +# SITEFLAG="--no-site-file" +#fi +FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile" + +ELDIR=/usr/share/emacs/site-lisp/${PACKAGE} +ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} + +# Install-info-altdir does not actually exist. +# Maybe somebody will write it. +if test -x /usr/sbin/install-info-altdir; then + echo install/${PACKAGE}: install Info links for ${FLAVOR} + install-info-altdir --quiet --section "" "" --dirname=${FLAVOR} /usr/info/${PACKAGE}.info.gz +fi + +install -m 755 -d ${ELCDIR} +cd ${ELDIR} +FILES=`echo *.el` +cp ${FILES} ${ELCDIR} +cd ${ELCDIR} + +cat << EOF > path.el +(setq load-path (cons "." load-path) byte-compile-warnings nil) +EOF +${FLAVOR} ${FLAGS} ${FILES} +rm -f *.el path.el + +exit 0 diff --git a/debian/emacsen-remove.ex b/debian/emacsen-remove.ex new file mode 100644 index 0000000..7570757 --- /dev/null +++ b/debian/emacsen-remove.ex @@ -0,0 +1,15 @@ +#!/bin/sh -e +# /usr/lib/emacsen-common/packages/remove/x2goserver + +FLAVOR=$1 +PACKAGE=x2goserver + +if [ ${FLAVOR} != emacs ]; then + if test -x /usr/sbin/install-info-altdir; then + echo remove/${PACKAGE}: removing Info links for ${FLAVOR} + install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/info/x2goserver.info.gz + fi + + echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR} + rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE} +fi diff --git a/debian/emacsen-startup.ex b/debian/emacsen-startup.ex new file mode 100644 index 0000000..a117cba --- /dev/null +++ b/debian/emacsen-startup.ex @@ -0,0 +1,25 @@ +;; -*-emacs-lisp-*- +;; +;; Emacs startup file, e.g. /etc/emacs/site-start.d/50x2goserver.el +;; for the Debian x2goserver package +;; +;; Originally contributed by Nils Naumann <naumann(a)unileoben.ac.at> +;; Modified by Dirk Eddelbuettel <edd(a)debian.org> +;; Adapted for dh-make by Jim Van Zandt <jrv(a)debian.org> + +;; The x2goserver package follows the Debian/GNU Linux 'emacsen' policy and +;; byte-compiles its elisp files for each 'emacs flavor' (emacs19, +;; xemacs19, emacs20, xemacs20...). The compiled code is then +;; installed in a subdirectory of the respective site-lisp directory. +;; We have to add this to the load-path: +(let ((package-dir (concat "/usr/share/" + (symbol-name flavor) + "/site-lisp/x2goserver"))) +;; If package-dir does not exist, the x2goserver package must have +;; removed but not purged, and we should skip the setup. + (when (file-directory-p package-dir) + (setq load-path (cons package-dir load-path)) + (autoload 'x2goserver-mode "x2goserver-mode" + "Major mode for editing x2goserver files." t) + (add-to-list 'auto-mode-alist '("\\.x2goserver$" . x2goserver-mode)))) + diff --git a/debian/init.d b/debian/init.d new file mode 100644 index 0000000..c41fe23 --- /dev/null +++ b/debian/init.d @@ -0,0 +1,82 @@ +#! /bin/sh +# +# skeleton example file to build /etc/init.d/ scripts. +# This file should be used to construct scripts for /etc/init.d. +# +# Written by Miquel van Smoorenburg <miquels(a)cistron.nl>. +# Modified for Debian +# by Ian Murdock <imurdock(a)gnu.ai.mit.edu>. +# +# Version: @(#)skeleton 1.9 26-Feb-2001 miquels(a)cistron.nl +# + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +export HOSTNAME +DAEMON=/usr/sbin/x2gocleansessions +NAME=x2goserver +DESC=x2goserver + +test -x $DAEMON || exit 0 + +# Include x2goserver defaults if available +if [ -f /etc/default/x2goserver ] ; then + . /etc/default/x2goserver +fi + +set -e + +case "$1" in + start) + echo -n "Starting $DESC: " + start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \ + --exec $DAEMON -- $DAEMON_OPTS + echo "$NAME." + ;; + stop) + echo -n "Stopping $DESC: " + start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid + + echo "$NAME." + ;; + #reload) + # + # If the daemon can reload its config files on the fly + # for example by sending it SIGHUP, do it here. + # + # If the daemon responds to changes in its config file + # directly anyway, make this a do-nothing entry. + # + # echo "Reloading $DESC configuration files." + # start-stop-daemon --stop --signal 1 --quiet --pidfile \ + # /var/run/$NAME.pid --exec $DAEMON + #;; + force-reload) + # + # If the "reload" option is implemented, move the "force-reload" + # option to the "reload" entry above. If not, "force-reload" is + # just the same as "restart" except that it does nothing if the + # daemon isn't already running. + # check wether $DAEMON is running. If so, restart + start-stop-daemon --stop --test --quiet --pidfile \ + /var/run/$NAME.pid \ + && $0 restart \ + || exit 0 + ;; + restart) + echo -n "Restarting $DESC: " + start-stop-daemon --stop --oknodo --quiet --pidfile \ + /var/run/$NAME.pid + sleep 1 + start-stop-daemon --start --quiet --pidfile \ + /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS + echo "$NAME." + ;; + *) + N=/etc/init.d/$NAME + # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2 + echo "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/debian/init.d.ex b/debian/init.d.ex new file mode 100644 index 0000000..9d4e4b6 --- /dev/null +++ b/debian/init.d.ex @@ -0,0 +1,81 @@ +#! /bin/sh +# +# skeleton example file to build /etc/init.d/ scripts. +# This file should be used to construct scripts for /etc/init.d. +# +# Written by Miquel van Smoorenburg <miquels(a)cistron.nl>. +# Modified for Debian +# by Ian Murdock <imurdock(a)gnu.ai.mit.edu>. +# +# Version: @(#)skeleton 1.9 26-Feb-2001 miquels(a)cistron.nl +# + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/x2goserver +NAME=x2goserver +DESC=x2goserver + +test -x $DAEMON || exit 0 + +# Include x2goserver defaults if available +if [ -f /etc/default/x2goserver ] ; then + . /etc/default/x2goserver +fi + +set -e + +case "$1" in + start) + echo -n "Starting $DESC: " + start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \ + --exec $DAEMON -- $DAEMON_OPTS + echo "$NAME." + ;; + stop) + echo -n "Stopping $DESC: " + start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \ + --exec $DAEMON + echo "$NAME." + ;; + #reload) + # + # If the daemon can reload its config files on the fly + # for example by sending it SIGHUP, do it here. + # + # If the daemon responds to changes in its config file + # directly anyway, make this a do-nothing entry. + # + # echo "Reloading $DESC configuration files." + # start-stop-daemon --stop --signal 1 --quiet --pidfile \ + # /var/run/$NAME.pid --exec $DAEMON + #;; + force-reload) + # + # If the "reload" option is implemented, move the "force-reload" + # option to the "reload" entry above. If not, "force-reload" is + # just the same as "restart" except that it does nothing if the + # daemon isn't already running. + # check wether $DAEMON is running. If so, restart + start-stop-daemon --stop --test --quiet --pidfile \ + /var/run/$NAME.pid --exec $DAEMON \ + && $0 restart \ + || exit 0 + ;; + restart) + echo -n "Restarting $DESC: " + start-stop-daemon --stop --quiet --pidfile \ + /var/run/$NAME.pid --exec $DAEMON + sleep 1 + start-stop-daemon --start --quiet --pidfile \ + /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS + echo "$NAME." + ;; + *) + N=/etc/init.d/$NAME + # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2 + echo "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/debian/manpage.1.ex b/debian/manpage.1.ex new file mode 100644 index 0000000..343ab46 --- /dev/null +++ b/debian/manpage.1.ex @@ -0,0 +1,59 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH X2GOSERVER SECTION "Februar 8, 2007" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp <n> insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +x2goserver \- program to do something +.SH SYNOPSIS +.B x2goserver +.RI [ options ] " files" ... +.br +.B bar +.RI [ options ] " files" ... +.SH DESCRIPTION +This manual page documents briefly the +.B x2goserver +and +.B bar +commands. +.PP +.\" TeX users may be more comfortable with the \fB<whatever>\fP and +.\" \fI<whatever>\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBx2goserver\fP is a program that... +.SH OPTIONS +These programs follow the usual GNU command line syntax, with long +options starting with two dashes (`-'). +A summary of options is included below. +For a complete description, see the Info files. +.TP +.B \-h, \-\-help +Show summary of options. +.TP +.B \-v, \-\-version +Show version of program. +.SH SEE ALSO +.BR bar (1), +.BR baz (1). +.br +The programs are documented fully by +.IR "The Rise and Fall of a Fooish Bar" , +available via the Info system. +.SH AUTHOR +x2goserver was written by <upstream author>. +.PP +This manual page was written by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, +for the Debian project (but may be used by others). diff --git a/debian/manpage.sgml.ex b/debian/manpage.sgml.ex new file mode 100644 index 0000000..a1817e6 --- /dev/null +++ b/debian/manpage.sgml.ex @@ -0,0 +1,156 @@ +<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ + + + +  + <!ENTITY dhfirstname "<firstname>FIRSTNAME</firstname>"> + <!ENTITY dhsurname "<surname>SURNAME</surname>"> +  + <!ENTITY dhdate "<date>Februar 8, 2007</date>"> +  + <!ENTITY dhsection "<manvolnum>SECTION</manvolnum>"> + <!ENTITY dhemail "<email>oleksandr.shneyder(a)obviously-nice.de</email>"> + <!ENTITY dhusername "Oleksandr Shneyder"> + <!ENTITY dhucpackage "<refentrytitle>X2GOSERVER</refentrytitle>"> + <!ENTITY dhpackage "x2goserver"> + + <!ENTITY debian "<productname>Debian</productname>"> + <!ENTITY gnu "<acronym>GNU</acronym>"> + <!ENTITY gpl "&gnu; <acronym>GPL</acronym>"> +]> + +<refentry> + <refentryinfo> + <address> + &dhemail; + </address> + <author> + &dhfirstname; + &dhsurname; + </author> + <copyright> + <year>2003</year> + <holder>&dhusername;</holder> + </copyright> + &dhdate; + </refentryinfo> + <refmeta> + &dhucpackage; + + &dhsection; + </refmeta> + <refnamediv> + <refname>&dhpackage;</refname> + + <refpurpose>program to do something</refpurpose> + </refnamediv> + <refsynopsisdiv> + <cmdsynopsis> + <command>&dhpackage;</command> + + <arg><option>-e <replaceable>this</replaceable></option></arg> + + <arg><option>--example <replaceable>that</replaceable></option></arg> + </cmdsynopsis> + </refsynopsisdiv> + <refsect1> + <title>DESCRIPTION</title> + + <para>This manual page documents briefly the + <command>&dhpackage;</command> and <command>bar</command> + commands.</para> + + <para>This manual page was written for the &debian; distribution + because the original program does not have a manual page. + Instead, it has documentation in the &gnu; + <application>Info</application> format; see below.</para> + + <para><command>&dhpackage;</command> is a program that...</para> + + </refsect1> + <refsect1> + <title>OPTIONS</title> + + <para>These programs follow the usual &gnu; command line syntax, + with long options starting with two dashes (`-'). A summary of + options is included below. For a complete description, see the + <application>Info</application> files.</para> + + <variablelist> + <varlistentry> + <term><option>-h</option> + <option>--help</option> + </term> + <listitem> + <para>Show summary of options.</para> + </listitem> + </varlistentry> + <varlistentry> + <term><option>-v</option> + <option>--version</option> + </term> + <listitem> + <para>Show version of program.</para> + </listitem> + </varlistentry> + </variablelist> + </refsect1> + <refsect1> + <title>SEE ALSO</title> + + <para>bar (1), baz (1).</para> + + <para>The programs are documented fully by <citetitle>The Rise and + Fall of a Fooish Bar</citetitle> available via the + <application>Info</application> system.</para> + </refsect1> + <refsect1> + <title>AUTHOR</title> + + <para>This manual page was written by &dhusername; &dhemail; for + the &debian; system (but may be used by others). Permission is + granted to copy, distribute and/or modify this document under + the terms of the &gnu; General Public License, Version 2 any + later version published by the Free Software Foundation. + </para> + <para> + On Debian systems, the complete text of the GNU General Public + License can be found in /usr/share/common-licenses/GPL. + </para> + + </refsect1> +</refentry> + + + + diff --git a/debian/manpage.xml.ex b/debian/manpage.xml.ex new file mode 100644 index 0000000..edd79ea --- /dev/null +++ b/debian/manpage.xml.ex @@ -0,0 +1,148 @@ +<?xml version='1.0' encoding='ISO-8859-1'?> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" +"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + + + +  + <!ENTITY dhfirstname "<firstname>FIRSTNAME</firstname>"> + <!ENTITY dhsurname "<surname>SURNAME</surname>"> +  + <!ENTITY dhdate "<date>Februar 8, 2007</date>"> +  + <!ENTITY dhsection "<manvolnum>SECTION</manvolnum>"> + <!ENTITY dhemail "<email>oleksandr.shneyder(a)obviously-nice.de</email>"> + <!ENTITY dhusername "Oleksandr Shneyder"> + <!ENTITY dhucpackage "<refentrytitle>X2GOSERVER</refentrytitle>"> + <!ENTITY dhpackage "x2goserver"> + + <!ENTITY debian "<productname>Debian</productname>"> + <!ENTITY gnu "<acronym>GNU</acronym>"> + <!ENTITY gpl "&gnu; <acronym>GPL</acronym>"> +]> + +<refentry> + <refentryinfo> + <address> + &dhemail; + </address> + <author> + &dhfirstname; + &dhsurname; + </author> + <copyright> + <year>2003</year> + <holder>&dhusername;</holder> + </copyright> + &dhdate; + </refentryinfo> + <refmeta> + &dhucpackage; + + &dhsection; + </refmeta> + <refnamediv> + <refname>&dhpackage;</refname> + + <refpurpose>program to do something</refpurpose> + </refnamediv> + <refsynopsisdiv> + <cmdsynopsis> + <command>&dhpackage;</command> + + <arg><option>-e <replaceable>this</replaceable></option></arg> + + <arg><option>--example <replaceable>that</replaceable></option></arg> + </cmdsynopsis> + </refsynopsisdiv> + <refsect1> + <title>DESCRIPTION</title> + + <para>This manual page documents briefly the + <command>&dhpackage;</command> and <command>bar</command> + commands.</para> + + <para>This manual page was written for the &debian; distribution + because the original program does not have a manual page. + Instead, it has documentation in the &gnu; + <application>Info</application> format; see below.</para> + + <para><command>&dhpackage;</command> is a program that...</para> + + </refsect1> + <refsect1> + <title>OPTIONS</title> + + <para>These programs follow the usual &gnu; command line syntax, + with long options starting with two dashes (`-'). A summary of + options is included below. For a complete description, see the + <application>Info</application> files.</para> + + <variablelist> + <varlistentry> + <term><option>-h</option> + <option>--help</option> + </term> + <listitem> + <para>Show summary of options.</para> + </listitem> + </varlistentry> + <varlistentry> + <term><option>-v</option> + <option>--version</option> + </term> + <listitem> + <para>Show version of program.</para> + </listitem> + </varlistentry> + </variablelist> + </refsect1> + <refsect1> + <title>SEE ALSO</title> + + <para>bar (1), baz (1).</para> + + <para>The programs are documented fully by <citetitle>The Rise and + Fall of a Fooish Bar</citetitle> available via the + <application>Info</application> system.</para> + </refsect1> + <refsect1> + <title>AUTHOR</title> + + <para>This manual page was written by &dhusername; &dhemail; for + the &debian; system (but may be used by others). Permission is + granted to copy, distribute and/or modify this document under + the terms of the &gnu; General Public License, Version 2 any + later version published by the Free Software Foundation. + </para> + <para> + On Debian systems, the complete text of the GNU General Public + License can be found in /usr/share/common-licenses/GPL. + </para> + + </refsect1> +</refentry> + diff --git a/debian/menu.ex b/debian/menu.ex new file mode 100644 index 0000000..5fe32c1 --- /dev/null +++ b/debian/menu.ex @@ -0,0 +1,2 @@ +?package(x2goserver):needs="X11|text|vc|wm" section="Apps/see-menu-manual"\ + title="x2goserver" command="/usr/bin/x2goserver" diff --git a/debian/postinst.ex b/debian/postinst.ex new file mode 100644 index 0000000..5a6a780 --- /dev/null +++ b/debian/postinst.ex @@ -0,0 +1,41 @@ +#!/bin/sh +# postinst script for x2goserver +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <postinst> `configure' <most-recently-configured-version> +# * <old-postinst> `abort-upgrade' <new version> +# * <conflictor's-postinst> `abort-remove' `in-favour' <package> +# <new-version> +# * <postinst> `abort-remove' +# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' +# <failed-install-package> <version> `removing' +# <conflicting-package> <version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + configure) + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + diff --git a/debian/postrm.ex b/debian/postrm.ex new file mode 100644 index 0000000..791f2d6 --- /dev/null +++ b/debian/postrm.ex @@ -0,0 +1,39 @@ +#!/bin/sh +# postrm script for x2goserver +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <postrm> `remove' +# * <postrm> `purge' +# * <old-postrm> `upgrade' <new-version> +# * <new-postrm> `failed-upgrade' <old-version> +# * <new-postrm> `abort-install' +# * <new-postrm> `abort-install' <old-version> +# * <new-postrm> `abort-upgrade' <old-version> +# * <disappearer's-postrm> `disappear' <overwriter> +# <overwriter-version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + diff --git a/debian/preinst b/debian/preinst new file mode 100755 index 0000000..1f73c6b --- /dev/null +++ b/debian/preinst @@ -0,0 +1,97 @@ +#!/bin/bash +# preinst script for x2goserver +# +# see: dh_installdeb(1) + +#set -e + +# summary of how this script can be called: +# * <new-preinst> `install' +# * <new-preinst> `install' <old-version> +# * <new-preinst> `upgrade' <old-version> +# * <old-preinst> `abort-upgrade' <new-version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +case "$1" in + install|upgrade) + VERSION=$2 + V1=`echo $VERSION|awk '{split($0,a,"."); print a[1]}'` + V2=`echo $VERSION|awk '{split($0,a,"."); print a[2]}'` + DV=`echo $VERSION|awk '{split($0,a,"."); print a[3]}'` + V3=`echo $DV|awk '{split($0,a,"-"); print a[1]}'` + V4=`echo $DV|awk '{split($0,a,"-"); print a[2]}'` + if [ "$V1" == "" ] + then + V1=0 + fi + + if [ "$V2" == "" ] + then + V2=0 + fi + + if [ "$V3" == "" ] + then + V3=0 + fi + + if [ "$V4" == "" ] + then + V4=0 + fi + + VSUM=$(($V1*100000 + $V2*10000 + $V3*100 +$V4)) + if [ $(( $VSUM < 200117 && $VSUM != 0)) != 0 ] + then + echo " + + + +---------------- +Attention: + +you are upgrading to a newer version of x2goserver. Please close all running x2go sessions and make sure that nobody will login during the installation procedure. You'll need to import a new database layout for this version, so please start the import script /usr/lib/x2go/script/x2gocreatebase.sh on your data base server after the packages have been installed. +---------------- + +Press Enter to continue + +" + read + fi + X2GOGRP=`getent group | grep x2gousers` + + if [ "$X2GOGRP" == "" ] + then + addgroup --system x2gousers + fi + + SUDOCONF=`cat /etc/sudoers | grep x2gopgwrapper | grep x2gousers` + if [ "$SUDOCONF" == "" ] + then + echo " +#### X2GO section +%x2gousers ALL=(ALL) NOPASSWD: /usr/bin/x2gopgwrapper +" >> /etc/sudoers + fi + + echo "Attention: If you want to allow users to log into the x2go system, you'll need to add them to the \"x2gousers\" group" + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + diff --git a/debian/preinst.ex b/debian/preinst.ex new file mode 100644 index 0000000..cad3fac --- /dev/null +++ b/debian/preinst.ex @@ -0,0 +1,38 @@ +#!/bin/sh +# preinst script for x2goserver +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <new-preinst> `install' +# * <new-preinst> `install' <old-version> +# * <new-preinst> `upgrade' <old-version> +# * <old-preinst> `abort-upgrade' <new-version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + install|upgrade) + echo "prev version is $2" + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + diff --git a/debian/prerm.ex b/debian/prerm.ex new file mode 100644 index 0000000..d78641f --- /dev/null +++ b/debian/prerm.ex @@ -0,0 +1,40 @@ +#!/bin/sh +# prerm script for x2goserver +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <prerm> `remove' +# * <old-prerm> `upgrade' <new-version> +# * <new-prerm> `failed-upgrade' <old-version> +# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version> +# * <deconfigured's-prerm> `deconfigure' `in-favour' +# <package-being-installed> <version> `removing' +# <conflicting-package> <version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + remove|upgrade|deconfigure) + ;; + + failed-upgrade) + ;; + + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..681a023 --- /dev/null +++ b/debian/rules @@ -0,0 +1,119 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + + + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + + touch configure-stamp + + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + + # Add here commands to compile the package. + #docbook-to-man debian/x2goserver.sgml > x2goserver.1 + + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/x2goserver. + install x2gocmdexitmessage $(CURDIR)/debian/x2goserver/usr/bin/ + install x2gogetservers $(CURDIR)/debian/x2goserver/usr/bin/ + install x2golistsessions $(CURDIR)/debian/x2goserver/usr/bin/ + install x2golistsessions_root $(CURDIR)/debian/x2goserver/usr/bin/ + install x2golistsessions_sql $(CURDIR)/debian/x2goserver/usr/bin/ + install x2gomountdirs $(CURDIR)/debian/x2goserver/usr/bin/ + install x2gopgwrapper $(CURDIR)/debian/x2goserver/usr/bin/ + install x2gopgwrapper_local $(CURDIR)/debian/x2goserver/usr/bin/ + install x2gopgwrapper_net $(CURDIR)/debian/x2goserver/usr/bin/ + install x2goresume-session $(CURDIR)/debian/x2goserver/usr/bin/ + install x2goruncommand $(CURDIR)/debian/x2goserver/usr/bin/ + install x2goshowblocks $(CURDIR)/debian/x2goserver/usr/bin/ + install x2gostartagent $(CURDIR)/debian/x2goserver/usr/bin/ + install x2gosuspend-session $(CURDIR)/debian/x2goserver/usr/bin/ + install x2gosuspend-agent $(CURDIR)/debian/x2goserver/usr/bin/ + install x2goterminate $(CURDIR)/debian/x2goserver/usr/bin/ + install x2goterminate-session $(CURDIR)/debian/x2goserver/usr/bin/ + install x2goumount $(CURDIR)/debian/x2goserver/usr/bin/ + install x2goumount_session $(CURDIR)/debian/x2goserver/usr/bin/ + cp sql $(CURDIR)/debian/x2goserver/etc/x2go/ + install x2gocleansessions $(CURDIR)/debian/x2goserver/usr/sbin/ + install x2gocreatebase.sh $(CURDIR)/debian/x2goserver/usr/lib/x2go/script + + + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples +# dh_install +# dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_python + dh_installinit -R +# dh_installcron +# dh_installinfo + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_perl +# dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/debian/watch.ex b/debian/watch.ex new file mode 100644 index 0000000..472c4c7 --- /dev/null +++ b/debian/watch.ex @@ -0,0 +1,22 @@ +# Example watch control file for uscan +# Rename this file to "watch" and then you can run the "uscan" command +# to check for upstream updates and more. +# See uscan(1) for format + +# Compulsory line, this is a version 3 file +version=3 + +# Uncomment to examine a Webpage +# <Webpage URL> <string match> +#http://www.example.com/downloads.php x2goserver-(.*)\.tar\.gz + +# Uncomment to examine a Webserver directory +#http://www.example.com/pub/x2goserver-(.*)\.tar\.gz + +# Uncommment to examine a FTP server +#ftp://ftp.example.com/pub/x2goserver-(.*)\.tar\.gz debian uupdate + +# Uncomment to find new files on sourceforge, for debscripts >= 2.9 +# http://sf.net/x2goserver/x2goserver-(.*)\.tar\.gz + + diff --git a/debian/x2goserver-default.ex b/debian/x2goserver-default.ex new file mode 100644 index 0000000..ad6479a --- /dev/null +++ b/debian/x2goserver-default.ex @@ -0,0 +1,10 @@ +# Defaults for x2goserver initscript +# sourced by /etc/init.d/x2goserver +# installed at /etc/default/x2goserver by the maintainer scripts + +# +# This is a POSIX shell fragment +# + +# Additional options that are passed to the Daemon. +DAEMON_OPTS="" diff --git a/debian/x2goserver.doc-base.EX b/debian/x2goserver.doc-base.EX new file mode 100644 index 0000000..7d379a3 --- /dev/null +++ b/debian/x2goserver.doc-base.EX @@ -0,0 +1,22 @@ +Document: x2goserver +Title: Debian x2goserver Manual +Author: <insert document author here> +Abstract: This manual describes what x2goserver is + and how it can be used to + manage online manuals on Debian systems. +Section: unknown + +Format: debiandoc-sgml +Files: /usr/share/doc/x2goserver/x2goserver.sgml.gz + +Format: postscript +Files: /usr/share/doc/x2goserver/x2goserver.ps.gz + +Format: text +Files: /usr/share/doc/x2goserver/x2goserver.text.gz + +Format: HTML +Index: /usr/share/doc/x2goserver/html/index.html +Files: /usr/share/doc/x2goserver/html/*.html + + diff --git a/sql b/sql new file mode 100644 index 0000000..c2c027f --- /dev/null +++ b/sql @@ -0,0 +1 @@ +local \ No newline at end of file diff --git a/x2gocleansessions b/x2gocleansessions index c23056f..491d634 100755 --- a/x2gocleansessions +++ b/x2gocleansessions @@ -34,11 +34,38 @@ sub check_stat } +sub catch_term +{ + unlink("/var/run/x2goserver.pid"); + exit; +} + my $uname; my $serv=$ENV{'HOSTNAME'}; -while(sleep 5) +my $pid = fork(); +if (not defined $pid) +{ + print "resources not avilable.\n"; +} +elsif ($pid != 0) { + open (F,">/var/run/x2goserver.pid"); + print F "$pid\n"; + close(F); +} +elsif ($pid == 0 ) +{ + + close(STDIN); + close(STDOUT); + close(STDERR); + + $SIG{TERM}=\&catch_term; + + while(sleep 5) + { + $serv=`hostname`; my $outp=`x2golistsessions_sql $serv 2>/dev/null`; my @outp=split("\n","$outp"); @@ -48,16 +75,16 @@ while(sleep 5) my @sinfo=split('\\|',"@outp[$i]"); if(@sinfo[4]eq 'F') { - print "@sinfo[1], is blocked\n"; - print "(@sinfo[1])Unmounting all shares\n"; - system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount_session @sinfo[1]\""); + #print "@sinfo[1], is blocked\n"; + #print "(@sinfo[1])Unmounting all shares\n"; + system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount_session @sinfo[1]\" 2> /dev/null"); } elsif(! check_pid (@sinfo[0],@sinfo[1],@sinfo[12])) { system("su @sinfo[11] -c \"sudo x2gopgwrapper changestatus 'F' @sinfo[1] \" > /dev/null"); - print "@sinfo[1], pid @sinfo[0] not exist, changing status from @sinfo[4] to F\n"; - print "(@sinfo[1])Unmounting all shares\n"; - system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount_session @sinfo[1]\""); + #print "@sinfo[1], pid @sinfo[0] not exist, changing status from @sinfo[4] to F\n"; + #print "(@sinfo[1])Unmounting all shares\n"; + system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount_session @sinfo[1]\" 2> /dev/null"); } else { @@ -66,11 +93,12 @@ while(sleep 5) if(!check_stat(@sinfo[1],@sinfo[11])) { system("su @sinfo[11] -c \"sudo x2gopgwrapper changestatus 'S' @sinfo[1] \" > /dev/null"); - print "@sinfo[1], is suspended, changing status from @sinfo[4] to S\n"; - print "(@sinfo[1])Unmounting all shares\n"; - system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount_session @sinfo[1]\""); + #print "@sinfo[1], is suspended, changing status from @sinfo[4] to S\n"; + #print "(@sinfo[1])Unmounting all shares\n"; + system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount_session @sinfo[1]\" 2> /dev/null"); } } } } + } } \ No newline at end of file diff --git a/x2gocmdexitmessage b/x2gocmdexitmessage new file mode 100755 index 0000000..29da10e --- /dev/null +++ b/x2gocmdexitmessage @@ -0,0 +1,7 @@ +#!/bin/bash + + +X2GO_ROOT=${HOME}/.x2go +MESSAGE_FILE=$X2GO_ROOT/C-$1/cmdoutput + +cat $MESSAGE_FILE \ No newline at end of file diff --git a/x2gocreatebase.sh b/x2gocreatebase.sh index 9eaf4a1..6bb025d 100755 --- a/x2gocreatebase.sh +++ b/x2gocreatebase.sh @@ -1,10 +1,12 @@ #!/bin/bash + +su postgres -c "dropdb x2go_sessions" su postgres -c "createdb x2go_sessions" su postgres -c "echo \"create table sessions( - session_id varchar(100) primary key, + session_id varchar(500) primary key, display integer not null, - uname varchar(20) not null, - server varchar(20) not null, + uname varchar(100) not null, + server varchar(100) not null, client inet, status char(1) not null default 'R', init_time timestamp not null default now(), @@ -12,26 +14,26 @@ su postgres -c "echo \"create table sessions( cookie char(33), agent_pid int, gr_port int, - sound_port int, - unique(display,server) + sound_port int, + fs_port int, + unique(display) )\" | psql x2go_sessions" su postgres -c "echo \"create table messages(mess_id varchar(20) primary key, message text)\" | psql x2go_sessions" su postgres -c "echo \"create table user_messages( mess_id varchar(20) not null, - uname varchar(20) not null + uname varchar(100) not null )\" | psql x2go_sessions" su postgres -c "echo \"create table used_ports( - server varchar(20) not null, - session_id varchar(100) references sessions on delete cascade, - port integer not null, - primary key(server,port) + server varchar(100) not null, + session_id varchar(500) references sessions on delete cascade, + port integer primary key )\" | psql x2go_sessions" su postgres -c "echo \"create table mounts( - session_id varchar(100) references sessions on delete restrict, + session_id varchar(500) references sessions on delete restrict, path varchar(512) not null, client inet not null, primary key(path,client) diff --git a/x2golistsessions b/x2golistsessions index 9b01454..726cc6d 100755 --- a/x2golistsessions +++ b/x2golistsessions @@ -1,24 +1,6 @@ #!/usr/bin/perl use strict; -sub check_pid -{ - my $pid=shift; - my $sess=shift; - my $sec=shift; - if($sec < 30) - { - return 1; - } - open (F,"</proc/$pid/cmdline") or return 0; - my $text=<F>; - close (F); - if($text =~ m/$sess/) - { - return 1; - } - return 0; -} sub check_stat { @@ -32,10 +14,22 @@ sub check_stat return 1; } - -my $serv=$ENV{'HOSTNAME'}; +my $serv=shift; +if( ! $serv) +{ + $serv=$ENV{'HOSTNAME'}; +} my $uname=$ENV{'USER'}; -my $outp=`sudo x2gopgwrapper listsessions $serv`; +my $outp; +if($serv eq "--all-servers") +{ + $outp=`sudo x2gopgwrapper listsessions_all`; +} +else +{ + $outp=`sudo x2gopgwrapper listsessions $serv`; +} + my @outp=split("\n","$outp"); for(my $i=0;$i<@outp;$i++) { @@ -46,12 +40,6 @@ for(my $i=0;$i<@outp;$i++) { print "@outp[$i]\n"; } - elsif(! check_pid (@sinfo[0],@sinfo[1],@sinfo[12]) ) - { - - system("sudo x2gopgwrapper changestatus 'F' @sinfo[1] > /dev/null"); - system( "x2goumount_session @sinfo[1]"); - } else { if(@sinfo[4]eq 'R') diff --git a/x2golistsessions_root b/x2golistsessions_root index 2a069d5..4e128b7 100755 --- a/x2golistsessions_root +++ b/x2golistsessions_root @@ -1,24 +1,6 @@ #!/usr/bin/perl use strict; -sub check_pid -{ - my $pid=shift; - my $sess=shift; - my $sec=shift; - if($sec < 30) - { - return 1; - } - open (F,"</proc/$pid/cmdline") or return 0; - my $text=<F>; - close (F); - if($text =~ m/$sess/) - { - return 1; - } - return 0; -} sub check_stat { @@ -35,10 +17,15 @@ sub check_stat my $uname; -my $serv=$ENV{'HOSTNAME'}; + +my $serv=shift; +if( ! $serv) +{ + $serv=$ENV{'HOSTNAME'}; +} + my $outp=`x2golistsessions_sql $serv 2>/dev/null`; -print $serv; my @outp=split("\n","$outp"); @@ -49,12 +36,6 @@ for(my $i=0;$i<@outp;$i++) { print "@outp[$i]\n"; } - elsif(! check_pid (@sinfo[0],@sinfo[1],@sinfo[12])) - { - system("su - @sinfo[11] -c \"sudo x2gopgwrapper changestatus 'F' @sinfo[1] \" > /dev/null"); - @outp[$i] =~ s/\|R\|/\|F\|/; - @outp[$i] =~ s/\|S\|/\|F\|/; - } else { if(@sinfo[4]eq 'R') diff --git a/x2golistsessions_sql b/x2golistsessions_sql index 5f4839b..aa44679 100755 --- a/x2golistsessions_sql +++ b/x2golistsessions_sql @@ -1,7 +1,15 @@ #!/usr/bin/perl use strict; my $serv=shift; -my $outp=`sudo x2gopgwrapper listsessionsroot $serv`; +my $outp; +if($serv eq "--all-servers") +{ + $outp=`sudo x2gopgwrapper listsessionsroot_all`; +} +else +{ + $outp=`sudo x2gopgwrapper listsessionsroot $serv`; +} $outp =~ s/ //g; $outp =~ s/\*/ /g; diff --git a/x2gomountdirs b/x2gomountdirs index 100de70..6cfc3cd 100755 --- a/x2gomountdirs +++ b/x2gomountdirs @@ -5,9 +5,44 @@ my $type=shift; my $session=shift; my $user=shift; my $key=shift; -my $dirlist=shift; +my @dl; +my $i=0; +@dl[$i]=shift; +while(@dl[$i]) +{ + $i++; + @dl[$i]=shift; +} +my $dirlist=join(" ",@dl); +chop($dirlist); +my $reverse=0; +my $port="22"; +print "dirs:$dirlist\n"; +if($dirlist =~ m/__REVERSESSH_PORT__/) +{ + @dl=split("__REVERSESSH_PORT__","$dirlist"); + $dirlist=@dl[0]; + $port=@dl[1]; + $reverse=1; +} + +if($dirlist =~ m/__SSH_PORT__/) +{ + @dl=split("__SSH_PORT__","$dirlist"); + $dirlist=@dl[0]; + $port=@dl[1]; +} -my $host=(split(" ",$ENV{'SSH_CLIENT'}))[0]; +print "ssh port:$port\n"; +my $host; +if($reverse == 0) +{ + $host=(split(" ",$ENV{'SSH_CLIENT'}))[0]; +} +else +{ + $host='127.0.0.1'; +} print "Host:$host\n"; print "User:$user\n"; @@ -27,47 +62,116 @@ open (F,">$key.ident"); print F "$host $rsa_identity"; close(F); -#my $mdir="/tmp/$ENV{'USER'}_media"; -my $mdir="$ENV{'HOME'}/media"; -mkdir($mdir); + +my $mdir="/tmp/$ENV{'USER'}_media"; +my $ldir="$ENV{'HOME'}/media"; +my $spooldir_lnk="$ENV{'HOME'}/.x2go/C-$session/spool"; +my $spooldir="/tmp/spool_$ENV{'USER'}"; + +if(! -e $mdir) +{ + mkdir($mdir); +} +chmod(0700,$mdir); + +if(! -e $spooldir) +{ + mkdir($spooldir); +} +chmod(0700,$spooldir); + +$spooldir="$spooldir/$session"; +if(! -e $spooldir) +{ + mkdir($spooldir); +} +chmod(0700,$spooldir); + +if( -d $ldir) +{ + rmdir($ldir); +} + +if( ! -l $ldir) +{ + system ("ln -s $mdir $ldir"); +} + +if( -d $spooldir_lnk) +{ + rmdir($spooldir_lnk); +} + +if( ! -l $spooldir_lnk) +{ + system ("ln -s $spooldir $spooldir_lnk"); +} my $uname=$ENV{'USER'}; my @dirs=split(':',$dirlist); for(my $i=0;$i<@dirs;$i++) { - my $p=@dirs[$i]; - if($type ne "dir") + my $printspool=0; + my $mntpath; + if(@dirs[$i]=~m/__PRINT_SPOOL_/) { - $p=~s/\/ramdrive\/mnt\///; + @dirs[$i]=~s/__PRINT_SPOOL_//; + $printspool=1; + $mntpath=$spooldir; } - $p=~s/\//_/g; - mkdir("$mdir/$p"); - my $mntpath="$mdir/$p"; + else + { + my $p=@dirs[$i]; + if($type ne "dir") + { + $p=~s/\/ramdrive\/mnt\///; + } + $p=~s/\//_/g; + $p=~s/ /_/g; + $p=~s/_cygdrive_//g; + $p=~s/~//g; + mkdir("$mdir/$p"); + $mntpath="$mdir/$p"; + } + + print "starting:sudo x2gopgwrapper insertmount $session \"$mntpath\" $host\n"; my $outp=`sudo x2gopgwrapper insertmount $session \"$mntpath\" $host`; + print "result: $outp"; if($outp =~ m/INSERT/) { - print "inserted, sshfs -o IdentityFile=$key,UserKnownHostsFile=$key.ident $user\@$host:@dirs[$i] $mdir/$p\n"; - if(system("sshfs -o IdentityFile=$key,UserKnownHostsFile=$key.ident $user\@$host:@dirs[$i] $mdir/$p")==0) + print "inserted,\nsshfs -o IdentityFile=$key,UserKnownHostsFile=$key.ident $user\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port\n"; + if(system("sshfs -o Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident $user\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 2>>~/mounts.log")==0) { print "mount @dirs[$i] ok\n"; - my $fname="$ENV{'HOME'}/Desktop"; - $p=@dirs[$i]; - $p=~s/\//%2f/g; - $fname="$fname/$p"; - if($type eq "dir") - { - $fname="$fname(sshfs-disk)"; - } - else + if(! $printspool) { - $fname="$fname(sshfs-removable)"; - $fname=~s/%2framdrive%2fmnt%2f//; + my $fname="$ENV{'HOME'}/Desktop"; + my $p=@dirs[$i]; + $p=~s/\/cygdrive\///g; + $p=~s/\//_/g; + $fname="$fname/$p"; + if($type eq "dir") + { + $fname="$fname(sshfs-disk)"; + } + else + { + if($fname =~ m/CDROM/) + { + $fname="$fname(sshfs-cdrom)"; + } + else + { + $fname="$fname(sshfs-removable)"; + } + $fname=~s/_ramdrive_mnt_//; + } + print "fname: $fname\n"; + open(F,">$fname"); + print F "$mntpath\n$session\n\n\0"; + close(F); } - print "fname: $fname\n"; - open(F,">$fname"); - print F "$mntpath\n$session"; - close(F); } else { diff --git a/x2gopgwrapper_local b/x2gopgwrapper_local index 7b44887..721cb7e 100755 --- a/x2gopgwrapper_local +++ b/x2gopgwrapper_local @@ -7,11 +7,11 @@ UNAME=$SUDO_USER case "$1" in getdisplays) - echo "select '|'||display||'|' from sessions where server = '$2';"|psql -t x2go_sessions + echo "select '|'||display||'|' from sessions;"|psql -t x2go_sessions ;; getports) - echo "select '|'||port||'|' from used_ports where server = '$2';"|psql -t x2go_sessions + echo "select '|'||port||'|' from used_ports;"|psql -t x2go_sessions ;; getservers) @@ -22,10 +22,18 @@ listsessions) echo "select agent_pid, session_id, display, server, status,\ to_char(init_time,'DD.MM.YY*HH24:MI:SS'),cookie,client,gr_port,\ sound_port,to_char(last_time,'DD.MM.YY*HH24:MI:SS'),uname,\ - to_char(now()-init_time,'SSSS') from sessions \ + to_char(now()-init_time,'SSSS'),fs_port from sessions \ where status !='F' and server='$2' and uname='$UNAME' order by status desc;"|psql -t x2go_sessions ;; +listsessions_all) + echo "select agent_pid, session_id, display, server, status,\ + to_char(init_time,'DD.MM.YY*HH24:MI:SS'),cookie,client,gr_port,\ + sound_port,to_char(last_time,'DD.MM.YY*HH24:MI:SS'),uname,\ + to_char(now()-init_time,'SSSS'),fs_port from sessions \ + where status !='F' and uname='$UNAME' order by status desc;"|psql -t x2go_sessions + ;; + listsessionsroot) if [ "$UNAME" != "root" ] then @@ -35,10 +43,76 @@ listsessionsroot) echo "select agent_pid, session_id, display, server, status,\ to_char(init_time,'DD.MM.YY*HH24:MI:SS'),cookie,client,gr_port,\ sound_port,to_char(last_time,'DD.MM.YY*HH24:MI:SS'),uname,\ - to_char(now()-init_time,'SSSS') from sessions \ + to_char(now()-init_time,'SSSS'),fs_port from sessions \ where server='$2' order by status desc;"|psql -t x2go_sessions ;; +listsessionsroot_all) + if [ "$UNAME" != "root" ] + then + echo "$UNAME, You have not permission to do this job!" + exit + fi + echo "select agent_pid, session_id, display, server, status,\ + to_char(init_time,'DD.MM.YY*HH24:MI:SS'),cookie,client,gr_port,\ + sound_port,to_char(last_time,'DD.MM.YY*HH24:MI:SS'),uname,\ + to_char(now()-init_time,'SSSS'),fs_port from sessions \ + order by status desc;"|psql -t x2go_sessions + ;; + +listsusp) + if [ "$UNAME" != "root" ] + then + echo "$UNAME, You have not permission to do this job!" + exit + fi + echo "select session_id, display, uname, server,extract( day from now()-last_time)*24*60+extract(hour from now()-last_time)*60+extract(minute from now()-last_time)\ + from sessions where server='$2' and status='S';"|psql -t x2go_sessions + ;; + +listallrunning) + if [ "$UNAME" != "root" ] + then + echo "$UNAME, You have not permission to do this job!" + exit + fi + echo "select agent_pid, session_id, display, server, status,\ + to_char(init_time,'DD.MM.YY*HH24:MI:SS'),cookie,client,gr_port,\ + sound_port,to_char(last_time,'DD.MM.YY*HH24:MI:SS'),uname,\ + to_char(now()-init_time,'SSSS'),fs_port from sessions \ + where status='R';"|psql -t x2go_sessions + ;; + +listmails) + if [ "$UNAME" != "root" ] + then + echo "$UNAME, You have not permission to do this job!" + exit + fi + echo "select user_messages.mess_id,sessions.session_id,\ + sessions.uname,sessions.display from sessions,user_messages,\ + messages where sessions.uname=user_messages.uname and sessions.status!='F'\ + and messages.mess_id=user_messages.mess_id and sessions.server='$2';"|psql -t x2go_sessions + ;; + +getmail) + if [ "$UNAME" != "root" ] + then + echo "$UNAME, You have not permission to do this job!" + exit + fi + echo "select message from messages where mess_id='$2';"|psql -t x2go_sessions + ;; + +rmmail) + if [ "$UNAME" != "root" ] + then + echo "$UNAME, You have not permission to do this job!" + exit + fi + echo "delete from user_messages where mess_id='$2' and uname='$3';"|psql -t x2go_sessions + ;; + rmsessionsroot) if [ "$UNAME" != "root" ] then @@ -72,7 +146,7 @@ insertsession) createsession) echo "update sessions set status='R',last_time=now(),cookie='$2',agent_pid='$3',\ - client='$4',gr_port='$5',sound_port='$6' where session_id='$7' and uname='$UNAME';"|psql x2go_sessions + client='$4',gr_port='$5',sound_port='$6',fs_port='$7' where session_id='$8' and uname='$UNAME';"|psql x2go_sessions ;; insertport) diff --git a/x2gopgwrapper_net b/x2gopgwrapper_net index 10c1b54..a3b9275 100755 --- a/x2gopgwrapper_net +++ b/x2gopgwrapper_net @@ -9,91 +9,170 @@ UNAME=$SUDO_USER case "$2" in getdisplays) - ssh -i ~postgres/.ssh/id_dsa postgres@$SERVER "echo \"select '|'||display||'|' from sessions where server = '$3';\"|psql -t x2go_sessions" + ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"select '|'||display||'|' from sessions;\"|psql -t x2go_sessions" ;; getports) - ssh -i ~postgres/.ssh/id_dsa postgres@$SERVER "echo \"select '|'||port||'|' from used_ports where server = '$3';\"|psql -t x2go_sessions" + ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"select '|'||port||'|' from used_ports;\"|psql -t x2go_sessions" ;; getservers) - ssh -i ~postgres/.ssh/id_dsa postgres@$SERVER "echo \"select server,count(*) from sessions where status != 'F' group by server;\"|psql -t x2go_sessions" + ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"select server,count(*) from sessions where status != 'F' group by server;\"|psql -t x2go_sessions" ;; listsessions) - ssh -i ~postgres/.ssh/id_dsa postgres@$SERVER "echo \"select agent_pid, session_id, display, server, status,\ + ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"select agent_pid, session_id, display, server, status,\ to_char(init_time,'DD.MM.YY*HH24:MI:SS'),cookie,client,gr_port,\ sound_port,to_char(last_time,'DD.MM.YY*HH24:MI:SS'),uname,\ - to_char(now()-init_time,'SSSS') from sessions \ + to_char(now()-init_time,'SSSS'),fs_port from sessions \ where status !='F' and server='$3' and uname='$UNAME' order by status desc;\"|psql -t x2go_sessions" ;; +listsessions_all) + ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"select agent_pid, session_id, display, server, status,\ + to_char(init_time,'DD.MM.YY*HH24:MI:SS'),cookie,client,gr_port,\ + sound_port,to_char(last_time,'DD.MM.YY*HH24:MI:SS'),uname,\ + to_char(now()-init_time,'SSSS'),fs_port from sessions \ + where status !='F' and uname='$UNAME' order by status desc;\"|psql -t x2go_sessions" + ;; + listsessionsroot) if [ "$UNAME" != "root" ] then echo "$UNAME, You have not permission to do this job!" exit fi - ssh -i ~postgres/.ssh/id_dsa postgres@$SERVER "echo \"select agent_pid, session_id, display, server, status,\ + ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"select agent_pid, session_id, display, server, status,\ to_char(init_time,'DD.MM.YY*HH24:MI:SS'),cookie,client,gr_port,\ sound_port,to_char(last_time,'DD.MM.YY*HH24:MI:SS'),uname,\ - to_char(now()-init_time,'SSSS') from sessions \ + to_char(now()-init_time,'SSSS'),fs_port from sessions \ where server='$3' order by status desc;\"|psql -t x2go_sessions" ;; +listsessionsroot_all) + if [ "$UNAME" != "root" ] + then + echo "$UNAME, You have not permission to do this job!" + exit + fi + ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"select agent_pid, session_id, display, server, status,\ + to_char(init_time,'DD.MM.YY*HH24:MI:SS'),cookie,client,gr_port,\ + sound_port,to_char(last_time,'DD.MM.YY*HH24:MI:SS'),uname,\ + to_char(now()-init_time,'SSSS'),fs_port from sessions \ + order by status desc;\"|psql -t x2go_sessions" + ;; + +listsusp) + if [ "$UNAME" != "root" ] + then + echo "$UNAME, You have not permission to do this job!" + exit + fi + ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"select session_id, display, uname, server,extract( day from now()-last_time)*24*60+extract(hour from now()-last_time)*60+extract(minute from now()-last_time)\ + from sessions where server='$3' and status='S';\"|psql -t x2go_sessions" + ;; + + +listallrunning) + if [ "$UNAME" != "root" ] + then + echo "$UNAME, You have not permission to do this job!" + exit + fi + ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"select agent_pid, session_id, display, server, status,\ + to_char(init_time,'DD.MM.YY*HH24:MI:SS'),cookie,client,gr_port,\ + sound_port,to_char(last_time,'DD.MM.YY*HH24:MI:SS'),uname,\ + to_char(now()-init_time,'SSSS'),fs_port from sessions \ + where status='R';\"|psql -t x2go_sessions" + ;; + +listmails) + if [ "$UNAME" != "root" ] + then + echo "$UNAME, You have not permission to do this job!" + exit + fi + ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"select user_messages.mess_id,sessions.session_id,\ + sessions.uname,sessions.display from sessions,user_messages,\ + messages where sessions.uname=user_messages.uname and sessions.status!='F'\ + and messages.mess_id=user_messages.mess_id and sessions.server='$3';\"|psql -t x2go_sessions" + ;; + +getmail) + if [ "$UNAME" != "root" ] + then + echo "$UNAME, You have not permission to do this job!" + exit + fi + ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"select message\ + from messages where mess_id='$3';\"|psql -t x2go_sessions" + ;; + + +rmmail) + if [ "$UNAME" != "root" ] + then + echo "$UNAME, You have not permission to do this job!" + exit + fi + ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"delete from \ + user_messages where mess_id='$3' and uname='$4';\"|psql -t x2go_sessions" + ;; + + rmsessionsroot) if [ "$UNAME" != "root" ] then echo "$UNAME, You have not permission to do this job!" exit fi - ssh -i ~postgres/.ssh/id_dsa postgres@$SERVER "echo \"delete from sessions \ + ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"delete from sessions \ where session_id='$3' ;\"|psql -t x2go_sessions" ;; getagent) - ssh -i ~postgres/.ssh/id_dsa postgres@$SERVER "echo \"select agent_pid from sessions where session_id = '$3';\"|psql -t x2go_sessions" + ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"select agent_pid from sessions where session_id = '$3';\"|psql -t x2go_sessions" ;; getdisplay) - ssh -i ~postgres/.ssh/id_dsa postgres@$SERVER "echo \"select display from sessions where session_id = '$3';\"|psql -t x2go_sessions" + ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"select display from sessions where session_id = '$3';\"|psql -t x2go_sessions" ;; changestatus) - ssh -i ~postgres/.ssh/id_dsa postgres@$SERVER "echo \"update sessions set last_time=now(),status='$3' where session_id = '$4' and uname='$UNAME';\"|psql -t x2go_sessions" + ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"update sessions set last_time=now(),status='$3' where session_id = '$4' and uname='$UNAME';\"|psql -t x2go_sessions" ;; resume) - ssh -i ~postgres/.ssh/id_dsa postgres@$SERVER "echo \"update sessions set last_time=now(),status='R',client='$3' where session_id = '$4' and uname='$UNAME';\"|psql -t x2go_sessions" + ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"update sessions set last_time=now(),status='R',client='$3' where session_id = '$4' and uname='$UNAME';\"|psql -t x2go_sessions" ;; insertsession) - ssh -i ~postgres/.ssh/id_dsa postgres@$SERVER "echo \"insert into sessions (display,server,uname,session_id) values \ + ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"insert into sessions (display,server,uname,session_id) values \ ('$3','$4','$UNAME','$5');\"|psql x2go_sessions" ;; createsession) - ssh -i ~postgres/.ssh/id_dsa postgres@$SERVER "echo \"update sessions set status='R',last_time=now(),cookie='$3',agent_pid='$4',\ - client='$5',gr_port='$6',sound_port='$7' where session_id='$8' and uname='$UNAME';\"|psql x2go_sessions" + ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"update sessions set status='R',last_time=now(),cookie='$3',agent_pid='$4',\ + client='$5',gr_port='$6',sound_port='$7',fs_port='$8' where session_id='$9' and uname='$UNAME';\"|psql x2go_sessions" ;; insertport) - ssh -i ~postgres/.ssh/id_dsa postgres@$SERVER "echo \"insert into used_ports (server,session_id,port) values \ + ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"insert into used_ports (server,session_id,port) values \ ('$3','$4','$5');\"|psql x2go_sessions" ;; insertmount) - ssh -i ~postgres/.ssh/id_dsa postgres@$SERVER "echo \"insert into mounts (session_id,path,client) values \ + ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"insert into mounts (session_id,path,client) values \ ('$3','$4','$5');\"|psql x2go_sessions" ;; deletemount) - ssh -i ~postgres/.ssh/id_dsa postgres@$SERVER "echo \"delete from mounts where session_id='$3' and path='$4';\"|psql x2go_sessions" + ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"delete from mounts where session_id='$3' and path='$4';\"|psql x2go_sessions" ;; getmounts) - ssh -i ~postgres/.ssh/id_dsa postgres@$SERVER "echo \"select client,path from mounts where session_id = '$3';\"|psql -t x2go_sessions" + ssh -i /root/.x2go/ssh/.pg/id_dsa postgres@$SERVER "echo \"select client,path from mounts where session_id = '$3';\"|psql -t x2go_sessions" ;; *) diff --git a/x2goresume-session b/x2goresume-session index 5fb7da0..f55a36d 100755 --- a/x2goresume-session +++ b/x2goresume-session @@ -1,4 +1,5 @@ -#!/bin/sh +#!/bin/bash + SESSION_NAME=$1 X2GO_GEOMETRY=$2 X2GO_LINK=$3 diff --git a/x2goruncommand b/x2goruncommand index b1c3d9c..66071db 100755 --- a/x2goruncommand +++ b/x2goruncommand @@ -1,19 +1,106 @@ #!/bin/bash + DISPLAY=":$1" X2GO_AGENT_PID=$2 X2GO_SESSION=$3 -ARTS_SERVER=localhost:$4 cmd=$5 +sndsys=$6 +X2GO_SESS_TYPE=$7 export DISPLAY export X2GO_AGENT_PID export X2GO_SESSION -export ARTS_SERVER -$cmd +cmd=`echo $cmd |sed 's/X2GO_SPACE_CHAR/ /g'` -kill -9 $X2GO_AGENT_PID +X2GO_ROOT=${HOME}/.x2go +MESSAGE_FILE=$X2GO_ROOT/C-$X2GO_SESSION/cmdoutput +echo "exec $cmd" >> $MESSAGE_FILE +if [ "$sndsys" == "esd" ] +then + export ESPEAKER=localhost:$4 +elif [ "$sndsys" == "arts" ] +then + export ARTS_SERVER=localhost:$4 +fi -sudo x2gopgwrapper changestatus 'F' $X2GO_SESSION > /dev/null +if [ "$cmd" == "WWWBROWSER" ] +then + if [ -e "/usr/bin/firefox" ] + then + cmd="/usr/bin/firefox" + elif [ -e "/usr/bin/iceweasel" ] + then + cmd="/usr/bin/iceweasel" + elif [ -e "/usr/bin/abrowser" ] + then + cmd="/usr/bin/abrowser" + elif [ -e "/usr/bin/konqueror" ] + then + cmd="/usr/bin/konqueror" + elif [ -e "/usr/bin/galeon" ] + then + cmd="/usr/bin/galeon" + fi +fi + +if [ "$cmd" == "MAILCLIENT" ] +then + if [ -e "/usr/bin/thunderbird" ] + then + cmd="/usr/bin/thunderbird" + elif [ -e "/usr/bin/icedove" ] + then + cmd="/usr/bin/icedove" + elif [ -e "/usr/bin/kmail" ] + then + cmd="/usr/bin/kmail" + elif [ -e "/usr/bin/evolution" ] + then + cmd="/usr/bin/evolution" + fi +fi + +if [ "$cmd" == "OFFICE" ] +then + if [ -e "/usr/bin/ooffice" ] + then + cmd="/usr/bin/ooffice" + fi +fi +if [ "$cmd" == "TERMINAL" ] +then + if [ -e "/usr/bin/konsole" ] + then + cmd="/usr/bin/konsole" + elif [ -e "/usr/bin/gnome-terminal" ] + then + cmd="/usr/bin/gnome-terminal" + elif [ -e "/usr/bin/rxvt" ] + then + cmd="/usr/bin/rxvt" + elif [ -e "/usr/bin/xterm" ] + then + cmd="/usr/bin/xterm" + fi +fi + +EXEC=`which $cmd` +if [ "$EXEC" != "" ] && [ -x `which $cmd` ] +then + $cmd + if [ "$X2GO_SESS_TYPE" == "R" ] #### some applications can quit immediately, we waiting until x2goagent exists + then + while [ -d /proc/$X2GO_AGENT_PID ] + do + sleep 1 + done + fi +else + echo "X2GORUNCOMMAND ERR NOEXEC:$cmd" > $MESSAGE_FILE +fi + +kill -TERM $X2GO_AGENT_PID +sudo x2gopgwrapper changestatus 'F' $X2GO_SESSION > /dev/null export HOSTNAME x2goumount_session $X2GO_SESSION diff --git a/x2gostartagent b/x2gostartagent index a734bc8..cf48c4d 100755 --- a/x2gostartagent +++ b/x2gostartagent @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash X2GO_PORT=49 #First port for X2GO=50 SSH_PORT=30000 #First ssh port 30001 @@ -13,10 +13,26 @@ X2GO_TYPE=$4 X2GO_KBD_LAYOUT=$5 X2GO_KBD_TYPE=$6 X2GO_SET_KBD=$7 - +X2GO_STYPE=$8 +X2GO_CMD=$9 X2GO_RESIZE=0 X2GO_FULLSCREEN=0 + +export NX_CLIENT=/usr/bin/x2gosuspend-agent + +COLORDEPTH=`echo "$X2GO_TYPE"|awk '{split($0,a,"-depth_"); print a[2]}'` + +SESSION_TYPE="D" + +if [ "$X2GO_STYPE" == "R" ] +then + SESSION_TYPE="R" +elif [ "$X2GO_STYPE" == "S" ] +then + SESSION_TYPE="S" +fi + if [ "$X2GO_CLIENT" == "" ] then X2GO_CLIENT=$HOSTNAME @@ -31,16 +47,24 @@ do X2GO_PORT=$(($X2GO_PORT + 1)) X2GO_PORT=`echo "for(\\$i=$X2GO_PORT;\\$br ne \"true\";\\$i++){ if(\"$USED_DISPLAYS\" =~ m/\\|\\$i\\|/){\\$br=\"false\";}else{\\$br=\"true\";print \\$i;}}"|perl` - -SESSION_NAME=${USER}-${X2GO_PORT}-`date +"%s"` -OUTPUT=`sudo x2gopgwrapper insertsession $X2GO_PORT $HOSTNAME $SESSION_NAME` + if [ -e "/tmp/.X${X2GO_PORT}-lock" ] || [ -e "/tmp/.X11-unix/X${X2GO_PORT}" ] + then + OUTPUT="XXX" + else + SESSION_NAME=${USER}-${X2GO_PORT}-`date +"%s"` + if [ "$COLORDEPTH" != "" ] + then + SESSION_NAME="$SESSION_NAME"_st${SESSION_TYPE}${X2GO_CMD}_dp${COLORDEPTH} + fi + OUTPUT=`sudo x2gopgwrapper insertsession $X2GO_PORT $HOSTNAME $SESSION_NAME` + fi done USED_PORTS=`sudo x2gopgwrapper getports $HOSTNAME` -while [ "$GR_PORT" == "" ] || [ "$SOUND_PORT" == "" ] +while [ "$GR_PORT" == "" ] || [ "$SOUND_PORT" == "" ] || [ "$FS_PORT" == "" ] do OUTPUT="" while [ "`echo \"$OUTPUT\" | awk '{print $1,$3}'`" != "INSERT 1" ] @@ -65,8 +89,11 @@ do if [ "$GR_PORT" == "" ] then GR_PORT=$SSH_PORT - else + elif [ "$SOUND_PORT" == "" ] + then SOUND_PORT=$SSH_PORT + else + FS_PORT=$SSH_PORT fi done @@ -131,15 +158,13 @@ SAVED_DISPLAY=$DISPLAY DISPLAY=nx/nx,options=${SESSION_DIR}/options:${X2GO_PORT} export DISPLAY -DEFAULT_FONT_PATH=$(echo $(grep -v '^ *#' /etc/X11/xorg.conf | grep FontPath | awk '{print $2}' | sed -r "s/^[\"']|[\"']$//g") | sed 's/ /,/g') - -LD_LIBRARY_PATH=$X2GO_LIB x2goagent -geometry ${X2GO_GEOMETRY} -name "X2GO-${SESSION_NAME}" -fp $DEFAULT_FONT_PATH ${NX_AGENT} 2>${SESSION_DIR}/session.log & +LD_LIBRARY_PATH=$X2GO_LIB x2goagent -$SESSION_TYPE -geometry ${X2GO_GEOMETRY} -name "X2GO-${SESSION_NAME}" ${NX_AGENT} 2>${SESSION_DIR}/session.log & X2GO_AGENT_PID=$! X2GO_SND_PORT=1024 -sudo x2gopgwrapper createsession $X2GO_COOKIE $X2GO_AGENT_PID $X2GO_CLIENT $GR_PORT $SOUND_PORT $SESSION_NAME > /dev/null +sudo x2gopgwrapper createsession $X2GO_COOKIE $X2GO_AGENT_PID $X2GO_CLIENT $GR_PORT $SOUND_PORT $FS_PORT $SESSION_NAME > /dev/null echo $X2GO_PORT echo $X2GO_COOKIE @@ -147,3 +172,4 @@ echo $X2GO_AGENT_PID echo $SESSION_NAME echo $GR_PORT echo $SOUND_PORT +echo $FS_PORT \ No newline at end of file diff --git a/x2gosuspend-agent b/x2gosuspend-agent new file mode 100755 index 0000000..95219b7 --- /dev/null +++ b/x2gosuspend-agent @@ -0,0 +1,10 @@ +#!/usr/bin/perl + +shift; +shift; +shift; + +my $capt=shift; +my @words=split(" ",$capt); + +system("/usr/bin/x2gosuspend-session @words[2] > /dev/null"); \ No newline at end of file diff --git a/x2gosuspend-session b/x2gosuspend-session index 6fdd9f1..db819f3 100755 --- a/x2gosuspend-session +++ b/x2gosuspend-session @@ -1,4 +1,5 @@ -#!/bin/sh +#!/bin/bash + SESSION_NAME=$1 diff --git a/x2goterminate-session b/x2goterminate-session index 2e9b7ca..59560d4 100755 --- a/x2goterminate-session +++ b/x2goterminate-session @@ -1,10 +1,11 @@ -#!/bin/sh +#!/bin/bash + SESSION_NAME=$1 X2GO_AGENT_PID=`sudo x2gopgwrapper getagent $SESSION_NAME` X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}` sudo x2gopgwrapper changestatus 'F' $SESSION_NAME > /dev/null -kill $X2GO_AGENT_PID +kill -TERM $X2GO_AGENT_PID export HOSTNAME x2goumount_session $SESSION_NAME diff --git a/x2goumount b/x2goumount index 1d0f6da..928c3c1 100755 --- a/x2goumount +++ b/x2goumount @@ -7,9 +7,18 @@ my $dir=<F>; my $session=<F>; close(F); +$session=~s/\n//; + chomp($dir); my $uname=$ENV{'USER'}; +my $use_zenity=0; + +if($ENV{'GNOME_DESKTOP_SESSION_ID'} ne "") +{ + $use_zenity=1; +} + if(system( "fusermount -u $dir" ) == 0) { unlink($fname); @@ -18,5 +27,12 @@ if(system( "fusermount -u $dir" ) == 0) } else { - system("x2gomessage --type error --code 0 --text $dir&"); + if($use_zenity == 0) + { + system("kdialog --error \"Can't umount:\n $dir\"&"); + } + else + { + system("zenity --error --text \"Can't umount:\n $dir\"&"); + } } diff --git a/x2goumount_session b/x2goumount_session index 2f1af56..64b212f 100755 --- a/x2goumount_session +++ b/x2goumount_session @@ -32,6 +32,13 @@ open (F,"</etc/mtab") or die "Can't open /etc/mtab for reading"; my @mounts=<F>; close(F); +my $use_zenity=0; + +if($ENV{'GNOME_DESKTOP_SESSION_ID'} ne "") +{ + $use_zenity=1; +} + for($i=0;$i<@outp;$i++) { @@ -70,12 +77,19 @@ break: else { $ENV{'DISPLAY'}=":$display"; - system("x2gomessage --type error --code 0 --text @line[1]&"); + if($use_zenity == 0) + { + system("kdialog --error \"@line[1]\"&"); + } + else + { + system("zenity --error --text \"@line[1]\"&"); + } } } if(! $found) { - $remote=~s/\//%2f/g; + $remote=~s/\//_/g; $remote=(split(":","$remote"))[1]; $remote="$ENV{'HOME'}/Desktop/$remote"; if( -e "$remote(sshfs-disk)") @@ -88,7 +102,11 @@ break: { unlink("$remote(sshfs-removable)"); } - print "$session \"@line[1]\"\n"; + if( -e "$remote(sshfs-cdrom)") + { + unlink("$remote(sshfs-cdrom)"); + } + #print "$session \"@line[1]\"\n"; system("sudo x2gopgwrapper deletemount $session \"@line[1]\"> /dev/null"); rmdir (@line[1]); } 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 - build-baikal (branch) created: 2.0.1
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, build-baikal has been created at 235238a43856cfb66fb8a2a3ba46d7e54120d0f9 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- 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.9-42-g18702f6
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, release/4.0.1.x has been updated via 18702f6ea834854b9777c43714d3047ab4a543f4 (commit) from eec64c23ea370dc7c025aed82379290915d45302 (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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 636baee..0a1cbdf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2goserver (4.0.1.10-0x2go1) UNRELEASED; urgency=low +x2goserver (4.0.1.10-0x2go1) unstable; urgency=low * New upstream version (4.0.1.10): - Fix x2goresume-session. The several parameters placed into the NX options @@ -10,9 +10,9 @@ x2goserver (4.0.1.10-0x2go1) UNRELEASED; urgency=low - x2goserver-printing/Makefile: create feature.d directory before installing files into it. - Handle TCP listening of x2goagent in x2goagent.options. (Fixes: #354). - - Clean up Makefiles, remove commented out line. + - Clean up Makefiles, remove commented out lines. - Use xkb ruleset 'base' rather than xfree86 as on RHEL systems the - xfree86 symlink to base rulset does not exist. + xfree86 symlink to base ruleset does not exist. - Grab systemd service file from Fedora and ship it upstream. - Provide RHEL/Fedora support in x2goserver-xsession. - Only sanity check for existence of /etc/x2go/Xsession.d on Debian @@ -26,7 +26,7 @@ x2goserver (4.0.1.10-0x2go1) UNRELEASED; urgency=low package. + Clear (Fedora package) changelog. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 28 Nov 2013 16:16:22 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 03 Jan 2014 11:34:36 +0100 x2goserver (4.0.1.9-0x2go1) unstable; urgency=low 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.9-41-geec64c2
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, release/4.0.1.x has been updated via eec64c23ea370dc7c025aed82379290915d45302 (commit) from e75d01aeaedee8eba8c46491b581e5384931f638 (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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 5cf6ac8..636baee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -162,7 +162,7 @@ x2goserver (4.0.1.0-0~x2go1) unstable; urgency=low -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 07 Jun 2013 23:07:40 +0200 -x2goserver (4.0.0.8-0x2go1) UNRELEASED; urgency=low +x2goserver (4.0.0.8-0x2go1) unstable; urgency=low * New upstream version (4.0.0.8): - Use mktemp instead of tempfile (because Fedora does not have the tempfile @@ -180,7 +180,7 @@ x2goserver (4.0.0.8-0x2go1) UNRELEASED; urgency=low - Sanitize session ID string, port numbers, display numbers and agent PID numbers before writing them as strings to the session DB. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 28 Nov 2013 16:14:32 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 03 Jan 2014 11:30:54 +0100 x2goserver (4.0.0.7-0x2go1) unstable; urgency=low 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.9-40-ge75d01a
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, release/4.0.1.x has been updated via e75d01aeaedee8eba8c46491b581e5384931f638 (commit) from 331ef6329eb1567a037bfc111465dfc5f0ae6497 (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 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ff70b68..5cf6ac8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -178,7 +178,7 @@ x2goserver (4.0.0.8-0x2go1) UNRELEASED; urgency=low - Avoid backticks in x2goshowblocks, move script to <prefix>/sbin/ as it is for being run with root privileges. - Sanitize session ID string, port numbers, display numbers and agent PID - numbers. + numbers before writing them as strings to the session DB. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 28 Nov 2013 16:14:32 +0100 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.9-38-g18bd2f0
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, release/4.0.1.x has been updated via 18bd2f09f6f2ee909068bb50490755b713110f2b (commit) from bf44925ecccda436caa1cfc34f89eced9c1bd104 (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: x2goserver/sbin/x2goshowblocks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2goserver/sbin/x2goshowblocks b/x2goserver/sbin/x2goshowblocks index 8cecaad..d63fcb3 100755 --- a/x2goserver/sbin/x2goshowblocks +++ b/x2goserver/sbin/x2goshowblocks @@ -24,7 +24,7 @@ use strict; use Sys::Syslog qw( :standard :macros ); use lib `x2gopath lib`; -use x2godbwrapper; +use x2godbwrapper; use x2gologlevel; use x2goutils; 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.9-35-g8347d3f
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, release/4.0.1.x has been updated via 8347d3fef0e5cbabe4aa48f503612fa7b9d078f8 (commit) from b03665513ab1969b069c1351fe17cbb8b5fca256 (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 | 1 + x2goserver-printing/bin/x2goprint | 9 ++++---- .../bin/x2gofm => x2goserver/lib/x2goutils.pm | 24 +++++++++++++------- 3 files changed, 22 insertions(+), 12 deletions(-) copy x2goserver-fmbindings/bin/x2gofm => x2goserver/lib/x2goutils.pm (60%) mode change 100755 => 100644 The diff of changes is: diff --git a/debian/changelog b/debian/changelog index fd4f452..2776c32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -174,6 +174,7 @@ x2goserver (4.0.0.8-0x2go1) UNRELEASED; urgency=low - Avoid one argument system calls and backticks in x2gocleansessions and x2golistsessions_root. - Avoid one argument system calls and backticks in x2golistsessions. + - Avoid one argument system calls and backticks in x2goprint. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 28 Nov 2013 16:14:32 +0100 diff --git a/x2goserver-printing/bin/x2goprint b/x2goserver-printing/bin/x2goprint index b5739c8..79890a4 100755 --- a/x2goserver-printing/bin/x2goprint +++ b/x2goserver-printing/bin/x2goprint @@ -29,6 +29,7 @@ use Sys::Syslog qw( :standard :macros ); use lib `x2gopath lib`; use x2godbwrapper; use x2gologlevel; +use x2goutils; openlog($0,'cons,pid','user'); setlogmask( LOG_UPTO(x2gologlevel()) ); @@ -52,7 +53,7 @@ sub check_usage if (scalar(@ARGV) == 1) { syslog('info', "x2goprint was called with only one cmd line arg, running in x2golistsessions wrapper mode"); - system ("su @ARGV[0] -c \"x2golistsessions --all-servers\""); + system ("su", "@ARGV[0]", "-c", "x2golistsessions --all-servers"); exit 0; } elsif (scalar(@ARGV) != 4) @@ -100,7 +101,7 @@ chown $uid, $gid, "$spooltmp"; chmod 0700, "$spooltmp"; # this last part mainly uses the session user's privileges -my $mounts=`su $user -c "x2golistmounts $session"`; +my $mounts=x2goutils::system_capture_merged_output("su", "$user", "-c", "x2golistmounts $session"); if ( $mounts=~m/$spooldir/) { @@ -117,7 +118,7 @@ if ( $mounts=~m/$spooldir/) } chown $uid, $gid, "$spooltmp/$pdfFile"; - system("su $user -c \"mv $spooltmp/$pdfFile $spooldir\""); + system("su", "$user", "-c", "mv $spooltmp/$pdfFile $spooldir"); syslog('debug', "x2goprint moved file $pdfFile to X2Go client's spool dir"); open (RFILE,">$spooltmp/$pdfFile.ready"); @@ -125,7 +126,7 @@ if ( $mounts=~m/$spooldir/) close (RFILE); chown $uid, $gid, "$spooltmp/$pdfFile.ready"; - system ("su $user -c \"mv $spooltmp/$pdfFile.ready $spooldir\""); + system ("su", "$user", "-c", "mv $spooltmp/$pdfFile.ready $spooldir"); syslog('debug', "x2goprint moved file $pdfFile.ready to X2Go client's spool dir, X2Go client should start the print dialog very soon"); } else { diff --git a/x2goserver-fmbindings/bin/x2gofm b/x2goserver/lib/x2goutils.pm old mode 100755 new mode 100644 similarity index 60% copy from x2goserver-fmbindings/bin/x2gofm copy to x2goserver/lib/x2goutils.pm index 9070055..649241a --- a/x2goserver-fmbindings/bin/x2gofm +++ b/x2goserver/lib/x2goutils.pm @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2007-2012 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2013 X2Go Project - http://wiki.x2go.org # # 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 @@ -17,13 +17,21 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2012 Milan Knížek <knizek.confy(a)gmail.com> -# Copyright (C) 2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2013 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2013 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> + +package x2goutils; use strict; +use base 'Exporter'; +our @EXPORT = ( 'system_capture_merged_output' ); + + +sub system_capture_merged_output { + my $cmd = shift; + my @args = @_; + return capture_merged { system( $cmd, @args ); }; +} -my $fname=shift; -open(F,"<$fname") or die "can't open $fname"; -my $dir=<F>; -close(F); -system( "xdg-open $dir" ); +1; 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.9-33-gebbb6a0
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, release/4.0.1.x has been updated via ebbb6a0b17264a6d9743ab8a7199fb964ba20efd (commit) from 99c70bb4cc17db04c2e63edd783476518b03de6d (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 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 3c70aba..fa1f121 100644 --- a/debian/changelog +++ b/debian/changelog @@ -173,7 +173,7 @@ x2goserver (4.0.0.8-0x2go1) UNRELEASED; urgency=low for finding this!!! (Fixes: #356). - Avoid one argument system calls and backticks in x2gocleansessions and x2golistsessions_root. - + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 28 Nov 2013 16:14:32 +0100 x2goserver (4.0.0.7-0x2go1) unstable; urgency=low 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.9-36-gb465d13
by git-admin＠x2go.org 03 Jan '14

03 Jan '14

The branch, release/4.0.1.x has been updated via b465d13a416d97614b3b4ac9fd1faf1c034a840c (commit) from 8347d3fef0e5cbabe4aa48f503612fa7b9d078f8 (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: x2goserver/sbin/x2golistsessions_root | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2goserver/sbin/x2golistsessions_root b/x2goserver/sbin/x2golistsessions_root index 56d1781..a3bd044 100755 --- a/x2goserver/sbin/x2golistsessions_root +++ b/x2goserver/sbin/x2golistsessions_root @@ -78,7 +78,7 @@ for (my $i=0;$i<@outp;$i++) { if (is_suspended(@sinfo[1],@sinfo[11])) { - system("su - @sinfo[11] -c \"$x2go_lib_path/x2gochangestatus 'S' @sinfo[1]\" > /dev/null"); + system("su", "-", "@sinfo[11]", "-c", "$x2go_lib_path/x2gochangestatus 'S' @sinfo[1] > /dev/null"); @outp[$i] =~ s/\|R\|/\|S\|/; } } 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 January 2014