Browse Source

[Minor] Fix random monitored requests

tags/2.0
Vsevolod Stakhov 4 years ago
parent
commit
0240e90e51
2 changed files with 9 additions and 3 deletions
  1. 5
    3
      src/libserver/monitored.c
  2. 4
    0
      src/plugins/lua/rbl.lua

+ 5
- 3
src/libserver/monitored.c View File

@@ -214,12 +214,13 @@ rspamd_monitored_dns_random (struct rspamd_monitored *m,
}

for (guint i = 0; i < len; i ++) {
guint idx = rspamd_random_uint64_fast () % sizeof (dns_chars);
guint idx = rspamd_random_uint64_fast () % (sizeof (dns_chars) - 1);
random_prefix[i] = dns_chars[idx];
}

conf->request->len = 0;
rspamd_printf_gstring (conf->request, "%*.s.%s", len, random_prefix, m->url);
rspamd_printf_gstring (conf->request, "%*.s.%s", len, random_prefix,
m->url);
}

static void *
@@ -414,7 +415,8 @@ rspamd_monitored_dns_mon (struct rspamd_monitored *m,
if (!rdns_make_request_full (ctx->resolver, rspamd_monitored_dns_cb,
conf, ctx->cfg->dns_timeout, ctx->cfg->dns_retransmits,
1, conf->request->str, conf->rt)) {
msg_notice_mon ("cannot make request to resolve %s", conf->request->str);
msg_notice_mon ("cannot make request to resolve %s (%s monitored url)",
conf->request->str, conf->m->url);

m->cur_errors ++;
rspamd_monitored_propagate_error (m, "failed to make DNS request");

+ 4
- 0
src/plugins/lua/rbl.lua View File

@@ -58,6 +58,10 @@ local function get_monitored(rbl)
ret.random = true
end

lua_util.debugm(N, rspamd_config,
'added monitored address: %s (%s random)',
ret.prefix, ret.random)

return ret
end


Loading…
Cancel
Save