Expand test suite to cover RSA as well as ed25519

tests/00_minimal.miltertest

@@ -1,8 +1,12 @@
 -- -*- lua -*-
-mt.echo("beginning test")
+for _, keytype in ipairs({"ed25519", "rsa"}) do
-conn = mt.connect("unix:signing.sock")
+   for _, func in ipairs({"signing", "verify"}) do
+      mt.echo("testing "..keytype.." "..func)
+      conn = mt.connect("unix:"..keytype.."."..func..".sock")
       if conn == nil then
-  error "mt.connect() failed"
+         error("mt.connect() failed "..keytype.." "..func)
       end
       mt.disconnect(conn)
-mt.echo("test complete")
+      mt.echo(keytype.." "..func.." complete")
+   end
+end

tests/01_connect.miltertest

@@ -1,36 +1,40 @@
 -- -*- lua -*-
-mt.echo("beginning test")
+for _, keytype in ipairs({"ed25519", "rsa"}) do
-conn = mt.connect("unix:signing.sock")
+   for _, func in ipairs({"signing", "verify"}) do
+      mt.echo("testing "..keytype.." "..func)
+      conn = mt.connect("unix:"..keytype.."."..func..".sock")
       if conn == nil then
-  error "mt.connect() failed"
+         error("mt.connect() failed "..keytype.." "..func)
       end
       if mt.conninfo(conn, "localhost", "127.0.0.1") ~= nil then
-  error "mt.conninfo() failed"
+         error("mt.conninfo() failed "..keytype.." "..func)
       end
       if mt.getreply(conn) ~= SMFIR_CONTINUE then
-     error "mt.conninfo() unexpected reply"
+         error("mt.conninfo() unexpected reply "..keytype.." "..func)
       end
 
       if mt.test_action(conn, SMFIF_ADDHDRS) then
-   print "could add headers"
+         print("could add headers "..keytype.." "..func)
       else
-   error "mt.test_action() says could not add headers"
+         error("mt.test_action() says could not add headers "..keytype.." "..func)
       end
 
       if mt.test_action(conn, SMFIF_CHGHDRS) then
-   print "could change headers"
+         print("could change headers "..keytype.." "..func)
       else
-   error "mt.test_action() says could not change headers"
+         error("mt.test_action() says could not change headers "..keytype.." "..func)
       end
 
 -- -- FIXME: this part of the test fails, as apparently the
 -- -- dkimpy-milter claims the right to change the body of a message,
 -- -- even though it shouldn't.  How can we fix the negotiation?
 --      if mt.test_action(conn, SMFIF_CHGBODY) then
---   error "mt.test_action() says could change body"
+--         error("mt.test_action() says could change body "..keytype.." "..func)
 --      else
---   print "could not change body"
+--         print("could not change body "..keytype.." "..func)
 --      end
 
       mt.disconnect(conn)
-mt.echo("test complete")
+      mt.echo(keytype.." "..func.." test complete")
+   end
+end

tests/02_sign_message.miltertest

@@ -1,5 +1,4 @@
 -- -*- lua -*-
