X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/47367f7ba8f0ebe97832daf18d6db259e2151056..1786b106a9c7f448136ff47d9b6dd26d48a5dd2e:/IkiWiki/Receive.pm

diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index 451a3fe8e..fdd463025 100644
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -1,27 +1,52 @@
 #!/usr/bin/perl
-
 package IkiWiki::Receive;
 
 use warnings;
 use strict;
 use IkiWiki;
 
-sub getuser () { #{{{
-	# CALLER_UID is set by the suid wrapper, to the original uid
+sub getuser () {
 	my $user=(getpwuid(exists $ENV{CALLER_UID} ? $ENV{CALLER_UID} : $<))[0];
 	if (! defined $user) {
 		error("cannot determine username for $<");
 	}
 	return $user;
-} #}}}
+}
 
-sub trusted () { #{{{
+sub trusted () {
 	my $user=getuser();
 	return ! ref $config{untrusted_committers} ||
 		! grep { $_ eq $user } @{$config{untrusted_committers}};
-} #}}}
+}
+
+sub genwrapper () {
+	# Test for commits from untrusted committers in the wrapper, to
+	# avoid starting ikiwiki proper at all for trusted commits.
+
+	my $ret=<<"EOF";
+	{
+		int u=getuid();
+EOF
+	$ret.="\t\tif ( ".
+		join("&&", map {
+			my $uid=getpwnam($_);
+			if (! defined $uid) {
+				error(sprintf(gettext("cannot determine id of untrusted committer %s"), $_));
+			}
+			"u != $uid";
+		} @{$config{untrusted_committers}}).
+		") exit(0);\n";
+
+	
+	$ret.=<<"EOF";
+		asprintf(&s, "CALLER_UID=%i", u);
+		newenviron[i++]=s;
+	}
+EOF
+	return $ret;
+}
 
-sub test () { #{{{
+sub test () {
 	exit 0 if trusted();
 	
 	IkiWiki::lockwiki();
@@ -32,7 +57,6 @@ sub test () { #{{{
 	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;
@@ -57,7 +81,7 @@ sub test () { #{{{
 		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);
 		}
 
@@ -90,7 +114,7 @@ sub test () { #{{{
 			# by not testing the removal in such pairs of changes.
 			# (The add is still tested, just to make sure that
 			# no data is added to the repo that a web edit
-			# could add.)
+			# could not add.)
 			next if $newfiles{$file};
 
 			if (IkiWiki::Plugin::remove->can("check_canremove")) {
@@ -106,6 +130,6 @@ sub test () { #{{{
 	}
 
 	exit 0;
-} #}}}
+}
 
 1