net.httpserver: Revert commit eccd3c87d717 which has since been fixed in a better way

[prosody.git] / util-src / pposix.c

diff --git a/util-src/pposix.c b/util-src/pposix.c
index ae3e1bb86a8bb79bffb26e93d392623ed5e5ca7b..ffd2128835ddb9124cc8fb858a23be23e8e2734a 100644 (file)
--- a/util-src/pposix.c
+++ b/util-src/pposix.c
@@ -1,6 +1,6 @@
-/* Prosody IM v0.4
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+/* Prosody IM
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- Copyright (C) 2009 Tobias Markmann
 --
 -- This project is MIT/X11 licensed. Please see the
@@ -13,14 +13,16 @@
 * POSIX support functions for Lua
 */
 
-#define MODULE_VERSION "0.3.1"
+#define MODULE_VERSION "0.3.5"
 
 #include <stdlib.h>
+#include <math.h>
 #include <unistd.h>
 #include <libgen.h>
 #include <sys/resource.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/utsname.h>
 #include <fcntl.h>
 
 #include <syslog.h>
@@ -358,6 +360,89 @@ int lc_setgid(lua_State* L)
        return 2;
 }
 
+int lc_initgroups(lua_State* L)
+{
+       int ret;
+       gid_t gid;
+       struct passwd *p;
+
+       if(!lua_isstring(L, 1))
+       {
+               lua_pushnil(L);
+               lua_pushstring(L, "invalid-username");
+               return 2;
+       }
+       p = getpwnam(lua_tostring(L, 1));
+       if(!p)
+       {
+               lua_pushnil(L);
+               lua_pushstring(L, "no-such-user");
+               return 2;
+       }
+       if(lua_gettop(L) < 2)
+               lua_pushnil(L);
+       switch(lua_type(L, 2))
+       {
+       case LUA_TNIL:
+               gid = p->pw_gid;
+               break;
+       case LUA_TNUMBER:
+               gid = lua_tointeger(L, 2);
+               break;
+       default:
+               lua_pushnil(L);
+               lua_pushstring(L, "invalid-gid");
+               return 2;
+       }
+       ret = initgroups(lua_tostring(L, 1), gid);
+       switch(errno)
+       {
+       case 0:
+               lua_pushboolean(L, 1);
+               lua_pushnil(L);
+               break;
+       case ENOMEM:
+               lua_pushnil(L);
+               lua_pushstring(L, "no-memory");
+               break;
+       case EPERM:
+               lua_pushnil(L);
+               lua_pushstring(L, "permission-denied");
+               break;
+       default:
+               lua_pushnil(L);
+               lua_pushstring(L, "unknown-error");
+       }
+       return 2;
+}
+
+int lc_umask(lua_State* L)
+{
+       char old_mode_string[7];
+       mode_t old_mode = umask(strtoul(luaL_checkstring(L, 1), NULL, 8));
+
+       snprintf(old_mode_string, sizeof(old_mode_string), "%03o", old_mode);
+       old_mode_string[sizeof(old_mode_string)-1] = 0;
+       lua_pushstring(L, old_mode_string);
+
+       return 1;
+}
+
+int lc_mkdir(lua_State* L)
+{
+       int ret = mkdir(luaL_checkstring(L, 1), S_IRUSR | S_IWUSR | S_IXUSR
+               | S_IRGRP | S_IWGRP | S_IXGRP
+               | S_IROTH | S_IXOTH); /* mode 775 */
+
+       lua_pushboolean(L, ret==0);
+       if(ret)
+       {
+               lua_pushstring(L, strerror(errno));
+               return 2;
+       }
+       return 1;
+}
+
 /*     Like POSIX's setrlimit()/getrlimit() API functions.
  *
  *     Syntax:
@@ -469,48 +554,64 @@ int lc_abort(lua_State* L)
        return 0;
 }
 
+int lc_uname(lua_State* L)
+{
+       struct utsname uname_info;
+       if(uname(&uname_info) != 0)
+       {
+               lua_pushnil(L);
+               lua_pushstring(L, strerror(errno));
+               return 2;
+       }
+       lua_newtable(L);
+       lua_pushstring(L, uname_info.sysname);
+       lua_setfield(L, -2, "sysname");
+       lua_pushstring(L, uname_info.nodename);
+       lua_setfield(L, -2, "nodename");
+       lua_pushstring(L, uname_info.release);
+       lua_setfield(L, -2, "release");
+       lua_pushstring(L, uname_info.version);
+       lua_setfield(L, -2, "version");
+       lua_pushstring(L, uname_info.machine);
+       lua_setfield(L, -2, "machine");
+       return 1;
+}
+
 /* Register functions */
 
 int luaopen_util_pposix(lua_State *L)
 {
-       lua_newtable(L);
+       luaL_Reg exports[] = {
+               { "abort", lc_abort },
 
-       lua_pushcfunction(L, lc_abort);
-       lua_setfield(L, -2, "abort");
+               { "daemonize", lc_daemonize },
 
-       lua_pushcfunction(L, lc_daemonize);
-       lua_setfield(L, -2, "daemonize");
+               { "syslog_open", lc_syslog_open },
+               { "syslog_close", lc_syslog_close },
+               { "syslog_log", lc_syslog_log },
+               { "syslog_setminlevel", lc_syslog_setmask },
 
-       lua_pushcfunction(L, lc_syslog_open);
-       lua_setfield(L, -2, "syslog_open");
+               { "getpid", lc_getpid },
+               { "getuid", lc_getuid },
+               { "getgid", lc_getgid },
 
-       lua_pushcfunction(L, lc_syslog_close);
-       lua_setfield(L, -2, "syslog_close");
+               { "setuid", lc_setuid },
+               { "setgid", lc_setgid },
+               { "initgroups", lc_initgroups },
 
-       lua_pushcfunction(L, lc_syslog_log);
-       lua_setfield(L, -2, "syslog_log");
+               { "umask", lc_umask },
 
-       lua_pushcfunction(L, lc_syslog_setmask);
-       lua_setfield(L, -2, "syslog_setminlevel");
+               { "mkdir", lc_mkdir },
 
-       lua_pushcfunction(L, lc_getpid);
-       lua_setfield(L, -2, "getpid");
+               { "setrlimit", lc_setrlimit },
+               { "getrlimit", lc_getrlimit },
 
-       lua_pushcfunction(L, lc_getuid);
-       lua_setfield(L, -2, "getuid");
-       lua_pushcfunction(L, lc_getgid);
-       lua_setfield(L, -2, "getgid");
+               { "uname", lc_uname },
 
-       lua_pushcfunction(L, lc_setuid);
-       lua_setfield(L, -2, "setuid");
-       lua_pushcfunction(L, lc_setgid);
-       lua_setfield(L, -2, "setgid");
+               { NULL, NULL }
+       };
 
-       lua_pushcfunction(L, lc_setrlimit);
-       lua_setfield(L, -2, "setrlimit");
-
-       lua_pushcfunction(L, lc_getrlimit);
-       lua_setfield(L, -2, "getrlimit");
+       luaL_register(L, "pposix",  exports);
 
        lua_pushliteral(L, "pposix");
        lua_setfield(L, -2, "_NAME");
@@ -519,4 +620,4 @@ int luaopen_util_pposix(lua_State *L)
        lua_setfield(L, -2, "_VERSION");
 
        return 1;
-};
+}