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

diff --git a/cgi-auth-flexible.pm b/cgi-auth-flexible.pm
index 8c3cb49..137de00 100644
--- a/cgi-auth-flexible.pm
+++ b/cgi-auth-flexible.pm
@@ -50,6 +50,7 @@ use Data::Dumper;
 use File::Copy;
 use Cwd qw/realpath/;
 
+
 #---------- public utilities ----------
 
 sub flatten_params ($) {
@@ -178,8 +179,9 @@ sub gen_plain_login_link ($$) {
 sub gen_srcdump_link_html ($$$$) {
     my ($c,$r,$anchor,$specval) = @_;
     my %params = ($r->{S}{srcdump_param_name} => [ $specval ]);
-    return '<a href="'.escapeHTML($r->url_with_query_params(\%params)).'">'.
-	$anchor."</a>";
+    return '<a href="'.
+	escapeHTML($r->url_with_query_params(\%params,'SRCDUMP')).
+	'">'.$anchor."</a>";
 }
 sub gen_plain_licence_link_html ($$) {
     my ($c,$r) = @_;
@@ -236,6 +238,7 @@ sub srcdump_process_item ($$$$$$) {
     my $upwards = $item;
     for (;;) {
 	$upwards =~ s#/+$##;
+	$upwards =~ s#/+\.$##;
 	last unless $upwards =~ m#[^/]#;
 	foreach my $try (@{ $v->{S}{srcdump_vcs_dirs} }) {
 #print STDERR "TRY $item $upwards $try\n";
@@ -244,13 +247,16 @@ sub srcdump_process_item ($$$$$$) {
 		next;
 	    }
 #print STDERR "VCS $item $upwards $try\n";
-	    return if $dirsdone->{$upwards}++;
+            if ($dirsdone->{$upwards}++) {
+		$outfn->("srcdump_process_item: did $upwards,".
+			 " skipping $item");
+		return;
+	    }
 #print STDERR "VCS $item $upwards $try GO\n";
 	    $try =~ m/\w+/ or die;
-	    return $v->_ch(('srcdump_byvcs_'.lc $&),
-			   $dumpdir, $upwards, $outfn);
+	    return $v->_ch('srcdump_byvcs', $dumpdir, $upwards, $outfn, lc $&);
 	}
-	$upwards =~ s#/*[^/]+##;
+	$upwards =~ s#/*[^/]+$##;
     }
     return $v->_ch('srcdump_novcs', $dumpdir, $item, $outfn);
 }
@@ -264,7 +270,7 @@ sub srcdump_novcs ($$$$$) {
 	    $script .= " \\! -name '$excl'";
 	}
 	$script .= " -print0";
-	return srcdump_dir_cpio($c,$v,$dumpdir,$item,$outfn,$script);
+	return srcdump_dir_cpio($c,$v,$dumpdir,$item,$outfn,'novcs',$script);
     } elsif (-f _) {
 	return srcdump_file($c,$v,$dumpdir,$item,$outfn);
     } else {
@@ -272,14 +278,11 @@ sub srcdump_novcs ($$$$$) {
     }
 }
 
-sub srcdump_byvcs_git ($$$$$) {
-    my ($c, $v, $dumpdir, $dir, $outfn) = @_;
+sub srcdump_byvcs ($$$$$$) {
+    my ($c, $v, $dumpdir, $dir, $outfn, $vcs) = @_;
 #print STDERR "BYVCS GIT $dir\n";
-    return srcdump_dir_cpio($c,$v,$dumpdir,$dir,$outfn,"
-                 git ls-files -z
-                 git ls-files -z --others --exclude-from=.gitignore
-                 find .git -print0
-                            ");
+    return srcdump_dir_cpio($c,$v,$dumpdir,$dir,$outfn,$vcs,
+			    $v->{S}{"srcdump_vcsscript_$vcs"});
 }
 
 sub srcdump_file ($$$$) {
@@ -288,9 +291,9 @@ sub srcdump_file ($$$$) {
     copy($file,$outfile) or die "$file $outfile $!";
 }
 
-sub srcdump_dir_cpio ($$$$$) {
-    my ($c,$v,$dumpdir,$dir,$outfn,$script) = @_;
-    my $outfile = $outfn->("srcdump_dir_cpio saved $dir", "tar");
+sub srcdump_dir_cpio ($$$$$$$) {
+    my ($c,$v,$dumpdir,$dir,$outfn,$how,$script) = @_;
+    my $outfile = $outfn->("srcdump_dir_cpio $how saved $dir", "tar");
 #print STDERR "CPIO $dir >$script<\n";
     my $pid = fork();
     defined $pid or die $!;
@@ -313,7 +316,7 @@ sub srcdump_dir_cpio ($$$$$) {
 	die $!;
     }
     $!=0; (waitpid $pid, 0) == $pid or die "$!";
-    die "$dir ($script) $outfile $?" if $?;
+    die "$dir ($how $script) $outfile $?" if $?;
 }
 
 sub srcdump_dirscan_prepare ($$) {
@@ -359,14 +362,14 @@ sub srcdump_dirscan_prepare ($$) {
 	}
 	if (!lstat "$item") {
 	    die "stat $item $!" unless $!==&ENOENT;
-	    $outfn->("srcdump_dirscan_prepare stat ENOENT: skipping $item");
+	    $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:".
+		$outfn->("srcdump_dirscan_prepare realpath ENOENT,".
 			 " skipping $item");
 	    }
 	}
@@ -381,6 +384,7 @@ sub srcdump_dirscan_prepare ($$) {
 	$dirsdone{$item}++;
     }
     close $reportfh or die $!;
+    srcdump_install($c,$v, $dumpdir, 'licence', 'text/plain');
     $!=0;
     my @cmd = (qw(tar -zvvcf), "$dumpdir/source.tmp",
 	       "-C", $dumpdir, qw(  --), @srcfiles);
@@ -390,7 +394,6 @@ sub srcdump_dirscan_prepare ($$) {
 	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');
     close $lockf or die $!;
 }
@@ -474,11 +477,17 @@ sub new_verifier {
 		$_[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,
-	    srcdump_byvcs_svn => \&srcdump_byvcs_svn,
-	    srcdump_byvcs_cvs => \&srcdump_byvcs_cvs,
+	    srcdump_vcs_dirs => [qw(.git .hg .bzr .svn CVS)],
+	    srcdump_vcsscript_git => "
+                 git ls-files -z
+                 git ls-files -z --others --exclude-from=.gitignore
+                 find .git -print0
+                            ",
+	    srcdump_vcsscript_hg => "false hg",
+	    srcdump_vcsscript_bzr => "false bzr",
+	    srcdump_vcsscript_svn => "false svn",
+	    srcdump_vcsscript_cvs => "false cvs",
+	    srcdump_byvcs => \&srcdump_byvcs,
 	    srcdump_novcs => \&srcdump_novcs,
 	    srcdump_excludes => [qw(*~ *.bak *.tmp), '#*#'],
 	    dump => \&dump_plain,
@@ -490,7 +499,9 @@ sub new_verifier {
     };
     my ($k,$v);
     while (($k,$v,@_) = @_) {
-	die "unknown setting $k" unless exists $verifier->{S}{$k};
+	die "unknown setting $k" unless
+	    $k =~ m/^promise_/ or
+	    exists $verifier->{S}{$k};
 	$verifier->{S}{$k} = $v;
     }
     bless $verifier, $class;
@@ -656,9 +667,9 @@ my @ca = (-name => $r->{S}{cookie_name},
 
 # pages/param-sets are
 #   n normal non-mutating page
-#   r retrieval of information for JS, non-mutating
+#   r retrieval of information for JS etc., non-mutating
 #   m mutating page
-#   u update of information by JS, mutating
+#   u update of information by JS etc., mutating
 #   i login
 #   o logout
 #   O "you have just logged out" page load
@@ -895,6 +906,7 @@ sub _check_divert_core ($) {
         die unless $parmt eq 'y';
         die unless $cookh eq $parmh;
     }
+    $r->{ParmT} = $parmt;
     $r->{AssocSecret} = $cooks;
     $r->{UserOK} = $cooku;
 #print STDERR "C-D-C OK\n";
@@ -1024,12 +1036,17 @@ sub get_username ($) {
     return $r->{UserOK};
 }
 
-sub url_with_query_params ($$) {
-    my ($r, $params) = @_;
+sub url_with_query_params ($$;$) {
+    my ($r, $params, $nonpagetype) = @_;
 #print STDERR "PARAMS ",Dumper($params);
     my $uri = URI->new($r->_ch('get_url'));
     $uri->path($uri->path() . $params->{''}[0]) if $params->{''};
-    $uri->query_form(flatten_params($params));
+    my @flatparams = flatten_params($params);
+    if (defined $nonpagetype
+	&& $r->nonpage_get_needs_secret_hidden($nonpagetype)) {
+	push @flatparams, $r->{S}{assoc_param_name}, $r->secret_hidden_val();
+    }
+    $uri->query_form(@flatparams);
     return $uri->as_string();
 }
 
@@ -1276,6 +1293,36 @@ sub mutate_ok ($) {
     return $r->_is_post();
 }
 
+our %_resource_get_needs_secret_hidden =
+    (map { $_ => 0 } qw(PAGE FRAME IFRAME SRCDUMP STYLESHEET FAVICON ROBOTS),
+     map { $_ => 1 } qw(IMAGE SCRIPT AJAX-XML AJAX-JSON AJAX-OTHER));
+
+sub update_get_need_add_hidden ($$) {
+    my ($r, $reqtype, $value) = @_;
+    my $hash = ref $r
+	? ($r->{GetNeedsSecretHidden} ||= { })
+	: \%_resource_get_needs_secret_hidden;
+    $hash->{$reqtype} = $value;
+}
+
+sub need_add_hidden ($$) {
+    my ($r, $method, $reqtype) = @_;
+    return 1 if $method ne 'GET';
+    my $ent = $r->{GetNeedsSecretHidden}{$reqtype};
+    return $ent if defined $ent;
+    my $ent = $_resource_get_needs_secret_hidden{$reqtype};
+    return $ent if defined $ent;
+    die "unsupported nonpage GET type $reqtype";
+}
+
+sub check_nonpage ($$) {
+    my ($r, $reqtype) = @_;
+    $r->_assert_checked();
+    return unless $r->resource_get_needs_secret_hidden($nonpagetype);
+    return if $r->{ParmT};
+    die "missing hidden secret parameter on nonpage request $nonpagetype";
+}
+
 #---------- output ----------
 
 sub secret_cookie_val ($) {
@@ -1307,41 +1354,3 @@ sub secret_cookie ($) {
 }
 
 1;
-
-__END__
-
-=head1 NAME
-
-CGI::Auth::Flexible - web authentication optionally using cookies
-
-=head1 SYNOPSYS
-
- my $verifier = CGI::Auth::Flexible->new_verifier(setting => value,...);
- my $authreq = $verifier->new_request($cgi_request_object);
-
- my $authreq = CGI::Auth::Flexible->new_request($cgi_request_object,
-                                              setting => value,...);
-
-=head1 USAGE PATTERN FOR SIMPLE APPLICATIONS
-
- $authreq->check_ok() or return;
-
- blah blah blah
- $authreq->check_mutate();
- blah blah blah
-
-=head1 USAGE PATTERN FOR FANCY APPLICATIONS
-
- my $divert_kind = $authreq->check_divert();
- if ($divert_kind) {
-     if ($divert_kind eq 'LOGGEDOUT') {
-	 print "goodbye you are now logged out" and quit
-     } elsif ($divert_kind eq 'NOCOOKIES') {
-	 print "you need cookies" and quit
-     ... etc.
-     }
- }
-
- blah blah blah
- $authreq->check_mutate();
- blah blah blah