This is a live mirror of the Perl 5 development currently hosted at
https://github.com/perl/perl5
https://perl5.git.perl.org
/
perl5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bring a long line in threads.pm under 80 cols
[perl5.git]
/
taint.c
diff --git
a/taint.c
b/taint.c
index
2c2e66e
..
3fc6250
100644
(file)
--- a/
taint.c
+++ b/
taint.c
@@
-1,7
+1,7
@@
/* taint.c
*
/* taint.c
*
- * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- * 200
0, 2001, 2002,
by Larry Wall and others
+ * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999,
2000, 2001,
+ * 200
2, 2003, 2004, 2005, 2006, 2007, 2008
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.
*
* You may distribute under the terms of either the GNU General Public
* License or the Artistic License, as specified in the README file.
@@
-9,9
+9,14
@@
*/
/*
*/
/*
- * "...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
+ * '...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.' --Théoden
+ *
+ * [p.580 of _The Lord of the Rings_, III/x: "The Voice of Saruman"]
+ */
+
+/* This file contains a few functions for handling data tainting in Perl
*/
#include "EXTERN.h"
*/
#include "EXTERN.h"
@@
-19,77
+24,80
@@
#include "perl.h"
void
#include "perl.h"
void
-Perl_taint_proper(pTHX_ const char *f, const char *s)
+Perl_taint_proper(pTHX_ const char *f, const char *
const
s)
{
{
- char *ug;
-
#if defined(HAS_SETEUID) && defined(DEBUGGING)
#if defined(HAS_SETEUID) && defined(DEBUGGING)
-# if Uid_t_size == 1
- {
- UV uid = PL_uid;
- UV euid = PL_euid;
+ dVAR;
+
+ PERL_ARGS_ASSERT_TAINT_PROPER;
- 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
;
+
const Uid_t uid = PerlProc_getuid()
;
+
const Uid_t euid = PerlProc_geteuid()
;
-
DEBUG_u(PerlIO_printf(Perl_debug_log,
- "%s %d %"
IVdf" %"IVd
f"\n",
- s,
PL_tainted
, uid, euid));
+ DEBUG_u(PerlIO_printf(Perl_debug_log,
+ "%s %d %"
Uid_t_f" %"Uid_t_
f"\n",
+ s,
TAINT_get
, uid, euid));
}
}
-# endif
#endif
#endif
- if (PL_tainted) {
+ if (TAINT_get) {
+ const char *ug;
+
if (!f)
f = PL_no_security;
if (!f)
f = PL_no_security;
- if (P
L_euid != PL_uid
)
+ if (P
erlProc_getuid() != PerlProc_geteuid()
)
ug = " while running setuid";
ug = " while running setuid";
- else if (P
L_egid != PL_gid
)
+ else if (P
erlProc_getgid() != PerlProc_getegid()
)
ug = " while running setgid";
ug = " while running setgid";
- else if (
PL_taint_warn
)
+ else if (
TAINT_WARN_get
)
ug = " while running with -t switch";
else
ug = " while running with -T switch";
ug = " while running with -t switch";
else
ug = " while running with -T switch";
- if (PL_unsafe || PL_taint_warn) {
- if(ckWARN(WARN_TAINT))
- Perl_warner(aTHX_ packWARN(WARN_TAINT), f, s, ug);
+
+ /* XXX because taint_proper adds extra format args, we can't
+ * get the caller to check properly; o we just silence the warning
+ * and hope the callers aren't naughty */
+ GCC_DIAG_IGNORE(-Wformat-nonliteral);
+ if (PL_unsafe || TAINT_WARN_get) {
+ Perl_ck_warner_d(aTHX_ packWARN(WARN_TAINT), f, s, ug);
}
else {
Perl_croak(aTHX_ f, s, ug);
}
}
else {
Perl_croak(aTHX_ f, s, ug);
}
+ GCC_DIAG_RESTORE;
+
}
}
void
Perl_taint_env(pTHX)
{
}
}
void
Perl_taint_env(pTHX)
{
+ dVAR;
SV** svp;
MAGIC* mg;
SV** svp;
MAGIC* mg;
- c
har**
e;
- static c
har*
misc_env[] = {
+ c
onst char* const *
e;
+ static c
onst char* const
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 */
"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 */
+#ifdef WIN32
+ "PERL5SHELL", /* used for system() on Windows */
+#endif
NULL
};
/* Don't bother if there's no *ENV glob */
if (!PL_envgv)
return;
NULL
};
/* Don't bother if there's no *ENV glob */
if (!PL_envgv)
return;
- /* If there's no %ENV hash o
f
if it's not magical, croak, because
+ /* If there's no %ENV hash o
r
if it's not magical, croak, because
* it probably doesn't reflect the actual environment */
if (!GvHV(PL_envgv) || !(SvRMAGICAL(GvHV(PL_envgv))
* 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
;
- c
har *
name = GvENAME(PL_envgv);
-
PL_tainted = TRUE
;
+ && mg_find((
const SV
*)GvHV(PL_envgv), PERL_MAGIC_env))) {
+
const bool was_tainted = TAINT_get
;
+ c
onst char * const
name = GvENAME(PL_envgv);
+
TAINT
;
if (strEQ(name,"ENV"))
/* hash alias */
taint_proper("%%ENV is aliased to %s%s", "another variable");
if (strEQ(name,"ENV"))
/* hash alias */
taint_proper("%%ENV is aliased to %s%s", "another variable");
@@
-97,18
+105,22
@@
Perl_taint_env(pTHX)
/* 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 */
/* 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;
+ TAINT_set(was_tainted);
+#ifdef NO_TAINT_SUPPORT
+ PERL_UNUSED_VAR(was_tainted);
+#endif
}
#ifdef VMS
{
int i = 0;
char name[10 + TYPE_DIGITS(int)] = "DCL$PATH";
}
#ifdef VMS
{
int i = 0;
char name[10 + TYPE_DIGITS(int)] = "DCL$PATH";
+ STRLEN len = 8; /* strlen(name) */
while (1) {
if (i)
while (1) {
if (i)
-
(void)
sprintf(name,"DCL$PATH;%d", i);
- svp = hv_fetch(GvHVn(PL_envgv), name,
strlen(name)
, FALSE);
+
len = my_
sprintf(name,"DCL$PATH;%d", i);
+ svp = hv_fetch(GvHVn(PL_envgv), name,
len
, FALSE);
if (!svp || *svp == &PL_sv_undef)
break;
if (SvTAINTED(*svp)) {
if (!svp || *svp == &PL_sv_undef)
break;
if (SvTAINTED(*svp)) {
@@
-124,7
+136,7
@@
Perl_taint_env(pTHX)
}
#endif /* VMS */
}
#endif /* VMS */
- svp = hv_fetch
(GvHVn(PL_envgv),"PATH",4
,FALSE);
+ svp = hv_fetch
s(GvHVn(PL_envgv),"PATH"
,FALSE);
if (svp && *svp) {
if (SvTAINTED(*svp)) {
TAINT;
if (svp && *svp) {
if (SvTAINTED(*svp)) {
TAINT;
@@
-138,16
+150,20
@@
Perl_taint_env(pTHX)
#ifndef VMS
/* tainted $TERM is okay if it contains no metachars */
#ifndef VMS
/* tainted $TERM is okay if it contains no metachars */
- svp = hv_fetch
(GvHVn(PL_envgv),"TERM",4
,FALSE);
+ svp = hv_fetch
s(GvHVn(PL_envgv),"TERM"
,FALSE);
if (svp && *svp && SvTAINTED(*svp)) {
if (svp && *svp && SvTAINTED(*svp)) {
- 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))
+ STRLEN len;
+ const bool was_tainted = TAINT_get;
+ const char *t = SvPV_const(*svp, len);
+ const char * const e = t + len;
+
+ TAINT_set(was_tainted);
+#ifdef NO_TAINT_SUPPORT
+ PERL_UNUSED_VAR(was_tainted);
+#endif
+ if (t < e && isWORDCHAR(*t))
t++;
t++;
- while (t < e && (is
ALNUM
(*t) || strchr("-_.+", *t)))
+ while (t < e && (is
WORDCHAR
(*t) || strchr("-_.+", *t)))
t++;
if (t < e) {
TAINT;
t++;
if (t < e) {
TAINT;
@@
-157,10
+173,20
@@
Perl_taint_env(pTHX)
#endif /* !VMS */
for (e = misc_env; *e; e++) {
#endif /* !VMS */
for (e = misc_env; *e; e++) {
- svp = hv_fetch(GvHVn(PL_envgv), *e, strlen(*e), FALSE);
+
SV * const * const
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);
}
}
}
if (svp && *svp != &PL_sv_undef && SvTAINTED(*svp)) {
TAINT;
taint_proper("Insecure $ENV{%s}%s", *e);
}
}
}
+
+/*
+ * Local variables:
+ * c-indentation-style: bsd
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * ex: set ts=8 sts=4 sw=4 et:
+ */