Merge pull request trusteddomainproject#220 from futatuki/issue222-Mi…

…nimum-setting-empty-body Don't treat empty body as partial if "Minimum" option is set.
futatuki · Aug 24, 2024 · ad3ac8c · ad3ac8c
2 parents 1341889 + 8f83e5f
commit ad3ac8c
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 18 deletions.
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
@@ -30,6 +30,9 @@ release, and a summary of the changes in that release.
 	Fix issue #28: RequiredHeaders should report and log the specific
 		error and reject the message, as documented.  Patch from
 		Dilyan Palauzov.
+	Fix issue #222: When the "Minimum" option is set, don't treat
+		empty body as partial. Patch from Yasuhito FUTATSUKI
+		(PR #223).
 	Fix bug #234: Make "NoHeaderB" do something.  Reported by Joseph
 		Coffland.
 	Fix bug #235: Quote "header.b" values in case they contain a slash

diff --git a/opendkim/opendkim.c b/opendkim/opendkim.c
@@ -14061,29 +14061,33 @@ mlfi_eom(SMFICTX *ctx)
 				                            sig, &bodylen,
 				                            &canonlen, NULL);
 
-				if (conf->conf_sigmintype == SIGMIN_PERCENT)
+				/* In the case body is empty, we don't treat it as partial */
+				if (bodylen)
 				{
-					size_t signpct;
+					if (conf->conf_sigmintype == SIGMIN_PERCENT)
+					{
+						size_t signpct;
 
-					signpct = (100 * canonlen) / bodylen;
+						signpct = (100 * canonlen) / bodylen;
 
-					if (signpct < conf->conf_sigmin)
-						dfc->mctx_status = DKIMF_STATUS_PARTIAL;
-				}
-				else if (conf->conf_sigmintype == SIGMIN_MAXADD)
-				{
-					if (canonlen + conf->conf_sigmin < bodylen)
-						dfc->mctx_status = DKIMF_STATUS_PARTIAL;
-				}
-				else
-				{
-					size_t required;
+						if (signpct < conf->conf_sigmin)
+							dfc->mctx_status = DKIMF_STATUS_PARTIAL;
+					}
+					else if (conf->conf_sigmintype == SIGMIN_MAXADD)
+					{
+						if (canonlen + conf->conf_sigmin < bodylen)
+							dfc->mctx_status = DKIMF_STATUS_PARTIAL;
+					}
+					else
+					{
+						size_t required;
 
-					required = MIN(conf->conf_sigmin,
-					               bodylen);
+						required = MIN(conf->conf_sigmin,
+						               bodylen);
 
-					if (canonlen < required)
-						dfc->mctx_status = DKIMF_STATUS_PARTIAL;
+						if (canonlen < required)
+							dfc->mctx_status = DKIMF_STATUS_PARTIAL;
+					}
 				}
 			}
 		}