X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/ccbf965e6b875c9cfa2ef681c85a224439928a69..c0cf13dbb064f354eb84430d10747fc0b454f408:/IkiWiki/Wrapper.pm

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 7d27abd06..a3ecccd5b 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -28,7 +28,7 @@ sub gen_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"
@@ -46,10 +46,12 @@ EOF
 		asprintf(&newenviron[i++], "%s=%s", "REV", s);
 EOF
 	}
-	
-	# This is only set by plugins, which append to it on startup, so
-	# avoid storing it in the wrapper.
-	$config{headercontent}="";
+	if ($config{rcs} eq "tla" && $config{notify}) {
+		$envsave.=<<"EOF"
+	if ((s=getenv("ARCH_VERSION")))
+		asprintf(&newenviron[i++], "%s=%s", "ARCH_VERSION", s);
+EOF
+	}
 	
 	$Data::Dumper::Indent=0; # no newlines
 	my $configstring=Data::Dumper->Dump([\%config], ['*config']);
@@ -62,6 +64,7 @@ EOF
 /* A wrapper for ikiwiki, can be safely made suid. */
 #define _GNU_SOURCE
 #include <stdio.h>
+#include <sys/types.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
@@ -79,6 +82,11 @@ $envsave
 	newenviron[i]=NULL;
 	environ=newenviron;
 
+	if (setregid(getegid(), -1) != 0 || setreuid(geteuid(), -1) != 0) {
+		perror("failed to drop real uid/gid");
+		exit(1);
+	}
+
 	execl("$this", "$this", NULL);
 	perror("failed to run $this");
 	exit(1);