From 3ef307611f6afd30a4a7949ebc93c055f2259746 Mon Sep 17 00:00:00 2001 From: j4n Date: Thu, 4 Dec 2025 12:12:18 +0100 Subject: [PATCH] cmdeploy/opendkim/final.lua: Readability refactor of header pruning Refactor DKIM-Header-Pruning into a "if valid-else" construct with a single "return nil" at the end --- cmdeploy/src/cmdeploy/opendkim/final.lua | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/cmdeploy/src/cmdeploy/opendkim/final.lua b/cmdeploy/src/cmdeploy/opendkim/final.lua index ee17aeec..7c9e01b5 100644 --- a/cmdeploy/src/cmdeploy/opendkim/final.lua +++ b/cmdeploy/src/cmdeploy/opendkim/final.lua @@ -28,7 +28,13 @@ for i = 1, nsigs do end end -if not valid then +if valid then + -- Strip all DKIM-Signature headers after successful validation + -- Delete in reverse order to avoid index shifting. + for i = nsigs, 1, -1 do + odkim.del_header(ctx, "DKIM-Signature", i) + end +else odkim.set_reply(ctx, "554", "5.7.1", "No valid DKIM signature found") -- Delete in reverse order to avoid index shifting. for i = nsigs, 1, -1 do @@ -37,13 +43,6 @@ if not valid then else odkim.set_reply(ctx, "554", "5.7.1", error_msg) odkim.set_result(ctx, SMFIS_REJECT) - return nil -end - --- Valid signature found. Strip all DKIM-Signature headers --- Delete in reverse order to avoid index shifting. -for i = nsigs, 1, -1 do - odkim.del_header(ctx, "DKIM-Signature", i) end return nil