From: Joey Hess <joey@kitenet.net>
Date: Tue, 7 Sep 2010 17:47:50 +0000 (-0400)
Subject: Remove PATH overriding code in ikiwiki script that was present to make perl taint... 
X-Git-Tag: 3.20100915~47
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5c6c0813ca8dff8c42ac32ed9702568228f8407b;p=ikiwiki.git

Remove PATH overriding code in ikiwiki script that was present to make perl taint checking happy, but taint checking is disabled.
---

diff --git a/debian/changelog b/debian/changelog
index 430bd302c..a9892938a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low
   * needsbuild hook interface changed; the hooks should now return
     the modified array of things that need built. (Backwards compatability
     code keeps plugins using the old interface working.)
+  * Remove PATH overriding code in ikiwiki script that was present to make
+    perl taint checking happy, but taint checking is disabled.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 07 Sep 2010 12:08:05 -0400
 
diff --git a/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn b/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn
index 63ac4bc31..5097acaef 100644
--- a/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn
+++ b/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn
@@ -7,3 +7,12 @@ This makes it a little hard to specify which specific binaries should be used, e
     $ENV{PATH}="$ENV{PATH}:/usr/local/bin:/usr/bin:/bin:/opt/local/bin";
 
 ? The alternative is of course to patch ikiwiki as suggested in the bug, but I wanted to ask here first :)
+
+> You can use the ENV setting in your setup file to set any environment
+> variables you like. Since ikiwiki.cgi is run by the web browser, that
+> is the best way to ensure ikiwiki always runs with a given variable set.
+> 
+> As a suid program, the ikiwiki wrappers have to sanitize the environment.
+> The ikiwiki script's own sanitization of PATH was done to make perl taint
+> checking happy, but as taint checking is disabled anyway, I have removed
+> that. [[done]] --[[Joey]] 
diff --git a/ikiwiki.in b/ikiwiki.in
index bcda2469b..339efd37c 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -1,7 +1,4 @@
 #!/usr/bin/perl
-$ENV{PATH}="/usr/local/bin:/usr/bin:/bin";
-delete @ENV{qw{IFS CDPATH ENV BASH_ENV}};
-
 package IkiWiki;
 
 use warnings;