From a752a9c829fb8ff99cead0291245e072fb977783 Mon Sep 17 00:00:00 2001
From: Scott Kitterman <scott@kitterman.com>
Date: Mon, 21 Oct 2019 14:08:23 -0400
Subject: [PATCH] Add test data and configuration for testing with signing and
 key tables

---
 tests/runtests | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/tests/runtests b/tests/runtests
index 0716ed3..0fac75a 100755
--- a/tests/runtests
+++ b/tests/runtests
@@ -15,10 +15,17 @@ for keytype in "${KEY_TYPES[@]}"; do
     if [ "$keytype" = ed25519 ]; then
         keyfile=KeyFileEd25519
         selector=SelectorEd25519
-    else
+    elif [ "$keytype" = rsa ]; then
         keyfile=KeyFile
         selector=Selector
     fi
+    if [ "$keytype" = ed25519 ]; then
+        keytable=KeyTableEd25519
+        selector=SelectorEd25519
+    elif [ "$keytype" = rsa ]; then
+        keytable=KeyTable
+        selector=Selector
+    fi
     cat > "$keytype.signing.conf" <<EOF
 Domain example.net
 $keyfile testkey.$keytype.key
@@ -35,6 +42,19 @@ PidFile $keytype.verify.pid
 Mode v
 DNSOverride $(cat testkey.$keytype.dns)
 UserID $(id --name --user):$(id --name --group)
+EOF
+
+    cat > "$keytype.table.conf" <<EOF
+$keytable $WORKDIR/$keytype-table
+Socket unix:$keytype.table.sock
+PidFile $keytype.table.pid
+Mode s
+UserID $(id --name --user):$(id --name --group)
+EOF
+
+    cat >  "$keytype-table" <<EOF
+example.org, testnokey, testkey.$keytype.key
+example.net, testkey, testkey.$keytype.key
 EOF
 done
 
@@ -42,7 +62,7 @@ cleanup() {
     echo cleaning up jobs:
     jobs
     for keytype in "${KEY_TYPES[@]}"; do
-        for func in signing verify; do
+        for func in signing verify table; do
             if [ -s "$keytype.$func.pid" ] && kill -0 "$(cat "$keytype.$func.pid")"; then
                 kill "$(cat $keytype.$func.pid)"
             fi
@@ -50,7 +70,7 @@ cleanup() {
     done
     wait
     for keytype in "${KEY_TYPES[@]}"; do
-        for func in signing verify; do
+        for func in signing verify table; do
             errdata="$keytype.$func.stderr"
             if [ -s "$errdata" ]; then
                 printf -- "-> %s:\n" "$errdata"
@@ -63,7 +83,7 @@ cleanup() {
 }
 
 for keytype in "${KEY_TYPES[@]}"; do
-    for func in signing verify; do
+    for func in signing verify table; do
         PYTHONPATH="$(dirname "$TESTDIR")" "$DKIMPY_MILTER" "$keytype.$func.conf" 2>"$keytype.$func.stderr" &
     done
 done