content-type for aggregate web trigger

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

diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index 3a5f91758363bd6cd4521af3a7a6e966c2c91488..f985f560b3d17b38aeef783a3b0ccbd0960d034d 100644 (file)
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -26,6 +26,8 @@ sub genwrapper () {
        my $ret=<<"EOF";
        {
                int u=getuid();
+               /* 3 characters per byte is certainly enough */
+               char uid_string[sizeof(u) * 3 + 1];
 EOF
        $ret.="\t\tif ( ".
                join("&&", map {
@@ -35,12 +37,19 @@ EOF
                        }
                        "u != $uid";
                } @{$config{untrusted_committers}}).
-               ") exit(0);\n";
+               ") {\n";
 
        
        $ret.=<<"EOF";
-               asprintf(&s, "CALLER_UID=%i", u);
-               newenviron[i++]=s;
+                       /* Trusted user.
+                        * Consume all stdin before exiting, as git may
+                        * otherwise be unhappy. */
+                       char buf[256];
+                       while (read(0, &buf, 256) != 0) {}
+                       exit(0);
+               }
+               snprintf(uid_string, sizeof(uid_string), "%i", u);
+               addenv("CALLER_UID", uid_string);
        }
 EOF
        return $ret;
@@ -48,10 +57,10 @@ EOF
 
 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};
@@ -72,58 +81,12 @@ sub test () {
                        regdate => time,
                }) || error("failed adding user");
        }
-       
-       my %newfiles;
-
-       foreach my $change (IkiWiki::rcs_receive()) {
-               # This untaint is safe because we check file_pruned and
-               # wiki_file_regexp.
-               my ($file)=$change->{file}=~/$config{wiki_file_regexp}/;
-               $file=IkiWiki::possibly_foolish_untaint($file);
-               if (! defined $file || ! length $file ||
-                   IkiWiki::file_pruned($file)) {
-                       error(gettext("bad file name %s"), $file);
-               }
-
-               my $type=pagetype($file);
-               my $page=pagename($file) if defined $type;
-               
-               if ($change->{action} eq 'add') {
-                       $newfiles{$file}=1;
-               }
-
-               if ($change->{action} eq 'change' ||
-                   $change->{action} eq 'add') {
-                       if (defined $page) {
-                               IkiWiki::check_canedit($page, $cgi, $session, 0, 1);
-                       }
-                       else {
-                               if (IkiWiki::Plugin::attachment->can("check_canattach")) {
-                                       IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path});
-                                       IkiWiki::check_canedit($file, $cgi, $session, 0, 1);
-                               }
-                       }
-               }
-               elsif ($change->{action} eq 'remove') {
-                       # check_canremove tests to see if the file is present
-                       # on disk. This will fail when a single commit adds a
-                       # file and then removes it again. Avoid the problem
-                       # 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 not add.)
-                       next if $newfiles{$file};
-
-                       if (IkiWiki::Plugin::remove->can("check_canremove")) {
-                               IkiWiki::Plugin::remove::check_canremove(defined $page ? $page : $file, $cgi, $session);
-                               IkiWiki::check_canedit(defined $page ? $page : $file, $cgi, $session, 0, 1);
-                       }
-               }
-               else {
-                       error "unknown action ".$change->{action};
-               }
-       }
 
+       IkiWiki::check_canchange(
+               cgi => $cgi,
+               session => $session,
+               changes => [IkiWiki::rcs_receive()]
+       );
        exit 0;
 }