correct logic on error fallthrough
[ikiwiki.git] / IkiWiki / Receive.pm
index 451a3fe8e50d98c155579321109e6084d25e657e..972e3578de0103650ba5455b609a175b06ea95cf 100644 (file)
@@ -1,27 +1,52 @@
 #!/usr/bin/perl
-
 package IkiWiki::Receive;
 
 use warnings;
 use strict;
 use IkiWiki;
 
-sub getuser () { #{{{
-       # CALLER_UID is set by the suid wrapper, to the original uid
+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();
@@ -32,7 +57,6 @@ sub test () { #{{{
        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;
@@ -57,7 +81,7 @@ 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})) {
+                   IkiWiki::file_pruned($file)) {
                        error(gettext("bad file name %s"), $file);
                }
 
@@ -71,30 +95,30 @@ sub test () { #{{{
                if ($change->{action} eq 'change' ||
                    $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, 0, 1);
+                               next;
                        }
                        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);
                                        next;
                                }
                        }
                }
                elsif ($change->{action} eq 'remove') {
                        # check_canremove tests to see if the file is present
-                       # on disk. This will fail is a single commit adds a
+                       # 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 add.)
+                       # 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);
                                next;
                        }
                }
@@ -106,6 +130,6 @@ sub test () { #{{{
        }
 
        exit 0;
-} #}}}
+}
 
 1