urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

the pre-receive wrapper needs to be suid after all 

It needs to write to the user db.
master
Joey Hess 2008-10-24 15:47:42 -04:00
parent 86ea8adaf3
commit 146192d5b0
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IkiWiki/Plugin/git.pm
View File

@ -46,7 +46,7 @@ sub checkconfig () { #{{{
push @{$config{wrappers}}, {
test_receive => 1,
wrapper => $config{git_test_receive_wrapper},
wrappermode => "0755",
wrappermode => (defined $config{git_wrappermode} ? $config{git_wrappermode} : "06755"),
};
}
} #}}}

26
IkiWiki/Receive.pm
View File

@ -7,7 +7,8 @@ use strict;
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 $<");
}
@ -23,20 +24,31 @@ sub 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;
$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());
$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()) {