# HG changeset patch # User Todd C. Miller <Todd.Miller@sudo.ws> # Date 1552053510 25200 # Node ID e82a381f4f3de693f880aab2781fd65c01030ec0 # Parent 09a915110812b9d6603995aa27be94b71c5df1e7 Test cvtsudoers stdout and stderr separately. Fixes a test failure on systems with musl libc. Bug #873 diff -r 09a915110812 -r e82a381f4f3d MANIFEST --- a/MANIFEST Wed Mar 06 20:15:11 2019 -0700 +++ b/MANIFEST Fri Mar 08 06:58:30 2019 -0700 @@ -450,6 +450,7 @@ plugins/sudoers/regress/cvtsudoers/test24.sh plugins/sudoers/regress/cvtsudoers/test25.out.ok plugins/sudoers/regress/cvtsudoers/test25.sh +plugins/sudoers/regress/cvtsudoers/test26.err.ok plugins/sudoers/regress/cvtsudoers/test26.out.ok plugins/sudoers/regress/cvtsudoers/test26.sh plugins/sudoers/regress/cvtsudoers/test27.out.ok @@ -465,6 +466,7 @@ plugins/sudoers/regress/cvtsudoers/test31.conf plugins/sudoers/regress/cvtsudoers/test31.out.ok plugins/sudoers/regress/cvtsudoers/test31.sh +plugins/sudoers/regress/cvtsudoers/test32.err.ok plugins/sudoers/regress/cvtsudoers/test32.out.ok plugins/sudoers/regress/cvtsudoers/test32.sh plugins/sudoers/regress/cvtsudoers/test33.out.ok diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test1.sh --- a/plugins/sudoers/regress/cvtsudoers/test1.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test1.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,7 +3,6 @@ # Test user and host filters # -exec 2>&1 ./cvtsudoers -c "" -f sudoers -m user=millert,host=hercules $TESTDIR/sudoers exit 0 diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test10.sh --- a/plugins/sudoers/regress/cvtsudoers/test10.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test10.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,7 +3,6 @@ # Test command defaults filtering # -exec 2>&1 ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d command $TESTDIR/sudoers exit 0 diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test11.sh --- a/plugins/sudoers/regress/cvtsudoers/test11.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test11.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,5 +3,4 @@ # Test that Aliases are removed when filtering by defaults type # -exec 2>&1 ./cvtsudoers -c "" -f sudoers -d command $TESTDIR/sudoers.defs diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test12.sh --- a/plugins/sudoers/regress/cvtsudoers/test12.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test12.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,5 +3,4 @@ # Test that Aliases are removed when filtering by defaults type # -exec 2>&1 ./cvtsudoers -c "" -f sudoers -d user $TESTDIR/sudoers.defs diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test13.sh --- a/plugins/sudoers/regress/cvtsudoers/test13.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test13.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,5 +3,4 @@ # Test that Aliases are removed when filtering by defaults type # -exec 2>&1 ./cvtsudoers -c "" -f sudoers -d host $TESTDIR/sudoers.defs diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test14.sh --- a/plugins/sudoers/regress/cvtsudoers/test14.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test14.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,5 +3,4 @@ # Test that Aliases are removed when filtering by defaults type # -exec 2>&1 ./cvtsudoers -c "" -f sudoers -d runas $TESTDIR/sudoers.defs diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test15.sh --- a/plugins/sudoers/regress/cvtsudoers/test15.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test15.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,7 +3,6 @@ # Test filters and pruning # -exec 2>&1 ./cvtsudoers -c "" -f sudoers -p -m user=user1 <<EOF user1, user2, user3, %group1 host1, host2, host3 = ALL EOF diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test16.sh --- a/plugins/sudoers/regress/cvtsudoers/test16.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test16.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,7 +3,6 @@ # Test filters and pruning # -exec 2>&1 ./cvtsudoers -c "" -f sudoers -p -m user=user2,host=host2 <<EOF user1, user2, user3, %group1 host1, host2, host3 = ALL EOF diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test17.sh --- a/plugins/sudoers/regress/cvtsudoers/test17.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test17.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,7 +3,6 @@ # Test filters and pruning # -exec 2>&1 ./cvtsudoers -c "" -f sudoers -p -m group=group1,host=host1 <<EOF user1, user2, user3, %group1 host1, host2, host3 = ALL EOF diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test18.sh --- a/plugins/sudoers/regress/cvtsudoers/test18.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test18.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,7 +3,6 @@ # Test filters and pruning # -exec 2>&1 ./cvtsudoers -c "" -f sudoers -p -m group=group1,host=somehost <<EOF user1, user2, user3, %group1 ALL = ALL EOF diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test19.sh --- a/plugins/sudoers/regress/cvtsudoers/test19.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test19.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,5 +3,4 @@ # Test filters and pruning; alias contents don't get pruned # -exec 2>&1 ./cvtsudoers -c "" -f sudoers -p -m user=FULLTIMERS,host=SERVERS $TESTDIR/sudoers diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test2.sh --- a/plugins/sudoers/regress/cvtsudoers/test2.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test2.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,7 +3,6 @@ # Test user and host filters, expanding aliases # -exec 2>&1 ./cvtsudoers -c "" -f sudoers -e -m user=millert,host=hercules $TESTDIR/sudoers exit 0 diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test20.sh --- a/plugins/sudoers/regress/cvtsudoers/test20.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test20.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,7 +3,6 @@ # Test cvtsudoers.conf # -exec 2>&1 ./cvtsudoers -c $TESTDIR/test20.conf <<EOF Defaults:SOMEUSERS authenticate, timestamp_timeout=0 User_Alias SOMEUSERS = user1, user2, user3 diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test21.sh --- a/plugins/sudoers/regress/cvtsudoers/test21.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test21.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,7 +3,6 @@ # Test cvtsudoers.conf # -exec 2>&1 ./cvtsudoers -c $TESTDIR/test21.conf <<EOF Defaults authenticate, timestamp_timeout=0 User_Alias FULLTIMERS = user1, user2, user3 diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test22.sh --- a/plugins/sudoers/regress/cvtsudoers/test22.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test22.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,7 +3,6 @@ # Test LDAP base filtering. # -exec 2>&1 ./cvtsudoers -c "" -i ldif -b "ou=SUDOers,dc=sudo,dc=ws" -I 10 -O 10 <<EOF dn: dc=sudo,dc=ws objectClass: dcObject diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test23.sh --- a/plugins/sudoers/regress/cvtsudoers/test23.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test23.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,6 +3,5 @@ # Test round-tripping of sudoers -> LDIF -> sudoers # -exec 2>&1 ./cvtsudoers -c "" -b "ou=SUDOers,dc=sudo,dc=ws" $TESTDIR/test23.out.ok | \ ./cvtsudoers -c "" -i LDIF -f sudoers | grep -v '^#' diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test24.sh --- a/plugins/sudoers/regress/cvtsudoers/test24.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test24.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,6 +3,5 @@ # Test round-tripping of LDIF -> sudoers -> LDIF # -exec 2>&1 ./cvtsudoers -c "" -i LDIF -f sudoers $TESTDIR/test24.out.ok | \ ./cvtsudoers -c "" -b "ou=SUDOers,dc=sudo,dc=ws" diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test25.sh --- a/plugins/sudoers/regress/cvtsudoers/test25.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test25.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,7 +3,6 @@ # Test LDIF base64 attribute parsing # -exec 2>&1 ./cvtsudoers -c "" -i ldif -b "ou=SUDOers,dc=sudo,dc=ws" -I 10 -O 10 <<EOF # defaults, SUDOers, sudo.ws dn:: Y249ZGVmYXVsdHMsb3U9U1VET2VycyxkYz1zdWRvLGRjPXdz diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test26.err.ok --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/sudoers/regress/cvtsudoers/test26.err.ok Fri Mar 08 06:58:30 2019 -0700 @@ -0,0 +1,3 @@ +cvtsudoers: ignoring invalid attribute value: bG9nX29@1dHB1dA== +cvtsudoers: ignoring invalid attribute value: Y249cm9vdCxvdT1TVURPZXJzLGRjPXN1ZG8sZGM9_d3M= +cvtsudoers: ignoring invalid attribute value: Y249JXdoZWVsLG91PVNVRE9lcnMsZGM9c3VkbyxkYz13cw!== diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test26.out.ok --- a/plugins/sudoers/regress/cvtsudoers/test26.out.ok Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test26.out.ok Fri Mar 08 06:58:30 2019 -0700 @@ -1,3 +0,0 @@ -cvtsudoers: ignoring invalid attribute value: bG9nX29@1dHB1dA== -cvtsudoers: ignoring invalid attribute value: Y249cm9vdCxvdT1TVURPZXJzLGRjPXN1ZG8sZGM9_d3M= -cvtsudoers: ignoring invalid attribute value: Y249JXdoZWVsLG91PVNVRE9lcnMsZGM9c3VkbyxkYz13cw!== diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test26.sh --- a/plugins/sudoers/regress/cvtsudoers/test26.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test26.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,7 +3,6 @@ # Test LDIF invalid base64 attribute parsing # -exec 2>&1 ./cvtsudoers -c "" -i ldif -b "ou=SUDOers,dc=sudo,dc=ws" -I 10 -O 10 <<EOF # defaults, SUDOers, sudo.ws dn:: Y249ZGVmYXVsdHMsb3U9U1VET2VycyxkYz1zdWRvLGRjPXdz diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test27.sh --- a/plugins/sudoers/regress/cvtsudoers/test27.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test27.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,7 +3,6 @@ # Test base64 encoding of non-safe strings # -exec 2>&1 ./cvtsudoers -c "" -b "ou=SUDOers©,dc=sudo,dc=ws" <<EOF Defaults badpass_message="Bad password¡" diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test28.sh --- a/plugins/sudoers/regress/cvtsudoers/test28.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test28.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,7 +3,6 @@ # Test LDAP sudoOrder when converting to sudoers. # -exec 2>&1 ./cvtsudoers -c "" -i ldif -f sudoers <<EOF dn: dc=sudo,dc=ws objectClass: dcObject diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test29.sh --- a/plugins/sudoers/regress/cvtsudoers/test29.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test29.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,7 +3,6 @@ # Test LDAP sudoOrder when converting to sudoers. # -exec 2>&1 ./cvtsudoers -c "" -i ldif -f sudoers <<EOF dn: dc=sudo,dc=ws objectClass: dcObject diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test3.sh --- a/plugins/sudoers/regress/cvtsudoers/test3.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test3.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,7 +3,6 @@ # Test group and host filters # -exec 2>&1 ./cvtsudoers -c "" -f sudoers -m group=wheel,host=blackhole $TESTDIR/sudoers exit 0 diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test30.sh --- a/plugins/sudoers/regress/cvtsudoers/test30.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test30.sh Fri Mar 08 06:58:30 2019 -0700 @@ -4,7 +4,6 @@ # See https://bugzilla.sudo.ws/show_bug.cgi?id=853 # -exec 2>&1 ./cvtsudoers -c "" -e -f json <<EOF Cmnd_Alias CMDA=/path/to/cmda Cmnd_Alias CMDB=/path/to/cmdb diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test31.sh --- a/plugins/sudoers/regress/cvtsudoers/test31.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test31.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,7 +3,6 @@ # Test cvtsudoers.conf with padding # -exec 2>&1 ./cvtsudoers -c $TESTDIR/test31.conf <<EOF Defaults authenticate, timestamp_timeout=0 User_Alias FULLTIMERS = user1, user2, user3 diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test32.err.ok --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/sudoers/regress/cvtsudoers/test32.err.ok Fri Mar 08 06:58:30 2019 -0700 @@ -0,0 +1,1 @@ +cvtsudoers: too many sudoers entries, maximum 10 diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test32.out.ok --- a/plugins/sudoers/regress/cvtsudoers/test32.out.ok Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test32.out.ok Fri Mar 08 06:58:30 2019 -0700 @@ -1,4 +1,3 @@ -cvtsudoers: too many sudoers entries, maximum 10 dn: cn=user0,ou=SUDOers,dc=my-domain,dc=com objectClass: top objectClass: sudoRole diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test32.sh --- a/plugins/sudoers/regress/cvtsudoers/test32.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test32.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,7 +3,6 @@ # Test cvtsudoers.conf with invalid padding # -exec 2>&1 ./cvtsudoers -c "" -b "ou=SUDOers,dc=my-domain,dc=com" -O 1000 -P 1 <<EOF user0 ALL = (ALL:ALL) ALL user1 ALL = (ALL:ALL) ALL diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test33.sh --- a/plugins/sudoers/regress/cvtsudoers/test33.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test33.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,7 +3,6 @@ # Test LDAP negated sudoRunAsUser and sudoRunAsGroup converted to sudoers. # -exec 2>&1 ./cvtsudoers -c "" -i ldif -f sudoers <<EOF dn: dc=sudo,dc=ws objectClass: dcObject diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test4.sh --- a/plugins/sudoers/regress/cvtsudoers/test4.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test4.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,7 +3,6 @@ # Test group and host filters, expanding aliases # -exec 2>&1 ./cvtsudoers -c "" -f sudoers -e -m group=wheel,host=blackhole $TESTDIR/sudoers exit 0 diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test5.sh --- a/plugins/sudoers/regress/cvtsudoers/test5.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test5.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,7 +3,6 @@ # Test defaults type filtering # -exec 2>&1 ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d all $TESTDIR/sudoers exit 0 diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test6.sh --- a/plugins/sudoers/regress/cvtsudoers/test6.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test6.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,7 +3,6 @@ # Test global defaults filtering # -exec 2>&1 ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d global $TESTDIR/sudoers exit 0 diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test7.sh --- a/plugins/sudoers/regress/cvtsudoers/test7.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test7.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,7 +3,6 @@ # Test user defaults filtering # -exec 2>&1 ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d user $TESTDIR/sudoers exit 0 diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test8.sh --- a/plugins/sudoers/regress/cvtsudoers/test8.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test8.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,7 +3,6 @@ # Test runas defaults filtering # -exec 2>&1 ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d runas $TESTDIR/sudoers exit 0 diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test9.sh --- a/plugins/sudoers/regress/cvtsudoers/test9.sh Wed Mar 06 20:15:11 2019 -0700 +++ b/plugins/sudoers/regress/cvtsudoers/test9.sh Fri Mar 08 06:58:30 2019 -0700 @@ -3,7 +3,6 @@ # Test host defaults filtering # -exec 2>&1 ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d host $TESTDIR/sudoers exit 0