x2go-commits September 2011

x2go-commits@lists.x2go.org

1 participants
268 discussions

x2goserver.git - master (branch) updated: 3.0.99-2-221-g79bb217
by git-admin＠x2go.org 09 Sep '11

09 Sep '11

The branch, master has been updated via 79bb217bd5b5ee6775607c75f91241613ed3cbdb (commit) via 596b66be5553398cd282ec296f2eca629c4373a6 (commit) from 7f7ec2c82959950ef5ef2186b2c2ff658f8508ca (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 79bb217bd5b5ee6775607c75f91241613ed3cbdb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 9 13:56:20 2011 +0200 x2gologlevel delivers int (instead of str) so that Perl scripts can handle it immediately commit 596b66be5553398cd282ec296f2eca629c4373a6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 9 12:50:45 2011 +0200 Add script lib/x2gologlevel: introduce [log] section in x2goserver.conf with only parameter ,,loglevel''. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 + x2goserver/etc/x2goserver.conf | 4 +++ x2goserver/lib/{x2gocreatesession => x2gologlevel} | 25 ++++++++++++-------- 3 files changed, 21 insertions(+), 10 deletions(-) copy x2goserver/lib/{x2gocreatesession => x2gologlevel} (56%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 87b6158..4356498 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low INSTALL howto. * Add sanity checks to x2goprint, script can only be run as root. * Fix x2goprint, add syslogging, add inline comments. + * Add script lib/x2gologlevel: introduce [log] section in x2goserver.conf + with only parameter ,,loglevel''. [ Martin Oehler ] * Removes old debug code fragment, fixes x2golistsessions parsing. diff --git a/x2goserver/etc/x2goserver.conf b/x2goserver/etc/x2goserver.conf index af1e1b6..3a91293 100644 --- a/x2goserver/etc/x2goserver.conf +++ b/x2goserver/etc/x2goserver.conf @@ -3,3 +3,7 @@ [limit groups] #x2gousers=1 + +[log] +# possible levels are: err, warn, notice, info, debug +loglevel=notice diff --git a/x2goserver/lib/x2gocreatesession b/x2goserver/lib/x2gologlevel similarity index 56% copy from x2goserver/lib/x2gocreatesession copy to x2goserver/lib/x2gologlevel index 425a5d0..0648f96 100755 --- a/x2goserver/lib/x2gocreatesession +++ b/x2goserver/lib/x2gologlevel @@ -21,17 +21,22 @@ # Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> use strict; +use Config::Simple; +use Sys::Syslog qw( :standard :macros ); -use lib `echo -n \$(x2gobasepath)/lib/x2go`; -use x2godbwrapper; +my $Config = new Config::Simple(syntax=>'ini'); +$Config->read('/etc/x2go/x2goserver.conf' ); +my $strloglevel = $Config->param("log.loglevel"); -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; +my $loglevel = LOG_NOTICE; +if ( $strloglevel eq "emerg" ) { $loglevel = LOG_EMERG; } +elsif ( $strloglevel eq "alert" ) { $loglevel = LOG_ALERT; } +elsif ( $strloglevel eq "crit" ) { $loglevel = LOG_CRIT; } +elsif ( $strloglevel eq "err" ) { $loglevel = LOG_ERR; } +elsif ( $strloglevel eq "warn" ) { $loglevel = LOG_WARNING; } +elsif ( $strloglevel eq "notice" ) { $loglevel = LOG_NOTICE; } +elsif ( $strloglevel eq "info" ) { $loglevel = LOG_INFO; } +elsif ( $strloglevel eq "debug" ) { $loglevel = LOG_DEBUG; } -db_createsession($cookie,$pid,$client,$gr_port, $snd_port, $fs_port, $sid); +print "$loglevel"; 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-25-gd94e29d
by git-admin＠x2go.org 09 Sep '11

09 Sep '11

The branch, master has been updated via d94e29dcd1b5cf40aad6505b7a2d004b828b5554 (commit) from 8599d986f186442a9c9c150657bba930d1da2c6f (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 d94e29dcd1b5cf40aad6505b7a2d004b828b5554 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 9 13:50:36 2011 +0200 fix for setting syslog level ----------------------------------------------------------------------- Summary of changes: cups-x2go | 45 ++++++++++++++------------------------------- 1 files changed, 14 insertions(+), 31 deletions(-) The diff of changes is: diff --git a/cups-x2go b/cups-x2go index ad2c436..061dcb4 100755 --- a/cups-x2go +++ b/cups-x2go @@ -18,13 +18,12 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -use Sys::Syslog qw( :DEFAULT setlogsock); +use Sys::Syslog qw( :standard :macros ); use Sys::Hostname; use File::Basename; use File::Copy; use strict; -setlogsock('unix'); openlog($0,'cons,pid','user'); ## if the CUPS server is X2go server at the same time, use ,,local'' here, otherwise @@ -43,7 +42,7 @@ my $ps2pdf = "/usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER #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\""; ## loglevel for cups-x2go, possible values: err, warn, notice, info, debug -my $strloglevel = 'notice'; +my $strloglevel = "notice"; # override hardcoded settings via config file my $cfgfile="/etc/cups/cups-x2go.conf"; @@ -70,7 +69,7 @@ sub readconfig if($option eq "x2goserver") { $x2goserver=$value; - $x2goserver=~s/ //g + $x2goserver=~s/ //g; } if($option eq "printdsa") { @@ -83,6 +82,7 @@ sub readconfig if($option eq "loglevel") { $strloglevel=$value; + $strloglevel=~s/ //g; } } close(CFG); @@ -91,33 +91,16 @@ sub readconfig sub setmylogmask { - if ( $strloglevel == 'emerg' ) { - my $intloglevel = LOG_EMERG; - } - elsif ( $strloglevel == 'alert' ) { - my $intloglevel = LOG_ALERT; - } - elsif ( $strloglevel == 'crit' ) { - my $intloglevel = LOG_CRIT; - } - elsif ( $strloglevel == 'err' ) { - my $intloglevel = LOG_ERR; - } - elsif ( $strloglevel == 'warn' ) { - my $intloglevel = LOG_WARNING; - } - elsif ( $strloglevel == 'notice' ) { - my $intloglevel = LOG_NOTICE - } - elsif ( $strloglevel == 'info' { - my $intloglevel = LOG_INFO; - } - elsif ( $strloglevel == 'debug' ) { - my $intloglevel = LOG_DEBUG; - } else { - my $intloglevel = LOG_ERR; - } - setlogmask( LOG_UPTO( $intloglevel ) ); + my $loglevel = LOG_ERR; + if ( $strloglevel eq "emerg" ) { $loglevel = LOG_EMERG; } + elsif ( $strloglevel eq "alert" ) { $loglevel = LOG_ALERT; } + elsif ( $strloglevel eq "crit" ) { $loglevel = LOG_CRIT; } + elsif ( $strloglevel eq "err" ) { $loglevel = LOG_ERR; } + elsif ( $strloglevel eq "warn" ) { $loglevel = LOG_WARNING; } + elsif ( $strloglevel eq "notice" ) { $loglevel = LOG_NOTICE; } + elsif ( $strloglevel eq "info" ) { $loglevel = LOG_INFO; } + elsif ( $strloglevel eq "debug" ) { $loglevel = LOG_DEBUG; } + setlogmask( LOG_UPTO( $loglevel ) ); } sub getsessions 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

cups-x2go.git - master (branch) updated: 3.0.0.2-24-g8599d98
by git-admin＠x2go.org 09 Sep '11

09 Sep '11

The branch, master has been updated via 8599d986f186442a9c9c150657bba930d1da2c6f (commit) from 264353530bff5c54a5f2294a8af9c8fea00ddc03 (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 8599d986f186442a9c9c150657bba930d1da2c6f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 9 13:18:36 2011 +0200 Add loglevel config option, allow different log levels (i.e. levels of syslog verbosity). ----------------------------------------------------------------------- Summary of changes: cups-x2go | 47 ++++++++++++++++++++++++++++++++++++++++++----- cups-x2go.conf | 2 ++ debian/changelog | 2 ++ 3 files changed, 46 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/cups-x2go b/cups-x2go index d9bf5f5..ad2c436 100755 --- a/cups-x2go +++ b/cups-x2go @@ -42,6 +42,9 @@ 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/margin-offset.ps \"%s\""; +## loglevel for cups-x2go, possible values: err, warn, notice, info, debug +my $strloglevel = 'notice'; + # override hardcoded settings via config file my $cfgfile="/etc/cups/cups-x2go.conf"; @@ -77,12 +80,46 @@ sub readconfig { $ps2pdf=$value; } + if($option eq "loglevel") + { + $strloglevel=$value; + } } close(CFG); } } +sub setmylogmask { + if ( $strloglevel == 'emerg' ) { + my $intloglevel = LOG_EMERG; + } + elsif ( $strloglevel == 'alert' ) { + my $intloglevel = LOG_ALERT; + } + elsif ( $strloglevel == 'crit' ) { + my $intloglevel = LOG_CRIT; + } + elsif ( $strloglevel == 'err' ) { + my $intloglevel = LOG_ERR; + } + elsif ( $strloglevel == 'warn' ) { + my $intloglevel = LOG_WARNING; + } + elsif ( $strloglevel == 'notice' ) { + my $intloglevel = LOG_NOTICE + } + elsif ( $strloglevel == 'info' { + my $intloglevel = LOG_INFO; + } + elsif ( $strloglevel == 'debug' ) { + my $intloglevel = LOG_DEBUG; + } else { + my $intloglevel = LOG_ERR; + } + setlogmask( LOG_UPTO( $intloglevel ) ); +} + sub getsessions { my $sesslist; @@ -113,7 +150,6 @@ sub printfile copy($tfile, "$spfile.title"); chown $uid,$gid,"$spfile"; chown $uid,$gid,"$spfile.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"); @@ -140,13 +176,16 @@ sub printfile ### 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; } +# read config file before we go on... +readconfig(); +setmylogmask(); + if (scalar(@ARGV) < 5 || scalar(@ARGV) > 6) { print STDERR "ERROR: Usage: cups-x2go job-id user title copies options [file]\n"; @@ -160,7 +199,7 @@ my $printOptions; my $psFile; ($jobID, $userName, $jobTitle, $copies, $printOptions, $psFile) = @ARGV; -syslog('info', "Print job received from cups -> $jobID $userName $jobTitle $copies $printOptions $psFile"); +syslog('notice', "Print job received from cups -> $jobID $userName $jobTitle $copies $printOptions $psFile"); my $tempFile; if (!$psFile) @@ -181,8 +220,6 @@ if (!$psFile) $psFile = $tempFile; } -readconfig(); - # converting PS file that we retrieved from CUPS into PDF format $ps2pdf=~s/%s/$psFile/g; syslog('info', "Converting printjob with command: $ps2pdf\n"); diff --git a/cups-x2go.conf b/cups-x2go.conf index f238e2a..6c7bf28 100644 --- a/cups-x2go.conf +++ b/cups-x2go.conf @@ -16,3 +16,5 @@ ## command to generate PDF file #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\" +## loglevel for cups-x2go, possible values: err, warn, notice, info, debug +# loglevel = notice \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index e732607..fa97eb2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ cups-x2go (3.0.0.2-0~x2go2) UNRELEASED; urgency=low * Major change of code, add comments, syslogging, fix ghostscript call. * Fix remote printing, use host specified in X2go session information for destination of print jobs, not the host specified in cups-x2go.conf. + * Add loglevel config option, allow different log levels (i.e. levels of + syslog verbosity). [ 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

cups-x2go.git - master (branch) updated: 3.0.0.2-23-g2643535
by git-admin＠x2go.org 09 Sep '11

09 Sep '11

The branch, master has been updated via 264353530bff5c54a5f2294a8af9c8fea00ddc03 (commit) from 3c6993f6a0afa679bfdf4c5a0d3375f4284db81d (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 264353530bff5c54a5f2294a8af9c8fea00ddc03 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 9 12:41:32 2011 +0200 remove commented code block ----------------------------------------------------------------------- Summary of changes: cups-x2go | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/cups-x2go b/cups-x2go index 0b24ff6..d9bf5f5 100755 --- a/cups-x2go +++ b/cups-x2go @@ -88,17 +88,8 @@ sub getsessions my $sesslist; if ( $x2goserver eq "local" ) { + # run x2golistsessions locally $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 { 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

cups-x2go.git - master (branch) updated: 3.0.0.2-22-g3c6993f
by git-admin＠x2go.org 09 Sep '11

09 Sep '11

The branch, master has been updated via 3c6993f6a0afa679bfdf4c5a0d3375f4284db81d (commit) from 698c43d6d21dfed60db3e70fcb8a987e8514f103 (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 3c6993f6a0afa679bfdf4c5a0d3375f4284db81d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 9 09:12:01 2011 +0200 Fix remote printing, use host specified in X2go session information for destination of print jobs, not the host specified in cups-x2go.conf. ----------------------------------------------------------------------- Summary of changes: cups-x2go | 24 +++++++++--------------- debian/changelog | 2 ++ 2 files changed, 11 insertions(+), 15 deletions(-) The diff of changes is: diff --git a/cups-x2go b/cups-x2go index 1a10aaa..0b24ff6 100755 --- a/cups-x2go +++ b/cups-x2go @@ -47,7 +47,7 @@ my $cfgfile="/etc/cups/cups-x2go.conf"; my $userName; my @sessions; -my $host=hostname(); +my $this_host=hostname(); sub readconfig { @@ -112,9 +112,9 @@ sub getsessions sub printfile { - my ($pfile,$tfile,$phost, $sess)=@_; + my ($pfile,$tfile,$x2gosession_host, $sess)=@_; my $bname=basename($pfile); - if($phost eq $host) + if($x2gosession_host eq $this_host) { my ($tm,$tm,$uid,$gid,$tm,$tm,$tm,$spooldir)=getpwnam("x2goprint"); my $spfile="$spooldir/${sess}_$bname"; @@ -133,21 +133,15 @@ sub printfile { # 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"); + syslog('debug', "scp -i $printdsa $pfile x2goprint\@$x2gosession_host:~x2goprint/${sess}_$bname"); + system ("scp -i $printdsa $pfile x2goprint\@$x2gosession_host:~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"); + syslog('debug', "scp -i $printdsa $tfile x2goprint\@$x2gosession_host:~x2goprint/${sess}_$bname.title"); + system ("scp -i $printdsa $tfile x2goprint\@$x2gosession_host:~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\"" ); + syslog('debug', "ssh -i $printdsa x2goprint\@$x2gosession_host \"sudo x2goprint $userName $sess ${sess}_$bname ${sess}_$bname.title\"" ); + system( "ssh -i $printdsa x2goprint\@$x2gosession_host \"sudo x2goprint $userName $sess ${sess}_$bname ${sess}_$bname.title\"" ); } } diff --git a/debian/changelog b/debian/changelog index b4a668a..e732607 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ cups-x2go (3.0.0.2-0~x2go2) UNRELEASED; urgency=low server share the same machine. * Add a proper dpkg-statoverride check in postinst script. * Major change of code, add comments, syslogging, fix ghostscript call. + * Fix remote printing, use host specified in X2go session information for + destination of print jobs, not the host specified in cups-x2go.conf. [ 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

cups-x2go.git - master (branch) updated: 3.0.0.2-21-g698c43d
by git-admin＠x2go.org 09 Sep '11

09 Sep '11

The branch, master has been updated via 698c43d6d21dfed60db3e70fcb8a987e8514f103 (commit) from 8f363bfe62295b8dc722e4970c7f44151fe89fa9 (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 698c43d6d21dfed60db3e70fcb8a987e8514f103 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 9 09:06:56 2011 +0200 improve comments for config file options (2) ----------------------------------------------------------------------- Summary of changes: cups-x2go | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/cups-x2go b/cups-x2go index 1fb1d7b..1a10aaa 100755 --- a/cups-x2go +++ b/cups-x2go @@ -27,14 +27,15 @@ use strict; setlogsock('unix'); openlog($0,'cons,pid','user'); - -# if the CUPS server is X2go server at the same time, use ,,local'' here, otherwise -# name the hostname of your master X2go server - that is the X2go server that -# can be queried for session information. +## if the CUPS server is X2go server at the same time, use ,,local'' here, otherwise +## name the hostname of your master X2go server within in your X2go cluster. This +## host then is used for querying session information. my $x2goserver = "local"; -# this private key has to be valid for all X2go servers that print via the CUPS -# server that cups-x2go is installed on. +## DSA key for user x2goprint (new path and filename, default in cups-x2go backend) +## this private key has to be valid for all X2go servers that print via the CUPS +## server that cups-x2go is installed on. The corresponding public key has to +## be installed in <remote-x2goserverX>:~x2goprint/.ssh/authorized_keys my $printdsa = "/root/.ssh/id_dsa-x2goprint"; # PS2PDF command 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

cups-x2go.git - master (branch) updated: 3.0.0.2-20-g8f363bf
by git-admin＠x2go.org 09 Sep '11

09 Sep '11

The branch, master has been updated via 8f363bfe62295b8dc722e4970c7f44151fe89fa9 (commit) from 3d504f393caf5d3942e22578695f8fcc73ef1409 (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 8f363bfe62295b8dc722e4970c7f44151fe89fa9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 9 09:05:14 2011 +0200 improve comments for config file options ----------------------------------------------------------------------- Summary of changes: cups-x2go | 12 ++++++++++++ cups-x2go.conf | 13 ++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/cups-x2go b/cups-x2go index a57cbea..1fb1d7b 100755 --- a/cups-x2go +++ b/cups-x2go @@ -27,11 +27,23 @@ use strict; setlogsock('unix'); openlog($0,'cons,pid','user'); + +# if the CUPS server is X2go server at the same time, use ,,local'' here, otherwise +# name the hostname of your master X2go server - that is the X2go server that +# can be queried for session information. my $x2goserver = "local"; + +# this private key has to be valid for all X2go servers that print via the CUPS +# server that cups-x2go is installed on. my $printdsa = "/root/.ssh/id_dsa-x2goprint"; + +# PS2PDF command 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/margin-offset.ps \"%s\""; + +# override hardcoded settings via config file my $cfgfile="/etc/cups/cups-x2go.conf"; + my $userName; my @sessions; my $host=hostname(); diff --git a/cups-x2go.conf b/cups-x2go.conf index 1b11d56..f238e2a 100644 --- a/cups-x2go.conf +++ b/cups-x2go.conf @@ -2,14 +2,17 @@ ### cups-x2go.conf -- CUPS Backend Configuration ### -## Server with x2go system +## if the CUPS server is X2go server at the same time, use ,,local'' here, otherwise +## name the hostname of your master X2go server within in your X2go cluster. This +## host then is used for querying session information. #x2goserver = local -## 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) +## this private key has to be valid for all X2go servers that print via the CUPS +## server that cups-x2go is installed on. The corresponding public key has to +## be installed in <remote-x2goserverX>:~x2goprint/.ssh/authorized_keys #printdsa = /root/.ssh/id_dsa-x2goprint -## command to generate pdf files +## command to generate PDF file #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\" + 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

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 - 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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits September 2011