hail UB313!

[git.ikiwiki.info.git] / IkiWiki / Wrapper.pm

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 62d284eb6fef018b268e69608c0f4282adc5f607..0f64a59f4c039ab24872457cc3529c364deee172 100644 (file)
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -4,6 +4,7 @@ use warnings;
 use strict;
 use Cwd q{abs_path};
 use Data::Dumper;
 use strict;
 use Cwd q{abs_path};
 use Data::Dumper;

+use IkiWiki;

 
 package IkiWiki;
 
 
 package IkiWiki;
 


@@ -19,6 +20,9 @@ sub gen_wrapper () { #{{{
                error("cannot create a wrapper that uses a setup file");
        }
        my $wrapper=possibly_foolish_untaint($config{wrapper});
                error("cannot create a wrapper that uses a setup file");
        }
        my $wrapper=possibly_foolish_untaint($config{wrapper});

+       if (! defined $wrapper || ! length $wrapper) {
+               error("wrapper filename not specified");
+       }

        delete $config{wrapper};
        
        my @envsave;
        delete $config{wrapper};
        
        my @envsave;


@@ -32,17 +36,29 @@ sub gen_wrapper () { #{{{
                asprintf(&newenviron[i++], "%s=%s", "$var", s);
 EOF
        }
                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
+       }

        
        

-       $Data::Dumper::Indent=0;
+       $Data::Dumper::Indent=0; # no newlines

        my $configstring=Data::Dumper->Dump([\%config], ['*config']);
        $configstring=~s/\\/\\\\/g;
        $configstring=~s/"/\\"/g;
        my $configstring=Data::Dumper->Dump([\%config], ['*config']);
        $configstring=~s/\\/\\\\/g;
        $configstring=~s/"/\\"/g;

+       $configstring=~s/\n/\\\n/g;

        
        

-       open(OUT, ">ikiwiki-wrap.c") || error("failed to write ikiwiki-wrap.c: $!");;
+       open(OUT, ">$wrapper.c") || error("failed to write $wrapper.c: $!");;

        print OUT <<"EOF";
 /* A wrapper for ikiwiki, can be safely made suid. */
 #define _GNU_SOURCE
 #include <stdio.h>
        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>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>


@@ -52,7 +68,7 @@ extern char **environ;
 int main (int argc, char **argv) {
        /* Sanitize environment. */
        char *s;
 int main (int argc, char **argv) {
        /* Sanitize environment. */
        char *s;

-       char *newenviron[$#envsave+4];
+       char *newenviron[$#envsave+5];

        int i=0;
 $envsave
        newenviron[i++]="HOME=$ENV{HOME}";
        int i=0;
 $envsave
        newenviron[i++]="HOME=$ENV{HOME}";


@@ -60,16 +76,21 @@ $envsave
        newenviron[i]=NULL;
        environ=newenviron;
 
        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);
 }
 EOF
        close OUT;
        execl("$this", "$this", NULL);
        perror("failed to run $this");
        exit(1);
 }
 EOF
        close OUT;

-       if (system("gcc", "ikiwiki-wrap.c", "-o", $wrapper) != 0) {
-               error("failed to compile ikiwiki-wrap.c");
+       if (system("gcc", "$wrapper.c", "-o", $wrapper) != 0) {
+               error("failed to compile $wrapper.c");

        }
        }

-       unlink("ikiwiki-wrap.c");
+       unlink("$wrapper.c");

        if (defined $config{wrappermode} &&
            ! chmod(oct($config{wrappermode}), $wrapper)) {
                error("chmod $wrapper: $!");
        if (defined $config{wrappermode} &&
            ! chmod(oct($config{wrappermode}), $wrapper)) {
                error("chmod $wrapper: $!");