Merge branch 'master' into templatemove

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

diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index c69911a7cfbe0130ef7acf8e5b035e7aeaa880ee..ae1bd8bef44c8b6918f2d2ced55c2074d8bbca13 100644 (file)
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -1,41 +1,79 @@
 #!/usr/bin/perl
-
 package IkiWiki::Receive;
 
 use warnings;
 use strict;
 use IkiWiki;
 
-sub getuser () { #{{{
-       my $user=(getpwuid($<))[0];
+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();
+       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()) {
@@ -44,8 +82,8 @@ 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})) {
-                       error(gettext("bad file name"));
+                   IkiWiki::file_pruned($file)) {
+                       error(gettext("bad file name %s"), $file);
                }
 
                my $type=pagetype($file);
@@ -59,8 +97,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 {
@@ -77,7 +115,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")) {
@@ -93,6 +131,6 @@ sub test () { #{{{
        }
 
        exit 0;
-} #}}}
+}
 
 1