the pre-receive wrapper needs to be suid after all

It needs to write to the user db.

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 84df561817e7123f6f3f5f3062e4d2ab13445419..5bef92856efa31e5693d67ba7207622da5d17171 100644 (file)
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -46,7 +46,7 @@ sub checkconfig () { #{{{
                push @{$config{wrappers}}, {
                        test_receive => 1,
                        wrapper => $config{git_test_receive_wrapper},
                push @{$config{wrappers}}, {
                        test_receive => 1,
                        wrapper => $config{git_test_receive_wrapper},

-                       wrappermode => "0755",
+                       wrappermode => (defined $config{git_wrappermode} ? $config{git_wrappermode} : "06755"),

                };
        }
 } #}}}
                };
        }
 } #}}}

diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index 81b67d9b47d5c527bfb538c706a4ea42aedf64ab..451a3fe8e50d98c155579321109e6084d25e657e 100644 (file)
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -7,7 +7,8 @@ use strict;
 use IkiWiki;
 
 sub getuser () { #{{{
 use IkiWiki;
 
 sub getuser () { #{{{

-       my $user=(getpwuid($<))[0];
+       # CALLER_UID is set by the suid wrapper, to the original uid
+       my $user=(getpwuid(exists $ENV{CALLER_UID} ? $ENV{CALLER_UID} : $<))[0];

        if (! defined $user) {
                error("cannot determine username for $<");
        }
        if (! defined $user) {
                error("cannot determine username for $<");
        }


@@ -23,20 +24,31 @@ sub trusted () { #{{{
 sub test () { #{{{
        exit 0 if trusted();
        
 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;
        # 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());
        require IkiWiki::CGI;
        my $session=IkiWiki::cgi_getsession($cgi);
        $session->param("name", getuser());

-       $ENV{REMOTE_ADDR}='unknown' unless exists $ENV{REMOTE_ADDR};
-
-       # Wiki is not locked because we lack permission to do so.
-       # So, relying on atomic index file updates to avoid trouble.
-       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()) {
        my %newfiles;
 
        foreach my $change (IkiWiki::rcs_receive()) {