X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/f5bd1cf3cd4cc481cfd0bb08ee06aded56fc32ee..d4fd8cd67dd868ed8b0d51c2d710b834d6a33b05:/IkiWiki/Receive.pm

diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index 31ab3a500..88fb49725 100644
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-
 package IkiWiki::Receive;
 
 use warnings;
@@ -20,9 +19,9 @@ sub trusted () {
 		! grep { $_ eq $user } @{$config{untrusted_committers}};
 }
 
-sub gen_wrapper () {
+sub genwrapper () {
 	# Test for commits from untrusted committers in the wrapper, to
-	# avoid loading ikiwiki at all for trusted commits.
+	# avoid starting ikiwiki proper at all for trusted commits.
 
 	my $ret=<<"EOF";
 	{
@@ -37,6 +36,8 @@ EOF
 			"u != $uid";
 		} @{$config{untrusted_committers}}).
 		") exit(0);\n";
+
+	
 	$ret.=<<"EOF";
 		asprintf(&s, "CALLER_UID=%i", u);
 		newenviron[i++]=s;
@@ -47,16 +48,15 @@ EOF
 
 sub test () {
 	exit 0 if trusted();
-	
+
 	IkiWiki::lockwiki();
 	IkiWiki::loadindex();
-	
+
 	# Dummy up a cgi environment to use when calling check_canedit
 	# and friends.
 	eval q{use CGI};
 	error($@) if $@;
 	my $cgi=CGI->new;
-	$ENV{REMOTE_ADDR}='unknown' unless exists $ENV{REMOTE_ADDR};
 
 	# And dummy up a session object.
 	require IkiWiki::CGI;
@@ -72,22 +72,34 @@ sub test () {
 			regdate => time,
 		}) || error("failed adding user");
 	}
-	
-	my %newfiles;
 
-	foreach my $change (IkiWiki::rcs_receive()) {
+	test_changes(cgi => $cgi,
+		session => $session,
+		changes => [IkiWiki::rcs_receive()]
+	);
+	exit 0;
+}
+
+sub test_changes {
+	my %params = @_;
+	my $cgi = $params{cgi};
+	my $session = $params{session};
+	my @changes = @{$params{changes}};
+
+	my %newfiles;
+	foreach my $change (@changes) {
 		# This untaint is safe because we check file_pruned and
 		# wiki_file_regexp.
 		my ($file)=$change->{file}=~/$config{wiki_file_regexp}/;
 		$file=IkiWiki::possibly_foolish_untaint($file);
 		if (! defined $file || ! length $file ||
-		    IkiWiki::file_pruned($file, $config{srcdir})) {
+		    IkiWiki::file_pruned($file)) {
 			error(gettext("bad file name %s"), $file);
 		}
 
 		my $type=pagetype($file);
 		my $page=pagename($file) if defined $type;
-		
+
 		if ($change->{action} eq 'add') {
 			$newfiles{$file}=1;
 		}
@@ -95,21 +107,20 @@ sub test () {
 		if ($change->{action} eq 'change' ||
 		    $change->{action} eq 'add') {
 			if (defined $page) {
-				if (IkiWiki->can("check_canedit")) {
-					IkiWiki::check_canedit($page, $cgi, $session);
-					next;
-				}
+				IkiWiki::check_canedit($page, $cgi, $session);
+				next;
 			}
 			else {
 				if (IkiWiki::Plugin::attachment->can("check_canattach")) {
 					IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path});
+					IkiWiki::check_canedit($file, $cgi, $session);
 					next;
 				}
 			}
 		}
 		elsif ($change->{action} eq 'remove') {
 			# check_canremove tests to see if the file is present
-			# on disk. This will fail is a single commit adds a
+			# on disk. This will fail when a single commit adds a
 			# file and then removes it again. Avoid the problem
 			# by not testing the removal in such pairs of changes.
 			# (The add is still tested, just to make sure that
@@ -119,17 +130,16 @@ sub test () {
 
 			if (IkiWiki::Plugin::remove->can("check_canremove")) {
 				IkiWiki::Plugin::remove::check_canremove(defined $page ? $page : $file, $cgi, $session);
+				IkiWiki::check_canedit(defined $page ? $page : $file, $cgi, $session);
 				next;
 			}
 		}
 		else {
 			error "unknown action ".$change->{action};
 		}
-		
+
 		error sprintf(gettext("you are not allowed to change %s"), $file);
 	}
-
-	exit 0;
 }
 
 1