x2go-commits

x2go-commits@lists.x2go.org

1 participants
37903 discussions

x2goserver.git - master (branch) updated: 3.0.99-2-219-g7f7ec2c
by git-admin＠x2go.org 08 Sep '11

08 Sep '11

The branch, master has been updated via 7f7ec2c82959950ef5ef2186b2c2ff658f8508ca (commit) from cfbadbad8aa07a623c38313799170feae6f63936 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7f7ec2c82959950ef5ef2186b2c2ff658f8508ca Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 8 17:38:45 2011 +0200 Fix x2goprint, add syslogging, add inline comments. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver/bin/x2goprint | 68 +++++++++++++++++++++++++++++++++++----------- 2 files changed, 53 insertions(+), 16 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8a9626e..87b6158 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low * Create x2goprint user/group on package installation, add same info to INSTALL howto. * Add sanity checks to x2goprint, script can only be run as root. + * Fix x2goprint, add syslogging, add inline comments. [ Martin Oehler ] * Removes old debug code fragment, fixes x2golistsessions parsing. diff --git a/x2goserver/bin/x2goprint b/x2goserver/bin/x2goprint index 89028af..8d0da56 100755 --- a/x2goserver/bin/x2goprint +++ b/x2goserver/bin/x2goprint @@ -23,44 +23,57 @@ use File::Basename; use File::Copy; use File::Path; +use Sys::Syslog qw( :DEFAULT setlogsock); use strict; use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; +setlogsock('unix'); +openlog($0,'cons,pid','user'); + sub check_root { my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid($<); my $realuser=$uname; if ($realuser ne "root") { + syslog('err', "x2goprint was called by user $realuser directly, x2goprint exits now!"); die "$realuser, you cannot use x2goprint as non-root user..."; } } -sub usage +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\""); exit 0; } elsif (scalar(@ARGV) != 4) { + syslog('err', "x2goprint was called with a wrong number of cmd line args, x2goprint exits now!"); print STDERR "ERROR: Usage:\nx2goprint user session file titleFile\nx2goprint user\n"; exit 1; } } +# sanity check, this script has to be run with root privileges check_root(); -usage(); -my ($user, $session, $file, $titleFile)=@ARGV; +# check number of cmd line args +check_usage(); + +# get options from the command line +my ($user, $session, $pdfFile, $titleFile)=@ARGV; +# location for incoming jobs is ~x2goprint my ($tm,$tm,$uid,$gid,$tm,$tm,$tm,$homedir)=getpwnam("x2goprint"); my $printdir=$homedir; -my $title; +# extract necessary information from title file and drop it afterwards +my $title='UNTITLED'; if( -e "$printdir/$titleFile") { open (TITLE,"<$printdir/$titleFile"); @@ -68,8 +81,11 @@ if( -e "$printdir/$titleFile") close (TITLE); unlink("$printdir/$titleFile"); } +syslog('info', "x2goprint is processing $printdir/$pdfFile with print job title ,,$title\''"); - +# temp location for placing incoming spool files, so that +# they can can be picked by the session user and further processed +# with user privileges ($tm,$tm,$uid,$gid,$tm,$tm,$tm,$homedir)=getpwnam($user); my $spoolbase="/tmp/spool_$user"; @@ -79,21 +95,41 @@ mkpath($spooltmp); chown $uid, $gid, "$spooltmp"; chmod 0700, "$spooltmp"; +# this last part mainly uses the session user's privileges my ($mounts)=db_getmounts($session); if ( $mounts=~m/$spooldir/) { - move("$printdir/$file", "$spooltmp") or die "$!: Can't move $file to $spooltmp/"; - chown $uid, $gid, "$spooltmp/$file"; - system("su $user -c \"mv $spooltmp/$file $spooldir\""); - open (RFILE,">$spooltmp/$file.ready"); - print RFILE "$file\n$title"; + # if the client side spool dir (the directory where x2goclient + # waits for incoming print job files) is mounted in the session + # we will copy the print files from the temp location above to + # the SSHFS share mounted from the client system. + + syslog('info', "client-side spool dir is mounted, transferring printable file $pdfFile to X2go client system"); + + if (not move("$printdir/$pdfFile", "$spooltmp")) { + syslog('err', "x2goprint failed to process print spool job for file $pdfFile"); + die "$0: Can't move $printdir/$pdfFile to $spooltmp/"; + } + chown $uid, $gid, "$spooltmp/$pdfFile"; + + 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"); + print RFILE "$pdfFile\n$title"; close (RFILE); - chown $uid, $gid, "$spooltmp/$file.ready"; - system ("su $user -c \"mv $spooltmp/$file.ready $spooldir\""); -} -else -{ - unlink("$printdir/$file"); + chown $uid, $gid, "$spooltmp/$pdfFile.ready"; + 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 { + + # if the client-side spool dir is not mounted via SSHFS, we will simply drop the + # printable PDF file + + syslog('info', "client-side spool dir is _not_ mounted, dropping spool job $pdfFile"); + + unlink("$printdir/$pdfFile"); } 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

cups-x2go.git - master (branch) updated: 3.0.0.2-19-g3d504f3
by git-admin＠x2go.org 08 Sep '11

08 Sep '11

The branch, master has been updated via 3d504f393caf5d3942e22578695f8fcc73ef1409 (commit) from 2a54f6694a95b24c915dfafc04b7a1e9123b94d4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3d504f393caf5d3942e22578695f8fcc73ef1409 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 8 17:36:30 2011 +0200 Major change of code, add comments, syslogging, fix ghostscript call. ----------------------------------------------------------------------- Summary of changes: cups-x2go | 66 ++++++++++++++++++++++++++++++++++++++--------------- cups-x2go.conf | 2 +- debian/changelog | 1 + 3 files changed, 49 insertions(+), 20 deletions(-) The diff of changes is: diff --git a/cups-x2go b/cups-x2go index ab0d1ef..a57cbea 100755 --- a/cups-x2go +++ b/cups-x2go @@ -1,4 +1,4 @@ -!/usr/bin/perl +#!/usr/bin/perl # X2go CUPS backend # Copyright 2009-2011 Obviously Nice @@ -104,19 +104,38 @@ sub printfile if($phost eq $host) { my ($tm,$tm,$uid,$gid,$tm,$tm,$tm,$spooldir)=getpwnam("x2goprint"); - my $spfile="$spooldir/$sess$bname"; + my $spfile="$spooldir/${sess}_$bname"; copy($pfile, $spfile); copy($tfile, "$spfile.title"); chown $uid,$gid,"$spfile"; chown $uid,$gid,"$spfile.title"; - system( "x2goprint $userName $sess $sess$bname $sess$bname.title" ); - # log that we processed a print job - syslog('debug', "x2goprint $userName $sess $bname $bname.title"); + syslog('debug', `ls /var/spool/x2goprint`); + # log that we are about to process a print job + syslog('debug', "x2goprint $userName $sess ${sess}_$bname ${sess}_$bname.title"); + + # process print job + system( "x2goprint $userName $sess ${sess}_$bname ${sess}_$bname.title" ); } else { - system ("scp -i $printdsa $pfile $tfile x2goprint\@$x2goserver:~x2goprint/"); - system( "ssh -i $printdsa x2goprint\@$x2goserver \"sudo x2goprint $userName $sess $bname $bname.title\"" ); + # push spool job to remote X2go server... and launch x2goprint there (with sudo!!!) + + # FIXME: probably the $phost contains the value for the remote x2goserver... + # $x2goserver is read from config, it doesn't make sense here that the + # X2go server is statically taken from the config file, it should be + # taken from the session information hash (i.e. = $phost). + # If that is so, then $phost is not an appropriate var name... + + # PDF file + syslog('debug', "scp -i $printdsa $pfile x2goprint\@$x2goserver:~x2goprint/${sess}_$bname"); + system ("scp -i $printdsa $pfile x2goprint\@$x2goserver:~x2goprint/${sess}_$bname"); + # title file + syslog('debug', "scp -i $printdsa $tfile x2goprint\@$x2goserver:~x2goprint/${sess}_$bname.title"); + system ("scp -i $printdsa $tfile x2goprint\@$x2goserver:~x2goprint/${sess}_$bname.title"); + # run x2goprint on remote X2go server + syslog('debug', "ssh -i $printdsa x2goprint\@$x2goserver \"sudo x2goprint $userName $sess ${sess}_$bname ${sess}_$bname.title\"" ); + system( "ssh -i $printdsa x2goprint\@$x2goserver \"sudo x2goprint $userName $sess ${sess}_$bname ${sess}_$bname.title\"" ); + } } @@ -140,13 +159,13 @@ my $jobID; my $jobTitle; my $copies; my $printOptions; -my $printFile; +my $psFile; -($jobID, $userName, $jobTitle, $copies, $printOptions, $printFile) = @ARGV; -syslog('info', "Print job received from cups -> $jobID $userName $jobTitle $copies $printOptions $printFile"); +($jobID, $userName, $jobTitle, $copies, $printOptions, $psFile) = @ARGV; +syslog('info', "Print job received from cups -> $jobID $userName $jobTitle $copies $printOptions $psFile"); my $tempFile; -if (!$printFile) +if (!$psFile) { my $jid = $jobID; my $uid = $userName; @@ -161,15 +180,24 @@ if (!$printFile) } close OUT; - $printFile = $tempFile; + $psFile = $tempFile; } readconfig(); -$ps2pdf=~s/%s/$printFile/g; -system($ps2pdf); -$printFile="$printFile.pdf"; -my $titleFile="$printFile.title"; +# converting PS file that we retrieved from CUPS into PDF format +$ps2pdf=~s/%s/$psFile/g; +syslog('info', "Converting printjob with command: $ps2pdf\n"); + +# the TMPDIR env var is needed for ghostscript... +$ENV{TMPDIR}="/tmp"; +system("$ps2pdf"); + +# after we have created the PDF from CUPS's PS file, we can drop the PS file +unlink ($psFile); + +my $pdfFile="$psFile.pdf"; +my $titleFile="$pdfFile.title"; open (TITLE,">$titleFile"); print TITLE $jobTitle; close (TITLE); @@ -180,12 +208,12 @@ for(my $i=0; $i<scalar(@sessions);$i++ ) my @sinfo=split("\\|",@sessions[$i]); if(@sinfo[4] eq "R") { - printfile( $printFile, $titleFile, @sinfo[3], @sinfo[1]); - syslog('debug', "Call to printfile function with: $printFile $titleFile @sinfo[3] @sinfo[1]\n"); + syslog('debug', "Call to printfile function with: $pdfFile $titleFile @sinfo[3] @sinfo[1]\n"); + printfile( $pdfFile, $titleFile, @sinfo[3], @sinfo[1]); } } -unlink ($printFile); +unlink ($pdfFile); unlink ($titleFile); # closing syslog diff --git a/cups-x2go.conf b/cups-x2go.conf index 0480381..1b11d56 100644 --- a/cups-x2go.conf +++ b/cups-x2go.conf @@ -12,4 +12,4 @@ #printdsa = /root/.ssh/id_dsa-x2goprint ## command to generate pdf files -#ps2pdf = /usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile="%s.pdf" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f "%s" +#ps2pdf = /usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f \"%s\" diff --git a/debian/changelog b/debian/changelog index 8d94388..b4a668a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ cups-x2go (3.0.0.2-0~x2go2) UNRELEASED; urgency=low * Call x2goprint directly with root privileges if x2goserver and CUPS server share the same machine. * Add a proper dpkg-statoverride check in postinst script. + * Major change of code, add comments, syslogging, fix ghostscript call. [ Mario Oroz ] * Add syslog support for cups-x2go. hooks/post-receive -- cups-x2go.git (CUPS Backend for X2go Printing) 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 "cups-x2go.git" (CUPS Backend for X2go Printing).

