sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

r8296: - split out the ejs auth functions into a separate file

Browse Source 
- got rid of the one line ejs_returnlist()
This commit is contained in:
Andrew Tridgell 2005-07-10 23:25:42 +00:00 committed by Gerald (Jerry) Carter
parent c1a3691f87
commit 6961fe2905
4 changed files with 148 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/scripting/ejs/config.mk
View File

@ -18,6 +18,7 @@ OBJ_FILES = \
scripting/ejs/smbcalls_nbt.o \
scripting/ejs/smbcalls_cli.o \
scripting/ejs/smbcalls_rpc.o \
scripting/ejs/smbcalls_auth.o \
scripting/ejs/mprutil.o
REQUIRED_SUBSYSTEMS = AUTH EJS LIBBASIC EJSRPC MESSAGING
# End SUBSYSTEM SMBCALLS

120
source/scripting/ejs/smbcalls.c
View File

@ -23,7 +23,6 @@
#include "includes.h"
#include "lib/ejs/ejs.h"
#include "auth/auth.h"
#include "scripting/ejs/smbcalls.h"
/*
@ -65,122 +64,6 @@ static int ejs_typeof(MprVarHandle eid, int argc, struct MprVar **argv)
return 0;
}
/*
setup a return of a string list
*/
void ejs_returnlist(int eid, const char *name, const char **list)
{
mpr_Return(eid, mprList(name, list));
}
static int ejs_systemAuth(TALLOC_CTX *tmp_ctx, struct MprVar *auth, const char *username, const char *password, const char *domain, const char *remote_host)
{
struct auth_usersupplied_info *user_info = NULL;
struct auth_serversupplied_info *server_info = NULL;
struct auth_context *auth_context;
const char *auth_unix[] = { "unix", NULL };
NTSTATUS nt_status;
DATA_BLOB pw_blob;
/*
darn, we need some way to get the right event_context here
*/
nt_status = auth_context_create(tmp_ctx, auth_unix, &auth_context, NULL);
if (!NT_STATUS_IS_OK(nt_status)) {
mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
mprSetPropertyValue(auth, "report", mprCreateStringVar("Auth System Failure", 1));
goto done;
}
pw_blob = data_blob(password, strlen(password)+1),
make_user_info(tmp_ctx, username, username,
domain, domain,
remote_host, remote_host,
NULL, NULL,
NULL, NULL,
&pw_blob, False,
USER_INFO_CASE_INSENSITIVE_USERNAME |
USER_INFO_DONT_CHECK_UNIX_ACCOUNT,
&user_info);
nt_status = auth_check_password(auth_context, tmp_ctx, user_info, &server_info);
if (!NT_STATUS_IS_OK(nt_status)) {
mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
mprSetPropertyValue(auth, "report", mprCreateStringVar("Login Failed", 1));
goto done;
}
mprSetPropertyValue(auth, "result", mprCreateBoolVar(server_info->authenticated));
mprSetPropertyValue(auth, "username", mprCreateStringVar(server_info->account_name, 1));
mprSetPropertyValue(auth, "domain", mprCreateStringVar(server_info->domain_name, 1));
done:
return 0;
}
/*
perform user authentication, returning an array of results
syntax:
var authinfo = new Object();
authinfo.username = myname;
authinfo.password = mypass;
authinfo.domain = mydom;
authinfo.rhost = request['REMOTE_HOST'];
auth = userAuth(authinfo);
*/
static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
{
TALLOC_CTX *tmp_ctx;
const char *username;
const char *password;
const char *domain;
const char *remote_host;
struct MprVar auth;
if (argc != 1 || argv[0]->type != MPR_TYPE_OBJECT) {
ejsSetErrorMsg(eid, "userAuth invalid arguments, this function requires an object.");
return -1;
}
username = mprToString(mprGetProperty(argv[0], "username", NULL));
password = mprToString(mprGetProperty(argv[0], "password", NULL));
domain = mprToString(mprGetProperty(argv[0], "domain", NULL));
remote_host = mprToString(mprGetProperty(argv[0], "rhost", NULL));
tmp_ctx = talloc_new(mprMemCtx());
auth = mprCreateObjVar("auth", MPR_DEFAULT_HASH_SIZE);
if (domain && strcmp("System User", domain) == 0) {
ejs_systemAuth(tmp_ctx, &auth, username, password, domain, remote_host);
} else {
mprSetPropertyValue(&auth, "result", mprCreateBoolVar(False));
mprSetPropertyValue(&auth, "report", mprCreateStringVar("Unknown Domain", 1));
}
mpr_Return(eid, auth);
talloc_free(tmp_ctx);
return 0;
}
static int ejs_domain_list(MprVarHandle eid, int argc, char **argv)
{
struct MprVar list;
if (argc != 0) {
ejsSetErrorMsg(eid, "domList invalid arguments");
return -1;
}
list = mprCreateObjVar("list", MPR_DEFAULT_HASH_SIZE);
mprSetVar(&list, "0", mprCreateStringVar("System User", 1));
mpr_Return(eid, list);
return 0;
}
/*
setup C functions that be called from ejs
@ -192,10 +75,9 @@ void smb_setup_ejs_functions(void)
smb_setup_ejs_nbt();
smb_setup_ejs_cli();
smb_setup_ejs_rpc();
smb_setup_ejs_auth();
ejsDefineCFunction(-1, "typeof", ejs_typeof, NULL, MPR_VAR_SCRIPT_HANDLE);
ejsDefineStringCFunction(-1, "getDomainList", ejs_domain_list, NULL, MPR_VAR_SCRIPT_HANDLE);
ejsDefineCFunction(-1, "userAuth", ejs_userAuth, NULL, MPR_VAR_SCRIPT_HANDLE);
}
/*

144
source/scripting/ejs/smbcalls_auth.c Normal file
View File

@ -0,0 +1,144 @@
/*
Unix SMB/CIFS implementation.
ejs auth functions
Copyright (C) Simo Sorce 2005
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 "lib/ejs/ejs.h"
#include "auth/auth.h"
#include "scripting/ejs/smbcalls.h"
static int ejs_systemAuth(TALLOC_CTX *tmp_ctx, struct MprVar *auth, const char *username, const char *password, const char *domain, const char *remote_host)
{
struct auth_usersupplied_info *user_info = NULL;
struct auth_serversupplied_info *server_info = NULL;
struct auth_context *auth_context;
const char *auth_unix[] = { "unix", NULL };
NTSTATUS nt_status;
DATA_BLOB pw_blob;
/*
darn, we need some way to get the right event_context here
*/
nt_status = auth_context_create(tmp_ctx, auth_unix, &auth_context, NULL);
if (!NT_STATUS_IS_OK(nt_status)) {
mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
mprSetPropertyValue(auth, "report", mprCreateStringVar("Auth System Failure", 1));
goto done;
}
pw_blob = data_blob(password, strlen(password)+1),
make_user_info(tmp_ctx, username, username,
domain, domain,
remote_host, remote_host,
NULL, NULL,
NULL, NULL,
&pw_blob, False,
USER_INFO_CASE_INSENSITIVE_USERNAME |
USER_INFO_DONT_CHECK_UNIX_ACCOUNT,
&user_info);
nt_status = auth_check_password(auth_context, tmp_ctx, user_info, &server_info);
if (!NT_STATUS_IS_OK(nt_status)) {
mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
mprSetPropertyValue(auth, "report", mprCreateStringVar("Login Failed", 1));
goto done;
}
mprSetPropertyValue(auth, "result", mprCreateBoolVar(server_info->authenticated));
mprSetPropertyValue(auth, "username", mprCreateStringVar(server_info->account_name, 1));
mprSetPropertyValue(auth, "domain", mprCreateStringVar(server_info->domain_name, 1));
done:
return 0;
}
/*
perform user authentication, returning an array of results
syntax:
var authinfo = new Object();
authinfo.username = myname;
authinfo.password = mypass;
authinfo.domain = mydom;
authinfo.rhost = request['REMOTE_HOST'];
auth = userAuth(authinfo);
*/
static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
{
TALLOC_CTX *tmp_ctx;
const char *username;
const char *password;
const char *domain;
const char *remote_host;
struct MprVar auth;
if (argc != 1 || argv[0]->type != MPR_TYPE_OBJECT) {
ejsSetErrorMsg(eid, "userAuth invalid arguments, this function requires an object.");
return -1;
}
username = mprToString(mprGetProperty(argv[0], "username", NULL));
password = mprToString(mprGetProperty(argv[0], "password", NULL));
domain = mprToString(mprGetProperty(argv[0], "domain", NULL));
remote_host = mprToString(mprGetProperty(argv[0], "rhost", NULL));
tmp_ctx = talloc_new(mprMemCtx());
auth = mprCreateObjVar("auth", MPR_DEFAULT_HASH_SIZE);
if (domain && strcmp("System User", domain) == 0) {
ejs_systemAuth(tmp_ctx, &auth, username, password, domain, remote_host);
} else {
mprSetPropertyValue(&auth, "result", mprCreateBoolVar(False));
mprSetPropertyValue(&auth, "report", mprCreateStringVar("Unknown Domain", 1));
}
mpr_Return(eid, auth);
talloc_free(tmp_ctx);
return 0;
}
static int ejs_domain_list(MprVarHandle eid, int argc, char **argv)
{
struct MprVar list;
if (argc != 0) {
ejsSetErrorMsg(eid, "domList invalid arguments");
return -1;
}
list = mprCreateObjVar("list", MPR_DEFAULT_HASH_SIZE);
mprSetVar(&list, "0", mprCreateStringVar("System User", 1));
mpr_Return(eid, list);
return 0;
}
/*
setup C functions that be called from ejs
*/
void smb_setup_ejs_auth(void)
{
ejsDefineStringCFunction(-1, "getDomainList", ejs_domain_list, NULL, MPR_VAR_SCRIPT_HANDLE);
ejsDefineCFunction(-1, "userAuth", ejs_userAuth, NULL, MPR_VAR_SCRIPT_HANDLE);
}

4
source/scripting/ejs/smbcalls_config.c
View File

@ -38,7 +38,7 @@ static int ejs_lpServices(MprVarHandle eid, int argc, char **argv)
list = str_list_add(list, lp_servicename(i));
}
talloc_steal(mprMemCtx(), list);
ejs_returnlist(eid, "services", list);
mpr_Return(eid, mprList("services", list));
return 0;
}
@ -131,7 +131,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
}
return -1;
case P_LIST:
ejs_returnlist(eid, parm->label, *(const char ***)parm_ptr);
mpr_Return(eid, mprList(parm->label, *(const char ***)parm_ptr));
break;
case P_SEP:
return -1;