mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.pposix, prosodyctl, mod_posix: Add initgroups() function, and bump module version. prosodyctl inits groups with the groups of prosody_user. (thanks dbb)

Browse source
This commit is contained in:
Matthew Wild 2010-08-28 14:31:48 +01:00
parent e724cea395
commit b465aa90b9
3 changed files with 63 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/mod_posix.lua
View file

@ -7,7 +7,7 @@
--
local want_pposix_version = "0.3.3";
local want_pposix_version = "0.3.4";
local pposix = assert(require "util.pposix");
if pposix._VERSION ~= want_pposix_version then module:log("warn", "Unknown version (%s) of binary pposix module, expected %s", tostring(pposix._VERSION), want_pposix_version); end

5
prosodyctl
View file

@ -79,7 +79,7 @@ require "util.datamanager".set_data_path(data_path);
-- Switch away from root and into the prosody user --
local switched_user, current_uid;
local want_pposix_version = "0.3.3";
local want_pposix_version = "0.3.4";
local ok, pposix = pcall(require, "util.pposix");
if ok and pposix then
@ -90,6 +90,9 @@ if ok and pposix then
local desired_user = config.get("*", "core", "prosody_user") or "prosody";
local desired_group = config.get("*", "core", "prosody_group") or desired_user;
local ok, err = pposix.setgid(desired_group);
if ok then
ok, err = pposix.initgroups(desired_user);
end
if ok then
ok, err = pposix.setuid(desired_user);
if ok then

59
util-src/pposix.c
View file

@ -13,7 +13,7 @@
* POSIX support functions for Lua
*/
#define MODULE_VERSION "0.3.3"
#define MODULE_VERSION "0.3.4"
#include <stdlib.h>
#include <math.h>
@ -359,6 +359,62 @@ 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];
@ -517,6 +573,7 @@ int luaopen_util_pposix(lua_State *L)
{ "setuid", lc_setuid },
{ "setgid", lc_setgid },
{ "initgroups", lc_initgroups },
{ "umask", lc_umask },