X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=taint.c;h=cd9e4ec5ca899fc63af43df66ab0527a5ba1c2c6;hb=2ddcc7aa6c936ba8e7a9703319dfd8959bb54574;hp=5178ee2250a0e4b26869979e7908789ab6a45082;hpb=79072805bf63abe5b5978b5928ab00d360ea3e7f;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/taint.c b/taint.c
index 5178ee2..cd9e4ec 100644
--- a/taint.c
+++ b/taint.c
@@ -1,14 +1,33 @@
+/*
+ * "...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_proper(f, s)
-char *f;
+const char *f;
 char *s;
 {
-    DEBUG_u(fprintf(stderr,"%s %d %d %d\n",s,tainted,uid, euid));
-    if (tainted && (!euid || euid != uid || egid != gid || taintanyway)) {
+    char *ug;
+
+    DEBUG_u(PerlIO_printf(PerlIO_stderr(),
+            "%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)
-	    fatal(f, s);
+	    croak(f, s, ug);
 	else if (dowarn)
-	    warn(f, s);
+	    warn(f, s, ug);
     }
 }
 
@@ -16,19 +35,74 @@ void
 taint_env()
 {
     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";
+
+    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}");
+	}
+	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 == &sv_undef || (*svp)->sv_tainted) {
-	tainted = 1;
-	if ((*svp)->sv_tainted == 2)
-	    taint_proper("Insecure directory in %s", "PATH");
-	else
-	    taint_proper("Insecure %s", "PATH");
+    if (svp && *svp) {
+	if (SvTAINTED(*svp)) {
+	    TAINT;
+	    taint_proper("Insecure %s%s", "$ENV{PATH}");
+	}
+	if ((mg = mg_find(*svp, 'e')) && MgTAINTEDDIR(mg)) {
+	    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)) {
+	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");
+	}
     }
-    svp = hv_fetch(GvHVn(envgv),"IFS",3,FALSE);
-    if (svp && *svp != &sv_undef && (*svp)->sv_tainted) {
-	tainted = 1;
-	taint_proper("Insecure %s", "IFS");
+#endif /* !VMS */
+
+    for (e = misc_env; *e; e++) {
+	svp = hv_fetch(GvHVn(envgv), *e, strlen(*e), FALSE);
+	if (svp && *svp != &sv_undef && SvTAINTED(*svp)) {
+	    TAINT;
+	    taint_proper("Insecure $ENV{%s}%s", *e);
+	}
     }
 }
-