Merge commit 'upstream/master'

[git.ikiwiki.info.git] / IkiWiki / Receive.pm

diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index c69911a7cfbe0130ef7acf8e5b035e7aeaa880ee..72668d26a9d596c8b340946b2051fa4ad840949e 100644 (file)
--- 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,22 +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};
-
-       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()) {
@@ -45,7 +82,7 @@ sub test () { #{{{
                $file=IkiWiki::possibly_foolish_untaint($file);
                if (! defined $file || ! length $file ||
                    IkiWiki::file_pruned($file, $config{srcdir})) {
-                       error(gettext("bad file name"));
+                       error(gettext("bad file name %s"), $file);
                }
 
                my $type=pagetype($file);
@@ -59,8 +96,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 {