X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=taint.c;h=ec568be2ccd7bc62a7f1d0a1cb9b3b14163b1157;hb=f8952f9c0d30f65af1114a6384b97ad7770dce81;hp=c8c6800c46970d6c57b046657f4afd39fe090090;hpb=4e35701fd273ba8d0093a29660dee38a92408e9b;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/taint.c b/taint.c
index c8c6800..ec568be 100644
--- a/taint.c
+++ b/taint.c
@@ -1,36 +1,76 @@
+/*    taint.c
+ *
+ *    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ *    2000, 2001, 2002, by Larry Wall and others
+ *
+ *    You may distribute under the terms of either the GNU General Public
+ *    License or the Artistic License, as specified in the README file.
+ *
+ */
+
 /*
  * "...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
  */
 
+/* This file contains a few functions for handling data tainting in Perl
+ */
+
 #include "EXTERN.h"
+#define PERL_IN_TAINT_C
 #include "perl.h"
 
 void
-taint_proper(const char *f, char *s)
+Perl_taint_proper(pTHX_ const char *f, const char *s)
 {
     char *ug;
 
-    DEBUG_u(PerlIO_printf(Perl_debug_log,
-            "%s %d %d %d\n", s, tainted, uid, euid));
+#if defined(HAS_SETEUID) && defined(DEBUGGING)
+#   if Uid_t_size == 1
+    {
+	 UV  uid = PL_uid;
+	 UV euid = PL_euid;
+
+	 DEBUG_u(PerlIO_printf(Perl_debug_log,
+			       "%s %d %"UVuf" %"UVuf"\n",
+			       s, PL_tainted, uid, euid));
+    }
+#   else
+    {
+	 IV  uid = PL_uid;
+	 IV euid = PL_euid;
+
+	 DEBUG_u(PerlIO_printf(Perl_debug_log,
+			       "%s %d %"IVdf" %"IVdf"\n",
+			       s, PL_tainted, uid, euid));
+    }
+#   endif
+#endif
 
-    if (tainted) {
-	if (euid != uid)
+    if (PL_tainted) {
+	if (!f)
+	    f = PL_no_security;
+	if (PL_euid != PL_uid)
 	    ug = " while running setuid";
-	else if (egid != gid)
+	else if (PL_egid != PL_gid)
 	    ug = " while running setgid";
-	else
+	else if (PL_taint_warn)
+            ug = " while running with -t switch";
+        else
 	    ug = " while running with -T switch";
-	if (!unsafe)
-	    croak(f, s, ug);
-	else if (dowarn)
-	    warn(f, s, ug);
+	if (PL_unsafe || PL_taint_warn) {
+            if(ckWARN(WARN_TAINT))
+                Perl_warner(aTHX_ packWARN(WARN_TAINT), f, s, ug);
+        }
+        else {
+            Perl_croak(aTHX_ f, s, ug);
+        }
     }
 }
 
 void
-taint_env(void)
+Perl_taint_env(pTHX)
 {
     SV** svp;
     MAGIC* mg;
@@ -43,35 +83,57 @@ taint_env(void)
 	NULL
     };
 
+    /* Don't bother if there's no *ENV glob */
+    if (!PL_envgv)
+	return;
+    /* If there's no %ENV hash of if it's not magical, croak, because
+     * it probably doesn't reflect the actual environment */
+    if (!GvHV(PL_envgv) || !(SvRMAGICAL(GvHV(PL_envgv))
+	    && mg_find((SV*)GvHV(PL_envgv), PERL_MAGIC_env))) {
+	bool was_tainted = PL_tainted;
+	char *name = GvENAME(PL_envgv);
+	PL_tainted = TRUE;
+	if (strEQ(name,"ENV"))
+	    /* hash alias */
+	    taint_proper("%%ENV is aliased to %s%s", "another variable");
+	else
+	    /* glob alias: report it in the error message */
+	    taint_proper("%%ENV is aliased to %%%s%s", name);
+	/* this statement is reached under -t or -U */
+	PL_tainted = was_tainted;
+    }
+
 #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)
+	svp = hv_fetch(GvHVn(PL_envgv), name, strlen(name), FALSE);
+	if (!svp || *svp == &PL_sv_undef)
 	    break;
 	if (SvTAINTED(*svp)) {
 	    TAINT;
 	    taint_proper("Insecure %s%s", "$ENV{DCL$PATH}");
 	}
-	if ((mg = mg_find(*svp, 'e')) && MgTAINTEDDIR(mg)) {
+	if ((mg = mg_find(*svp, PERL_MAGIC_envelem)) && MgTAINTEDDIR(mg)) {
 	    TAINT;
 	    taint_proper("Insecure directory in %s%s", "$ENV{DCL$PATH}");
 	}
 	i++;
     }
+  }
 #endif /* VMS */
 
-    svp = hv_fetch(GvHVn(envgv),"PATH",4,FALSE);
+    svp = hv_fetch(GvHVn(PL_envgv),"PATH",4,FALSE);
     if (svp && *svp) {
 	if (SvTAINTED(*svp)) {
 	    TAINT;
 	    taint_proper("Insecure %s%s", "$ENV{PATH}");
 	}
-	if ((mg = mg_find(*svp, 'e')) && MgTAINTEDDIR(mg)) {
+	if ((mg = mg_find(*svp, PERL_MAGIC_envelem)) && MgTAINTEDDIR(mg)) {
 	    TAINT;
 	    taint_proper("Insecure directory in %s%s", "$ENV{PATH}");
 	}
@@ -79,15 +141,16 @@ taint_env(void)
 
 #ifndef VMS
     /* tainted $TERM is okay if it contains no metachars */
-    svp = hv_fetch(GvHVn(envgv),"TERM",4,FALSE);
+    svp = hv_fetch(GvHVn(PL_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;
+	STRLEN n_a;
+	bool was_tainted = PL_tainted;
+	char *t = SvPV(*svp, n_a);
+	char *e = t + n_a;
+	PL_tainted = was_tainted;
 	if (t < e && isALNUM(*t))
 	    t++;
-	while (t < e && (isALNUM(*t) || *t == '-' || *t == ':'))
+	while (t < e && (isALNUM(*t) || strchr("-_.+", *t)))
 	    t++;
 	if (t < e) {
 	    TAINT;
@@ -97,8 +160,8 @@ taint_env(void)
 #endif /* !VMS */
 
     for (e = misc_env; *e; e++) {
-	svp = hv_fetch(GvHVn(envgv), *e, strlen(*e), FALSE);
-	if (svp && *svp != &sv_undef && SvTAINTED(*svp)) {
+	svp = hv_fetch(GvHVn(PL_envgv), *e, strlen(*e), FALSE);
+	if (svp && *svp != &PL_sv_undef && SvTAINTED(*svp)) {
 	    TAINT;
 	    taint_proper("Insecure $ENV{%s}%s", *e);
 	}