Merge commit 'upstream/master'

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

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 558cdb1cca8c53415358b572664b9a0cca8dad1d..99237d3b5c5b46b6b5afb85436938b1cbbd329c4 100644 (file)
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -1,17 +1,17 @@
 #!/usr/bin/perl
 
 #!/usr/bin/perl
 

+package IkiWiki;
+

 use warnings;
 use strict;
 use warnings;
 use strict;

-use Cwd q{abs_path};
+use File::Spec;

 use Data::Dumper;
 use IkiWiki;
 
 use Data::Dumper;
 use IkiWiki;
 

-package IkiWiki;
-

 sub gen_wrapper () { #{{{
 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));
        }
        if (! -x $this) {
                error(sprintf(gettext("%s doesn't seem to be executable"), $this));
        }


@@ -28,31 +28,46 @@ sub gen_wrapper () { #{{{
        my @envsave;
        push @envsave, qw{REMOTE_ADDR QUERY_STRING REQUEST_METHOD REQUEST_URI
                       CONTENT_TYPE CONTENT_LENGTH GATEWAY_INTERFACE
        my @envsave;
        push @envsave, qw{REMOTE_ADDR QUERY_STRING REQUEST_METHOD REQUEST_URI
                       CONTENT_TYPE CONTENT_LENGTH GATEWAY_INTERFACE

-                      HTTP_COOKIE REMOTE_USER} if $config{cgi};
+                      HTTP_COOKIE REMOTE_USER HTTPS} if $config{cgi};

        my $envsave="";
        foreach my $var (@envsave) {
        my $envsave="";
        foreach my $var (@envsave) {

-               $envsave.=<<"EOF"
+               $envsave.=<<"EOF";

        if ((s=getenv("$var")))
                addenv("$var", s);
 EOF
        }
        if ((s=getenv("$var")))
                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
+
+       my $test_receive="";
+       if ($config{test_receive}) {
+               require IkiWiki::Receive;
+               $test_receive=IkiWiki::Receive::gen_wrapper();
+       }
+
+       my $check_commit_hook="";
+       if ($config{post_commit}) {
+               # Optimise checking !commit_hook_enabled() , 
+               # so that ikiwiki does not have to be started if the
+               # hook is disabled.
+               #
+               # Note that perl's flock may be implemented using fcntl
+               # or lockf on some systems. If so, and if there is no
+               # interop between the locking systems, the true C flock will
+               # always succeed, and this optimisation won't work.
+               # The perl code will later correctly check the lock,
+               # so the right thing will still happen, though without
+               # the benefit of this optimisation.
+               $check_commit_hook=<<"EOF";
+       {
+               int fd=open("$config{wikistatedir}/commitlock", O_CREAT | O_RDWR);
+               if (fd != -1) {
+                       if (flock(fd, LOCK_SH | LOCK_NB) != 0)
+                               exit(0);
+                       close(fd);
+               }

        }
        }

-       if ($config{rcs} eq "tla" && $config{notify}) {
-               $envsave.=<<"EOF"
-       if ((s=getenv("ARCH_VERSION")))
-               addenv("ARCH_VERSION", s);

 EOF
        }
 EOF
        }

-       
+

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


@@ -66,12 +81,15 @@ EOF
 /* A wrapper for ikiwiki, can be safely made suid. */
 #include <stdio.h>
 #include <sys/types.h>
 /* A wrapper for ikiwiki, can be safely made suid. */
 #include <stdio.h>
 #include <sys/types.h>

+#include <sys/stat.h>
+#include <fcntl.h>

 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>

+#include <sys/file.h>

 
 extern char **environ;
 
 extern char **environ;

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

 int i=0;
 
 addenv(char *var, char *val) {
 int i=0;
 
 addenv(char *var, char *val) {


@@ -83,16 +101,24 @@ addenv(char *var, char *val) {
 }
 
 int main (int argc, char **argv) {
 }
 
 int main (int argc, char **argv) {

-       /* Sanitize environment. */

        char *s;
        char *s;

+
+$check_commit_hook
+$test_receive

 $envsave
        newenviron[i++]="HOME=$ENV{HOME}";
        newenviron[i++]="WRAPPED_OPTIONS=$configstring";
        newenviron[i]=NULL;
        environ=newenviron;
 
 $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);
        }
 
                exit(1);
        }
 


@@ -102,14 +128,28 @@ $envsave
 }
 EOF
        close OUT;
 }
 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");
                #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} &&
        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"), $wrapper);
        }
        #translators: The parameter is a filename.
        printf(gettext("successfully generated %s"), $wrapper);