+/*
+ * "...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;
+
+ if (tainted) {
+ DEBUG_u(PerlIO_printf(PerlIO_stderr(),
+ "%s %d %d %d\n", s, tainted, uid, euid));
+ 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);
}
}
taint_env()
{
SV** svp;
+ MAGIC *mg = 0;
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");
+ if (!svp || *svp == &sv_undef ||
+ ((mg = mg_find(*svp, 't')) && mg->mg_len & 1))
+ {
+ TAINT;
+ if (mg && MgTAINTEDDIR(mg))
+ taint_proper("Insecure directory in %s%s", "$ENV{PATH}");
else
- taint_proper("Insecure %s", "PATH");
+ taint_proper("Insecure %s%s", "$ENV{PATH}");
}
+
svp = hv_fetch(GvHVn(envgv),"IFS",3,FALSE);
- if (svp && *svp != &sv_undef && (*svp)->sv_tainted) {
- tainted = 1;
- taint_proper("Insecure %s", "IFS");
+ if (svp && *svp != &sv_undef &&
+ (mg = mg_find(*svp, 't')) && mg->mg_len & 1)
+ {
+ TAINT;
+ taint_proper("Insecure %s%s", "$ENV{IFS}");
}
}
-