From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 17 Jul 2018 09:10:33 +0000 (+0100)
Subject: [Minor] Slightly improve and document task:set_user method
X-Git-Tag: 1.7.9~110
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d4ad6ac19dbe2d1896e0fb47ee1fb9c6bba9f391;p=rspamd.git

[Minor] Slightly improve and document task:set_user method
---

diff --git a/src/lua/lua_task.c b/src/lua/lua_task.c
index 2ce489e9c..cffaa269c 100644
--- a/src/lua/lua_task.c
+++ b/src/lua/lua_task.c
@@ -453,6 +453,11 @@ LUA_FUNCTION_DEF (task, set_from);
  * @return {string} username or nil
  */
 LUA_FUNCTION_DEF (task, get_user);
+/***
+ * @method task:set_user([username])
+ * Sets or resets (if username is not specified) authenticated user name for this task.
+ * @return {string} the previously set username or nil
+ */
 LUA_FUNCTION_DEF (task, set_user);
 /***
  * @method task:get_from_ip()
@@ -2910,16 +2915,38 @@ lua_task_set_user (lua_State *L)
 	const gchar *new_user;
 
 	if (task) {
-		new_user = luaL_checkstring (L, 2);
-		if (new_user) {
+
+		if (lua_type (L, 2) == LUA_TSTRING) {
+			new_user = lua_tostring (L, 2);
+
+			if (task->user) {
+				/* Push old user */
+				lua_pushstring (L, task->user);
+			}
+			else {
+				lua_pushnil (L);
+			}
+
 			task->user = rspamd_mempool_strdup (task->task_pool, new_user);
 		}
+		else {
+			/* Reset user */
+			if (task->user) {
+				/* Push old user */
+				lua_pushstring (L, task->user);
+			}
+			else {
+				lua_pushnil (L);
+			}
+
+			task->user = NULL;
+		}
 	}
 	else {
 		return luaL_error (L, "invalid arguments");
 	}
 
-	return 0;
+	return 1;
 }
 
 static gint