Cleanup MakeMaker 'not in config' noise

[perl5.git] / taint.c

diff --git a/taint.c b/taint.c
index 66affdd..2dc43a4 100644 (file)
--- a/taint.c
+++ b/taint.c
@@ -1,60 +1,111 @@
+/*
+ * "...we will have peace, when you and all your works have perished--and
+ * the works of your dark master to whom you would deliver us.  You are a
+ * liar, Saruman, and a corrupter of men's hearts."  --Theoden
+ */
+
 #include "EXTERN.h"
 #include "perl.h"
 
 void
-taint_not(s)
-char *s;
+taint_proper(const char *f, char *s)
 {
-    if (euid != uid)
-        croak("No %s allowed while running setuid", s);
-    if (egid != gid)
-        croak("No %s allowed while running setgid", s);
-}
+    dTHR;      /* just for taint */
+    char *ug;
 
-void
-taint_proper(f, s)
-char *f;
-char *s;
-{
-    if (tainting) {
-       DEBUG_u(fprintf(stderr,"%s %d %d %d\n",s,tainted,uid, euid));
-       if (tainted) {
-           char *ug = 0;
-           if (euid != uid)
-               ug = " while running setuid";
-           else if (egid != gid)
-               ug = " while running setgid";
-           else if (tainting)
-               ug = " while running with -T switch";
-           if (ug) {
-               if (!unsafe)
-                   croak(f, s, ug);
-               else if (dowarn)
-                   warn(f, s, ug);
-           }
-       }
+    DEBUG_u(PerlIO_printf(Perl_debug_log,
+            "%s %d %d %d\n", s, tainted, uid, euid));
+
+    if (tainted) {
+       if (euid != uid)
+           ug = " while running setuid";
+       else if (egid != gid)
+           ug = " while running setgid";
+       else
+           ug = " while running with -T switch";
+       if (!unsafe)
+           croak(f, s, ug);
+       else if (dowarn)
+           warn(f, s, ug);
     }
 }
 
 void
-taint_env()
+taint_env(void)
 {
     SV** svp;
+    MAGIC* mg;
+    char** e;
+    static char* misc_env[] = {
+       "IFS",          /* most shells' inter-field separators */
+       "CDPATH",       /* ksh dain bramage #1 */
+       "ENV",          /* ksh dain bramage #2 */
+       "BASH_ENV",     /* bash dain bramage -- I guess it's contagious */
+       NULL
+    };
+
+#ifdef VMS
+    int i = 0;
+    char name[10 + TYPE_DIGITS(int)] = "DCL$PATH";
 
-    if (tainting) {
-       svp = hv_fetch(GvHVn(envgv),"PATH",4,FALSE);
-       if (!svp || *svp == &sv_undef || mg_find(*svp, 't')) {
-           tainted = 1;
-           if (SvPRIVATE(*svp) & SVp_TAINTEDDIR)
-               taint_proper("Insecure directory in %s%s", "PATH");
-           else
-               taint_proper("Insecure %s%s", "PATH");
+    while (1) {
+       if (i)
+           (void)sprintf(name,"DCL$PATH;%d", i);
+       svp = hv_fetch(GvHVn(envgv), name, strlen(name), FALSE);
+       if (!svp || *svp == &sv_undef)
+           break;
+       if (SvTAINTED(*svp)) {
+           TAINT;
+           taint_proper("Insecure %s%s", "$ENV{DCL$PATH}");
        }
-       svp = hv_fetch(GvHVn(envgv),"IFS",3,FALSE);
-       if (svp && *svp != &sv_undef && mg_find(*svp, 't')) {
-           tainted = 1;
-           taint_proper("Insecure %s%s", "IFS");
+       if ((mg = mg_find(*svp, 'e')) && MgTAINTEDDIR(mg)) {
+           TAINT;
+           taint_proper("Insecure directory in %s%s", "$ENV{DCL$PATH}");
+       }
+       i++;
+    }
+#endif /* VMS */
+
+    svp = hv_fetch(GvHVn(envgv),"PATH",4,FALSE);
+    if (svp && *svp) {
+       if (SvTAINTED(*svp)) {
+           dTHR;
+           TAINT;
+           taint_proper("Insecure %s%s", "$ENV{PATH}");
+       }
+       if ((mg = mg_find(*svp, 'e')) && MgTAINTEDDIR(mg)) {
+           dTHR;
+           TAINT;
+           taint_proper("Insecure directory in %s%s", "$ENV{PATH}");
        }
     }
-}
 
+#ifndef VMS
+    /* tainted $TERM is okay if it contains no metachars */
+    svp = hv_fetch(GvHVn(envgv),"TERM",4,FALSE);
+    if (svp && *svp && SvTAINTED(*svp)) {
+       dTHR;   /* just for taint */
+       bool was_tainted = tainted;
+       char *t = SvPV(*svp, na);
+       char *e = t + na;
+       tainted = was_tainted;
+       if (t < e && isALNUM(*t))
+           t++;
+       while (t < e && (isALNUM(*t) || *t == '-' || *t == ':'))
+           t++;
+       if (t < e) {
+           TAINT;
+           taint_proper("Insecure $ENV{%s}%s", "TERM");
+       }
+    }
+#endif /* !VMS */
+
+    for (e = misc_env; *e; e++) {
+       svp = hv_fetch(GvHVn(envgv), *e, strlen(*e), FALSE);
+       if (svp && *svp != &sv_undef && SvTAINTED(*svp)) {
+           dTHR;       /* just for taint */
+           TAINT;
+           taint_proper("Insecure $ENV{%s}%s", *e);
+       }
+    }
+}