more work on untrusted committers

[git.ikiwiki.info.git] / ikiwiki.in

diff --git a/ikiwiki.in b/ikiwiki.in
index 873bde0df49d68d0fe51e18b6ee11bc2ea4f0378..60663bc89cdf8e0283da54a4d7f0014f627582dd 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -118,6 +118,17 @@ sub getconfig () { #{{{
                        error("WRAPPED_OPTIONS: $@");
                }
                delete $ENV{WRAPPED_OPTIONS};
                        error("WRAPPED_OPTIONS: $@");
                }
                delete $ENV{WRAPPED_OPTIONS};

+
+               if ($config{post_commit} && ! commit_hook_enabled()) {
+                       # optimisation for no-op post_commit 
+                       exit 0;
+               }
+               elsif ($config{test_receive}) {
+                       # quick success if the user is trusted
+                       require IkiWiki::Receive;
+                       exit 0 if IkiWiki::Receive::trusted();
+               }
+

                loadplugins();
                checkconfig();
        }
                loadplugins();
                checkconfig();
        }


@@ -184,7 +195,8 @@ sub main () { #{{{
                # do nothing
        }
        elsif ($config{test_receive}) {
                # do nothing
        }
        elsif ($config{test_receive}) {

-               rcs_test_receive();
+               require IkiWiki::Receive;
+               IkiWiki::Receive::test();

        }
        else {
                if ($config{rebuild}) {
        }
        else {
                if ($config{rebuild}) {