suX/src/sux.c - diff

Return to sux.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / suX / src

Diff for /suX/src/sux.c between versions 1.2.2.1 and 1.3.2.3

version 1.2.2.1, 2011/10/09 18:58:44	version 1.3.2.3, 2013/04/09 08:56:57
Line 9	Line 9
#include "global.h"	#include "global.h"


sl_config cfg;	cfg_root_t cfg;
int Verbose;	int Verbose;
struct tagProc proc;	struct tagProc proc;
FILE *lf;	FILE *lf;
Line 20 Log(int lvl, const char *fmt, ...)	Line 20 Log(int lvl, const char *fmt, ...)
{	{
va_list lst, cp;	va_list lst, cp;

if (lvl <= Verbose) {	EVERBS(lvl) {
va_start(lst, fmt);	va_start(lst, fmt);
va_copy(cp, lst);	va_copy(cp, lst);
vfprintf(lf, fmt, lst);	vfprintf(lf, fmt, lst);
Line 48 Err(const char *fmt, ...)	Line 48 Err(const char *fmt, ...)
static void	static void
initProg()	initProg()
{	{
proc.proc_uid = getuid();	char d[MAXPATHLEN];
proc.proc_gid = getgid();
proc.proc_prio = getpriority(PRIO_PROCESS, 0);
getcwd(proc.proc_dir, sizeof proc.proc_dir);

	AIT_SET_I16(&proc.proc_uid, getuid());
	AIT_SET_I16(&proc.proc_gid, getgid());
	AIT_SET_I32(&proc.proc_prio, getpriority(PRIO_PROCESS, 0));
	getcwd(d, sizeof d);
	AIT_SET_STR(&proc.proc_dir, d);

#if 0	#if 0
lf = fopen(DEFAULT_LOG, "a");	lf = fopen(DEFAULT_LOG, "a");
if (!lf)	if (!lf)
Line 63 initProg()	Line 66 initProg()
}	}

static void	static void
	endProg()
	{
	AIT_FREE_VAL(&proc.proc_uid);
	AIT_FREE_VAL(&proc.proc_gid);
	AIT_FREE_VAL(&proc.proc_prio);
	AIT_FREE_VAL(&proc.proc_class);
	AIT_FREE_VAL(&proc.proc_dir);
	AIT_FREE_VAL(&proc.proc_name);
	AIT_FREE_VAL(&proc.proc_cmd);
	}

	static void
Usage()	Usage()
{	{
printf( " -= suX =- suExecutor designed for web based applicaions\n"	printf( " -= suX =- suExecutor designed for web based applicaions\n"
Line 75 Usage()	Line 90 Usage()
"\t-C <directory>\t\t\tChroot to directory\n"	"\t-C <directory>\t\t\tChroot to directory\n"
"\t-c <cfgfile>\t\t\tConfig file\n"	"\t-c <cfgfile>\t\t\tConfig file\n"
"\t-l <logfile>\t\t\tLog file path (default:/var/log/suX.log)\n"	"\t-l <logfile>\t\t\tLog file path (default:/var/log/suX.log)\n"
	"\t-o\t\t\t\tForce set UID,GID and Priority for program\n"
"\t-v\t\t\t\tVerbose, (more -v, more verbosity)\n"	"\t-v\t\t\t\tVerbose, (more -v, more verbosity)\n"
"\t-h\t\t\t\tThis help screen!\n\n", PACKAGE_NAME);	"\t-h\t\t\t\tThis help screen!\n\n", PACKAGE_NAME);
}	}
Line 85 setUIDGID(char flg, const char *name)	Line 101 setUIDGID(char flg, const char *name)
struct stat sb;	struct stat sb;

if (stat(name, &sb) == -1) {	if (stat(name, &sb) == -1) {
Err("Error:: %s stat #%d - %s", name, errno, strerror(errno));	ESYSERR(0);
return -1;	return -1;
}	}

if (!(flg & 1))	if (!(flg & SUX_GET_UID))
proc.proc_uid = sb.st_uid;	AIT_SET_I16(&proc.proc_uid, sb.st_uid);
if (!(flg & 2))	if (!(flg & SUX_GET_GID))
proc.proc_gid = sb.st_gid;	AIT_SET_I16(&proc.proc_gid, sb.st_gid);

return 0;	return 0;
}	}
Line 103 SetClass()	Line 119 SetClass()
login_cap_t *cap;	login_cap_t *cap;
struct passwd *pass;	struct passwd *pass;

pass = getpwuid(proc.proc_uid);	pass = getpwuid(AIT_GET_I16(&proc.proc_uid));
if (!pass) {	if (!pass) {
Err("Error:: User with this UID %d not found", proc.proc_uid);	Err("Error:: User with this UID %d not found", AIT_GET_I16(&proc.proc_uid));
endpwent();	endpwent();
return -1;	return -1;
} else	} else
strlcpy(proc.proc_class, pass->pw_class, sizeof proc.proc_class);	AIT_SET_STR(&proc.proc_class, pass->pw_class);

cap = login_getclass(proc.proc_class);	cap = login_getclass(AIT_GET_STR(&proc.proc_class));
if (!cap) {	if (!cap) {
Err("Error:: Cant get login class %s", proc.proc_class);	Err("Error:: Cant get login class %s", AIT_GET_STR(&proc.proc_class));
endpwent();	endpwent();
return -1;	return -1;
}	}

if (setusercontext(cap, pass, proc.proc_uid, LOGIN_SETALL)) {	if (setusercontext(cap, pass, AIT_GET_I16(&proc.proc_uid), LOGIN_SETALL)) {
Err("Error:: Cant set login class %s", proc.proc_class);	Err("Error:: Cant set login class %s", AIT_GET_STR(&proc.proc_class));
login_close(cap);	login_close(cap);
endpwent();	endpwent();
return -1;	return -1;
Line 133 SetClass()	Line 149 SetClass()
static int	static int
LoadCfgData(char flg)	LoadCfgData(char flg)
{	{
char *str, mode = 0;	const char *str;
	char mode = 0;

str = (char*) cfg_GetAttribute(&cfg, CFG("global"), CFG("mode"));	str = cfg_getAttribute(&cfg, "global", "mode");
if (!str) {	if (!str) {
Err("Error:: Unknown mode ...");	Err("Error:: Unknown mode ...");
return -1;	return -1;
}	}
if (!strcasecmp(str, "SCRIPT")) {	if (!strcasecmp(str, "SCRIPT")) {
mode = 1;	mode = 1;
if (setUIDGID(flg, proc.proc_name) == -1)	if (setUIDGID(flg, AIT_GET_STR(&proc.proc_name)) == -1)
return -1;	return -1;
} else if (!strcasecmp(str, "FILE")) {	} else if (!strcasecmp(str, "FILE")) {
mode = 2;	mode = 2;
if (setUIDGID(flg, proc.proc_name) == -1)	if (setUIDGID(flg, AIT_GET_STR(&proc.proc_name)) == -1)
return -1;	return -1;
} else if (!strcasecmp(str, "DIR") &&	} else if (!strcasecmp(str, "DIR") &&
(str = (char*) cfg_GetAttribute(&cfg, CFG("global"), CFG("directory")))) {	(str = cfg_getAttribute(&cfg, "global", "directory"))) {
mode = 3;	mode = 3;
if (!(flg & 8))	if (!(flg & SUX_GET_DIR))
strlcpy(proc.proc_dir, str, sizeof proc.proc_dir);	AIT_SET_STR(&proc.proc_dir, str);

if (setUIDGID(flg, proc.proc_dir) == -1)	if (setUIDGID(flg, AIT_GET_STR(&proc.proc_dir)) == -1)
return -1;	return -1;
} else {	} else {
Err("Error:: Unknown mode %s", str);	Err("Error:: Unknown mode %s", str);
return -1;	return -1;
}	}
if (!(flg & 4)) {	if (!(flg & SUX_GET_PRIO)) {
str = (char*) cfg_GetAttribute(&cfg, CFG("global"), CFG("priority"));	str = cfg_getAttribute(&cfg, "global", "priority");
if (str)	if (str)
proc.proc_prio = strtol(str, NULL, 10);	AIT_SET_I32(&proc.proc_prio, strtol(str, NULL, 10));
}	}

/* find associate extension */	/* find associate extension */
str = strrchr(proc.proc_name, '.');	str = strrchr(AIT_GET_STR(&proc.proc_name), '.');
if (str) {	if (str) {
str++;	str++;
str = (*str) ? str : "default";	str = (*str) ? str : "default";
switch (cfg_LoadAttribute(&cfg, CFG("associate"), CFG(str),	switch (cfg_loadAttribute(&cfg, "associate", str, &proc.proc_cmd, NULL)) {
CFG(proc.proc_cmd), sizeof proc.proc_cmd, NULL)) {
case -1:	case -1:
Err("Error:: can`t load attribute #%d - %s\n", cfg_GetErrno(), cfg_GetError());	ELIBERR(cfg);
return -1;	return -1;
case 0:	case 0:
cfg_LoadAttribute(&cfg, CFG("associate"), CFG("default"),	cfg_loadAttribute(&cfg, "associate", "default", &proc.proc_cmd, DEFAULT_CMD);
CFG(proc.proc_cmd), sizeof proc.proc_cmd, DEFAULT_CMD);
}	}
} else	} else
strlcpy(proc.proc_cmd, DEFAULT_CMD, sizeof proc.proc_cmd);	AIT_SET_STR(&proc.proc_cmd, DEFAULT_CMD);

return 0;	return 0;
}	}

static int	static int
Run(char **argv)	Run(char **argv, char flg)
{	{
char *args, cmd;	char *args, cmd;
array_t acmd, aarg;	array_t acmd, aarg;
Line 196 Run(char **argv)	Line 211 Run(char **argv)
if (!argv)	if (!argv)
return -1;	return -1;

n = io_arrayMake(proc.proc_cmd, 0, " \t", &acmd);	n = array_Args(AIT_GET_STR(&proc.proc_cmd), 0, " \t", &acmd);
if (n < 1)	if (n < 1)
return -1;	return -1;
if (!(aarg = io_arrayFrom((const char**) argv, 0))) {	if (!(aarg = array_From((const char***) &argv, 0))) {
io_arrayDestroy(&acmd);	array_Destroy(&acmd);
return -1;	return -1;
} else if (io_arrayGet(acmd, 0, char) == '!') {	} else if (array(acmd, 0, char) == '!') {
if (io_arrayGrow(acmd, 0)) {	if (array_Grow(acmd, 0, 0)) {
io_arrayDestroy(&aarg);	array_Destroy(&aarg);
io_arrayDestroy(&acmd);	array_Destroy(&acmd);
return -1;	return -1;
}	}
cmd = io_arrayGet(aarg, 0, char*);	cmd = array(aarg, 0, char*);
} else	} else
cmd = io_arrayGet(acmd, 0, char*);	cmd = array(acmd, 0, char*);

if (io_arrayConcat(acmd, aarg) == -1) {	if (array_Concat(acmd, aarg) == -1) {
io_arrayDestroy(&aarg);	array_Destroy(&aarg);
io_arrayDestroy(&acmd);	array_Destroy(&acmd);
return -1;	return -1;
}	}
io_arrayDestroy(&aarg);	array_Destroy(&aarg);
if (!(args = io_arrayTo(acmd))) {	if (!(args = array_To(acmd))) {
io_arrayDestroy(&acmd);	array_Destroy(&acmd);
return -1;	return -1;
}	}
io_arrayDestroy(&acmd);	array_Destroy(&acmd);

if (SetClass()) {	if (SetClass()) {
if (args)	if (args)
free(args);	e_free(args);
return -1;	return -1;
}	}

/*	if (flg & SUX_GET_FORCE) {
if (setgid(proc.proc_gid) == -1) {	if (setgid(AIT_GET_I16(&proc.proc_gid)) == -1) {
Err("Error:: setgid #%d - %s\n", errno, strerror(errno));	ESYSERR(0);
if (args)	if (args)
free(args);	free(args);
return -1;	return -1;
	}
	if (setuid(AIT_GET_I16(&proc.proc_uid)) == -1) {
	ESYSERR(0);
	if (args)
	free(args);
	return -1;
	}
	if (setpriority(PRIO_PROCESS, 0, AIT_GET_I32(&proc.proc_prio)) == -1) {
	ESYSERR(0);
	if (args)
	free(args);
	return -1;
	}
}	}
if (setuid(proc.proc_uid) == -1) {
Err("Error:: setuid #%d - %s\n", errno, strerror(errno));
if (args)
free(args);
return -1;
}
if (setpriority(PRIO_PROCESS, 0, proc.proc_prio) == -1) {
Err("Error:: setpriority #%d - %s\n", errno, strerror(errno));
if (args)
free(args);
return -1;
}
*/

Log(0, "UID:GID=%d:%d Prio=%d Class=%s Name=%s Dir=%s Cmd=%s Script=%s",	Log(0, "UID:GID=%d:%d Prio=%d Class=%s Name=%s Dir=%s Cmd=%s Script=%s",
proc.proc_uid, proc.proc_gid, proc.proc_prio, proc.proc_class,	proc.proc_uid, proc.proc_gid, proc.proc_prio, AIT_GET_STR(&proc.proc_class),
proc.proc_name, proc.proc_dir, proc.proc_cmd, getenv("PATH_TRANSLATED"));	AIT_GET_STR(&proc.proc_name), AIT_GET_STR(&proc.proc_dir),
	AIT_GET_STR(&proc.proc_cmd), getenv("PATH_TRANSLATED"));

if (3 <= Verbose) {	EVERBS(3) {
char **el = args - 1;	char **el = args - 1;
while (*++el)	while (*++el)
Log(3, "args: %s", *el);	Log(3, "args: %s", *el);
Line 266 Run(char **argv)	Line 282 Run(char **argv)
execve(cmd, args, environ);	execve(cmd, args, environ);
if (args)	if (args)
free(args);	free(args);
Err("Error:: in exec() #%d - %s", errno, strerror(errno));	ESYSERR(0);
return -1;	return -1;
}	}

Line 274 Run(char **argv)	Line 290 Run(char **argv)
int	int
main(int argc, char **argv)	main(int argc, char **argv)
{	{
char ch, str, szCfg[MAXPATHLEN], *pp, flg = 0;	char ch, str, wrk, szCfg[MAXPATHLEN], **pp, flg = 0;
struct passwd *pass;	struct passwd *pass;
struct group *grp;	struct group *grp;
FILE *f;	FILE *f;
Line 282 main(int argc, char **argv)	Line 298 main(int argc, char **argv)
initProg();	initProg();
strlcpy(szCfg, DEFAULT_CONFIG, sizeof szCfg);	strlcpy(szCfg, DEFAULT_CONFIG, sizeof szCfg);

while ((ch = getopt(argc, argv, "hvC:c:u:g:p:d:l:")) != -1)	while ((ch = getopt(argc, argv, "hvoC:c:u:g:p:d:l:")) != -1)
switch (ch) {	switch (ch) {
case 'l':	case 'l':
f = fopen(optarg, "a");	f = fopen(optarg, "a");
Line 295 main(int argc, char **argv)	Line 311 main(int argc, char **argv)
lf = f;	lf = f;
break;	break;
case 'd':	case 'd':
strlcpy(proc.proc_dir, optarg, sizeof proc.proc_dir);	AIT_SET_STR(&proc.proc_dir, optarg);
flg \|= 8;	flg \|= SUX_GET_DIR;
break;	break;
case 'p':	case 'p':
proc.proc_prio = strtol(optarg, NULL, 0);	AIT_SET_I32(&proc.proc_prio, strtol(optarg, NULL, 0));
flg \|= 4;	flg \|= SUX_GET_PRIO;
break;	break;
case 'g':	case 'g':
setgrent();	setgrent();
grp = getgrnam(optarg);	grp = getgrnam(optarg);
if (grp) {	if (grp) {
proc.proc_gid = grp->gr_gid;	AIT_SET_I16(&proc.proc_gid, grp->gr_gid);
flg \|= 2;	flg \|= SUX_GET_GID;
} else	} else
Err("Error:: Group not found!");	Err("Error:: Group not found!");
endgrent();	endgrent();
Line 316 main(int argc, char **argv)	Line 332 main(int argc, char **argv)
setpwent();	setpwent();
pass = getpwnam(optarg);	pass = getpwnam(optarg);
if (pass) {	if (pass) {
proc.proc_uid = pass->pw_uid;	AIT_SET_I16(&proc.proc_uid, pass->pw_uid);
flg \|= 1;	flg \|= SUX_GET_UID;
} else	} else
Err("Error:: User not found!");	Err("Error:: User not found!");
endpwent();	endpwent();
Line 328 main(int argc, char **argv)	Line 344 main(int argc, char **argv)
case 'C':	case 'C':
if (chroot(optarg) == -1)	if (chroot(optarg) == -1)
Err("Error:: chroot to dir");	Err("Error:: chroot to dir");
	if ((str = getenv("PATH_TRANSLATED")))
	if ((wrk = strstr(str, optarg)))
	setenv("PATH_TRANSLATED", str + strlen(optarg), 42);
break;	break;
	case 'o':
	flg \|= SUX_GET_FORCE;
	break;
case 'v':	case 'v':
Verbose++;	e_incVerbose;
break;	break;
case 'h':	case 'h':
default:	default:
Usage();	Usage();
	endProg();
if (fileno(lf) > 2)	if (fileno(lf) > 2)
fclose(lf);	fclose(lf);
return 1;	return 1;
Line 342 main(int argc, char **argv)	Line 365 main(int argc, char **argv)
argc -= optind;	argc -= optind;
argv += optind;	argv += optind;

if (2 <= Verbose) {	EVERBS(2) {
for (pp = argv; *pp; pp++)	for (pp = argv; *pp; pp++)
Log(2, "Args=%s\n", *pp);	Log(2, "Args=%s\n", *pp);
for (pp = environ; *pp; pp++)	for (pp = environ; *pp; pp++)
Line 352 main(int argc, char **argv)	Line 375 main(int argc, char **argv)
if (!argc) {	if (!argc) {
if (!(str = getenv("PATH_TRANSLATED"))) {	if (!(str = getenv("PATH_TRANSLATED"))) {
Usage();	Usage();
	endProg();
if (fileno(lf) > 2)	if (fileno(lf) > 2)
fclose(lf);	fclose(lf);
return 1;	return 1;
} else	} else
strlcpy(proc.proc_name, str, sizeof proc.proc_name);	AIT_SET_STR(&proc.proc_name, str);
} else	} else
strlcpy(proc.proc_name, *argv, sizeof proc.proc_name);	AIT_SET_STR(&proc.proc_name, *argv);
Log(2, "Try to load config %s", szCfg);	Log(2, "Try to load config %s", szCfg);
if (LoadConfig(szCfg, &cfg)) {	if (cfgLoadConfig(szCfg, &cfg)) {
Err("Error:: can`t load config #%d - %s\n", cfg_GetErrno(), cfg_GetError());	ELIBERR(cfg);
	endProg();
if (fileno(lf) > 2)	if (fileno(lf) > 2)
fclose(lf);	fclose(lf);
return 2;	return 2;
} else	} else
if (LoadCfgData(flg) == -1) {	if (LoadCfgData(flg) == -1) {
UnloadConfig(&cfg);	cfgUnloadConfig(&cfg);
	endProg();
if (fileno(lf) > 2)	if (fileno(lf) > 2)
fclose(lf);	fclose(lf);
closelog();	closelog();
return 3;	return 3;
}	}
UnloadConfig(&cfg);	cfgUnloadConfig(&cfg);

if (Run(argv) == -1) {	if (Run(argv, flg) == -1) {
	endProg();
if (fileno(lf) > 2)	if (fileno(lf) > 2)
fclose(lf);	fclose(lf);
closelog();	closelog();
return 4;	return 4;
}	}

	endProg();
if (fileno(lf) > 2)	if (fileno(lf) > 2)
fclose(lf);	fclose(lf);
closelog();	closelog();

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.2.2.1
changed lines
	Added in v.1.3.2.3