the pre-receive wrapper needs to be suid after all

[ikiwiki.git] / IkiWiki / Receive.pm

diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index 9a672abc99ca2742f5373d737280ad8a6bbe830a..451a3fe8e50d98c155579321109e6084d25e657e 100644 (file)
--- 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,19 +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};
-
-       IkiWiki::lockwiki();
-       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()) {
@@ -59,8 +72,8 @@ sub test () { #{{{
                    $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 {