Add test cases for running with SigningTable and no KeyTable
This commit is contained in:
@@ -69,7 +69,7 @@ function connect_and_send (sockname, headers, body)
|
|||||||
return conn
|
return conn
|
||||||
end
|
end
|
||||||
|
|
||||||
for _, keytype in ipairs({"ed25519", "rsa", "ed25519.table", "rsa.table"}) do
|
for _, keytype in ipairs({"ed25519", "rsa", "ed25519.stable", "rsa.stable", "ed25519.table", "rsa.table"}) do
|
||||||
mt.echo("testing "..keytype)
|
mt.echo("testing "..keytype)
|
||||||
signing = connect_and_send("unix:"..keytype..".signing.sock", msg.headers, msg.body)
|
signing = connect_and_send("unix:"..keytype..".signing.sock", msg.headers, msg.body)
|
||||||
-- verify that a test header field got added
|
-- verify that a test header field got added
|
||||||
|
|||||||
+14
-3
@@ -44,6 +44,17 @@ PidFile $keytype.verify.pid
|
|||||||
Mode v
|
Mode v
|
||||||
DNSOverride $(cat testkey.$keytype.dns)
|
DNSOverride $(cat testkey.$keytype.dns)
|
||||||
UserID $(id --name --user):$(id --name --group)
|
UserID $(id --name --user):$(id --name --group)
|
||||||
|
EOF
|
||||||
|
|
||||||
|
cat > "$keytype.stable.conf" <<EOF
|
||||||
|
$keyfile testkey.$keytype.key
|
||||||
|
$selector testkey
|
||||||
|
$signingtable $WORKDIR/signing-table
|
||||||
|
Socket unix:$keytype.stable.signing.sock
|
||||||
|
PidFile $keytype.stable.pid
|
||||||
|
Mode s
|
||||||
|
UserID $(id --name --user):$(id --name --group)
|
||||||
|
debugLevel 5
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
cat > "$keytype.table.conf" <<EOF
|
cat > "$keytype.table.conf" <<EOF
|
||||||
@@ -70,7 +81,7 @@ cleanup() {
|
|||||||
echo cleaning up jobs:
|
echo cleaning up jobs:
|
||||||
jobs
|
jobs
|
||||||
for keytype in "${KEY_TYPES[@]}"; do
|
for keytype in "${KEY_TYPES[@]}"; do
|
||||||
for func in signing verify table; do
|
for func in signing verify stable table; do
|
||||||
if [ -s "$keytype.$func.pid" ] && kill -0 "$(cat "$keytype.$func.pid")"; then
|
if [ -s "$keytype.$func.pid" ] && kill -0 "$(cat "$keytype.$func.pid")"; then
|
||||||
kill "$(cat $keytype.$func.pid)"
|
kill "$(cat $keytype.$func.pid)"
|
||||||
fi
|
fi
|
||||||
@@ -78,7 +89,7 @@ cleanup() {
|
|||||||
done
|
done
|
||||||
wait
|
wait
|
||||||
for keytype in "${KEY_TYPES[@]}"; do
|
for keytype in "${KEY_TYPES[@]}"; do
|
||||||
for func in signing verify table; do
|
for func in signing verify stable table; do
|
||||||
errdata="$keytype.$func.stderr"
|
errdata="$keytype.$func.stderr"
|
||||||
if [ -s "$errdata" ]; then
|
if [ -s "$errdata" ]; then
|
||||||
printf -- "-> %s:\n" "$errdata"
|
printf -- "-> %s:\n" "$errdata"
|
||||||
@@ -91,7 +102,7 @@ cleanup() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for keytype in "${KEY_TYPES[@]}"; do
|
for keytype in "${KEY_TYPES[@]}"; do
|
||||||
for func in signing verify table; do
|
for func in signing verify stable table; do
|
||||||
PYTHONPATH="$(dirname "$TESTDIR")" "$DKIMPY_MILTER" "$keytype.$func.conf" 2>"$keytype.$func.stderr" &
|
PYTHONPATH="$(dirname "$TESTDIR")" "$DKIMPY_MILTER" "$keytype.$func.conf" 2>"$keytype.$func.stderr" &
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
|||||||
Reference in New Issue
Block a user