[Pkg-shadow-commits] r2993 - in debian/trunk/tests/su: . 10_su_sulog_success 10_su_sulog_success/config/etc 10_su_sulog_success/config/var/log 11_su_sulog_failure 11_su_sulog_failure/config/etc 11_su_sulog_failure/config/var/log 11_su_sulog_failure/data
Nicolas FRANÇOIS
nekral-guest at alioth.debian.org
Fri May 22 11:50:26 UTC 2009
Author: nekral-guest
Date: 2009-05-22 11:50:26 +0000 (Fri, 22 May 2009)
New Revision: 2993
Added:
debian/trunk/tests/su/10_su_sulog_success/
debian/trunk/tests/su/10_su_sulog_success/su.test
debian/trunk/tests/su/11_su_sulog_failure/
debian/trunk/tests/su/11_su_sulog_failure/config/var/log/sulog
debian/trunk/tests/su/11_su_sulog_failure/data/
debian/trunk/tests/su/11_su_sulog_failure/data/sulog
debian/trunk/tests/su/11_su_sulog_failure/su.test
Removed:
debian/trunk/tests/su/10_su_sulog_success/config/var/log/auth.log
debian/trunk/tests/su/10_su_sulog_success/su_user_syslog.test
debian/trunk/tests/su/11_su_sulog_failure/config/var/log/auth.log
debian/trunk/tests/su/11_su_sulog_failure/su_user_syslog.test
Modified:
debian/trunk/tests/su/10_su_sulog_success/config/etc/login.defs
debian/trunk/tests/su/11_su_sulog_failure/config/etc/login.defs
debian/trunk/tests/su/11_su_sulog_failure/run_su.exp
Log:
Added tests for SULOG.
Modified: debian/trunk/tests/su/10_su_sulog_success/config/etc/login.defs
===================================================================
--- debian/trunk/tests/su/07/config/etc/login.defs 2009-05-10 19:36:36 UTC (rev 2906)
+++ debian/trunk/tests/su/10_su_sulog_success/config/etc/login.defs 2009-05-22 11:50:26 UTC (rev 2993)
@@ -64,7 +64,7 @@
#
# If defined, all su activity is logged to this file.
#
-#SULOG_FILE /var/log/sulog
+SULOG_FILE /var/log/sulog
#
# If defined, file which maps tty line to TERM environment parameter.
Copied: debian/trunk/tests/su/10_su_sulog_success/su.test (from rev 2906, debian/trunk/tests/su/07/su_user_syslog.test)
===================================================================
--- debian/trunk/tests/su/10_su_sulog_success/su.test (rev 0)
+++ debian/trunk/tests/su/10_su_sulog_success/su.test 2009-05-22 11:50:26 UTC (rev 2993)
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ../../common/config.sh
+. ../../common/log.sh
+
+log_start "$0" "su can be used to switch to a non-root user"
+
+
+# no testsuite password
+# root password: rootF00barbaz
+# myuser password: myuserF00barbaz
+
+save_config
+
+# restore the files on exit
+trap 'log_status "$0" "FAILURE"; restore_config' 0
+
+change_config
+
+./run_su.exp myuser myuserF00barbaz '$ '
+
+#date +"SU %m/%d %H:%M + $(tty) root-testsuite" > tmp/sulog
+#date +"SU %m/%d %H:%M + $(tty) testsuite-myuser" >> tmp/sulog
+echo -n "Check /var/log/sulog..."
+wc -l /var/log/sulog > tmp/sulog
+cat /var/log/sulog | \
+ egrep -v "$(date +"SU %m/%d %H:%M \+ /dev/pts/[0-9]* root-testsuite")" | \
+ egrep -v "$(date +"SU %m/%d %H:%M \+ /dev/pts/[0-9]* testsuite-myuser")" \
+ >> tmp/sulog || true
+diff -auN tmp/sulog data/sulog
+echo "OK"
+rm -f tmp/sulog
+
+log_status "$0" "SUCCESS"
+restore_config
+trap '' 0
+
Deleted: debian/trunk/tests/su/10_su_sulog_success/su_user_syslog.test
===================================================================
--- debian/trunk/tests/su/07/su_user_syslog.test 2009-05-10 19:36:36 UTC (rev 2906)
+++ debian/trunk/tests/su/10_su_sulog_success/su_user_syslog.test 2009-05-22 11:50:26 UTC (rev 2993)
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "su can be used to switch to a non-root user"
-
-
-# no testsuite password
-# root password: rootF00barbaz
-# myuser password: myuserF00barbaz
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-./run_su.exp myuser myuserF00barbaz '$ '
-
-echo
-echo -n "Looking for 'Successful su for myuser by testsuite' in /var/log/auth.log..."
-grep -q "Successful su for myuser by testsuite" /var/log/auth.log
-echo "OK"
-echo -n "Looking for '+ pts/[0-9]+ tstsuite:myuser' in /var/log/auth.log..."
-grep -v -q -E "\+ pts/[0-9]+ testsuite:myuser" /var/log/auth.log
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
Modified: debian/trunk/tests/su/11_su_sulog_failure/config/etc/login.defs
===================================================================
--- debian/trunk/tests/su/07/config/etc/login.defs 2009-05-10 19:36:36 UTC (rev 2906)
+++ debian/trunk/tests/su/11_su_sulog_failure/config/etc/login.defs 2009-05-22 11:50:26 UTC (rev 2993)
@@ -64,7 +64,7 @@
#
# If defined, all su activity is logged to this file.
#
-#SULOG_FILE /var/log/sulog
+SULOG_FILE /var/log/sulog
#
# If defined, file which maps tty line to TERM environment parameter.
Added: debian/trunk/tests/su/11_su_sulog_failure/data/sulog
===================================================================
--- debian/trunk/tests/su/11_su_sulog_failure/data/sulog (rev 0)
+++ debian/trunk/tests/su/11_su_sulog_failure/data/sulog 2009-05-22 11:50:26 UTC (rev 2993)
@@ -0,0 +1 @@
+2 /var/log/sulog
Modified: debian/trunk/tests/su/11_su_sulog_failure/run_su.exp
===================================================================
--- debian/trunk/tests/su/07/run_su.exp 2009-05-10 19:36:36 UTC (rev 2906)
+++ debian/trunk/tests/su/11_su_sulog_failure/run_su.exp 2009-05-22 11:50:26 UTC (rev 2993)
@@ -1,6 +1,6 @@
#!/usr/bin/expect
-set timeout 2
+set timeout 5
expect_after default {puts "\nFAIL"; exit 1}
if {$argc != 3} {
@@ -44,28 +44,22 @@
# Wait a little bit more (su is not ready to receive the password)
sleep 0.1
-send "$password\r" ;# Send the password
+send "$password wrong\r" ;# Send the password
-send_user "\n# password '$password' sent\n\n"
-send_user "# expect prompt '$prompt'"
+send_user "\n# password '$password wrong' sent\n\n"
+send_user "# expect prompt '$ '"
expect {
# Wait for the new prompt
- "$prompt" {
- send_user "\n\n# make sure we are '$user'\n"
- send_user "# id should return '($user).*($user).*($user)"
+ "$ " {
+ send_user "\n\n# make sure we are 'testsuite'\n"
+ send_user "\n# id should return 'uid=424243(testsuite) gid=424243 groups=424243'"
send "\r" ;# restore the prompt for the logs
send "id\r" ;# Verify the id
-
- expect {
- -re "\\($user\\).*\\($user\\).*\\($user\\)" {
- expect "$prompt"
- send "exit\r"
- expect "$ "
- puts "\nPASS"
- exit 0
- }
- }
+ expect "uid=424243(testsuite) gid=424243 groups=424243"
+ send "exit\r"
+ puts "\nPASS"
+ exit 0
}
}
Copied: debian/trunk/tests/su/11_su_sulog_failure/su.test (from rev 2906, debian/trunk/tests/su/07/su_user_syslog.test)
===================================================================
--- debian/trunk/tests/su/11_su_sulog_failure/su.test (rev 0)
+++ debian/trunk/tests/su/11_su_sulog_failure/su.test 2009-05-22 11:50:26 UTC (rev 2993)
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ../../common/config.sh
+. ../../common/log.sh
+
+log_start "$0" "su can be used to switch to a non-root user"
+
+
+# no testsuite password
+# root password: rootF00barbaz
+# myuser password: myuserF00barbaz
+
+save_config
+
+# restore the files on exit
+trap 'log_status "$0" "FAILURE"; restore_config' 0
+
+change_config
+
+./run_su.exp myuser myuserF00barbaz-wrong '$ '
+
+#date +"SU %m/%d %H:%M + $(tty) root-testsuite" > tmp/sulog
+#date +"SU %m/%d %H:%M + $(tty) testsuite-myuser" >> tmp/sulog
+echo -n "Check /var/log/sulog..."
+wc -l /var/log/sulog > tmp/sulog
+cat /var/log/sulog | \
+ egrep -v "$(date +"SU %m/%d %H:%M \+ /dev/pts/[0-9]* root-testsuite")" | \
+ egrep -v "$(date +"SU %m/%d %H:%M - /dev/pts/[0-9]* testsuite-myuser")" \
+ >> tmp/sulog || true
+diff -au tmp/sulog data/sulog
+echo "OK"
+rm -f tmp/sulog
+
+log_status "$0" "SUCCESS"
+restore_config
+trap '' 0
+
Deleted: debian/trunk/tests/su/11_su_sulog_failure/su_user_syslog.test
===================================================================
--- debian/trunk/tests/su/07/su_user_syslog.test 2009-05-10 19:36:36 UTC (rev 2906)
+++ debian/trunk/tests/su/11_su_sulog_failure/su_user_syslog.test 2009-05-22 11:50:26 UTC (rev 2993)
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "su can be used to switch to a non-root user"
-
-
-# no testsuite password
-# root password: rootF00barbaz
-# myuser password: myuserF00barbaz
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-./run_su.exp myuser myuserF00barbaz '$ '
-
-echo
-echo -n "Looking for 'Successful su for myuser by testsuite' in /var/log/auth.log..."
-grep -q "Successful su for myuser by testsuite" /var/log/auth.log
-echo "OK"
-echo -n "Looking for '+ pts/[0-9]+ tstsuite:myuser' in /var/log/auth.log..."
-grep -v -q -E "\+ pts/[0-9]+ testsuite:myuser" /var/log/auth.log
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
More information about the Pkg-shadow-commits
mailing list