From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 22 Jul 2019 11:10:27 +0000 (+0100)
Subject: [Minor] Allow to output new body in rspamc
X-Git-Tag: 2.0~523
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1e9937774f97d81bf0158491d2ef07387f2868aa;p=rspamd.git

[Minor] Allow to output new body in rspamc
---

diff --git a/src/client/rspamc.c b/src/client/rspamc.c
index e118688d0..abea78da7 100644
--- a/src/client/rspamc.c
+++ b/src/client/rspamc.c
@@ -672,6 +672,8 @@ add_options (GQueue *opts)
 		ADD_CLIENT_FLAG (flagbuf, "profile");
 	}
 
+	ADD_CLIENT_FLAG (flagbuf, "body_block");
+
 	if (skip_images) {
 		ADD_CLIENT_HEADER (opts, "Skip-Images", "true");
 	}
@@ -1547,7 +1549,16 @@ rspamc_client_cb (struct rspamd_client_connection *conn,
 	else {
 
 		if (cmd->cmd == RSPAMC_COMMAND_SYMBOLS && mime_output && input) {
-			rspamc_mime_output (out, result, input, diff, err);
+			if (body) {
+				GString tmp;
+
+				tmp.str = (char *)body;
+				tmp.len = bodylen;
+				rspamc_mime_output (out, result, &tmp, diff, err);
+			}
+			else {
+				rspamc_mime_output (out, result, input, diff, err);
+			}
 		}
 		else {
 			if (cmd->need_input) {
@@ -1596,6 +1607,11 @@ rspamc_client_cb (struct rspamd_client_connection *conn,
 					cmd->command_output_func (out, result);
 				}
 
+				if (body) {
+					rspamd_fprintf (out, "\nNew body:\n%*s\n", (int)bodylen,
+							body);
+				}
+
 				ucl_object_unref (result);
 			}
 			else if (err != NULL) {