X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/6c8cf5dd571662f981227489f7c4652a1a1f10cd..7d30ee640a5da696101f6fcee1f0e86256dc60bf:/IkiWiki/Wrapper.pm diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm index 8e513c1f6..558cdb1cc 100644 --- a/IkiWiki/Wrapper.pm +++ b/IkiWiki/Wrapper.pm @@ -2,95 +2,118 @@ use warnings; use strict; +use Cwd q{abs_path}; +use Data::Dumper; +use IkiWiki; package IkiWiki; sub gen_wrapper () { #{{{ - eval q{use Cwd 'abs_path'}; $config{srcdir}=abs_path($config{srcdir}); $config{destdir}=abs_path($config{destdir}); my $this=abs_path($0); if (! -x $this) { - error("$this doesn't seem to be executable"); + error(sprintf(gettext("%s doesn't seem to be executable"), $this)); } if ($config{setup}) { - error("cannot create a wrapper that uses a setup file"); + error(gettext("cannot create a wrapper that uses a setup file")); } - - my @params=($config{srcdir}, $config{destdir}, - "--wikiname=$config{wikiname}", - "--templatedir=$config{templatedir}"); - push @params, "--verbose" if $config{verbose}; - push @params, "--rebuild" if $config{rebuild}; - push @params, "--nosvn" if !$config{svn}; - push @params, "--cgi" if $config{cgi}; - push @params, "--url=$config{url}" if length $config{url}; - push @params, "--cgiurl=$config{cgiurl}" if length $config{cgiurl}; - push @params, "--historyurl=$config{historyurl}" if length $config{historyurl}; - push @params, "--diffurl=$config{diffurl}" if length $config{diffurl}; - push @params, "--anonok" if $config{anonok}; - push @params, "--adminuser=$_" foreach @{$config{adminuser}}; - my $params=join(" ", @params); - my $call=''; - foreach my $p ($this, $this, @params) { - $call.=qq{"$p", }; + my $wrapper=possibly_foolish_untaint($config{wrapper}); + if (! defined $wrapper || ! length $wrapper) { + error(gettext("wrapper filename not specified")); } - $call.="NULL"; + delete $config{wrapper}; my @envsave; push @envsave, qw{REMOTE_ADDR QUERY_STRING REQUEST_METHOD REQUEST_URI CONTENT_TYPE CONTENT_LENGTH GATEWAY_INTERFACE - HTTP_COOKIE} if $config{cgi}; + HTTP_COOKIE REMOTE_USER} if $config{cgi}; my $envsave=""; foreach my $var (@envsave) { $envsave.=<<"EOF" if ((s=getenv("$var"))) - asprintf(&newenviron[i++], "%s=%s", "$var", s); + addenv("$var", s); +EOF + } + if ($config{rcs} eq "svn" && $config{notify}) { + # Support running directly as hooks/post-commit by passing + # $2 in REV in the environment. + $envsave.=<<"EOF" + if (argc == 3) + addenv("REV", argv[2]); + else if ((s=getenv("REV"))) + addenv("REV", s); +EOF + } + if ($config{rcs} eq "tla" && $config{notify}) { + $envsave.=<<"EOF" + if ((s=getenv("ARCH_VERSION"))) + addenv("ARCH_VERSION", s); EOF } - open(OUT, ">ikiwiki-wrap.c") || error("failed to write ikiwiki-wrap.c: $!");; + $Data::Dumper::Indent=0; # no newlines + my $configstring=Data::Dumper->Dump([\%config], ['*config']); + $configstring=~s/\\/\\\\/g; + $configstring=~s/"/\\"/g; + $configstring=~s/\n/\\n/g; + + #translators: The first parameter is a filename, and the second is + #translators: a (probably not translated) error message. + open(OUT, ">$wrapper.c") || error(sprintf(gettext("failed to write %s: %s"), "$wrapper.c", $!));; print OUT <<"EOF"; /* A wrapper for ikiwiki, can be safely made suid. */ -#define _GNU_SOURCE #include +#include #include #include #include extern char **environ; +char *newenviron[$#envsave+5]; +int i=0; + +addenv(char *var, char *val) { + char *s=malloc(strlen(var)+1+strlen(val)+1); + if (!s) + perror("malloc"); + sprintf(s, "%s=%s", var, val); + newenviron[i++]=s; +} int main (int argc, char **argv) { /* Sanitize environment. */ char *s; - char *newenviron[$#envsave+3]; - int i=0; $envsave newenviron[i++]="HOME=$ENV{HOME}"; + newenviron[i++]="WRAPPED_OPTIONS=$configstring"; newenviron[i]=NULL; environ=newenviron; - if (argc == 2 && strcmp(argv[1], "--params") == 0) { - printf("$params\\n"); - exit(0); + if (setregid(getegid(), -1) != 0 || setreuid(geteuid(), -1) != 0) { + perror("failed to drop real uid/gid"); + exit(1); } - - execl($call); - perror("failed to run $this"); + + execl("$this", "$this", NULL); + perror("exec $this"); exit(1); } EOF close OUT; - if (system("gcc", "ikiwiki-wrap.c", "-o", possibly_foolish_untaint($config{wrapper})) != 0) { - error("failed to compile ikiwiki-wrap.c"); + if (system("gcc", "$wrapper.c", "-o", $wrapper) != 0) { + #translators: The parameter is a C filename. + error(sprintf(gettext("failed to compile %s"), "$wrapper.c")); } - unlink("ikiwiki-wrap.c"); + unlink("$wrapper.c"); if (defined $config{wrappermode} && - ! chmod(oct($config{wrappermode}), possibly_foolish_untaint($config{wrapper}))) { - error("chmod $config{wrapper}: $!"); + ! chmod(oct($config{wrappermode}), $wrapper)) { + error("chmod $wrapper: $!"); } - print "successfully generated $config{wrapper}\n"; + #translators: The parameter is a filename. + printf(gettext("successfully generated %s"), $wrapper); + print "\n"; } #}}} 1