X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=cups-pdf-find-owner.pl;h=e2ff5ba1de1b9a620b7022e58edd808556116963;hb=1f7a169e4c6a66f0015dc78e0b0e63c90341a9a2;hp=54fafcc9a8f2ecc7dda4f31e982f44db4e240076;hpb=7234eee102128f066d5c5681b82186d0561e2199;p=safeq

diff --git a/cups-pdf-find-owner.pl b/cups-pdf-find-owner.pl
index 54fafcc..e2ff5ba 100755
--- a/cups-pdf-find-owner.pl
+++ b/cups-pdf-find-owner.pl
@@ -6,8 +6,32 @@ use autodie;
 use Data::Dump qw(dump);
 use File::Slurp;
 use DBI;
+use IO::Socket::INET;
 
-my ($file, $local_user, $remote_user) = @ARGV;
+my $socket = IO::Socket::INET->new(
+	LocalPort => 4001,
+	LocalAddr => 'localhost',
+	Proto => 'tcp',
+	Listen => 5,
+	Reuse => 1
+) or die "ERROR: $!";
+
+open(my $log, '>>', '/var/log/cups/find_owner_log');
+$SIG{__WARN__} = sub {
+	print STDERR @_;
+	print $log time(), " ", @_;
+};
+
+warn "$0 waiting for client connection on port ", $socket->sockaddr, ":", $socket->sockport, "\n";
+
+while(1) {
+	our $client_socket = $socket->accept();
+	my $line = <$client_socket>;
+
+	warn "<< [$line]";
+
+#my ($file, $local_user, $remote_user) = @ARGV;
+my ($file, $local_user, $remote_user) = split(/\s/,$line,3);
 
 my $job_id = $1 if ( $file =~ m/job_(\d+)/ );
 
@@ -15,6 +39,16 @@ die "can't find job_id in [$file]" unless $job_id;
 
 my $c_file = sprintf "/var/spool/cups/c%05d", $job_id;
 
+if ( ! -e $c_file ) {
+	my $wait = 5; # max s wait for file to appear
+	while ( $wait ) {
+		$0 = "find-owner #$job_id wait $wait s for $c_file";
+		sleep 1;
+		$wait--;
+		last if -e $c_file;
+	}
+}
+
 my $blob = read_file $c_file;
 
 my (undef,$ip) = split(/job-originating-host-name\x00/, $blob, 2);
@@ -45,12 +79,17 @@ warn "## row = ",dump($row);
 $sth->finish;
 
 my $username = $row->{username} || die "no username in row = ",dump($row);
+$username =~ s/\@ffzg.hr$//; # strip domain, same as pGina
 
 my $spool = '/var/spool/cups-pdf/';
 mkdir "$spool/$username" if ( ! -e "$spool/$username" );
 my $filename_only = $file;
 $filename_only =~ s/^.*\///; # basename
 
-rename $file, "$spool/$username/$filename_only";
+my $to = "$spool/$username/$filename_only";
+rename $file, $to;
+warn "# $to";
+$0 = "find-owner #$job_id $username $filename_only"
+
+} # while(1)
 
-exit 0;