(no commit message)

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

diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index 72668d26a9d596c8b340946b2051fa4ad840949e..e77c477a98ad743b6db8d584067cff1cba992be3 100644 (file)
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -1,28 +1,27 @@
 #!/usr/bin/perl
 #!/usr/bin/perl

-

 package IkiWiki::Receive;
 
 use warnings;
 use strict;
 use IkiWiki;
 
 package IkiWiki::Receive;
 
 use warnings;
 use strict;
 use IkiWiki;
 

-sub getuser () { #{{{
+sub getuser () {

        my $user=(getpwuid(exists $ENV{CALLER_UID} ? $ENV{CALLER_UID} : $<))[0];
        if (! defined $user) {
                error("cannot determine username for $<");
        }
        return $user;
        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}};
        my $user=getuser();
        return ! ref $config{untrusted_committers} ||
                ! grep { $_ eq $user } @{$config{untrusted_committers}};

-} #}}}
+}

 
 

-sub gen_wrapper () { #{{{
+sub genwrapper () {

        # Test for commits from untrusted committers in the wrapper, to
        # Test for commits from untrusted committers in the wrapper, to

-       # avoid loading ikiwiki at all for trusted commits.
+       # avoid starting ikiwiki proper at all for trusted commits.

 
        my $ret=<<"EOF";
        {
 
        my $ret=<<"EOF";
        {


@@ -37,15 +36,17 @@ EOF
                        "u != $uid";
                } @{$config{untrusted_committers}}).
                ") exit(0);\n";
                        "u != $uid";
                } @{$config{untrusted_committers}}).
                ") exit(0);\n";

+
+       

        $ret.=<<"EOF";
                asprintf(&s, "CALLER_UID=%i", u);
                newenviron[i++]=s;
        }
 EOF
        return $ret;
        $ret.=<<"EOF";
                asprintf(&s, "CALLER_UID=%i", u);
                newenviron[i++]=s;
        }
 EOF
        return $ret;

-} #}}}
+}

 
 

-sub test () { #{{{
+sub test () {

        exit 0 if trusted();
        
        IkiWiki::lockwiki();
        exit 0 if trusted();
        
        IkiWiki::lockwiki();


@@ -56,7 +57,6 @@ sub test () { #{{{
        eval q{use CGI};
        error($@) if $@;
        my $cgi=CGI->new;
        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;
 
        # And dummy up a session object.
        require IkiWiki::CGI;


@@ -81,7 +81,7 @@ sub test () { #{{{
                my ($file)=$change->{file}=~/$config{wiki_file_regexp}/;
                $file=IkiWiki::possibly_foolish_untaint($file);
                if (! defined $file || ! length $file ||
                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);
                }
 
                        error(gettext("bad file name %s"), $file);
                }
 


@@ -95,30 +95,30 @@ sub test () { #{{{
                if ($change->{action} eq 'change' ||
                    $change->{action} eq 'add') {
                        if (defined $page) {
                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);
+                               next;

                        }
                        else {
                                if (IkiWiki::Plugin::attachment->can("check_canattach")) {
                                        IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path});
                        }
                        else {
                                if (IkiWiki::Plugin::attachment->can("check_canattach")) {
                                        IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path});

+                                       IkiWiki::check_canedit($file, $cgi, $session);

                                        next;
                                }
                        }
                }
                elsif ($change->{action} eq 'remove') {
                        # check_canremove tests to see if the file is present
                                        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
                        # 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);
                        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);

                                next;
                        }
                }
                                next;
                        }
                }


@@ -130,6 +130,6 @@ sub test () { #{{{
        }
 
        exit 0;
        }
 
        exit 0;

-} #}}}
+}

 
 1
 
 1