8:09 p.m.
Richard Ipsum (4):
Bind getgroups(2)
Bind getgrgid(3) and getgrnam(3)
Bind getpwuid(3) and getpwnam(3)
Add db access test
luxio.c | 250 +++++++++++++++++++++++++++++++++++++++++++++++-
tests/test-dbaccess.lua | 55 +++++++++++
2 files changed, 302 insertions(+), 3 deletions(-)
create mode 100644 tests/test-dbaccess.lua
--
2.11.0
8:09 p.m.
New subject: [PATCH 1/4] Bind getgroups(2)
---
luxio.c | 35 ++++++++++++++++++++++++++++++++++-
1 file changed, 34 insertions(+), 1 deletion(-)
diff --git a/luxio.c b/luxio.c
index 5013106..d9b0ce9 100644
--- a/luxio.c
+++ b/luxio.c
@@ -694,7 +694,39 @@ luxio_setgid(lua_State *L) /* 4.2.2 */
return 2;
}
-/* TODO: getgroups() 4.2.3 */
+/*** Get list of supplementary group IDs.
+
+Return the supplementary group IDs of the calling process.
+
+@treturn number return value
+@treturn table|errno group IDs, or errno.
+@function getgroups
+*/
+static int
+luxio_getgroups(lua_State *L)
+{
+ int ngroups;
+ long ngroups_max = sysconf(_SC_NGROUPS_MAX) + 1;
+ gid_t groups[ngroups_max];
+
+ ngroups = getgroups(ngroups_max, groups);
+ if (ngroups == -1) {
+ lua_pushinteger(L, -1);
+ lua_pushinteger(L, errno);
+
+ return 2;
+ }
+
+ lua_pushinteger(L, ngroups);
+ lua_newtable(L);
+ for (size_t i = 0; i < ngroups; i++) {
+ lua_pushinteger(L, i + 1);
+ lua_pushinteger(L, groups[i]);
+ lua_settable(L, -3);
+ }
+
+ return 2;
+}
/*** Get username.
@@ -4502,6 +4534,7 @@ luxio_functions[] = {
{ "getppid", luxio_getppid },
{ "getpgrp", luxio_getpgrp },
+ { "getgroups", luxio_getgroups },
{ "getuid", luxio_getuid },
{ "geteuid", luxio_geteuid },
--
2.11.0
8:09 p.m.
New subject: [PATCH 2/4] Bind getgrgid(3) and getgrnam(3)
---
luxio.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 107 insertions(+), 1 deletion(-)
diff --git a/luxio.c b/luxio.c
index d9b0ce9..e744746 100644
--- a/luxio.c
+++ b/luxio.c
@@ -61,6 +61,7 @@ Not all systems will provide all the functions described here.
#include <signal.h>
#include <syslog.h>
#include <iconv.h>
+#include <grp.h>
#if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 24)
/* readdir is deprecated as of glibc 2.24, use readdir instead */
@@ -2458,7 +2459,109 @@ luxio_tcsetpgrp(lua_State *L) /* 7.2.4 */
/* 9.1 Database access *******************************************************/
-/* TODO: getgrgid(), getgrgid_r(), getgrnam(), getgrnam_r() 9.2.1 */
+/*** Database access
+@section dbaccess
+*/
+
+static void
+luxio__push_group_table(lua_State *L, const struct group *g)
+{
+ lua_newtable(L);
+ lua_pushstring(L, "gr_name");
+ lua_pushstring(L, g->gr_name);
+ lua_settable(L, -3);
+ lua_pushstring(L, "gr_passwd");
+ lua_pushstring(L, g->gr_passwd);
+ lua_settable(L, -3);
+ lua_pushstring(L, "gr_gid");
+ lua_pushinteger(L, g->gr_gid);
+ lua_settable(L, -3);
+
+ lua_pushstring(L, "gr_mem");
+ lua_newtable(L);
+ for (size_t i = 0; g->gr_mem[i] != NULL; i++) {
+ lua_pushinteger(L, i + 1);
+ lua_pushstring(L, g->gr_mem[i]);
+ lua_settable(L, -3);
+ }
+
+ lua_settable(L, -3);
+}
+
+/*** group() information table.
+Returned by @{getgrgid} and @{getgrnam}.
+@field gr_name Group name
+@field gr_passwd Group password - if this field is empty, no password is needed.
+@field gr_gid Group ID
+@field gr_mem Table of names of group members
+@table group-table
+*/
+
+/*** Get group file entry.
+
+Returns 0 on success and non-zero on failure.
+
+On success the second return value is a table containing group data
+from the group database (e.g. /etc/group, LDAP).
+On failure the second return value contains errno.
+
+@tparam number gid
+@treturn number return value
+@treturn group-table|errno group, result table or errno.
+@function getgrgid
+*/
+static int
+luxio_getgrgid(lua_State *L)
+{
+ gid_t gid = luaL_checkinteger(L, 1);
+ struct group *g = getgrgid(gid);
+
+ if (g == NULL) {
+ lua_pushinteger(L, -1);
+ lua_pushinteger(L, errno);
+
+ return 2;
+ }
+
+ lua_pushinteger(L, 0);
+ luxio__push_group_table(L, g);
+
+ return 2;
+
+}
+
+/*** Get group file entry.
+
+Returns 0 on success and non-zero on failure.
+
+On success the second return value is a table containing group data
+from the group database (e.g. /etc/group, LDAP).
+On failure the second return value contains errno.
+
+@tparam string name
+@treturn number return value
+@treturn group-table|errno result table, or errno.
+@function getgrnam
+*/
+static int
+luxio_getgrnam(lua_State *L)
+{
+ const char *name = luaL_checkstring(L, 1);
+ struct group *g = getgrnam(name);
+
+ if (g == NULL) {
+ lua_pushinteger(L, -1);
+ lua_pushinteger(L, errno);
+
+ return 2;
+ }
+
+ lua_pushinteger(L, 0);
+ luxio__push_group_table(L, g);
+
+ return 2;
+}
+
/* TODO: getpwuid(), getpwuid_r(), getpwnam(), getpwnam_r() 9.2.2 */
/* 10 Data interchange format ************************************************/
@@ -4536,6 +4639,9 @@ luxio_functions[] = {
{ "getpgrp", luxio_getpgrp },
{ "getgroups", luxio_getgroups },
+ { "getgrgid", luxio_getgrgid },
+ { "getgrnam", luxio_getgrnam },
+
{ "getuid", luxio_getuid },
{ "geteuid", luxio_geteuid },
{ "getgid", luxio_getgid },
--
2.11.0
8:09 p.m.
New subject: [PATCH 3/4] Bind getpwuid(3) and getpwnam(3)
---
luxio.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 106 insertions(+), 1 deletion(-)
diff --git a/luxio.c b/luxio.c
index e744746..49dbb67 100644
--- a/luxio.c
+++ b/luxio.c
@@ -62,6 +62,7 @@ Not all systems will provide all the functions described here.
#include <syslog.h>
#include <iconv.h>
#include <grp.h>
+#include <pwd.h>
#if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 24)
/* readdir is deprecated as of glibc 2.24, use readdir instead */
@@ -2562,7 +2563,108 @@ luxio_getgrnam(lua_State *L)
return 2;
}
-/* TODO: getpwuid(), getpwuid_r(), getpwnam(), getpwnam_r() 9.2.2 */
+static void
+luxio__push_passwd_table(lua_State *L, const struct passwd *p)
+{
+ lua_newtable(L);
+ lua_pushstring(L, "pw_name");
+ lua_pushstring(L, p->pw_name);
+ lua_settable(L, -3);
+ lua_pushstring(L, "pw_passwd");
+ lua_pushstring(L, p->pw_passwd);
+ lua_settable(L, -3);
+ lua_pushstring(L, "pw_uid");
+ lua_pushinteger(L, p->pw_uid);
+ lua_settable(L, -3);
+ lua_pushstring(L, "pw_gid");
+ lua_pushinteger(L, p->pw_gid);
+ lua_settable(L, -3);
+ lua_pushstring(L, "pw_gecos");
+ lua_pushstring(L, p->pw_gecos);
+ lua_settable(L, -3);
+ lua_pushstring(L, "pw_dir");
+ lua_pushstring(L, p->pw_dir);
+ lua_settable(L, -3);
+ lua_pushstring(L, "pw_shell");
+ lua_pushstring(L, p->pw_shell);
+ lua_settable(L, -3);
+}
+
+/*** passwd() information table.
+Returned by @{getpwuid} and @{getpwnam}.
+@field pw_name Username
+@field pw_passwd User password - if this field is empty, no password is needed.
+@field pw_uid User ID
+@field pw_gid Group ID
+@field pw_gecos User information
+@field pw_dir Home directory
+@field pw_shell Shell program
+@table passwd-table
+*/
+
+/*** Get password file entry.
+
+Returns 0 on success and non-zero on failure.
+
+On success the second return value is a table containing password data
+from the password database (e.g. /etc/passwd, LDAP).
+On failure the second return value contains errno.
+
+@tparam number uid
+@treturn number return value
+@treturn passwd-table|errno result table, or errno.
+@function getpwuid
+*/
+static int
+luxio_getpwuid(lua_State *L)
+{
+ uid_t uid = luaL_checkinteger(L, 1);
+ struct passwd *p = getpwuid(uid);
+
+ if (p == NULL) {
+ lua_pushinteger(L, -1);
+ lua_pushinteger(L, errno);
+
+ return 2;
+ }
+
+ lua_pushinteger(L, 0);
+ luxio__push_passwd_table(L, p);
+
+ return 2;
+}
+
+/*** Get password file entry.
+
+Returns 0 on success and non-zero on failure.
+
+On success the second return value is a table containing password data
+from the password database (e.g. /etc/passwd, LDAP).
+On failure the second return value contains errno.
+
+@tparam string username
+@treturn number return value
+@treturn passwd-table|errno result table, or errno.
+@function getpwnam
+*/
+static int
+luxio_getpwnam(lua_State *L)
+{
+ const char *name = luaL_checkstring(L, 1);
+ struct passwd *p = getpwnam(name);
+
+ if (p == NULL) {
+ lua_pushinteger(L, -1);
+ lua_pushinteger(L, errno);
+
+ return 2;
+ }
+
+ lua_pushinteger(L, 0);
+ luxio__push_passwd_table(L, p);
+
+ return 2;
+}
/* 10 Data interchange format ************************************************/
@@ -4642,6 +4744,9 @@ luxio_functions[] = {
{ "getgrgid", luxio_getgrgid },
{ "getgrnam", luxio_getgrnam },
+ { "getpwuid", luxio_getpwuid },
+ { "getpwnam", luxio_getpwnam },
+
{ "getuid", luxio_getuid },
{ "geteuid", luxio_geteuid },
{ "getgid", luxio_getgid },
--
2.11.0
8:09 p.m.
New subject: [PATCH 4/4] Add db access test
---
tests/test-dbaccess.lua | 55 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 55 insertions(+)
create mode 100644 tests/test-dbaccess.lua
diff --git a/tests/test-dbaccess.lua b/tests/test-dbaccess.lua
new file mode 100644
index 0000000..5fb2b20
--- /dev/null
+++ b/tests/test-dbaccess.lua
@@ -0,0 +1,55 @@
+local l = require "luxio"
+
+-- getgrgid, getgrnam
+function print_group(group)
+ print("gr_name: ", group["gr_name"])
+ print("gr_passwd: ", group["gr_passwd"])
+ print("gr_gid: ", group["gr_gid"])
+
+ for k, v in pairs(group["gr_mem"]) do
+ print(k, v)
+ end
+end
+
+r, t = l.getgrgid(0)
+if r == -1 then
+ io.stderr:write(("getgrgid failed: %s\n"):format(l.strerror(t)))
+ os.exit(1)
+end
+
+print_group(t)
+
+r, t = l.getgrnam('root')
+if r == -1 then
+ io.stderr:write(("getgrnam failed: %s\n"):format(l.strerror(t)))
+ os.exit(1)
+end
+
+print_group(t)
+
+-- getpwuid, getpwnam
+function print_passwd(passwd)
+ print("pw_name: ", passwd["pw_name"])
+ print("pw_passwd: ", passwd["pw_passwd"])
+ print("pw_uid: ", passwd["pw_uid"])
+ print("pw_gid: ", passwd["pw_gid"])
+ print("pw_gecos: ", passwd["pw_gecos"])
+ print("pw_dir: ", passwd["pw_dir"])
+ print("pw_shell: ", passwd["pw_shell"])
+end
+
+r, t = l.getpwuid(0)
+if r == -1 then
+ io.stderr:write(("getpwuid failed: %s\n"):format(l.strerror(t)))
+ os.exit(1)
+end
+
+print_passwd(t)
+
+r, t = l.getpwnam('root')
+if r == -1 then
+ io.stderr:write(("getpwnam failed: %s\n"):format(l.strerror(t)))
+ os.exit(1)
+end
+
+print_passwd(t)
--
2.11.0
10:10 p.m.
On Wed, Oct 03, 2018 at 12:09:18 +0100, Richard Ipsum wrote:
Richard Ipsum (4):
Bind getgroups(2)
Bind getgrgid(3) and getgrnam(3)
Bind getpwuid(3) and getpwnam(3)
Add db access test
[snip]
A brief skim of this looks good. I'll have a try with it soon and merge
assuming nothing bad shows up. Thanks for this.
D.
--
Daniel Silverstone http://www.digital-scurf.org/
PGP mail accepted and encouraged. Key Id: 3CCE BABE 206C 3B69
1815
days inactive
1815
days old
5 comments
2 participants
participants (2)
-
Daniel Silverstone -
Richard Ipsum