From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 19 Apr 2021 16:20:02 +0000 (+0100)
Subject: [Rework] Rework extended urls output
X-Git-Tag: 3.0~481
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b78a75ca179f30eca99b51ef88e927c85e59694b;p=thirdparty%2Frspamd.git

[Rework] Rework extended urls output
---

diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
index 878f0bb3e9..e7f4dbd508 100644
--- a/src/libserver/protocol.c
+++ b/src/libserver/protocol.c
@@ -889,11 +889,16 @@ rspamd_protocol_extended_url (struct rspamd_task *task,
 		ucl_object_insert_key (obj, elt, "host", 0, false);
 	}
 
-	elt = ucl_object_frombool (url->flags & RSPAMD_URL_FLAG_PHISHED);
-	ucl_object_insert_key (obj, elt, "phished", 0, false);
+	ucl_object_t *flags = ucl_object_typed_new (UCL_ARRAY);
 
-	elt = ucl_object_frombool (url->flags & RSPAMD_URL_FLAG_REDIRECTED);
-	ucl_object_insert_key (obj, elt, "redirected", 0, false);
+	for (unsigned int i = 0; i < RSPAMD_URL_MAX_FLAG_SHIFT; i ++) {
+		if (url->flags & (1u << i)) {
+			ucl_object_t *fl = ucl_object_fromstring (rspamd_url_flag_to_string (1u << i));
+			ucl_array_append (flags, fl);
+		}
+	}
+
+	ucl_object_insert_key (obj, flags, "flags", 0, false);
 
 	if (url->linked_url) {
 		encoded = rspamd_url_encode (url->linked_url, &enclen, task->task_pool);