X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=cgi-auth-flexible.pm;h=8c3cb49d4cc33e172d281c0d94b66679668b68b7;hb=8e8af24e5d49760ef384d02e29430a6e6e8a26ad;hp=a6fb33cf4660e08f4031332aaa66e374840d0486;hpb=4e254e72c7879e561dc7c9a2521f00cb2954eb68;p=cgi-auth-flexible.git

diff --git a/cgi-auth-flexible.pm b/cgi-auth-flexible.pm
index a6fb33c..8c3cb49 100644
--- a/cgi-auth-flexible.pm
+++ b/cgi-auth-flexible.pm
@@ -48,6 +48,7 @@ use Digest::HMAC;
 use Digest::SHA;
 use Data::Dumper;
 use File::Copy;
+use Cwd qw/realpath/;
 
 #---------- public utilities ----------
 
@@ -226,55 +227,70 @@ sub dump_plain ($$$$) {
     }
 }
 
-sub srcdump_process_dir ($$$$$$) {
-    my ($c, $v, $dumpdir, $incdir, $tarballcounter,
-	$needlicence, $dirsdone) = @_;
-    return () if $v->_ch('srcdump_system_dir', $incdir);
-    my $upwards = $incdir;
+sub srcdump_process_item ($$$$$$) {
+    my ($c, $v, $dumpdir, $item, $outfn, $needlicence, $dirsdone) = @_;
+    if ($v->_ch('srcdump_system_dir', $item)) {
+	$outfn->("srcdump_process_item: srcdump_system_dir, skipping $item");
+	return;
+    }
+    my $upwards = $item;
     for (;;) {
 	$upwards =~ s#/+$##;
 	last unless $upwards =~ m#[^/]#;
 	foreach my $try (@{ $v->{S}{srcdump_vcs_dirs} }) {
-#print STDERR "TRY $incdir $upwards $try\n";
+#print STDERR "TRY $item $upwards $try\n";
 	    if (!stat "$upwards/$try") {
-		$!==&ENOENT or die "check $upwards/$try $!";
+		$!==&ENOENT or $!==&ENOTDIR or die "check $upwards/$try $!";
 		next;
 	    }
-#print STDERR "VCS $incdir $upwards $try\n";
+#print STDERR "VCS $item $upwards $try\n";
 	    return if $dirsdone->{$upwards}++;
-#print STDERR "VCS $incdir $upwards $try GO\n";
+#print STDERR "VCS $item $upwards $try GO\n";
 	    $try =~ m/\w+/ or die;
 	    return $v->_ch(('srcdump_byvcs_'.lc $&),
-			   $dumpdir, $upwards, $tarballcounter);
+			   $dumpdir, $upwards, $outfn);
 	}
 	$upwards =~ s#/*[^/]+##;
     }
-    return $v->_ch('srcdump_novcs', $dumpdir, $incdir, $tarballcounter);
+    return $v->_ch('srcdump_novcs', $dumpdir, $item, $outfn);
 }
 
 sub srcdump_novcs ($$$$$) {
-    my ($c, $v, $dumpdir, $dir, $tarballcounter) = @_;
-    my $script = 'find -type f -perm +004';
-    foreach my $excl (@{ $v->{S}{srcdump_excludes} }) {
-	$script .= " \\! -name '$excl'";
+    my ($c, $v, $dumpdir, $item, $outfn) = @_;
+    stat $item or die "$item $!";
+    if (-d _) {
+	my $script = 'find -type f -perm +004';
+	foreach my $excl (@{ $v->{S}{srcdump_excludes} }) {
+	    $script .= " \\! -name '$excl'";
+	}
+	$script .= " -print0";
+	return srcdump_dir_cpio($c,$v,$dumpdir,$item,$outfn,$script);
+    } elsif (-f _) {
+	return srcdump_file($c,$v,$dumpdir,$item,$outfn);
+    } else {
+	die "$item not file or directory";
     }
-    $script .= " -print0";
-    return srcdump_dir_cpio($c,$v,$dumpdir,$dir,$tarballcounter,$script);
 }
 
 sub srcdump_byvcs_git ($$$$$) {
-    my ($c, $v, $dumpdir, $dir, $tarballcounter) = @_;
+    my ($c, $v, $dumpdir, $dir, $outfn) = @_;
 #print STDERR "BYVCS GIT $dir\n";
-    return srcdump_dir_cpio($c,$v,$dumpdir,$dir,$tarballcounter,"
+    return srcdump_dir_cpio($c,$v,$dumpdir,$dir,$outfn,"
                  git ls-files -z
                  git ls-files -z --others --exclude-from=.gitignore
                  find .git -print0
                             ");
 }
 
+sub srcdump_file ($$$$) {
+    my ($c,$v,$dumpdir,$file,$outfn) = @_;
+    my $outfile = $outfn->("srcdump_file saved $file", "src");
+    copy($file,$outfile) or die "$file $outfile $!";
+}
+
 sub srcdump_dir_cpio ($$$$$) {
-    my ($c,$v,$dumpdir,$dir,$tarballcounter,$script) = @_;
-    my $outfile = "$dumpdir/$$tarballcounter.tar";
+    my ($c,$v,$dumpdir,$dir,$outfn,$script) = @_;
+    my $outfile = $outfn->("srcdump_dir_cpio saved $dir", "tar");
 #print STDERR "CPIO $dir >$script<\n";
     my $pid = fork();
     defined $pid or die $!;
@@ -298,11 +314,6 @@ sub srcdump_dir_cpio ($$$$$) {
     }
     $!=0; (waitpid $pid, 0) == $pid or die "$!";
     die "$dir ($script) $outfile $?" if $?;
-    print STDERR
-	"CGI::Auth::Flexible srcdump_dir_cpio saved $dir into $outfile\n"
-	or die $!;
-    $$tarballcounter++;
-    return $outfile;
 }
 
 sub srcdump_dirscan_prepare ($$) {
@@ -319,35 +330,65 @@ sub srcdump_dirscan_prepare ($$) {
 	    or die "$v->{S}{srcdump_licence_path} $!";
 	$needlicence = undef;
     }
-    unlink <"$dumpdir/[a-z][a-z][a-z].tar">;
-    my $srctarballcounter = 'aaa';
+    unlink <"$dumpdir/s.[a-z][a-z][a-z].*">;
+    my @srcfiles = qw(licence.data manifest.txt);
+    my $srcoutcounter = 'aaa';
+
+    my $reportfh = new IO::File "$dumpdir/manifest.txt", 'w' or die $!;
+    my $outfn = sub {
+	my ($message, $extension) = @_;
+	if (defined $extension) {
+	    my $leaf = "s.$srcoutcounter.$extension";
+	    $srcoutcounter++;
+	    push @srcfiles, $leaf;
+	    print $reportfh "$leaf: $message\n" or die $!;
+	    return "$dumpdir/$leaf";
+	} else {
+	    print $reportfh "none: $message\n" or die $!;
+	    return undef;
+	}
+    };
     my %dirsdone;
-    my @srcfiles = ("$dumpdir/licence.data");
-    foreach my $incdir ($v->_ch('srcdump_includedirs')) {
-	if ($incdir eq '.' && $v->{S}{srcdump_filter_cwd}) {
+    foreach my $item ($v->_ch('srcdump_listitems')) {
+	if ($item eq '.' && $v->{S}{srcdump_filter_cwd}) {
 	    my @bad = grep { !m#^/# } values %INC;
-	    die "filtering . from srcdump dirs and \@INC but already".
+	    die "filtering . from srcdump items and \@INC but already".
 		" included @bad " if @bad;
 	    @INC = grep { $_ ne '.' } @INC;
 	    next;
 	}
-	if (!stat "$incdir/.") {
-	    next if $!==&ENOENT;
-	    die "stat $incdir $!";
+	if (!lstat "$item") {
+	    die "stat $item $!" unless $!==&ENOENT;
+	    $outfn->("srcdump_dirscan_prepare stat ENOENT: skipping $item");
+	    next;
 	};
+	if (-l _) {
+	    $item = realpath($item);
+	    if (!defined $item) {
+		die "realpath $item $!" unless $!==&ENOENT;
+		$outfn->("srcdump_dirscan_prepare realpath ENOENT:".
+			 " skipping $item");
+	    }
+	}
 	if (defined $needlicence) {
 	    foreach my $try (@{ $v->{S}{srcdump_licence_files} }) {
-		last if copy("$incdir/$try", $needlicence);
-		$!==&ENOENT or die "copy $incdir/$try $!";
+		last if copy("$item/$try", $needlicence);
+		$!==&ENOENT or $!==&ENOTDIR or die "copy $item/$try $!";
 	    }
 	}
-	push @srcfiles, $v->_ch('srcdump_process_dir', $dumpdir, $incdir,
-				\$srctarballcounter, \$needlicence, \%dirsdone);
-	$dirsdone{$incdir}++;
+	$v->_ch('srcdump_process_item', $dumpdir, $item,
+		$outfn, \$needlicence, \%dirsdone);
+	$dirsdone{$item}++;
     }
+    close $reportfh or die $!;
     $!=0;
-    my $r = system qw(tar -zvvc -f), "$dumpdir/source.tmp", '--', @srcfiles;
-    die "tar $r $!" if $r;
+    my @cmd = (qw(tar -zvvcf), "$dumpdir/source.tmp",
+	       "-C", $dumpdir, qw(  --), @srcfiles);
+    my $r = system(@cmd);
+    if ($r) {
+	print STDERR "CGI::Auth::Flexible tar failed ($r $!) @cmd\n";
+	die "tar failed";
+    }
     die "licence file not found" unless defined $needlicence;
     srcdump_install($c,$v, $dumpdir, 'licence', 'text/plain');
     srcdump_install($c,$v, $dumpdir, 'source', 'application/octet-stream');
@@ -427,10 +468,12 @@ sub new_verifier {
 	    srcdump_prepare => \&srcdump_dirscan_prepare,
 	    srcdump_licence_path => undef,
 	    srcdump_licence_files => [qw(AGPLv3 CGI/Auth/Flexible/AGPLv3)],
-	    srcdump_includedirs => sub { return @INC; },
+	    srcdump_listitems => sub { (@INC, $ENV{'SCRIPT_FILENAME'}, $0); },
 	    srcdump_filter_cwd => 1,
-	    srcdump_system_dir => sub { $_[2] =~ m#^/etc/|^/usr/(?!local/)#; },
-	    srcdump_process_dir => \&srcdump_process_dir,
+	    srcdump_system_dir => sub {
+		$_[2] =~ m#^/etc/|^/usr/(?!local/)(?!lib/cgi)#;
+	    },
+	    srcdump_process_item => \&srcdump_process_item,
 	    srcdump_vcs_dirs => [qw(.git .hg .svn CVS)],
 	    srcdump_byvcs_git => \&srcdump_byvcs_git,
 	    srcdump_byvcs_hg => \&srcdump_byvcs_hg,