[Feature] Dump current ratelimits for fuzzy keys

diff --git a/src/fuzzy_storage.c b/src/fuzzy_storage.c
index f21992a94d8a0af05967b6eb6b1a7e250370319e..0d7a1c2a860f7c163d597a5f23c6c0e246e0ab93 100644 (file)
--- a/src/fuzzy_storage.c
+++ b/src/fuzzy_storage.c
@@ -268,6 +268,7 @@ static struct fuzzy_key *fuzzy_add_keypair_from_ucl(struct rspamd_config *cfg,
                                                                                                        const ucl_object_t *obj,
                                                                                                        khash_t(rspamd_fuzzy_keys_hash) * target);
 
+static ucl_object_t *rspamd_leaky_bucket_to_ucl(struct rspamd_leaky_bucket_elt *p_elt);
 struct fuzzy_keymap_ucl_buf {
        rspamd_fstring_t *buf;
        struct rspamd_fuzzy_storage_ctx *ctx;
@@ -2456,9 +2457,28 @@ rspamd_fuzzy_key_stat_iter(const unsigned char *pk_iter, struct fuzzy_key *fuzzy
                                                          rspamd_keypair_to_ucl(fuzzy_key->key, RSPAMD_KEYPAIR_ENCODING_DEFAULT,
                                                                                                        RSPAMD_KEYPAIR_DUMP_NO_SECRET | RSPAMD_KEYPAIR_DUMP_FLATTENED),
                                                          "keypair", 0, false);
+
+               if (fuzzy_key->rl_bucket) {
+                       ucl_object_insert_key(elt,
+                                                                 rspamd_leaky_bucket_to_ucl(fuzzy_key->rl_bucket),
+                                                                 "ratelimit", 0, false);
+               }
+
                ucl_object_insert_key(keys_obj, elt, keyname, 0, true);
        }
 }
+static ucl_object_t *
+rspamd_leaky_bucket_to_ucl(struct rspamd_leaky_bucket_elt *p_elt)
+{
+       ucl_object_t *res;
+
+       res = ucl_object_typed_new(UCL_OBJECT);
+
+       ucl_object_insert_key(res, ucl_object_fromdouble(p_elt->cur), "cur", 0, false);
+       ucl_object_insert_key(res, ucl_object_fromdouble(p_elt->last), "last", 0, false);
+
+       return res;
+}
 
 static ucl_object_t *
 rspamd_fuzzy_stat_to_ucl(struct rspamd_fuzzy_storage_ctx *ctx, gboolean ip_stat)