1 0

python-x2go.git - release/0.1.1.x (branch) updated: 0.1.1.4-22-g20a8605
by git-admin＠x2go.org 08 Sep '11

08 Sep '11

The branch, release/0.1.1.x has been updated via 20a8605bddc3da4b9635ec6532f90c9a972f84ac (commit) from b6adff9a57bdb59f184842ba222f3a3f89808aca (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 20a8605bddc3da4b9635ec6532f90c9a972f84ac Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 8 13:34:42 2011 +0200 log message fix in x2gosession.py ----------------------------------------------------------------------- Summary of changes: x2go/session.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2go/session.py b/x2go/session.py index 9d30221..7d1c95e 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -932,7 +932,7 @@ class X2goSession(object): # skip this session status update if not longer than a second ago... if _status_update_timedelta < 1: - self.logger('status update interval too short (%s), skipping status about this time...' % _status_update_timedelta, loglevel=log.loglevel_DEBUG) + self.logger('status update interval too short (%s), skipping status update this time...' % _status_update_timedelta, loglevel=log.loglevel_DEBUG) return False e = None hooks/post-receive -- python-x2go.git (Python X2go Client API) 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 "python-x2go.git" (Python X2go Client API).

1 0

python-x2go.git - pristine-tar (branch) created: adb2c199999dca85af4516b6ba3c5ec2d2faea62
by git-admin＠x2go.org 08 Sep '11

08 Sep '11

The branch, pristine-tar has been created at adb2c199999dca85af4516b6ba3c5ec2d2faea62 (commit) - Log ----------------------------------------------------------------- commit adb2c199999dca85af4516b6ba3c5ec2d2faea62 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Mar 26 21:00:54 2011 +0100 pristine-tar data for python-x2go_0.0.41.0.tar.gz commit 419fe7853a37394386c23f1aa5f211ccf8f4faa8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Mar 11 00:44:40 2011 +0100 pristine-tar data for python-x2go_0.0.40.0.orig.tar.gz commit 4b4a3ca3c37f4fb3c2cfbc54a6403d4eaa04966b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Mar 11 00:42:34 2011 +0100 pristine-tar data for python-x2go_0.0.40.0.orig.tar.gz commit 78003345f03997e56c6370c2ac56b33ff5e3e98b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Mar 1 00:46:18 2011 +0100 pristine-tar data for python-x2go_0.0.39.0.orig.tar.gz commit 9e933be9f556140a9569df63bd54ba5e8dacbeaf Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Feb 27 02:50:09 2011 +0100 pristine-tar data for python-x2go_0.0.38.0.orig.tar.gz commit 614900c915b3e13c3059ec8d4faa4f3d7c1bb0e8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Feb 25 18:45:04 2011 +0100 pristine-tar data for python-x2go_0.0.37.0.orig.tar.gz ----------------------------------------------------------------------- hooks/post-receive -- python-x2go.git (Python X2go Client API) 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 "python-x2go.git" (Python X2go Client API).

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-24-g43fdebe
by git-admin＠x2go.org 08 Sep '11

08 Sep '11

The branch, master has been updated via 43fdebef41f673bc7afe06759990e1c1fa88d973 (commit) from 45ef555923e37f73ec2465d3825e8e5b88d1c02b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 43fdebef41f673bc7afe06759990e1c1fa88d973 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 8 13:34:42 2011 +0200 log message fix in x2gosession.py ----------------------------------------------------------------------- Summary of changes: x2go/session.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2go/session.py b/x2go/session.py index 9ac086b..53b5dd5 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -932,7 +932,7 @@ class X2goSession(object): # skip this session status update if not longer than a second ago... if _status_update_timedelta < 1: - self.logger('status update interval too short (%s), skipping status about this time...' % _status_update_timedelta, loglevel=log.loglevel_DEBUG) + self.logger('status update interval too short (%s), skipping status update this time...' % _status_update_timedelta, loglevel=log.loglevel_DEBUG) return False e = None hooks/post-receive -- python-x2go.git (Python X2go Client API) 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 "python-x2go.git" (Python X2go Client API).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-218-gcfbadba
by git-admin＠x2go.org 07 Sep '11

07 Sep '11

The branch, master has been updated via cfbadbad8aa07a623c38313799170feae6f63936 (commit) via d8bf461f9299ce7f2b5c61ce4f6e7330f2ab2974 (commit) via 4408d3d51bfe24d168e67ae6411c26f459769132 (commit) via 618c1468df976ea93f307e658360a6ec20fc44a0 (commit) from 39feab07aa3bfaa30de5f35e7f13f2c61d435e66 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit cfbadbad8aa07a623c38313799170feae6f63936 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 8 01:29:05 2011 +0200 Add sanity checks to x2goprint, script can only be run as root. commit d8bf461f9299ce7f2b5c61ce4f6e7330f2ab2974 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 8 01:27:14 2011 +0200 postinst fix commit 4408d3d51bfe24d168e67ae6411c26f459769132 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 8 01:18:25 2011 +0200 revert test code in dbwrapper commit 618c1468df976ea93f307e658360a6ec20fc44a0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 8 01:14:51 2011 +0200 revert setgid wrapper for x2goprint ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 +++----- debian/x2goserver.postinst | 2 +- x2goserver/Makefile | 4 ---- x2goserver/bin/x2goprint | 27 ++++++++++++++++++++++----- x2goserver/lib/x2gosqlitewrapper.pl | 1 - 5 files changed, 26 insertions(+), 16 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c7cb3f6..8a9626e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low - [Mike Gabriel] + [ Mike Gabriel ] * Rename x2goumount_session calls to x2goumount-session calls in x2goserver internal scripts. * React to bug #627990, prefer man2html-base over man2html. @@ -34,11 +34,9 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low * Silence x2golistsessions on missing session.log files. * Create x2goprint user/group on package installation, add same info to INSTALL howto. - * Change permissions on x2goprint, using 2755:root:x2goprint (setgid). - * Change X2go printing concept: use setgit and a sgid wrapper instead of sudo. - * Makefile update for x2goprint setgid wrapper. + * Add sanity checks to x2goprint, script can only be run as root. - [Martin Oehler] + [ Martin Oehler ] * Removes old debug code fragment, fixes x2golistsessions parsing. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 05 Jun 2011 20:44:32 +0200 diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index 961fdc1..407cf79 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -128,7 +128,7 @@ case "$1" in chown root:root /usr/bin/x2goprint chmod 0755 /usr/bin/x2goprint fi - + ;; abort-upgrade|abort-remove|abort-deconfigure) ;; diff --git a/x2goserver/Makefile b/x2goserver/Makefile index b46c117..71cced9 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -37,7 +37,6 @@ build-arch: build_setgidwrappers build_setgidwrappers: gcc -o x2gosqlitewrapper x2gosqlitewrapper.c - gcc -o x2goprint x2goprint.c build-indep: build_man2html @@ -50,7 +49,6 @@ clean: clean_arch clean_man2html clean_arch: rm -f x2gosqlitewrapper - rm -f x2goprint clean_man2html: rm -Rf `dirname $(MAN2HTML_DEST)` @@ -64,7 +62,6 @@ install_scripts: $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/ $(INSTALL_PROGRAM) x2gosqlitewrapper $(DESTDIR)$(LIBDIR)/ - $(INSTALL_PROGRAM) x2goprint $(DESTDIR)$(BINDIR)/ $(INSTALL_PROGRAM) lib/* $(DESTDIR)$(LIBDIR)/ chmod a-x $(DESTDIR)$(LIBDIR)/*.pm chown root:x2gouser $(DESTDIR)$(LIBDIR)/x2gosqlitewrapper @@ -100,7 +97,6 @@ uninstall_scripts: for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SBINDIR)/$$file; done for file in $(LIB_FILES); do $(RM_FILE) $(DESTDIR)$(LIBDIR)/$$file; done $(RM_FILE) $(DESTDIR)$(LIBDIR)/x2gosqlitewrapper - $(RM_FILE) $(DESTDIR)$(BINDIR)/x2goprint $(RM_DIR) $(DESTDIR)$(LIBDIR) || true uninstall_config: diff --git a/x2goserver/bin/x2goprint b/x2goserver/bin/x2goprint index ea35584..89028af 100755 --- a/x2goserver/bin/x2goprint +++ b/x2goserver/bin/x2goprint @@ -28,16 +28,33 @@ use strict; use lib `echo -n \$(x2gobasepath)/lib/x2go`; use x2godbwrapper; -if (scalar(@ARGV) ==1) +sub check_root { - db_listsessions_all @ARGV[0]; + my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid($<); + my $realuser=$uname; + if ($realuser ne "root") + { + die "$realuser, you cannot use x2goprint as non-root user..."; + } } -elsif (scalar(@ARGV) != 4) + +sub usage { - print STDERR "ERROR: Usage:\nx2goprint user session file titleFile\nx2goprint user\n"; - exit 1; + if (scalar(@ARGV) == 1) + { + system ("su @ARGV[0] -c \"x2golistsessions --all-servers\""); + exit 0; + } + elsif (scalar(@ARGV) != 4) + { + print STDERR "ERROR: Usage:\nx2goprint user session file titleFile\nx2goprint user\n"; + exit 1; + } } +check_root(); +usage(); + my ($user, $session, $file, $titleFile)=@ARGV; my ($tm,$tm,$uid,$gid,$tm,$tm,$tm,$homedir)=getpwnam("x2goprint"); diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl index 79f10af..0beef3a 100755 --- a/x2goserver/lib/x2gosqlitewrapper.pl +++ b/x2goserver/lib/x2gosqlitewrapper.pl @@ -279,7 +279,6 @@ elsif($cmd eq "listsessions") elsif($cmd eq "listsessions_all") { - my $user=shift and $realuser = $user; 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), hooks/post-receive -- x2goserver.git (X2go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2go Server).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-214-g39feab0
by git-admin＠x2go.org 07 Sep '11

07 Sep '11

The branch, master has been updated via 39feab07aa3bfaa30de5f35e7f13f2c61d435e66 (commit) from 103e231b27adfe1f557cfd097eb1c4eeb853dbe4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 39feab07aa3bfaa30de5f35e7f13f2c61d435e66 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 8 00:04:27 2011 +0200 Partially revert setgid changes committed earlier. ----------------------------------------------------------------------- Summary of changes: debian/x2goserver.install | 1 - debian/x2goserver.postinst | 12 ++-- debian/x2goserver.postrm | 3 - x2goserver/VERSION.x2goserver | 2 +- x2goserver/{lib/x2goprint.pl => bin/x2goprint} | 2 +- x2goserver/lib/x2gosqlitewrapper.pl | 2 + x2goserver/x2goprint.c | 79 ------------------------ 7 files changed, 10 insertions(+), 91 deletions(-) rename x2goserver/{lib/x2goprint.pl => bin/x2goprint} (97%) delete mode 100644 x2goserver/x2goprint.c The diff of changes is: diff --git a/debian/x2goserver.install b/debian/x2goserver.install index 9b7c34c..5f1395a 100644 --- a/debian/x2goserver.install +++ b/debian/x2goserver.install @@ -5,5 +5,4 @@ x2goserver/etc/x2gosql/sql /etc/x2go/x2gosql/ x2goserver/etc/x2goserver.conf /etc/x2go/ x2goserver/VERSION.x2goserver /usr/share/x2go/versions/ x2goserver/x2gosqlitewrapper /usr/lib/x2go/ -x2goserver/x2goprint /usr/bin/ diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index c3b5a3f..961fdc1 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -121,13 +121,13 @@ case "$1" in # egid x2goprint needs write access to the spool dir chmod 0770 /var/spool/x2goprint - ### setgid section for x2goprint (X2go printing) - - # the x2goprint command can only be run by users that are in group x2goprint - if ! dpkg-statoverride --list /usr/bin/x2goprint >/dev/null; then - dpkg-statoverride --add --update root x2goprint 2755 /usr/bin/x2goprint + # we may be upgrading versions of x2goserver that had + # /usr/bin/x2goprint was set to setuid x2goprint. + if dpkg-statoverride --list /usr/bin/x2goprint >/dev/null; then + dpkg-statoverride --remove /usr/bin/x2goprint + chown root:root /usr/bin/x2goprint + chmod 0755 /usr/bin/x2goprint fi - ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/x2goserver.postrm b/debian/x2goserver.postrm index 423d45e..e99c2c9 100755 --- a/debian/x2goserver.postrm +++ b/debian/x2goserver.postrm @@ -28,9 +28,6 @@ case "$1" in getent group x2gouser >/dev/null && delgroup x2gouser getent group x2gousers >/dev/null && delgroup x2gousers - if dpkg-statoverride --list /usr/bin/x2goprint >/dev/null; then - dpkg-statoverride --remove /usr/bin/x2goprint - fi getent passwd x2goprint >/dev/null && deluser x2goprint getent group x2goprint >/dev/null && delgroup x2goprint ;; diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index 34936c7..36a9e31 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -3.0.99.5 \ No newline at end of file +3.0.99.6 \ No newline at end of file diff --git a/x2goserver/lib/x2goprint.pl b/x2goserver/bin/x2goprint similarity index 97% rename from x2goserver/lib/x2goprint.pl rename to x2goserver/bin/x2goprint index 8b913ea..ea35584 100755 --- a/x2goserver/lib/x2goprint.pl +++ b/x2goserver/bin/x2goprint @@ -30,7 +30,7 @@ use x2godbwrapper; if (scalar(@ARGV) ==1) { - system ("su @ARGV[0] -c \"x2golistsessions --all-servers\" "); + db_listsessions_all @ARGV[0]; } elsif (scalar(@ARGV) != 4) { diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl index 9e40d3e..79f10af 100755 --- a/x2goserver/lib/x2gosqlitewrapper.pl +++ b/x2goserver/lib/x2gosqlitewrapper.pl @@ -279,6 +279,7 @@ elsif($cmd eq "listsessions") elsif($cmd eq "listsessions_all") { + my $user=shift and $realuser = $user; 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), @@ -287,6 +288,7 @@ elsif($cmd eq "listsessions_all") uname, strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions where status !='F' and uname=? and ( session_id not like '%XSHAD%') order by status desc"); + $sth->execute($realuser)or die; fetchrow_printall_array($sth); } diff --git a/x2goserver/x2goprint.c b/x2goserver/x2goprint.c deleted file mode 100644 index 9151d17..0000000 --- a/x2goserver/x2goprint.c +++ /dev/null @@ -1,79 +0,0 @@ -/* - * This file is part of the X2go Project - http://www.x2go.org - * Copyright (C) 2011 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> - * Copyright (C) 2011 Moritz 'Morty' Strübe <morty(a)gmx.net> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - * - * - */ - -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <libgen.h> -#include <errno.h> - - -int main( int argc, char *argv[] ) { - char * x2goprint = NULL; - size_t path_max; - -/* - The following snippet is taken from the realpath manpage -*/ -#ifdef PATH_MAX - path_max = PATH_MAX; -#else - path_max = pathconf (".", _PC_PATH_MAX); - if (path_max <= 0){ - path_max = 4096; - } -#endif - { - // allocate dynamic buffer in stack: this needs C99 or gnu?? - char buffer[path_max]; - ssize_t rvrl; - int rvap; - - // resolve link of /proc/self/exe to find out where we are - rvrl = readlink("/proc/self/exe", buffer, path_max); - if(rvrl == -1){ - perror("readlink(\"/proc/self/exe\",buffer,path_max)"); - exit(EXIT_FAILURE); - } - if(rvrl >= path_max){ - fprintf(stderr, "Could not resolve the path of this file using \"/proc/self/exe\". The path is too long (> %i)", path_max); - exit(EXIT_FAILURE); - } - - // derive the full path of x2goprint.pl from path of this binary - rvap = asprintf(&x2goprint, "%s/lib/x2go/%s", dirname(dirname(buffer)), "x2goprint.pl"); - if(rvap == -1){ - fprintf(stderr, "Failed to allocate memory calling asprintf\n"); - exit(EXIT_FAILURE); - } - - // execute the script, running with user-rights of this binary - execv(x2goprint, argv); - - } - - // ...fail - fprintf(stderr, "Failed to execute %s: %s\n", x2goprint, strerror(errno)); - return EXIT_FAILURE; - -} 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

cups-x2go.git - master (branch) updated: 3.0.0.2-18-g2a54f66
by git-admin＠x2go.org 07 Sep '11

07 Sep '11

The branch, master has been updated via 2a54f6694a95b24c915dfafc04b7a1e9123b94d4 (commit) via 87f5a7a16778541a45e631d1a7004443a5f44df1 (commit) from e6bae2cd4b9cbed83cee9f8d495985d713d676fc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2a54f6694a95b24c915dfafc04b7a1e9123b94d4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 8 00:00:45 2011 +0200 Call x2goprint directly with root privileges if x2goserver and CUPS server share the same machine. commit 87f5a7a16778541a45e631d1a7004443a5f44df1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 7 23:52:37 2011 +0200 tab'ified cups-x2go backend script ----------------------------------------------------------------------- Summary of changes: cups-x2go | 200 +++++++++++++++++++++++++++--------------------------- cups-x2go.conf | 11 ++- debian/changelog | 3 +- 3 files changed, 108 insertions(+), 106 deletions(-) The diff of changes is: diff --git a/cups-x2go b/cups-x2go index ddba23d..ab0d1ef 100755 --- a/cups-x2go +++ b/cups-x2go @@ -1,4 +1,5 @@ !/usr/bin/perl + # X2go CUPS backend # Copyright 2009-2011 Obviously Nice # @@ -27,114 +28,112 @@ setlogsock('unix'); openlog($0,'cons,pid','user'); my $x2goserver = "local"; -my $printdsa = "/root/.x2go/ssh/.x2goprint/id_dsa"; +my $printdsa = "/root/.ssh/id_dsa-x2goprint"; my $ps2pdf = "/usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f \"%s\""; -#my $ps2pdf = "/usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f /usr/bin/margen-offset.ps \"%s\""; +#my $ps2pdf = "/usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f /usr/bin/margin-offset.ps \"%s\""; my $cfgfile="/etc/cups/cups-x2go.conf"; my $userName; my @sessions; my $host=hostname(); - sub readconfig { - if( -e $cfgfile) - { - open(CFG,"<$cfgfile"); - while(!eof(CFG)) - { - my $ln=<CFG>; - my $nocomln=(split("#",$ln))[0]; - $nocomln=~s/\n//g; - my @valarr=split("=",$nocomln); - my $option=@valarr[0]; - shift(@valarr); - my $value=join("=",@valarr); - $option=~s/ //g; - if($option eq "x2goserver") - { - $x2goserver=$value; - $x2goserver=~s/ //g - } - if($option eq "printdsa") - { - $printdsa=$value; - } - if($option eq "ps2pdf") - { - $ps2pdf=$value; - } - } - close(CFG); - } + if( -e $cfgfile) + { + open(CFG,"<$cfgfile"); + while(!eof(CFG)) + { + my $ln=<CFG>; + my $nocomln=(split("#",$ln))[0]; + $nocomln=~s/\n//g; + my @valarr=split("=",$nocomln); + my $option=@valarr[0]; + shift(@valarr); + my $value=join("=",@valarr); + $option=~s/ //g; + if($option eq "x2goserver") + { + $x2goserver=$value; + $x2goserver=~s/ //g + } + if($option eq "printdsa") + { + $printdsa=$value; + } + if($option eq "ps2pdf") + { + $ps2pdf=$value; + } + } + close(CFG); + } } sub getsessions { - my $sesslist; - if ( $x2goserver eq "local" ) - { - $sesslist=`su $userName -c "x2golistsessions --all-servers"`; - - ### Suggested patch from Mario OROZ, probably not acceptable here... - #-$sesslist=`su $userName -c "x2golistsessions --all-servers"`; - #+open (SQLCONF, "</etc/x2go/x2gosql/sql"); - #+my $cfgline=<SQLCONF>; - #+close (SQLCONF); - #+if(($cfgline=~m/local/)||($cfgline=~m/sqlite/)) - #+{ - #+ $sesslist=`su $userName -c "x2golistsessions --all-servers"`; - #+} - - } - else - { - # Calling x2goprint with a single parameter <username> will result in an x2golistsessions --all-servers command on the - # remote X2go server. - $sesslist=`ssh -i $printdsa x2goprint\@$x2goserver "which x2gobasepath &>/dev/null && test -f \$(x2gobasepath)/lib/x2go/x2goprint.pl && x2goprint $userName || sudo x2goprint $userName"`; - } - @sessions=split("\n",$sesslist); + my $sesslist; + if ( $x2goserver eq "local" ) + { + $sesslist=`su $userName -c "x2golistsessions --all-servers"`; + + ### Suggested patch from Mario OROZ, probably not acceptable here... + #-$sesslist=`su $userName -c "x2golistsessions --all-servers"`; + #+open (SQLCONF, "</etc/x2go/x2gosql/sql"); + #+my $cfgline=<SQLCONF>; + #+close (SQLCONF); + #+if(($cfgline=~m/local/)||($cfgline=~m/sqlite/)) + #+{ + #+ $sesslist=`su $userName -c "x2golistsessions --all-servers"`; + #+} + } + else + { + # Calling x2goprint with a single parameter <username> will result in an x2golistsessions --all-servers command on the + # remote X2go server. + $sesslist=`ssh -i $printdsa x2goprint\@$x2goserver "sudo x2goprint $userName"`; + } + @sessions=split("\n",$sesslist); } sub printfile { - my ($pfile,$tfile,$phost, $sess)=@_; - my $bname=basename($pfile); - if($phost eq $host) - { - my ($tm,$tm,$uid,$gid,$tm,$tm,$tm,$spooldir)=getpwnam("x2goprint"); - my $spfile="$spooldir/$sess$bname"; - copy($pfile, $spfile); - copy($tfile, "$spfile.title"); - chown $uid,$gid,"$spfile"; - chown $uid,$gid,"$spfile.title"; - system( "su x2goprint -c \"which x2gobasepath &>/dev/null && test -f \$(x2gobasepath)/lib/x2go/x2goprint.pl && x2goprint $userName $sess $sess$bname $sess$bname.title || sudo x2goprint $userName $sess $sess$bname $sess$bname.title\"" ); - - # log that we processed a print job - syslog('debug', "su x2goprint -c \"which x2gobasepath &>/dev/null && test -f \$(x2gobasepath)/lib/x2go/x2goprint.pl && x2goprint $userName $sess $bname $bname.title || sudo x2goprint $userName $sess $bname $bname.title\""); - } - else - { - system ("scp -i $printdsa $pfile $tfile x2goprint\@$x2goserver:~x2goprint/"); - system( "ssh -i $printdsa x2goprint\@$x2goserver \"which x2gobasepath &>/dev/null && test -f \$(x2gobasepath)/lib/x2go/x2goprint.pl && x2goprint $userName $sess $bname $bname.title || sudo x2goprint $userName $sess $bname $bname.title\"" ); - } + my ($pfile,$tfile,$phost, $sess)=@_; + my $bname=basename($pfile); + if($phost eq $host) + { + my ($tm,$tm,$uid,$gid,$tm,$tm,$tm,$spooldir)=getpwnam("x2goprint"); + my $spfile="$spooldir/$sess$bname"; + copy($pfile, $spfile); + copy($tfile, "$spfile.title"); + chown $uid,$gid,"$spfile"; + chown $uid,$gid,"$spfile.title"; + system( "x2goprint $userName $sess $sess$bname $sess$bname.title" ); + # log that we processed a print job + syslog('debug', "x2goprint $userName $sess $bname $bname.title"); + } + else + { + system ("scp -i $printdsa $pfile $tfile x2goprint\@$x2goserver:~x2goprint/"); + system( "ssh -i $printdsa x2goprint\@$x2goserver \"sudo x2goprint $userName $sess $bname $bname.title\"" ); + } } -my $uname=$ENV{USER}; +### main ### +my $uname=$ENV{USER}; if (!$ARGV[0]) { - print "file cups-x2go:/ \"Virtual X2GO Printer\" \"CUPS-X2GO\" \"MFG:Generic;MDL:CUPS-X2GO Printer;DES:Generic CUPS-X2GO Printer;CLS:PRINTER;CMD:POSTSCRIPT;\"\n"; - exit 0; + print "file cups-x2go:/ \"Virtual X2GO Printer\" \"CUPS-X2GO\" \"MFG:Generic;MDL:CUPS-X2GO Printer;DES:Generic CUPS-X2GO Printer;CLS:PRINTER;CMD:POSTSCRIPT;\"\n"; + exit 0; } if (scalar(@ARGV) < 5 || scalar(@ARGV) > 6) { - print STDERR "ERROR: Usage: cups-x2go job-id user title copies options [file]\n"; - exit 1; + print STDERR "ERROR: Usage: cups-x2go job-id user title copies options [file]\n"; + exit 1; } my $jobID; @@ -149,20 +148,20 @@ syslog('info', "Print job received from cups -> $jobID $userName $jobTitle $copi my $tempFile; if (!$printFile) { - my $jid = $jobID; - my $uid = $userName; - $jid =~ s/\W//g; #sanity check - $uid =~ s/\W//g; #sanity check - $tempFile = "/tmp/$jid-$uid-cupsjob$$"; - open (OUT, ">$tempFile") or die "ERROR: Cannot write $tempFile: $!\n"; - syslog('info', "Print job comes from STDIN, writing incoming job to temp file $tempFile\n"); - while(<STDIN>) - { - print OUT "$_"; - } - close OUT; - - $printFile = $tempFile; + my $jid = $jobID; + my $uid = $userName; + $jid =~ s/\W//g; #sanity check + $uid =~ s/\W//g; #sanity check + $tempFile = "/tmp/$jid-$uid-cupsjob$$"; + open (OUT, ">$tempFile") or die "ERROR: Cannot write $tempFile: $!\n"; + syslog('info', "Print job comes from STDIN, writing incoming job to temp file $tempFile\n"); + while(<STDIN>) + { + print OUT "$_"; + } + close OUT; + + $printFile = $tempFile; } readconfig(); @@ -178,12 +177,12 @@ close (TITLE); getsessions(); for(my $i=0; $i<scalar(@sessions);$i++ ) { - my @sinfo=split("\\|",@sessions[$i]); - if(@sinfo[4] eq "R") - { - printfile( $printFile, $titleFile, @sinfo[3], @sinfo[1]); - syslog('debug', "Call to printfile function with: $printFile $titleFile @sinfo[3] @sinfo[1]\n"); - } + my @sinfo=split("\\|",@sessions[$i]); + if(@sinfo[4] eq "R") + { + printfile( $printFile, $titleFile, @sinfo[3], @sinfo[1]); + syslog('debug', "Call to printfile function with: $printFile $titleFile @sinfo[3] @sinfo[1]\n"); + } } unlink ($printFile); @@ -191,4 +190,3 @@ unlink ($titleFile); # closing syslog closelog; - diff --git a/cups-x2go.conf b/cups-x2go.conf index 1c3579e..0480381 100644 --- a/cups-x2go.conf +++ b/cups-x2go.conf @@ -1,12 +1,15 @@ -## cups-x2go.conf -- CUPS Backend Configuration -## -## +### +### cups-x2go.conf -- CUPS Backend Configuration +### ## Server with x2go system #x2goserver = local -## dsa key for user x2goprint +## DSA key for user x2goprint (old path and filename) #printdsa = /root/.x2go/ssh/.x2goprint/id_dsa +## DSA key for user x2goprint (new path and filename, default in cups-x2go backend) +#printdsa = /root/.ssh/id_dsa-x2goprint + ## command to generate pdf files #ps2pdf = /usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile="%s.pdf" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f "%s" diff --git a/debian/changelog b/debian/changelog index c860558..8d94388 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,8 @@ cups-x2go (3.0.0.2-0~x2go2) UNRELEASED; urgency=low * Add dpkg-statoverride for CUPS backend cups-x2go, file permission 0700 on CUPS backend makes CUPS run this backend with root-privileges which is needed for cups-x2go to work. - * Adapt to x2goprint setgid change in x2goserver package (>=3.0.99.6). + * Call x2goprint directly with root privileges if x2goserver and CUPS + server share the same machine. * Add a proper dpkg-statoverride check in postinst script. [ Mario Oroz ] hooks/post-receive -- cups-x2go.git (CUPS Backend for X2go Printing) 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 "cups-x2go.git" (CUPS Backend for X2go Printing).

1 0

pyhoca-cli.git - build-main (branch) updated: 0.1.4.2
by git-admin＠x2go.org 07 Sep '11

07 Sep '11

The branch, build-main has been updated via 6225f29139d86cb730453772e5a0a07c1e7da9c8 (commit) via 473364d57429435b36b1f546e1442cd882cc624e (commit) via d5c1ff7f2e31a150aa241acd7317fabb940e5439 (commit) via 1d7da12b3de5787b7ada39333601bccbe50f4c5c (commit) via 37ba4e6f7dfa24bf27cab76c6588344da5a6b4a4 (commit) via 3e307a9bfbb2f945dcb8c887b122cd8bb9087b4b (commit) via cde819a720c1ae037c56e2b2f81d0c19a86ca244 (commit) via efdb5891fcc0086c3f512d95a5fea9ab17c64da2 (commit) via ba599ba09b3b6a0a6de151e1ad0dc2d5631d1e40 (commit) from 47aa48ba7d8fb6f6b36034e0f7ca8f52bd690df7 (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: .build_man2html/html/man1/pyhoca-cli.1.html | 213 --------------------------- Makefile.docupload | 20 +++ debian/changelog | 15 ++ man/man1/pyhoca-cli.1 | 34 +++-- pyhoca-cli | 11 +- pyhoca/cli/__init__.py | 2 +- pyhoca/cli/frontend.py | 108 ++++++++++++-- 7 files changed, 162 insertions(+), 241 deletions(-) delete mode 100644 .build_man2html/html/man1/pyhoca-cli.1.html create mode 100644 Makefile.docupload The diff of changes is: diff --git a/.build_man2html/html/man1/pyhoca-cli.1.html b/.build_man2html/html/man1/pyhoca-cli.1.html deleted file mode 100644 index c2ae09c..0000000 --- a/.build_man2html/html/man1/pyhoca-cli.1.html +++ /dev/null @@ -1,213 +0,0 @@ -Content-type: text/html - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<HTML><HEAD><TITLE>Man page of pyhoca-cli</TITLE> -</HEAD><BODY> -<H1>pyhoca-cli</H1> -Section: X2go Application (1) Updated: 26 May 2011 <A HREF="#index">Index</A> -<A HREF="../index.html">Return to Main Contents</A><HR> - -<A NAME="lbAB"> </A> -<H2>NAME</H2> - -pyhoca-cli - X2go command line client written in Python -<A NAME="lbAC"> </A> -<H2>SYNOPSIS</H2> - - - - -pyhoca-cli - - -[ -options -] - - - -<A NAME="lbAD"> </A> -<H2>DESCRIPTION</H2> - -pyhoca-cli aims to be a cross-platform (Windows, Mac OS X, Linux) X2go command line client written -in Python. - - -You can use it -for scripting remote X2go sessions or simply starting, resuming or shadowing X2go sessions from -the command line in a terminal. - - -It supports versatile -command line options as well as parsing x2goclient configuration -files. - - -See the included README and TODO for further information on pyhoca-cli. -<A NAME="lbAE"> </A> -<H2>COMMON OPTIONS</H2> - -pyhoca-cli accepts the following common options: -<DL COMPACT> -<DT>-h, --help <DD> -Display a help with all available command line options and exit. -<DT>-V, --version <DD> -Output version information and exit. -<DT>-d, --debug <DD> -Enable debugging output. -<DT>--libdebug <DD> -Enable debugging code of the unterlying Python X2go module. -<DT>--libdebug-sftpxfer <DD> -Enable debugging code of Python X2go's sFTP server code (very verbose, and it may even reveal promiscuous data). -</DL> -<A NAME="lbAF"> </A> -<H2>SERVER</H2> - -<DL COMPACT> -<DT>--server <HOSTNAME_or_IP> <DD> -If not in LDAP mode you always have to name the remote X2go server's hostname or IP address. -</DL> -<A NAME="lbAG"> </A> -<H2>ACTIONS</H2> - -pyhoca-cli accepts exclusively one of the listed actions: -<DL COMPACT> -<DT>-N, --new <DD> -Start a new X2go session on server (default mode if no mode is explicitly specified). -<DT>-R, --resume <SESSION_NAME> <DD> -Resume existing X2go session <SESSION_NAME> on server. -<DT>-S, --suspend <SESSION_NAME> <DD> -Suspend running X2go session <SESSION_NAME>. -<DT>-T, --terminate <SESSION_NAME> <DD> -Terminate running X2go session <SESSION_NAME> . -<DT>-L, --list-sessions <DD> -List user's X2go sessions on server. -</DL> -<A NAME="lbAH"> </A> -<H2>X2GO OPTIONS</H2> - -<DL COMPACT> -<DT>-P, --session-profile<DD> -The name of the session profile to be used to make the connection.B -<DT>-c, --command <CMD> <DD> -Command to run with --new mode on server (default: xterm). -<DT>-u, --username <USERNAME> <DD> -Username for the session (default: currently logged in user). -<DT>--password <PASSWORD> <DD> -User password for this session. If a matching private SSH key is available this one will be preferred for -authentication. The cleartext password that has been specified at the command line will be masqueraded in -the systems process list (Linux, MacOS). On Windows systems the usage of the --password option is forbidden. -<DT>-p, --remote-ssh-port <R_PORT> <DD> -Remote X2go server's SSH port (default: 22). -<DT>-k, --ssh-privkey <SSH_PRIVKEY> <DD> -Use file <SSH_PRIVKEY> as private key for SSH connections (default: ~/.ssh/id_rsa). -<DT>--add-to-known-hosts <DD> -Add RSA/DSA host key to ~/.ssh/known_hosts if authenticity of server can't be established (default: not set). -<DT>--sound {pulse|esd|none} <DD> -X2go server's sound system (default: 'pulse'). -<DT>-F, --share-local-folders <folder1>[,<folder2>[,...]] <DD> -A comma separated list of local folders that shall be made available in the remote X2go session. -<DT>--printing <DD> -Use X2go printing (default: disabled). -<DT>--clean-sessions <DD> -Clean all of the user's suspended/running sessions before starting a new one on the named X2go server. -<DT>--time-to-wait <DD> -Time to wait for session startup/resume (default: 8s). There should be no need to touch this, unless on very slow network connections. -</DL> -<A NAME="lbAI"> </A> -<H2>LDAP OPTIONS</H2> - -LDAP support is planned to be added into pyhoca-cli in the near future. So stay tuned... - - -<A NAME="lbAJ"> </A> -<H2>NX OPTIONS (Version 3) </H2> - -<DL COMPACT> -<DT>-g, --geometry {<WIDTH>x<HEIGHT>|fullscreen} <DD> -Screen geometry (default: '800x600'). -<DT>-q, --link {modem|isdn|adsl|wan|lan} <DD> -link quality (default: 'adsl') -<DT>-t, --session-type {desktop|application} <DD> -Session type (default: 'application'). Note: there are also some auto-detection -feature for the session type built into the code. -It might not always happen what you expect from setting this option. -<DT>-p, --pack <PACK_METHOD><DD> -Compression method (see below for possible values). -<DT>--kbd-layout {us|de|fr|...}<DD> -Use keyboard layout (default: 'us'). -<DT>--kbd-type {pc105/us|pc105/de|...}<DD> -Set Keyboard type (default 'pc105/us'). -</DL> -<A NAME="lbAK"> </A> -<H2>COMPATIBILITY OPTIONS</H2> - -pyhoca-cli aims at being fully compatible with all command line options and session config files of the X2go project's X2go command -line client x2goclient-cli as well as the x2goclient GUI. This is still work in progress. -To achieve this, some compatibility options have already -been added: -<DL COMPACT> -<DT>--port <R_PORT><DD> -Compatibility option, synonymous to --remote-ssh-port <R_PORT>. -<DT>--ssh-key <SSH_PRIVKEY><DD> -Compatibility option, synonymous to --ssh-privkey SSH_KEY. -<DT>--use-sound {yes|no}<DD> -Compatibility option, synonymous to --sound {pulse|none}. -<DT>--client-ssh-port <PORT> <DD> -Compatibility option for the x2goclient GUI. PyHoca-Cli (resp. Python X2go) brings its own internal sFTP server. Thus, this option will be ignored. -</DL> -<A NAME="lbAL"> </A> -<H2>NX COMPRESSION METHODS</H2> - -As NX compression methods (--pack option) the following values are possible. The % character must be replaced by a digit 0-9. - - -nopack, 8, 64, 256, 512, 4k, 32k, 64k, 256k, 2m, 16m -256-rdp, 256-rdp-compressed, 32k-rdp, 32k-rdp-compressed, 64k-rdp -64k-rdp-compressed, 16m-rdp, 16m-rdp-compressed -rfb-hextile, rfb-tight, rfb-tight-compressed -8-tight, 64-tight, 256-tight, 512-tight, 4k-tight, 32k-tight -64k-tight, 256k-tight, 2m-tight, 16m-tight -8-jpeg-%, 64-jpeg, 256-jpeg, 512-jpeg, 4k-jpeg, 32k-jpeg -64k-jpeg, 256k-jpeg, 2m-jpeg, 16m-jpeg-% -8-png-jpeg-%, 64-png-jpeg, 256-png-jpeg, 512-png-jpeg, 4k-png-jpeg -32k-png-jpeg, 64k-png-jpeg, 256k-png-jpeg, 2m-png-jpeg, 16m-png-jpeg-% -8-png-%, 64-png, 256-png, 512-png, 4k-png -32k-png, 64k-png, 256k-png, 2m-png, 16m-png-% -16m-rgb-%, 16m-rle-% -<A NAME="lbAM"> </A> -<H2>SEE ALSO</H2> - -/usr/share/doc/python-x2go -<A NAME="lbAN"> </A> -<H2>AUTHOR</H2> - -This manual has been written by for the X2go project (<A HREF="http://www.x2go.org)">http://www.x2go.org)</A> by - -Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> - - -<HR> -<A NAME="index"> </A><H2>Index</H2> -<DL> -<DT><A HREF="#lbAB">NAME</A><DD> -<DT><A HREF="#lbAC">SYNOPSIS</A><DD> -<DT><A HREF="#lbAD">DESCRIPTION</A><DD> -<DT><A HREF="#lbAE">COMMON OPTIONS</A><DD> -<DT><A HREF="#lbAF">SERVER</A><DD> -<DT><A HREF="#lbAG">ACTIONS</A><DD> -<DT><A HREF="#lbAH">X2GO OPTIONS</A><DD> -<DT><A HREF="#lbAI">LDAP OPTIONS</A><DD> -<DT><A HREF="#lbAJ">NX OPTIONS (Version 3) </A><DD> -<DT><A HREF="#lbAK">COMPATIBILITY OPTIONS</A><DD> -<DT><A HREF="#lbAL">NX COMPRESSION METHODS</A><DD> -<DT><A HREF="#lbAM">SEE ALSO</A><DD> -<DT><A HREF="#lbAN">AUTHOR</A><DD> -</DL> -<HR> -This document was created by -<A HREF="/cgi-bin/man/man2html">man2html</A>, -using the manual pages. -Time: 09:14:04 GMT, May 30, 2011 -</BODY> -</HTML> diff --git a/Makefile.docupload b/Makefile.docupload new file mode 100644 index 0000000..1a6c71d --- /dev/null +++ b/Makefile.docupload @@ -0,0 +1,20 @@ +#!/usr/bin/make -f +# Makefile.docupload file - for pyhoca-cli +# Copyright 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, GPLv3 applies to this file + +VERSION=`head -n1 debian/changelog | sed 's,.*($.*$).*,\1,' | cut -d"-" -f1` +DOC_HOST=code.x2go.org +DOC_PATH=/srv/sites/x2go.org/packages/doc/pyhoca-cli/man/ +DOC_USER=x2go-admin + +doc: docbuild docupload + +docbuild: + make -f Makefile.man2html build_man2html + +docupload: + + ssh -l${DOC_USER} ${DOC_HOST} "{ mkdir -p ${DOC_PATH}; rm -Rfv ${DOC_PATH}/*; }" + scp -r .build_man2html/html/* ${DOC_USER}@${DOC_HOST}:${DOC_PATH}/ + + diff --git a/debian/changelog b/debian/changelog index 7a7217c..0ff89d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +pyhoca-cli (0.1.4.2-0~x2go1) unstable; urgency=low + + * New upstream version (0.1.4.2): + - Translate cmd line options into python-x2go options + - Allow ,,ALL'' as session name when suspending -> will suspend + all sessions of the connecting user. + - Allow ,,ALL'' as session name when terminating -> will terminate + all sessions of the connecting user. + - Allow ,,NEWEST'' and ,,OLDEST'' as session name when resuming (closes + upstream issue #86). + - Add cmd line option --terminate-on-ctrl-c. + - Add cmd line option --auth-attempts. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Sep 2011 20:19:16 +0200 + pyhoca-cli (0.1.4.1-0~x2go1) unstable; urgency=low * New upstream version (0.1.4.1): diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1 index 7fa18a0..b16cbee 100644 --- a/man/man1/pyhoca-cli.1 +++ b/man/man1/pyhoca-cli.1 @@ -54,10 +54,16 @@ Enable debugging code of the unterlying Python X2go module. .TP \*(T<\fB\-\-libdebug-sftpxfer\fR\*(T> Enable debugging code of Python X2go's sFTP server code (very verbose, and it may even reveal promiscuous data). -.SH SERVER +.SH SERVER / SESSION PROFILE +You either have to specify a server name or a pre-configured X2goClient session profile to tell \fBpyhoca-cli\fR to +what X2go server to connect. \fBpyhoca-cli\fR will not start +if neither of these two options has been given on the command line. .TP \*(T<\fB\-\-server\fR \fI<HOSTNAME_or_IP>\fR\*(T> If not in LDAP mode you always have to name the remote X2go server's hostname or IP address. +.TP +\*(T<\fB\-P, \-\-session-profile\fR \fI<SESSION_PROFILE_NAME>\fR\*(T> +The name of the session profile to be used to make the connection. .SH ACTIONS \fBpyhoca-cli\fR accepts exclusively one of the listed actions: .TP @@ -65,7 +71,8 @@ If not in LDAP mode you always have to name the remote X2go server's hostname or Start a new X2go session on server (default mode if no mode is explicitly specified). .TP \*(T<\fB\-R, \-\-resume\fR \fI<SESSION_NAME>\fR\*(T> -Resume existing X2go session <SESSION_NAME> on server. +Resume existing X2go session <SESSION_NAME> on server. Special values for <SESSION_NAME> are ,,NEWEST'' (will resume youngest session) +or ,,OLDEST'' (resume session with oldest timestamp). .TP \*(T<\fB\-D, \-\-share-desktop\fR \fI<USER>@<DISPLAY>\fR\*(T> Share an X2go session on the remote server specified by <USER>@<DISPLAY>, @@ -73,18 +80,23 @@ whereas <USER> can be the same user that is starting the share mode session or a other user that grants X2go desktop sharing for the current user. .TP \*(T<\fB\-S, \-\-suspend\fR \fI<SESSION_NAME>\fR\*(T> -Suspend running X2go session <SESSION_NAME>. +Suspend running X2go session <SESSION_NAME>. A special value for <SESSION_NAME> is ,,ALL'' (will suspend all sessions of the connected user). .TP \*(T<\fB\-T, \-\-terminate\fR \fI<SESSION_NAME>\fR\*(T> -Terminate running X2go session <SESSION_NAME> . +Terminate running X2go session <SESSION_NAME>. A special value for <SESSION_NAME> is ,,ALL'' (will terminate all sessions of the connected user). .TP \*(T<\fB\-L, \-\-list-sessions\fR\*(T> List user's X2go sessions on server. +.SH ACTION OPTIONS +\fBpyhoca-cli\fR actions can be tweaked by these options: +.TP +\*(T<\fB\-\-clean-sessions\fR\*(T> +Clean all of the user's suspended/running sessions before starting a new one on the named X2go server. +.TP +\*(T<\fB\-\-terminate-on-ctrl-c\fR\*(T> +Terminate the connected session when pressing CTRL+C (instead of suspending the session). .SH X2GO OPTIONS .TP -\*(T<\fB\-P, \-\-session-profile\fR\*(T> -The name of the session profile to be used to make the connection.B -.TP \*(T<\fB\-c, \-\-command\fR \fI<CMD>\fR\*(T> Command to run with \fB\-\-new\fR mode on server (default: xterm). .TP @@ -117,11 +129,13 @@ Use X2go printing (default: disabled). \*(T<\fB\-\-share-mode\fR \fI{0|1}\fR\*(T> Share mode for X2go desktop sharing (0: view-only, 1: full access). .TP -\*(T<\fB\-\-clean-sessions\fR\*(T> -Clean all of the user's suspended/running sessions before starting a new one on the named X2go server. -.TP \*(T<\fB\-\-time-to-wait\fR\*(T> Time to wait for session startup/resume (default: 8s). There should be no need to touch this, unless on very slow network connections. +.TP +\*(T<\fB\-\-auth-attempts\fR \fI{0,1,2,3,...}\fR\*(T> +Number of interactive authentication attempts in case authentication with the server fails (wrong password?). A value that equals 0 +disables interactive authentication completely and requires that a private SSH key has been given on the command line or in the +session profile or that the --password command line option is used. .SH LDAP OPTIONS LDAP support is planned to be added into \fBpyhoca-cli\fR in the near future. So stay tuned... .PP diff --git a/pyhoca-cli b/pyhoca-cli index 34fb297..c6752d9 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -122,7 +122,9 @@ x2go_options = [ {'args':['--share-mode'], 'default': 0, 'help': 'share mode for X2go desktop sharing (0: view-only, 1: full access)', }, {'args':['-F', '--share-local-folders'], 'metavar': '<folder1>[,<folder2[,...]]', 'default': None, 'help': 'a comma separated list of local folder names to mount in the X2go session', }, {'args':['--clean-sessions'], 'default': False, 'action': 'store_true', 'help': 'clean all suspended sessions before starting a new one', }, + {'args':['--terminate-on-ctrl-c'], 'default': False, 'action': 'store_true', 'help': 'terminate the connected session when pressing CTRL+C (instead of suspending the session)', }, {'args':['--time-to-wait'], 'default': '8', 'help': 'time to wait for session startup/resume (default: 8s)', }, + {'args':['--auth-attempts'], 'default': 3, 'help': 'number of authentication attempts before authentication fails (default: 3)', }, ] print_options = [ {'args':['--print-action'], 'default': 'PDFVIEW', 'choices': PRINT_ACTIONS, 'help': 'action to be performed for incoming X2go print jobs (default: \'PDFVIEW\')', }, @@ -220,9 +222,9 @@ Possible values for the --pack NX option are: if not (a.session_profile or a.list_profiles): - # the --server options is required for most operations + # the --server (or --session-profile) option is required for most operations if not a.server: - runtime_error ("argument --server is required", parser=p, exitcode=1) + runtime_error ("argument --server (or --session-profile) is required", parser=p, exitcode=1) # check for mutual exclusiveness of -N, -R, -S, -T and -L, -N is default if none of them is set if bool(a.new) + bool(a.resume) + bool(a.share_desktop) + bool(a.suspend) + bool(a.terminate) + bool(a.list_sessions) + bool(a.list_desktops) + bool(a.list_profiles)> 1: @@ -294,6 +296,11 @@ Possible values for the --pack NX option are: if a.share_local_folders is not None: a.share_local_folders = a.share_local_folders.split(',') + try: + _dummy = int(a.auth_attempts) + except ValueError: + runtime_error ("value for cmd line argument --auth-attempts has to be of type integer", parser=p, exitcode=1) + if a.server: ##### TODO: ssh_config to be moved into Python X2go!!!! diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py index 9ce6174..294b0ad 100644 --- a/pyhoca/cli/__init__.py +++ b/pyhoca/cli/__init__.py @@ -20,6 +20,6 @@ """\ STILL UNDOCUMENTED """ -__VERSION__ = "0.1.4.1" +__VERSION__ = "0.1.4.2" from frontend import * diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 8931e3d..363d9e9 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -166,6 +166,24 @@ class PyHocaCLI(x2go.X2goClient): self.logger('command from session profile to run is: %s' % self.session_registry(self.x2go_session_hash).get_session_cmd(), loglevel=x2go.loglevel_DEBUG, ) self._X2goClient__start_session(s_hash) + def _auto_resume_newest(self, s_hash): + session_infos = self._X2goClient__list_sessions(s_hash) + if session_infos: + newest_session_name = x2go.utils.session_names_by_timestamp(session_infos)[-1] + self._pyhoca_logger("Resuming newest X2go session %s..." % newest_session_name, loglevel=x2go.loglevel_NOTICE, ) + self._X2goClient__resume_session(s_hash, newest_session_name) + return True + return False + + def _auto_resume_oldest(self, s_hash): + session_infos = self._X2goClient__list_sessions(s_hash) + if session_infos: + oldest_session_name = x2go.utils.session_names_by_timestamp(session_infos)[0] + self._pyhoca_logger("Resuming oldest X2go session %s..." % oldest_session_name, loglevel=x2go.loglevel_NOTICE, ) + self._X2goClient__resume_session(s_hash, oldest_session_name) + return True + return False + def resume_session(self, s_hash): """\ STILL UNDOCUMENTED @@ -173,7 +191,11 @@ class PyHocaCLI(x2go.X2goClient): # resume a running session self.logger('resuming X2go session: %s' % self.args.resume, loglevel=x2go.loglevel_INFO, ) available_sessions = self._X2goClient__list_sessions(s_hash) - if self.args.resume in available_sessions.keys(): + if available_sessions and self.args.resume == 'OLDEST': + self._auto_resume_oldest(s_hash) + elif available_sessions and self.args.resume == 'NEWEST': + self._auto_resume_newest(s_hash) + elif self.args.resume in available_sessions.keys(): self._X2goClient__resume_session(s_hash, self.args.resume) else: self._runtime_error('requested session not available on X2go server [%s]:%s' % (self.args.server, self.args.remote_ssh_port), exitcode=20) @@ -199,26 +221,54 @@ class PyHocaCLI(x2go.X2goClient): # send a suspend request to a session self.logger('requesting X2go session suspend of session: %s' % self.args.suspend, loglevel=x2go.loglevel_INFO, ) available_sessions = self._X2goClient__list_sessions(s_hash) - if self.args.suspend in available_sessions.keys(): - self._X2goClient__suspend_session(s_hash, self.args.suspend) + + if self.args.suspend == "ALL": + _session_names = available_sessions else: - self._runtime_error('requested session not available on X2go server [%s]:%s' % (self.args.server, self.args.remote_ssh_port), exitcode=21) + _session_names = [ self.args.suspend ] + + for _session_name in _session_names: + if _session_name in available_sessions.keys(): + self._X2goClient__suspend_session(s_hash, _session_name) + self._pyhoca_logger("X2go session %s has been suspended" % _session_name, loglevel=x2go.loglevel_NOTICE, ) + else: + _server = self.args.server + _remote_ssh_port = self.args.remote_ssh_port + if not self.args.server and self.args.session_profile: + _server = self.session_profiles.get_value(self.session_profiles.to_profile_id(self.args.session_profile), 'host') + _remote_ssh_port = self.session_profiles.get_value(self.session_profiles.to_profile_id(self.args.session_profile), 'sshport') + self._runtime_error('session %s not available on X2go server [%s]:%s' % (_session_name, _server, _remote_ssh_port), exitcode=21) def terminate_session(self, s_hash): """\ STILL UNDOCUMENTED + """ # send a terminate request to a session self.logger('requesting X2go session terminate of session: %s' % self.args.terminate, loglevel=x2go.loglevel_INFO, ) available_sessions = self._X2goClient__list_sessions(s_hash) - if self.args.terminate in available_sessions.keys(): - self._X2goClient__terminate_session(s_hash, self.args.terminate) + + if self.args.terminate == "ALL": + _session_names = available_sessions else: - self._runtime_error('requested session not available on X2go server [%s]:%s' % (self.args.server, self.args.remote_ssh_port), exitcode=22) + _session_names = [ self.args.terminate ] + + for _session_name in _session_names: + if _session_name in available_sessions.keys(): + self._X2goClient__terminate_session(s_hash, _session_name) + self._pyhoca_logger("X2go session %s has been terminated" % _session_name, loglevel=x2go.loglevel_NOTICE, ) + else: + _server = self.args.server + _remote_ssh_port = self.args.remote_ssh_port + if not self.args.server and self.args.session_profile: + _server = self.session_profiles.get_value(self.session_profiles.to_profile_id(self.args.session_profile), 'host') + _remote_ssh_port = self.session_profiles.get_value(self.session_profiles.to_profile_id(self.args.session_profile), 'sshport') + self._runtime_error('session %s not available on X2go server [%s]:%s' % (_session_name, _server, _remote_ssh_port), exitcode=22) def __init__(self, args, logger=None, liblogger=None): """\ STILL UNDOCUMENTED + """ self.args = args if logger is None: @@ -236,14 +286,29 @@ class PyHocaCLI(x2go.X2goClient): if self.args.session_profile and not _profiles.has_profile(self.args.session_profile): self._runtime_error('no such session profile of name: %s' % (self.args.session_profile), exitcode=31) + self.auth_attempts = int(self.args.auth_attempts) + if self.args.session_profile: + _cmdlineopt_to_sessionopt = { + 'command': 'cmd', + 'kb_layout': 'kblayout', + 'kb_type': 'kbtype', + 'sound': 'snd_system', + 'ssh_privkey': 'key_filename', + 'server': 'hostname', + 'remote_ssh_port': 'port', + } + # override session profile options by option values from the arg parser kwargs={} if hasattr(self.args, 'parser'): for a, v in self.args._get_kwargs(): if v != self.args.parser.get_default(a): - kwargs[a] = v + try: + kwargs[_cmdlineopt_to_sessionopt[a]] = v + except KeyError: + kwargs[a] = v # setup up the session profile based X2go session self.x2go_session_hash = self._X2goClient__register_session(profile_name=self.args.session_profile, @@ -284,7 +349,7 @@ class PyHocaCLI(x2go.X2goClient): _username = self.args.username or self._X2goClient__get_session_username(self.x2go_session_hash) try: - _auth_count = 4 + _auth_count = self.auth_attempts +1 while not connected and _auth_count: try: self._X2goClient__connect_session(self.x2go_session_hash, username=_username, password=self.args.password, force_password_auth=force_password_auth) @@ -312,8 +377,13 @@ class PyHocaCLI(x2go.X2goClient): _auth_count -= 1 - if not _auth_count: - self._runtime_error('Authentication failed, too many failures during interactive login', exitcode=-201) + if not connected and not _auth_count: + if self.auth_attempts >= 2: + self._runtime_error('authentication failed, too many failures during interactive login', exitcode=-201) + elif self.auth_attempts == 1: + self._runtime_error('interactive authentication failed', exitcode=-202) + else: + self._runtime_error('non-interactive authentication failed', exitcode=-203) except socket.error, e: self._runtime_error('a socket error occured while establishing the connection: %s' % str(e), exitcode=-245) @@ -359,14 +429,13 @@ class PyHocaCLI(x2go.X2goClient): elif self.args.new: self.new_session(self.x2go_session_hash) - # finally call the MainLoop of PyHocaCLI if not (self.args.new or self.args.resume or self.args.share_desktop or self.args.session_profile): sys.exit(0) - # give the session some time to come up... - # no CTRL-C is allowed during this phase... + if self.args.resume or self.args.new: + self._pyhoca_logger("give the X2go session some time to come up...", loglevel=x2go.loglevel_NOTICE, ) + i=0 - self._pyhoca_logger("give the X2go session some time to come up...", loglevel=x2go.loglevel_NOTICE, ) while i < self.args.time_to_wait: time.sleep(1) i+=1 @@ -379,8 +448,11 @@ class PyHocaCLI(x2go.X2goClient): self._pyhoca_logger("X2go session name is: %s" % session_name, loglevel=x2go.loglevel_INFO, ) if self.args.share_desktop: self._pyhoca_logger("Press CTRL+C to end desktop sharing for this session...", loglevel=x2go.loglevel_NOTICE, ) + elif self.args.terminate_on_ctrl_c: + self._pyhoca_logger("Press CTRL+C to terminate the running session...", loglevel=x2go.loglevel_NOTICE, ) else: self._pyhoca_logger("Press CTRL+C to suspend the running session...", loglevel=x2go.loglevel_NOTICE, ) + try: session_duration = 0 @@ -406,6 +478,12 @@ class PyHocaCLI(x2go.X2goClient): self._X2goClient__terminate_session(self.x2go_session_hash) time.sleep(2) self._pyhoca_logger("X2go session %s has been terminated" % session_name, loglevel=x2go.loglevel_NOTICE, ) + elif self.args.terminate_on_ctrl_c: + self._pyhoca_logger("Terminating X2go session %s" % session_name, loglevel=x2go.loglevel_INFO, ) + self._X2goClient__terminate_session(self.x2go_session_hash) + # giving nxproxy's SSH tunnel some time to settle + time.sleep(2) + self._pyhoca_logger("X2go session %s has been terminated" % session_name, loglevel=x2go.loglevel_NOTICE, ) else: self._pyhoca_logger("Suspending X2go session %s" % session_name, loglevel=x2go.loglevel_INFO, ) self._X2goClient__suspend_session(self.x2go_session_hash) hooks/post-receive -- pyhoca-cli.git (Python X2go Client (command line client)) 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 "pyhoca-cli.git" (Python X2go Client (command line client)).

1 0

pyhoca-cli.git - master (branch) updated: 0.1.4.1-9-g6225f29
by git-admin＠x2go.org 07 Sep '11

07 Sep '11

The branch, master has been updated via 6225f29139d86cb730453772e5a0a07c1e7da9c8 (commit) from 473364d57429435b36b1f546e1442cd882cc624e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6225f29139d86cb730453772e5a0a07c1e7da9c8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 7 20:19:43 2011 +0200 Release version 0.1.4.2 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 31c4b03..0ff89d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pyhoca-cli (0.1.4.2-0~x2go1) UNRELEASED; urgency=low +pyhoca-cli (0.1.4.2-0~x2go1) unstable; urgency=low * New upstream version (0.1.4.2): - Translate cmd line options into python-x2go options @@ -11,7 +11,7 @@ pyhoca-cli (0.1.4.2-0~x2go1) UNRELEASED; urgency=low - Add cmd line option --terminate-on-ctrl-c. - Add cmd line option --auth-attempts. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 06 Jul 2011 22:18:01 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Sep 2011 20:19:16 +0200 pyhoca-cli (0.1.4.1-0~x2go1) unstable; urgency=low hooks/post-receive -- pyhoca-cli.git (Python X2go Client (command line client)) 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 "pyhoca-cli.git" (Python X2go Client (command line client)).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits