From 683432660ea53304d25212c56fd119aaabe2c0e3 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 11 Jul 2005 09:19:50 +0000 Subject: r8318: added a bunch more ejs calls. getgr*() getpw*() strlower() strupper() IfaceList() (This used to be commit 1517ad490dd67302f38ab9dcd8a3b24b73b8d550) --- source4/scripting/ejs/config.mk | 2 + source4/scripting/ejs/mprutil.c | 12 +++ source4/scripting/ejs/smbcalls.c | 17 ++++ source4/scripting/ejs/smbcalls.h | 3 - source4/scripting/ejs/smbcalls_nss.c | 148 ++++++++++++++++++++++++++++++++ source4/scripting/ejs/smbcalls_string.c | 70 +++++++++++++++ 6 files changed, 249 insertions(+), 3 deletions(-) create mode 100644 source4/scripting/ejs/smbcalls_nss.c create mode 100644 source4/scripting/ejs/smbcalls_string.c (limited to 'source4/scripting/ejs') diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk index 7afcacbdf5..5e061cb2a3 100644 --- a/source4/scripting/ejs/config.mk +++ b/source4/scripting/ejs/config.mk @@ -20,6 +20,8 @@ OBJ_FILES = \ scripting/ejs/smbcalls_rpc.o \ scripting/ejs/smbcalls_auth.o \ scripting/ejs/smbcalls_options.o \ + scripting/ejs/smbcalls_nss.o \ + scripting/ejs/smbcalls_string.o \ scripting/ejs/mprutil.o REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING # End SUBSYSTEM SMBCALLS diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c index 6b5c02c48d..a9cf71b15d 100644 --- a/source4/scripting/ejs/mprutil.c +++ b/source4/scripting/ejs/mprutil.c @@ -114,6 +114,18 @@ struct MprVar mprList(const char *name, const char **list) return var; } +/* + construct a MprVar from a string, using NULL if needed +*/ +struct MprVar mprString(const char *s) +{ + struct MprVar var; + if (s == NULL) { + return mprCreatePtrVar(NULL, "NULL"); + } + return mprCreateStringVar(s, 1); +} + /* construct a string MprVar from a lump of data */ diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c index 328bd14ab5..5972518036 100644 --- a/source4/scripting/ejs/smbcalls.c +++ b/source4/scripting/ejs/smbcalls.c @@ -64,6 +64,20 @@ static int ejs_typeof(MprVarHandle eid, int argc, struct MprVar **argv) return 0; } +/* + return the list of configured network interfaces +*/ +static int ejs_IfaceList(MprVarHandle eid, int argc, struct MprVar **argv) +{ + int i, count = iface_count(); + struct MprVar ret = mprCreateObjVar("interfaces", MPR_DEFAULT_HASH_SIZE); + for (i=0;ipw_name)); + mprSetVar(&ret, "pw_passwd", mprString(pwd->pw_passwd)); + mprSetVar(&ret, "pw_uid", mprCreateIntegerVar(pwd->pw_uid)); + mprSetVar(&ret, "pw_gid", mprCreateIntegerVar(pwd->pw_gid)); + mprSetVar(&ret, "pw_gecos", mprString(pwd->pw_gecos)); + mprSetVar(&ret, "pw_dir", mprString(pwd->pw_dir)); + mprSetVar(&ret, "pw_shell", mprString(pwd->pw_shell)); + return ret; +} + +/* + return a struct passwd as an object +*/ +static struct MprVar mpr_group(struct group *grp) +{ + struct MprVar ret; + if (grp == NULL) { + return mprCreateUndefinedVar(); + } + ret = mprCreateObjVar("group", MPR_DEFAULT_HASH_SIZE); + + mprSetVar(&ret, "gr_name", mprString(grp->gr_name)); + mprSetVar(&ret, "gr_passwd", mprString(grp->gr_passwd)); + mprSetVar(&ret, "gr_gid", mprCreateIntegerVar(grp->gr_gid)); + mprSetVar(&ret, "gr_mem", mprList("gr_mem", (const char **)grp->gr_mem)); + return ret; +} + + +/* + usage: + var pw = getpwnam("root"); + + returns an object containing struct passwd entries +*/ +static int ejs_getpwnam(MprVarHandle eid, int argc, struct MprVar **argv) +{ + /* validate arguments */ + if (argc != 1 || argv[0]->type != MPR_TYPE_STRING) { + ejsSetErrorMsg(eid, "getpwnam invalid arguments"); + return -1; + } + + mpr_Return(eid, mpr_passwd(getpwnam(mprToString(argv[0])))); + return 0; +} + +/* + usage: + var pw = getpwuid(0); + + returns an object containing struct passwd entries +*/ +static int ejs_getpwuid(MprVarHandle eid, int argc, struct MprVar **argv) +{ + /* validate arguments */ + if (argc != 1 || argv[0]->type != MPR_TYPE_INT) { + ejsSetErrorMsg(eid, "getpwuid invalid arguments"); + return -1; + } + mpr_Return(eid, mpr_passwd(getpwuid(mprToInt(argv[0])))); + return 0; +} + +/* + usage: + var pw = getgrnam("users"); + + returns an object containing struct group entries +*/ +static int ejs_getgrnam(MprVarHandle eid, int argc, struct MprVar **argv) +{ + /* validate arguments */ + if (argc != 1 || argv[0]->type != MPR_TYPE_STRING) { + ejsSetErrorMsg(eid, "getgrnam invalid arguments"); + return -1; + } + mpr_Return(eid, mpr_group(getgrnam(mprToString(argv[0])))); + return 0; +} + +/* + usage: + var pw = getgrgid(0); + + returns an object containing struct group entries +*/ +static int ejs_getgrgid(MprVarHandle eid, int argc, struct MprVar **argv) +{ + /* validate arguments */ + if (argc != 1 || argv[0]->type != MPR_TYPE_STRING) { + ejsSetErrorMsg(eid, "getgrgid invalid arguments"); + return -1; + } + mpr_Return(eid, mpr_group(getgrgid(mprToInt(argv[0])))); + return 0; +} + + +/* + setup C functions that be called from ejs +*/ +void smb_setup_ejs_nss(void) +{ + ejsDefineCFunction(-1, "getpwnam", ejs_getpwnam, NULL, MPR_VAR_SCRIPT_HANDLE); + ejsDefineCFunction(-1, "getpwuid", ejs_getpwuid, NULL, MPR_VAR_SCRIPT_HANDLE); + ejsDefineCFunction(-1, "getgrnam", ejs_getgrnam, NULL, MPR_VAR_SCRIPT_HANDLE); + ejsDefineCFunction(-1, "getgrgid", ejs_getgrgid, NULL, MPR_VAR_SCRIPT_HANDLE); +} diff --git a/source4/scripting/ejs/smbcalls_string.c b/source4/scripting/ejs/smbcalls_string.c new file mode 100644 index 0000000000..7817de1b0d --- /dev/null +++ b/source4/scripting/ejs/smbcalls_string.c @@ -0,0 +1,70 @@ +/* + Unix SMB/CIFS implementation. + + provide access to string functions + + Copyright (C) Andrew Tridgell 2005 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#include "includes.h" +#include "scripting/ejs/smbcalls.h" +#include "lib/ejs/ejs.h" +#include "system/passwd.h" + +/* + usage: + var s = strlower("UPPER"); +*/ +static int ejs_strlower(MprVarHandle eid, int argc, char **argv) +{ + char *s; + if (argc != 1) { + ejsSetErrorMsg(eid, "strlower invalid arguments"); + return -1; + } + s = strlower_talloc(mprMemCtx(), argv[0]); + mpr_Return(eid, mprString(s)); + talloc_free(s); + return 0; +} + +/* + usage: + var s = strupper("lower"); +*/ +static int ejs_strupper(MprVarHandle eid, int argc, char **argv) +{ + char *s; + if (argc != 1) { + ejsSetErrorMsg(eid, "strupper invalid arguments"); + return -1; + } + s = strupper_talloc(mprMemCtx(), argv[0]); + mpr_Return(eid, mprString(s)); + talloc_free(s); + return 0; +} + + +/* + setup C functions that be called from ejs +*/ +void smb_setup_ejs_string(void) +{ + ejsDefineStringCFunction(-1, "strlower", ejs_strlower, NULL, MPR_VAR_SCRIPT_HANDLE); + ejsDefineStringCFunction(-1, "strupper", ejs_strupper, NULL, MPR_VAR_SCRIPT_HANDLE); +} -- cgit