X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/8daaa11baa70e07f6405ccb4474e97cac9627961..fc2a0ba2303446db91ee837655da4bcca070fd73:/IkiWiki/Wrapper.pm

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index beabc5649..6dc25403e 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -1,17 +1,17 @@
 #!/usr/bin/perl
 
+package IkiWiki;
+
 use warnings;
 use strict;
-use Cwd q{abs_path};
+use File::Spec;
 use Data::Dumper;
 use IkiWiki;
 
-package IkiWiki;
-
 sub gen_wrapper () { #{{{
-	$config{srcdir}=abs_path($config{srcdir});
-	$config{destdir}=abs_path($config{destdir});
-	my $this=abs_path($0);
+	$config{srcdir}=File::Spec->rel2abs($config{srcdir});
+	$config{destdir}=File::Spec->rel2abs($config{destdir});
+	my $this=File::Spec->rel2abs($0);
 	if (! -x $this) {
 		error(sprintf(gettext("%s doesn't seem to be executable"), $this));
 	}
@@ -33,23 +33,7 @@ sub gen_wrapper () { #{{{
 	foreach my $var (@envsave) {
 		$envsave.=<<"EOF"
 	if ((s=getenv("$var")))
-		asprintf(&newenviron[i++], "%s=%s", "$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)
-		asprintf(&newenviron[i++], "REV=%s", argv[2]);
-	else if ((s=getenv("REV")))
-		asprintf(&newenviron[i++], "%s=%s", "REV", s);
-EOF
-	}
-	if ($config{rcs} eq "tla" && $config{notify}) {
-		$envsave.=<<"EOF"
-	if ((s=getenv("ARCH_VERSION")))
-		asprintf(&newenviron[i++], "%s=%s", "ARCH_VERSION", s);
+		addenv("$var", s);
 EOF
 	}
 	
@@ -57,14 +41,13 @@ EOF
 	my $configstring=Data::Dumper->Dump([\%config], ['*config']);
 	$configstring=~s/\\/\\\\/g;
 	$configstring=~s/"/\\"/g;
-	$configstring=~s/\n/\\\n/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 <stdio.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -72,40 +55,69 @@ EOF
 #include <string.h>
 
 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+5];
-	int i=0;
 $envsave
 	newenviron[i++]="HOME=$ENV{HOME}";
 	newenviron[i++]="WRAPPED_OPTIONS=$configstring";
 	newenviron[i]=NULL;
 	environ=newenviron;
 
-	if (setregid(getegid(), -1) != 0 || setreuid(geteuid(), -1) != 0) {
-		perror("failed to drop real uid/gid");
+	if (setregid(getegid(), -1) != 0 &&
+	    setregid(getegid(), -1) != 0) {
+		perror("failed to drop real gid");
+		exit(1);
+	}
+	if (setreuid(geteuid(), -1) != 0 &&
+	    setreuid(geteuid(), -1) != 0) {
+		perror("failed to drop real uid");
 		exit(1);
 	}
 
 	execl("$this", "$this", NULL);
-	perror("failed to run $this");
+	perror("exec $this");
 	exit(1);
 }
 EOF
 	close OUT;
-	if (system("gcc", "$wrapper.c", "-o", $wrapper) != 0) {
+
+	my $cc=exists $ENV{CC} ? possibly_foolish_untaint($ENV{CC}) : 'cc';
+	if (system($cc, "$wrapper.c", "-o", "$wrapper.new") != 0) {
 		#translators: The parameter is a C filename.
 		error(sprintf(gettext("failed to compile %s"), "$wrapper.c"));
 	}
 	unlink("$wrapper.c");
+	if (defined $config{wrappergroup}) {
+		my $gid=(getgrnam($config{wrappergroup}))[2];
+		if (! defined $gid) {
+			error(sprintf("bad wrappergroup"));
+		}
+		if (! chown(-1, $gid, "$wrapper.new")) {
+			error("chown $wrapper.new: $!");
+		}
+	}
 	if (defined $config{wrappermode} &&
-	    ! chmod(oct($config{wrappermode}), $wrapper)) {
-		error("chmod $wrapper: $!");
+	    ! chmod(oct($config{wrappermode}), "$wrapper.new")) {
+		error("chmod $wrapper.new: $!");
+	}
+	if (! rename("$wrapper.new", $wrapper)) {
+		error("rename $wrapper.new $wrapper: $!");
 	}
 	#translators: The parameter is a filename.
-	printf(gettext("successfully generated %s\n"), $wrapper);
+	printf(gettext("successfully generated %s"), $wrapper);
+	print "\n";
 } #}}}
 
 1