X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/739e2ca0b442531b3f0e1b83c3338d2da65ca77d..697c54acc5e5fe1b31b3a1ee43f7de656127d4ed:/IkiWiki/Receive.pm

diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index 81b67d9b4..451a3fe8e 100644
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -7,7 +7,8 @@ use strict;
 use IkiWiki;
 
 sub getuser () { #{{{
-	my $user=(getpwuid($<))[0];
+	# CALLER_UID is set by the suid wrapper, to the original uid
+	my $user=(getpwuid(exists $ENV{CALLER_UID} ? $ENV{CALLER_UID} : $<))[0];
 	if (! defined $user) {
 		error("cannot determine username for $<");
 	}
@@ -23,20 +24,31 @@ sub trusted () { #{{{
 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()) {