Change 23310 by nicholas@no-spam on 2004/09/10 08:57:45
Integrate:
[ 23206]
Subject: Patch for t/op/sleep.t
From: Andy Lester <andy@no-spam>
Date: Mon, 9 Aug 2004 00:11:51 -0500
Message-ID: <20040809051151.GA13872@no-spam>
[ 23215]
Subject: Test for functions with operator names
From: Andy Lester <andy@no-spam>
Date: Thu, 12 Aug 2004 11:31:03 -0500
Message-ID: <20040812163103.GA26687@no-spam>
[ 23253]
Subject: PATCH: Taintedness and ternary conditional
From: Andy Lester <andy@no-spam>
Date: Thu, 26 Aug 2004 23:44:47 -0500
Message-Id: <20040827044447.GA5268@no-spam>
add tests and documentation to the effect that ($tainted ? $a : $b)
doesn't necessarily return a tainted value. Also tidy the markup in
perldoc.pod
Affected files ...
... //depot/maint-5.8/perl/MANIFEST#192 integrate
... //depot/maint-5.8/perl/pod/perlsec.pod#12 integrate
... //depot/maint-5.8/perl/t/comp/opsubs.t#1 branch
... //depot/maint-5.8/perl/t/op/sleep.t#2 integrate
... //depot/maint-5.8/perl/t/op/taint.t#10 integrate
Differences ...
==== //depot/maint-5.8/perl/MANIFEST#192 (text) ====
Index: perl/MANIFEST
--- perl/MANIFEST#191~23295~ Thu Sep 9 04:25:08 2004
+++ perl/MANIFEST Fri Sep 10 01:57:45 2004
@@no-spam -2397,6 +2397,7 @@no-spam
t/comp/decl.t See if declarations work
t/comp/hints.t See if %^H works
t/comp/multiline.t See if multiline strings work
+t/comp/opsubs.t See if q() etc. are not parsed as functions
t/comp/our.t Tests for our declaration
t/comp/package.t See if packages work
t/comp/parser.t See if the parser works in edge cases
==== //depot/maint-5.8/perl/pod/perlsec.pod#12 (text) ====
Index: perl/pod/perlsec.pod
--- perl/pod/perlsec.pod#11~22718~ Tue Apr 20 07:43:18 2004
+++ perl/pod/perlsec.pod Fri Sep 10 01:57:45 2004
@@no-spam -32,10 +32,10 @@no-spam
You may not use data derived from outside your program to affect
something else outside your program--at least, not by accident. All
command line arguments, environment variables, locale information (see
-L<perllocale>), results of certain system calls (readdir(),
-readlink(), the variable of shmread(), the messages returned by
-msgrcv(), the password, gcos and shell fields returned by the
-getpwxxx() calls), and all file input are marked as "tainted".
+L<perllocale>), results of certain system calls (C<readdir()>,
+C<readlink()>, the variable of C<shmread()>, the messages returned by
+C<msgrcv()>, the password, gcos and shell fields returned by the
+C<getpwxxx()> calls), and all file input are marked as "tainted".
Tainted data may not be used directly or indirectly in any command
that invokes a sub-shell, nor in any command that modifies files,
directories, or processes, B<with the following exceptions>:
@@no-spam -129,11 +129,27 @@no-spam
If you try to do something insecure, you will get a fatal error saying
something like "Insecure dependency" or "Insecure $ENV{PATH}".
+The exception to the principle of "one tainted value taints the whole
+expression" is with the ternary conditional operator C<?:>. Since code
+with a ternary conditional
+
+ $result = $tainted_value ? "Untainted" : "Also untainted";
+
+is effectively
+
+ if ( $tainted_value ) {
+ $result = "Untainted";
+ } else {
+ $result = "Also untainted";
+ }
+
+it doesn't make sense for C<$result> to be tainted.
+
=head2 Laundering and Detecting Tainted Data
To test whether a variable contains tainted data, and whose use would
thus trigger an "Insecure dependency" message, you can use the
-tainted() function of the Scalar::Util module, available in your
+C<tainted()> function of the Scalar::Util module, available in your
nearby CPAN mirror, and included in Perl starting from the release 5.8.0.
Or you may be able to use the following C<is_tainted()> function.
@@no-spam -179,7 +195,7 @@no-spam
untainting dirty data, unless you use the strategy detailed below to fork
a child of lesser privilege.
-The example does not untaint $data if C<use locale> is in effect,
+The example does not untaint C<$data> if C<use locale> is in effect,
because the characters matched by C<\w> are determined by the locale.
Perl considers that locale definitions are untrustworthy because they
contain data from outside the program. If you are writing a
@@no-spam -247,26 +263,26 @@no-spam
so be careful what you print out. The tainting mechanism is intended to
prevent stupid mistakes, not to remove the need for thought.
-Perl does not call the shell to expand wild cards when you pass B<system>
-and B<exec> explicit parameter lists instead of strings with possible shell
-wildcards in them. Unfortunately, the B<open>, B<glob>, and
+Perl does not call the shell to expand wild cards when you pass C<system>
+and C<exec> explicit parameter lists instead of strings with possible shell
+wildcards in them. Unfortunately, the C<open>, C<glob>, and
backtick functions provide no such alternate calling convention, so more
subterfuge will be required.
Perl provides a reasonably safe way to open a file or pipe from a setuid
or setgid program: just create a child process with reduced privilege who
does the dirty work for you. First, fork a child using the special
-B<open> syntax that connects the parent and child by a pipe. Now the
+C<open> syntax that connects the parent and child by a pipe. Now the
child resets its ID set and any other per-process attributes, like
environment variables, umasks, current working directories, back to the
originals or known safe values. Then the child process, which no longer
-has any special permissions, does the B<open> or other system call.
+has any special permissions, does the C<open> or other system call.
Finally, the child passes the data it managed to access back to the
parent. Because the file or pipe was opened in the child while running
under less privilege than the parent, it's not apt to be tricked into
doing something it shouldn't.
-Here's a way to do backticks reasonably safely. Notice how the B<exec> is
+Here's a way to do backticks reasonably safely. Notice how the C<exec> is
not called with a string that the shell could expand. This is by far the
best way to call something that might be subjected to shell escapes: just
never call the shell at all.
@@no-spam -330,7 +346,7 @@no-spam
Alternately, it can simply ignore the set-id bits on scripts. If the
latter is true, Perl can emulate the setuid and setgid mechanism when it
notices the otherwise useless setuid/gid bits on Perl scripts. It does
-this via a special executable called B<suidperl> that is automatically
+this via a special executable called F<suidperl> that is automatically
invoked for you if it's needed.
However, if the kernel set-id script feature isn't disabled, Perl will
@@no-spam -357,12 +373,12 @@no-spam
pathname subject to meddling, it instead passes I</dev/fd/3>. This is a
special file already opened on the script, so that there can be no race
condition for evil scripts to exploit. On these systems, Perl should be
-compiled with C<-DSETUID_SCRIPTS_ARE_SECURE_NOW>. The B<Configure>
+compiled with C<-DSETUID_SCRIPTS_ARE_SECURE_NOW>. The F<Configure>
program that builds Perl tries to figure this out for itself, so you
should never have to specify this yourself. Most modern releases of
SysVr4 and BSD 4.4 use this approach to avoid the kernel race condition.
-Prior to release 5.6.1 of Perl, bugs in the code of B<suidperl> could
+Prior to release 5.6.1 of Perl, bugs in the code of F<suidperl> could
introduce a security hole.
=head2 Protecting Your Programs
==== //depot/maint-5.8/perl/t/comp/opsubs.t#1 (text) ====
Index: perl/t/comp/opsubs.t
--- /dev/null Tue May 5 13:32:27 1998
+++ perl/t/comp/opsubs.t Fri Sep 10 01:57:45 2004
@@no-spam -0,0 +1,117 @@no-spam
+#!./perl -T
+
+use warnings;
+use strict;
+$|++;
+
+=pod
+
+Even if you have a C<sub q{}>, calling C<q()> will be parsed as the
+C<q()> operator. Calling C<&q()> or C<main::q()> gets you the function.
+This test verifies this behavior for nine different operators.
+
+=cut
+
+use Test::More tests => 36;
+
+sub m { return "m-".shift }
+sub q { return "q-".shift }
+sub qq { return "qq-".shift }
+sub qr { return "qr-".shift }
+sub qw { return "qw-".shift }
+sub qx { return "qx-".shift }
+sub s { return "s-".shift }
+sub tr { return "tr-".shift }
+sub y { return "y-".shift }
+
+# m operator
+can_ok( 'main', "m" );
+SILENCE_WARNING: { # Complains because $_ is undef
+ no warnings;
+ isnt( m('unqualified'), "m-unqualified", "m('unqualified') is oper" );
+}
+is( main::m('main'), "m-main", "main::m() is func" );
+is( &m('amper'), "m-amper", "&m() is func" );
+
+# q operator
+can_ok( 'main', "q" );
+isnt( q('unqualified'), "q-unqualified", "q('unqualified') is oper" );
+is( main::q('main'), "q-main", "main::q() is func" );
+is( &q('amper'), "q-amper", "&q() is func" );
+
+# qq operator
+can_ok( 'main', "qq" );
+isnt( qq('unqualified'), "qq-unqualified", "qq('unqualified') is oper" );
+is( main::qq('main'), "qq-main", "main::qq() is func" );
+is( &qq('amper'), "qq-amper", "&qq() is func" );
+
+# qr operator
+can_ok( 'main', "qr" );
+isnt( qr('unqualified'), "qr-unqualified", "qr('unqualified') is oper" );
+is( main::qr('main'), "qr-main", "main::qr() is func" );
+is( &qr('amper'), "qr-amper", "&qr() is func" );
+
+# qw operator
+can_ok( 'main', "qw" );
+isnt( qw('unqualified'), "qw-unqualified", "qw('unqualified') is oper" );
+is( main::qw('main'), "qw-main", "main::qw() is func" );
+is( &qw('amper'), "qw-amper", "&qw() is func" );
+
+# qx operator
+can_ok( 'main', "qx" );
+eval "qx('unqualified')";
+like( $@no-spam qr/^Insecure/, "qx('unqualified') doesn't work" );
+is( main::qx('main'), "qx-main", "main::qx() is func" );
+is( &qx('amper'), "qx-amper", "&qx() is func" );
+
+# s operator
+can_ok( 'main', "s" );
+eval "s('unqualified')";
+like( $@no-spam qr/^Substitution replacement not terminated/, "s('unqualified') doesn't work" );
+is( main::s('main'), "s-main", "main::s() is func" );
+is( &s('amper'), "s-amper", "&s() is func" );
+
+# tr operator
+can_ok( 'main', "tr" );
+eval "tr('unqualified')";
+like( $@no-spam qr/^Transliteration replacement not terminated/, "tr('unqualified') doesn't work" );
+is( main::tr('main'), "tr-main", "main::tr() is func" );
+is( &tr('amper'), "tr-amper", "&tr() is func" );
+
+# y operator
+can_ok( 'main', "y" );
+eval "y('unqualified')";
+like( $@no-spam qr/^Transliteration replacement not terminated/, "y('unqualified') doesn't work" );
+is( main::y('main'), "y-main", "main::y() is func" );
+is( &y('amper'), "y-amper", "&y() is func" );
+
+=pod
+
+from irc://irc.perl.org/p5p 2004/08/12
+
+ <kane-xs> bug or feature?
+ <purl> You decide!!!!
+ <kane-xs> [kane@no-spam ~]$ perlc -le'sub y{1};y(1)'
+ <kane-xs> Transliteration replacement not terminated at -e line 1.
+ <Nicholas> bug I think
+ <kane-xs> i'll perlbug
+ <rgs> feature
+ <kane-xs> smiles at rgs
+ <kane-xs> done
+ <rgs> will be closed at not a bug,
+ <rgs> like the previous reports of this one
+ <Nicholas> feature being first class and second class keywords?
+ <rgs> you have similar ones with q, qq, qr, qx, tr, s and m
+ <rgs> one could say 1st class keywords, yes
+ <rgs> and I forgot qw
+ <kane-xs> hmm silly...
+ <Nicholas> it's acutally operators, isn't it?
+ <Nicholas> as in you can't call a subroutine with the same name as an
+ operator unless you have the & ?
+ <kane-xs> or fqpn (fully qualified package name)
+ <kane-xs> main::y() works just fine
+ <kane-xs> as does &y; but not y()
+ <Andy> If that's a feature, then let's write a test that it continues
+ to work like that.
+
+=cut
==== //depot/maint-5.8/perl/t/op/sleep.t#2 (xtext) ====
Index: perl/t/op/sleep.t
--- perl/t/op/sleep.t#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/t/op/sleep.t Fri Sep 10 01:57:45 2004
@@no-spam -1,8 +1,15 @@no-spam
#!./perl
-# $RCSfile: sleep.t,v $$Revision: 4.1 $$Date: 92/08/07 18:28:23 $
+use strict;
+use warnings;
+use Test::More tests=>4;
-print "1..1\n";
+my $start = time;
+my $sleep_says = sleep 3;
+my $diff = time - $start;
-$x = sleep 3;
-if ($x >= 2 && $x <= 10) {print "ok 1\n";} else {print "not ok 1 $x\n";}
+cmp_ok( $sleep_says, '>=', 2, 'Sleep says it slept at least 2 seconds' );
+cmp_ok( $sleep_says, '<=', 10, '... and no more than 10' );
+
+cmp_ok( $diff, '>=', 2, 'Actual time diff is at least 2 seconds' );
+cmp_ok( $diff, '<=', 10, '... and no more than 10' );
==== //depot/maint-5.8/perl/t/op/taint.t#10 (xtext) ====
Index: perl/t/op/taint.t
--- perl/t/op/taint.t#9~22225~ Mon Jan 26 14:26:53 2004
+++ perl/t/op/taint.t Fri Sep 10 01:57:45 2004
@@no-spam -16,6 +16,7 @@no-spam
use Config;
use File::Spec::Functions;
+my $total_tests = 236;
my $test = 177;
sub ok ($;$) {
my($ok, $name) = @no-spam
@@no-spam -124,7 +125,7 @@no-spam
my $TEST = catfile(curdir(), 'TEST');
-print "1..223\n";
+print "1..$total_tests\n";
# First, let's make sure that Perl is checking the dangerous
# environment variables. Maybe they aren't set yet, so we'll
@@no-spam -1040,4 +1041,40 @@no-spam
test 222, !tainted($^O);
eval '$^O = $^X';
test 223, $@no-spam =~ /Insecure dependency in/;
+}
+
+EFFECTIVELY_CONSTANTS: {
+ my $tainted_number = 12 + $TAINT0;
+ test 224, tainted( $tainted_number );
+
+ # Even though it's always 0, it's still tainted
+ my $tainted_product = $tainted_number * 0;
+ test 225, tainted( $tainted_product );
+ test 226, $tainted_product == 0;
+}
+
+TERNARY_CONDITIONALS: {
+ my $tainted_true = $TAINT . "blah blah blah";
+ my $tainted_false = $TAINT0;
+ test 227, tainted( $tainted_true );
+ test 228, tainted( $tainted_false );
+
+ my $result = $tainted_true ? "True" : "False";
+ test 229, $result eq "True";
+ test 230, !tainted( $result );
+
+ $result = $tainted_false ? "True" : "False";
+ test 231, $result eq "False";
+ test 232, !tainted( $result );
+
+ my $untainted_whatever = "The Fabulous Johnny Cash";
+ my $tainted_whatever = "Soft Cell" . $TAINT;
+
+ $result = $tainted_true ? $tainted_whatever : $untainted_whatever;
+ test 233, $result eq "Soft Cell";
+ test 234, tainted( $result );
+
+ $result = $tainted_false ? $tainted_whatever : $untainted_whatever;
+ test 235, $result eq "The Fabulous Johnny Cash";
+ test 236, !tainted( $result );
}
End of Patch.