Merge pull request #2540 from negram/dns-sync-rspamadm

Dns sync rspamadm

4 files changed, 89 insertions, 15 deletions

diff --git a/src/lua/lua_dns.c b/src/lua/lua_dns.c
index 77a7ef855..fe4b7ff2e 100644
--- a/src/lua/lua_dns.c
+++ b/src/lua/lua_dns.c
@@ -39,6 +39,7 @@ lua_dns_request (lua_State *L)
 {
 	GError *err = NULL;
 	struct rspamd_async_session *session = NULL;
+	struct rspamd_config *cfg = NULL;
 	struct lua_rspamd_dns_cbdata *cbdata = NULL;
 	const gchar *to_resolve = NULL;
 	const gchar *type_str = NULL;
@@ -49,8 +50,8 @@ lua_dns_request (lua_State *L)
 
 	/* Check arguments */
 	if (!rspamd_lua_parse_table_arguments (L, 1, &err,
-										   "*name=S;*task=U{task};*type=S;forced=B",
-										   &to_resolve, &task, &type_str, &forced)) {
+										   "*name=S;task=U{task};*type=S;forced=B;session=U{session};config=U{config}",
+										   &to_resolve, &task, &type_str, &forced, &session, &cfg)) {
 
 		if (err) {
 			ret = luaL_error (L, "invalid arguments: %s", err->message);
@@ -65,6 +66,10 @@ lua_dns_request (lua_State *L)
 	if (task) {
 		session = task->s;
 		pool = task->task_pool;
+		cfg = task->cfg;
+	}
+	else if (session && cfg) {
+		pool = cfg->cfg_pool;
 	}
 	else {
 		return luaL_error (L, "invalid arguments: either task or session/config should be set");
@@ -97,23 +102,35 @@ lua_dns_request (lua_State *L)
 		free (ptr_str);
 	}
 
-	if (forced) {
-		ret = make_dns_request_task_forced (task,
-											lua_dns_callback,
-											cbdata,
-											type,
-											to_resolve);
+
+	if (task == NULL) {
+		ret = make_dns_request (cfg->dns_resolver,
+							   session,
+							   pool,
+							   lua_dns_callback,
+							   cbdata,
+							   type,
+							   to_resolve);
 	}
 	else {
-		ret = make_dns_request_task (task,
-									 lua_dns_callback,
-									 cbdata,
-									 type,
-									 to_resolve);
+	if (forced) {
+			ret = make_dns_request_task_forced (task,
+												lua_dns_callback,
+												cbdata,
+												type,
+												to_resolve);
+		}
+		else {
+			ret = make_dns_request_task (task,
+										 lua_dns_callback,
+										 cbdata,
+										 type,
+										 to_resolve);
+		}
 	}
 
 	if (ret) {
-		cbdata->thread = lua_thread_pool_get_running_entry (task->cfg->lua_thread_pool);
+		cbdata->thread = lua_thread_pool_get_running_entry (cfg->lua_thread_pool);
 		cbdata->s = session;
 		cbdata->w = rspamd_session_get_watcher (session);
 		rspamd_session_watcher_push (session);
diff --git a/src/rspamadm/rspamadm.c b/src/rspamadm/rspamadm.c
index 052dcd1d6..49242ccaf 100644
--- a/src/rspamadm/rspamadm.c
+++ b/src/rspamadm/rspamadm.c
@@ -423,6 +423,11 @@ main (gint argc, gchar **argv, gchar **env)
 	rspamd_set_logger (cfg, process_quark, &rspamd_main->logger,
 			rspamd_main->server_pool);
 	(void) rspamd_log_open (rspamd_main->logger);
+
+	(void) dns_resolver_init (rspamd_main->logger,
+			rspamd_main->ev_base,
+			cfg);
+
 	g_log_set_default_handler (rspamd_glib_log_function, rspamd_main->logger);
 	g_set_printerr_handler (rspamd_glib_printerr_function);
 	rspamd_config_post_load (cfg,
diff --git a/test/functional/cases/151_rspamadm_async.robot b/test/functional/cases/151_rspamadm_async.robot
index 31fa84245..a496bf12a 100644
--- a/test/functional/cases/151_rspamadm_async.robot
+++ b/test/functional/cases/151_rspamadm_async.robot
@@ -9,7 +9,9 @@ Suite Teardown  Terminate All Processes    kill=True
 
 *** Variables ***
 ${REDIS_SCOPE}   Test
-
+${CONFIG}       ${TESTDIR}/configs/plugins.conf
+${URL_TLD}      ${TESTDIR}/../lua/unit/test_tld.dat
+${PLUGIN_CONFIG}  
 
 *** Test Cases ***
 Tcp client
@@ -24,6 +26,16 @@ Redis client
   Should Be Equal As Integers  ${result.rc}  0
   Should Be Equal  ${result.stdout}  true\thello from lua on redis
 
+DNS client
+  ${tmpdir} =  Prepare temp directory  ${CONFIG}
+  Set test variable  ${tmpdir}
+  ${result} =  Run Process  ${RSPAMADM}  --var\=CONFDIR\=${tmpdir}  lua  -b  ${TESTDIR}/lua/rspamadm/test_dns_client.lua
+  Log  ${result.stdout}
+  Log  ${result.stderr}
+  Should Be Equal As Integers  ${result.rc}  0
+  Should Be Equal  ${result.stdout}  true\tk=ed25519; p=yi50DjK5O9pqbFpNHklsv9lqaS0ArSYu02qp1S0DW1Y=
+  Cleanup Temporary Directory  ${tmpdir}
+
 *** Keywords ***
 
 Rspamadm test Setup
@@ -40,3 +52,13 @@ Run Dummy Http
   [Arguments]
   ${result} =  Start Process  ${TESTDIR}/util/dummy_http.py
   Wait Until Created  /tmp/dummy_http.pid
+
+Prepare temp directory
+  [Arguments]  ${CONFIG}
+  ${template} =  Get File  ${CONFIG}
+  ${tmpdir} =  Make Temporary Directory
+  ${config} =  Replace Variables  ${template}
+  ${config} =  Replace Variables  ${config}
+  Log  ${config}
+  Create File  ${tmpdir}/rspamd.conf  ${config}
+  [Return]  ${tmpdir}
\ No newline at end of file
diff --git a/test/functional/lua/rspamadm/test_dns_client.lua b/test/functional/lua/rspamadm/test_dns_client.lua
new file mode 100644
index 000000000..c54d59499
--- /dev/null
+++ b/test/functional/lua/rspamadm/test_dns_client.lua
@@ -0,0 +1,30 @@
+local rspamd_dns = require "rspamd_dns"
+local logger = require "rspamd_logger"
+
+local config_path = rspamd_paths['CONFDIR'] .. '/rspamd.conf'
+local _r,err = rspamd_config:load_ucl(config_path)
+
+if not _r then
+  logger.errx('cannot parse %s: %s (r=%s)', config_path, err, _r)
+  os.exit(1)
+end
+
+_r,err = rspamd_config:parse_rcl({'logging', 'worker'})
+if not _r then
+  logger.errx('cannot process %s: %s (r=%s)', config_path, err, _r)
+  os.exit(1)
+end
+
+rspamd_config:init_subsystem('dns', rspamadm_ev_base)
+
+
+local is_ok, results = rspamd_dns.request({
+     config = rspamd_config,
+     session = rspamadm_session,
+
+     type = 'txt',
+     name = 'test._domainkey.example.com',
+     -- name = '_dmarc.google.com',
+   })
+
+print(is_ok, results[1])