X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/739e2ca0b442531b3f0e1b83c3338d2da65ca77d..f086baf61f643b1372257492eac5b8ec0df4f164:/IkiWiki/Receive.pm?ds=inline

diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index 81b67d9b4..72668d26a 100644
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -7,7 +7,7 @@ use strict;
 use IkiWiki;
 
 sub getuser () { #{{{
-	my $user=(getpwuid($<))[0];
+	my $user=(getpwuid(exists $ENV{CALLER_UID} ? $ENV{CALLER_UID} : $<))[0];
 	if (! defined $user) {
 		error("cannot determine username for $<");
 	}
@@ -20,23 +20,59 @@ sub trusted () { #{{{
 		! grep { $_ eq $user } @{$config{untrusted_committers}};
 } #}}}
 
+sub gen_wrapper () { #{{{
+	# Test for commits from untrusted committers in the wrapper, to
+	# avoid loading ikiwiki 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 () { #{{{
 	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;
 	my $session=IkiWiki::cgi_getsession($cgi);
 	$session->param("name", getuser());
-	$ENV{REMOTE_ADDR}='unknown' unless exists $ENV{REMOTE_ADDR};
-
-	# Wiki is not locked because we lack permission to do so.
-	# So, relying on atomic index file updates to avoid trouble.
-	IkiWiki::loadindex();
-
+	# Make sure whatever user was authed is in the
+	# userinfo db.
+	require IkiWiki::UserInfo;
+	if (! IkiWiki::userinfo_get($session->param("name"), "regdate")) {
+		IkiWiki::userinfo_setall($session->param("name"), {
+			email => "",
+			password => "",
+			regdate => time,
+		}) || error("failed adding user");
+	}
+	
 	my %newfiles;
 
 	foreach my $change (IkiWiki::rcs_receive()) {