Relevant BUGIDs: debian #326407

Purpose of commit: new testcase

Commit summary:
---------------

User entries with "|" don't work as expected.

2008-11-24  Thorsten Kukuk  <kukuk@thkukuk.de>

        * xtests/Makefile.am: Add pam_time1 tests.
        * xtests/tst-pam_time1.c: New test case.
        * xtests/tst-pam_time1.pamd: New.
        * xtests/time.conf: New.
        * xtests/run-xtests.sh: Copy time.conf.

6 files changed, 130 insertions, 8 deletions

diff --git a/xtests/.cvsignore b/xtests/.cvsignore
index cc96e8c7..4533b249 100644
--- a/xtests/.cvsignore
+++ b/xtests/.cvsignore
@@ -22,3 +22,4 @@ tst-pam_group1
 tst-pam_authfail
 tst-pam_authsucceed
 tst-pam_pwhistory1
+tst-pam_time1
diff --git a/xtests/Makefile.am b/xtests/Makefile.am
index 620c61d1..30ba2735 100644
--- a/xtests/Makefile.am
+++ b/xtests/Makefile.am
@@ -29,7 +29,8 @@ EXTRA_DIST = run-xtests.sh tst-pam_dispatch1.pamd tst-pam_dispatch2.pamd \
 	tst-pam_substack4.pamd tst-pam_substack4a.pamd tst-pam_substack4.sh \
 	tst-pam_substack5.pamd tst-pam_substack5a.pamd tst-pam_substack5.sh \
 	tst-pam_assemble_line1.pamd tst-pam_assemble_line1.sh \
-	tst-pam_pwhistory1.pamd tst-pam_pwhistory1.sh
+	tst-pam_pwhistory1.pamd tst-pam_pwhistory1.sh \
+	tst-pam_time1.pamd
 
 XTESTS = tst-pam_dispatch1 tst-pam_dispatch2 tst-pam_dispatch3 \
 	tst-pam_dispatch4 tst-pam_dispatch5 \
@@ -38,7 +39,7 @@ XTESTS = tst-pam_dispatch1 tst-pam_dispatch2 tst-pam_dispatch3 \
 	tst-pam_access1 tst-pam_access2 tst-pam_access3 \
 	tst-pam_access4 tst-pam_limits1 tst-pam_succeed_if1 \
 	tst-pam_group1 tst-pam_authfail tst-pam_authsucceed \
-	tst-pam_pwhistory1
+	tst-pam_pwhistory1 tst-pam_time1
 
 NOSRCTESTS = tst-pam_substack1 tst-pam_substack2 tst-pam_substack3 \
 	tst-pam_substack4 tst-pam_substack5 tst-pam_assemble_line1
diff --git a/xtests/run-xtests.sh b/xtests/run-xtests.sh
index b06685da..73433630 100755
--- a/xtests/run-xtests.sh
+++ b/xtests/run-xtests.sh
@@ -17,12 +17,10 @@ skiped=0
 all=0
 
 mkdir -p /etc/security
-cp /etc/security/access.conf /etc/security/access.conf-pam-xtests
-install -m 644 "${SRCDIR}"/access.conf /etc/security/access.conf
-cp /etc/security/group.conf /etc/security/group.conf-pam-xtests
-install -m 644 "${SRCDIR}"/group.conf /etc/security/group.conf
-cp /etc/security/limits.conf /etc/security/limits.conf-pam-xtests
-install -m 644 "${SRCDIR}"/limits.conf /etc/security/limits.conf
+for config in access.conf group.conf time.conf limits.conf ; do
+	cp /etc/security/$config /etc/security/$config-pam-xtests
+	install -m 644 "${SRCDIR}"/$config /etc/security/$config
+done
 mv /etc/security/opasswd /etc/security/opasswd-pam-xtests
 
 for testname in $XTESTS ; do
@@ -50,6 +48,7 @@ for testname in $XTESTS ; do
 done
 mv /etc/security/access.conf-pam-xtests /etc/security/access.conf
 mv /etc/security/group.conf-pam-xtests /etc/security/group.conf
+mv /etc/security/time.conf-pam-xtests /etc/security/time.conf
 mv /etc/security/limits.conf-pam-xtests /etc/security/limits.conf
 mv /etc/security/opasswd-pam-xtests /etc/security/opasswd
 if test "$failed" -ne 0; then
diff --git a/xtests/time.conf b/xtests/time.conf
new file mode 100644
index 00000000..518124cd
--- /dev/null
+++ b/xtests/time.conf
@@ -0,0 +1,2 @@
+*;*;you|me;!Al0000-2400
+*;*;x|y;!Al0000-2400
diff --git a/xtests/tst-pam_time1.c b/xtests/tst-pam_time1.c
new file mode 100644
index 00000000..5161644e
--- /dev/null
+++ b/xtests/tst-pam_time1.c
@@ -0,0 +1,114 @@
+/*
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, and the entire permission notice in its entirety,
+ *    including the disclaimer of warranties.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * ALTERNATIVELY, this product may be distributed under the terms of
+ * the GNU Public License, in which case the provisions of the GPL are
+ * required INSTEAD OF the above restrictions.  (This clause is
+ * necessary due to a potential bad interaction between the GPL and
+ * the restrictions contained in a BSD-style copyright.)
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+  test case:
+
+  Check the following lines in time.conf:
+  *;*;you|me;!Al0000-2400
+  *;*;x|y;!Al0000-2400
+
+  User 'x' should not be able to login.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <security/pam_appl.h>
+
+
+struct test_t {
+  const char *user;
+  int retval;
+};
+
+static struct test_t tests[] = {
+  {"xy", 0},
+  {"yx", 0},
+  {"me", 7},
+  {"you", 7},
+  {"x",  7},
+  {"y",  7},
+};
+
+static int num_tests = sizeof (tests) / sizeof (struct test_t);
+
+static struct pam_conv conv = {
+  NULL, NULL
+};
+
+int
+main(int argc, char *argv[])
+{
+  pam_handle_t *pamh = NULL;
+  int retval;
+  int debug = 0;
+  int i;
+
+  if (argc > 1 && strcmp (argv[1], "-d") == 0)
+    debug = 1;
+
+  for (i = 0; i < num_tests; i++)
+    {
+      retval = pam_start("tst-pam_time1", tests[i].user, &conv, &pamh);
+      if (retval != PAM_SUCCESS)
+	{
+	  if (debug)
+	    fprintf (stderr, "pam_time1: pam_start returned %d\n", retval);
+	  return 1;
+	}
+
+      retval = pam_acct_mgmt (pamh, 0);
+      if (retval != tests[i].retval)
+	{
+	  if (debug)
+	    fprintf (stderr,
+		     "pam_time1: pam_acct_mgmt(%s) returned wrong value, %d, expected %d\n",
+		     tests[i].user, retval, tests[i].retval);
+	  return 1;
+	}
+
+      retval = pam_end (pamh,retval);
+      if (retval != PAM_SUCCESS)
+	{
+	  if (debug)
+	    fprintf (stderr, "pam_time1: pam_end returned %d\n", retval);
+	  return 1;
+	}
+    }
+  return 0;
+}
diff --git a/xtests/tst-pam_time1.pamd b/xtests/tst-pam_time1.pamd
new file mode 100644
index 00000000..cbbd23da
--- /dev/null
+++ b/xtests/tst-pam_time1.pamd
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth     required       pam_time.so
+account  required       pam_permit.so
+password required       pam_permit.so
+session  required       pam_permit.so