-mt.echo("beginning test")
 
 msg = {
    ['headers'] = {
@@ -70,7 +69,9 @@ function connect_and_send (sockname, headers, body)
    return conn
 end
 
-signing = connect_and_send("unix:signing.sock", msg.headers, msg.body)
+for _, keytype in ipairs({"ed25519", "rsa"}) do
+   mt.echo("testing "..keytype)
+   signing = connect_and_send("unix:"..keytype..".signing.sock", msg.headers, msg.body)
    -- verify that a test header field got added
    if not mt.eom_check(signing, MT_HDRINSERT) then
       error "no header added by signer"
@@ -84,7 +85,7 @@ mt.echo("DKIM-Signature: " .. signature)
 
    msg.headers['DKIM-Signature'] = signature
 
-verify = connect_and_send("unix:verify.sock", msg.headers, msg.body)
+   verify = connect_and_send("unix:"..keytype..".verify.sock", msg.headers, msg.body)
 
    if not mt.eom_check(verify, MT_HDRINSERT) then
       error "no header added in verify"
@@ -95,4 +96,5 @@ mt.echo("Authentication-Results: "..authres)
 
    mt.disconnect(verify)
 
-mt.echo("test complete")
+   mt.echo(keytype.." complete")
+end

tests/runtests

@@ -4,55 +4,72 @@ set -e
 WORKDIR=$(mktemp -d)
 TESTDIR=$(realpath "$(dirname "$0")")
 DKIMPY_MILTER=${DKIMPY_MILTER:-"$TESTDIR/dkimpy-milter"}
+KEY_TYPES=(ed25519 rsa)
 
 cd "$WORKDIR"
 
 printf "Testing %s from directory %s\n" "$DKIMPY_MILTER" "$WORKDIR"
 
-dknewkey --ktype ed25519 testkey
+for keytype in "${KEY_TYPES[@]}"; do
-cat > signing.conf <<EOF
+    dknewkey --ktype "$keytype" "testkey.$keytype"
+    if [ "$keytype" = ed25519 ]; then
+        keyfile=KeyFileEd25519
+        selector=SelectorEd25519
+    else
+        keyfile=KeyFile
+        selector=Selector
+    fi
+    cat > "$keytype.signing.conf" <<EOF
 Domain example.net
-KeyFileEd25519 testkey.key
+$keyfile testkey.$keytype.key
-SelectorEd25519 testkey
+$selector testkey
-Socket unix:signing.sock
+Socket unix:$keytype.signing.sock
-PidFile signing.pid
+PidFile $keytype.signing.pid
 Mode s
 UserID $(id --name --user):$(id --name --group)
 EOF
 
-cat > verify.conf <<EOF
+    cat > "$keytype.verify.conf" <<EOF
-Socket unix:verify.sock
+Socket unix:$keytype.verify.sock
-PidFile verify.pid
+PidFile $keytype.verify.pid
 Mode v
-DNSOverride $(cat testkey.dns)
+DNSOverride $(cat testkey.$keytype.dns)
 UserID $(id --name --user):$(id --name --group)
 EOF
+done
 
 cleanup() {
     echo cleaning up jobs:
     jobs
-    if [ -s signing.pid ] && kill -0 "$(cat signing.pid)"; then
+    for keytype in "${KEY_TYPES[@]}"; do
-        kill "$(cat signing.pid)"
+        for func in signing verify; do
-    fi
+            if [ -s "$keytype.$func.pid" ] && kill -0 "$(cat "$keytype.$func.pid")"; then
-    if [ -s verify.pid ] && kill -0 "$(cat verify.pid)"; then
+                kill "$(cat $keytype.$func.pid)"
-        kill "$(cat verify.pid)"
             fi
+        done
+    done
     wait
-    for errdata in signing.stderr verify.stderr; do
+    for keytype in "${KEY_TYPES[@]}"; do
+        for func in signing verify; do
+            errdata="$keytype.$func.stderr"
             if [ -s "$errdata" ]; then
                 printf -- "-> %s:\n" "$errdata"
                 cat "$errdata"
                 printf -- "-> end %s\n" "$errdata"
             fi
         done
+    done
     rm -rf "$WORKDIR"
 }
 
-PYTHONPATH="$(dirname "$TESTDIR")" "$DKIMPY_MILTER" signing.conf 2>signing.stderr &
+for keytype in "${KEY_TYPES[@]}"; do
-PYTHONPATH="$(dirname "$TESTDIR")" "$DKIMPY_MILTER" verify.conf 2>verify.stderr &
+    for func in signing verify; do
+        PYTHONPATH="$(dirname "$TESTDIR")" "$DKIMPY_MILTER" "$keytype.$func.conf" 2>"$keytype.$func.stderr" &
+    done
+done
 trap cleanup EXIT
 
-# ugly ugly (how are we supposed to know that the filter is ready?):
+# ugly ugly (how are we supposed to know that the milters are all ready?):
 sleep 2
 
 # uses miltertest from opendkim: