X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util-src%2Fpposix.c;h=94086ed64dc3ca24e77e7e8faec8a24dcecd7d96;hb=40f6eff7c498e233fead90192b54b7101e54f615;hp=d26639b24a58f37fa39723ba5b7e94ca5ad41275;hpb=c0c83da1a045258025a2825f437af7a5e602c9c9;p=prosody.git

diff --git a/util-src/pposix.c b/util-src/pposix.c
index d26639b2..94086ed6 100644
--- a/util-src/pposix.c
+++ b/util-src/pposix.c
@@ -13,7 +13,7 @@
 * POSIX support functions for Lua
 */
 
-#define MODULE_VERSION "0.3.0"
+#define MODULE_VERSION "0.3.1"
 
 #include <stdlib.h>
 #include <unistd.h>
@@ -25,6 +25,7 @@
 
 #include <syslog.h>
 #include <pwd.h>
+#include <grp.h>
 
 #include <string.h>
 #include <errno.h>
@@ -90,10 +91,14 @@ static int lc_daemonize(lua_State *L)
 
 const char * const facility_strings[] = {
 					"auth",
+#if !(defined(sun) || defined(__sun))
 					"authpriv",
+#endif
 					"cron",
 					"daemon",
+#if !(defined(sun) || defined(__sun))
 					"ftp",
+#endif
 					"kern",
 					"local0",
 					"local1",
@@ -112,10 +117,14 @@ const char * const facility_strings[] = {
 				};
 int facility_constants[] =	{
 					LOG_AUTH,
+#if !(defined(sun) || defined(__sun))
 					LOG_AUTHPRIV,
+#endif
 					LOG_CRON,
 					LOG_DAEMON,
+#if !(defined(sun) || defined(__sun))
 					LOG_FTP,
+#endif
 					LOG_KERN,
 					LOG_LOCAL0,
 					LOG_LOCAL1,
@@ -173,7 +182,7 @@ int level_constants[] = 	{
 				LOG_INFO,
 				LOG_NOTICE,
 				LOG_WARNING,
-				LOG_EMERG,
+				LOG_CRIT,
 				-1
 			};
 int lc_syslog_log(lua_State* L)
@@ -291,6 +300,64 @@ int lc_setuid(lua_State* L)
 	return 2;
 }
 
+int lc_setgid(lua_State* L)
+{
+	int gid = -1;
+	if(lua_gettop(L) < 1)
+		return 0;
+	if(!lua_isnumber(L, 1) && lua_tostring(L, 1))
+	{
+		/* Passed GID is actually a string, so look up the GID */
+		struct group *g;
+		g = getgrnam(lua_tostring(L, 1));
+		if(!g)
+		{
+			lua_pushboolean(L, 0);
+			lua_pushstring(L, "no-such-group");
+			return 2;
+		}
+		gid = g->gr_gid;
+	}
+	else
+	{
+		gid = lua_tonumber(L, 1);
+	}
+	
+	if(gid>-1)
+	{
+		/* Ok, attempt setgid */
+		errno = 0;
+		if(setgid(gid))
+		{
+			/* Fail */
+			lua_pushboolean(L, 0);
+			switch(errno)
+			{
+			case EINVAL:
+				lua_pushstring(L, "invalid-gid");
+				break;
+			case EPERM:
+				lua_pushstring(L, "permission-denied");
+				break;
+			default:
+				lua_pushstring(L, "unknown-error");
+			}
+			return 2;
+		}
+		else
+		{
+			/* Success! */
+			lua_pushboolean(L, 1);
+			return 1;
+		}
+	}
+	
+	/* Seems we couldn't find a valid GID to switch to */
+	lua_pushboolean(L, 0);
+	lua_pushstring(L, "invalid-gid");
+	return 2;
+}
+
 /*	Like POSIX's setrlimit()/getrlimit() API functions.
  *	
  *	Syntax:
@@ -306,11 +373,13 @@ int string2resource(const char *s) {
 	if (!strcmp(s, "CPU")) return RLIMIT_CPU;
 	if (!strcmp(s, "DATA")) return RLIMIT_DATA;
 	if (!strcmp(s, "FSIZE")) return RLIMIT_FSIZE;
-	if (!strcmp(s, "MEMLOCK")) return RLIMIT_MEMLOCK;
 	if (!strcmp(s, "NOFILE")) return RLIMIT_NOFILE;
+	if (!strcmp(s, "STACK")) return RLIMIT_STACK;
+#if !(defined(sun) || defined(__sun))
+	if (!strcmp(s, "MEMLOCK")) return RLIMIT_MEMLOCK;
 	if (!strcmp(s, "NPROC")) return RLIMIT_NPROC;
 	if (!strcmp(s, "RSS")) return RLIMIT_RSS;
-	if (!strcmp(s, "STACK")) return RLIMIT_STACK;
+#endif
 	return -1;
 }
 
@@ -394,12 +463,20 @@ int lc_getrlimit(lua_State *L) {
 	return 3;
 }
 
+void lc_abort(lua_State* L)
+{
+	abort();
+}
+
 /* Register functions */
 
 int luaopen_util_pposix(lua_State *L)
 {
 	lua_newtable(L);
 
+	lua_pushcfunction(L, lc_abort);
+	lua_setfield(L, -2, "abort");
+
 	lua_pushcfunction(L, lc_daemonize);
 	lua_setfield(L, -2, "daemonize");
 
@@ -420,9 +497,13 @@ int luaopen_util_pposix(lua_State *L)
 
 	lua_pushcfunction(L, lc_getuid);
 	lua_setfield(L, -2, "getuid");
+	lua_pushcfunction(L, lc_getgid);
+	lua_setfield(L, -2, "getgid");
 
 	lua_pushcfunction(L, lc_setuid);
 	lua_setfield(L, -2, "setuid");
+	lua_pushcfunction(L, lc_setgid);
+	lua_setfield(L, -2, "setgid");
 	
 	lua_pushcfunction(L, lc_setrlimit);
 	lua_setfield(L, -2, "setrlimit");