Merge pull request trusteddomainproject#145 from glts/quote-result

futatuki · futatuki · commit bac95651908f · 2024-09-14T23:48:57.000+09:00
Quote results in Authentication-Results if necessary trusteddomainproject#145
diff --git a/libopenarc/arc.c b/libopenarc/arc.c
@@ -3715,7 +3715,7 @@ arc_chain_custody_str(ARC_MESSAGE *msg, u_char *buf, size_t buflen)
 		kvset = msg->arc_sets[set].arcset_ams->hdr_data;
 		str = arc_param_get(kvset, "d");
 		(void) arc_dstring_printf(tmpbuf, "%s%s",
-		                          (set < msg->arc_nsets ? ":" : ""),
+		                          (set < msg->arc_nsets - 1 ? ":" : ""),
 		                          str);
 	}
 
diff --git a/openarc/openarc.c b/openarc/openarc.c
@@ -3851,14 +3851,24 @@ mlfi_eom(SMFICTX *ctx)
 
 		if (ipout != NULL)
 		{
+			_Bool quote = strchr(ipout, ':') != NULL;
+
 			arcf_dstring_printf(afc->mctx_tmpstr,
-			                    " smtp.remote-ip=%s", ipout);
+			                    " smtp.remote-ip=%s%s%s",
+			                    quote ? "\"" : "",
+			                    ipout,
+			                    quote ? "\"" : "");
 		}
 
 		if (conf->conf_finalreceiver && arcchainlen > 0)
 		{
+			_Bool quote = strchr(arcchainbuf, ':') != NULL;
+
 			arcf_dstring_printf(afc->mctx_tmpstr,
-			                    " arc.chain=%s", arcchainbuf);
+			                    " arc.chain=%s%s%s",
+			                    quote ? "\"" : "",
+			                    arcchainbuf,
+			                    quote ? "\"" : "");
 		}
 
 		if (arcf_insheader(ctx, 0, AUTHRESULTSHDR,

Original file line number	Diff line number	Diff line change
`@@ -3715,7 +3715,7 @@ arc_chain_custody_str(ARC_MESSAGE msg, u_char buf, size_t buflen)`
`3715`	`3715`	`kvset = msg->arc_sets[set].arcset_ams->hdr_data;`
`3716`	`3716`	`str = arc_param_get(kvset, "d");`
`3717`	`3717`	`(void) arc_dstring_printf(tmpbuf, "%s%s",`
`3718`		`- (set < msg->arc_nsets ? ":" : ""),`
	`3718`	`+ (set < msg->arc_nsets - 1 ? ":" : ""),`
`3719`	`3719`	`str);`
`3720`	`3720`	`}`
`3721`	`3721`
Original file line number	Diff line number	Diff line change
`@@ -3851,14 +3851,24 @@ mlfi_eom(SMFICTX *ctx)`
`3851`	`3851`
`3852`	`3852`	`if (ipout != NULL)`
`3853`	`3853`	`{`
	`3854`	`+ _Bool quote = strchr(ipout, ':') != NULL;`
	`3855`	`+`
`3854`	`3856`	`arcf_dstring_printf(afc->mctx_tmpstr,`
`3855`		`- " smtp.remote-ip=%s", ipout);`
	`3857`	`+ " smtp.remote-ip=%s%s%s",`
	`3858`	`+ quote ? "\"" : "",`
	`3859`	`+ ipout,`
	`3860`	`+ quote ? "\"" : "");`
`3856`	`3861`	`}`
`3857`	`3862`
`3858`	`3863`	`if (conf->conf_finalreceiver && arcchainlen > 0)`
`3859`	`3864`	`{`
	`3865`	`+ _Bool quote = strchr(arcchainbuf, ':') != NULL;`
	`3866`	`+`
`3860`	`3867`	`arcf_dstring_printf(afc->mctx_tmpstr,`
`3861`		`- " arc.chain=%s", arcchainbuf);`
	`3868`	`+ " arc.chain=%s%s%s",`
	`3869`	`+ quote ? "\"" : "",`
	`3870`	`+ arcchainbuf,`
	`3871`	`+ quote ? "\"" : "");`
`3862`	`3872`	`}`
`3863`	`3873`
`3864`	`3874`	`if (arcf_insheader(ctx, 0, AUTHRESULTSHDR,`