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.3.2.2 and 1.3.2.3

version 1.3.2.2, 2013/04/09 08:29:20	version 1.3.2.3, 2013/04/09 08:56:57
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 66 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 78 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 88 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))
AIT_SET_I16(&proc.proc_uid, sb.st_uid);	AIT_SET_I16(&proc.proc_uid, sb.st_uid);
if (!(flg & 2))	if (!(flg & SUX_GET_GID))
AIT_SET_I16(&proc.proc_gid, sb.st_gid);	AIT_SET_I16(&proc.proc_gid, sb.st_gid);

return 0;	return 0;
Line 108 SetClass()	Line 121 SetClass()

pass = getpwuid(AIT_GET_I16(&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
Line 155 LoadCfgData(char flg)	Line 168 LoadCfgData(char flg)
} else if (!strcasecmp(str, "DIR") &&	} else if (!strcasecmp(str, "DIR") &&
(str = cfg_getAttribute(&cfg, "global", "directory"))) {	(str = cfg_getAttribute(&cfg, "global", "directory"))) {
mode = 3;	mode = 3;
if (!(flg & 8))	if (!(flg & SUX_GET_DIR))
AIT_SET_STR(&proc.proc_dir, str);	AIT_SET_STR(&proc.proc_dir, str);

if (setUIDGID(flg, AIT_GET_STR(&proc.proc_dir)) == -1)	if (setUIDGID(flg, AIT_GET_STR(&proc.proc_dir)) == -1)
Line 164 LoadCfgData(char flg)	Line 177 LoadCfgData(char flg)
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 = cfg_getAttribute(&cfg, "global", "priority");	str = cfg_getAttribute(&cfg, "global", "priority");
if (str)	if (str)
AIT_SET_I32(&proc.proc_prio, strtol(str, NULL, 10));	AIT_SET_I32(&proc.proc_prio, strtol(str, NULL, 10));
Line 189 LoadCfgData(char flg)	Line 202 LoadCfgData(char flg)
}	}

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 228 Run(char **argv)	Line 241 Run(char **argv)

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, AIT_GET_STR(&proc.proc_class),	proc.proc_uid, proc.proc_gid, proc.proc_prio, AIT_GET_STR(&proc.proc_class),
AIT_GET_STR(&proc.proc_name), AIT_GET_STR(&proc.proc_dir),	AIT_GET_STR(&proc.proc_name), AIT_GET_STR(&proc.proc_dir),
AIT_GET_STR(&proc.proc_cmd), getenv("PATH_TRANSLATED"));	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 269 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 285 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 299 main(int argc, char **argv)	Line 312 main(int argc, char **argv)
break;	break;
case 'd':	case 'd':
AIT_SET_STR(&proc.proc_dir, optarg);	AIT_SET_STR(&proc.proc_dir, optarg);
flg \|= 8;	flg \|= SUX_GET_DIR;
break;	break;
case 'p':	case 'p':
AIT_SET_I32(&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) {
AIT_SET_I16(&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 320 main(int argc, char **argv)	Line 333 main(int argc, char **argv)
pass = getpwnam(optarg);	pass = getpwnam(optarg);
if (pass) {	if (pass) {
AIT_SET_I16(&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 335 main(int argc, char **argv)	Line 348 main(int argc, char **argv)
if ((wrk = strstr(str, optarg)))	if ((wrk = strstr(str, optarg)))
setenv("PATH_TRANSLATED", str + strlen(optarg), 42);	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 348 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 358 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;
Line 367 main(int argc, char **argv)	Line 385 main(int argc, char **argv)
AIT_SET_STR(&proc.proc_name, *argv);	AIT_SET_STR(&proc.proc_name, *argv);
Log(2, "Try to load config %s", szCfg);	Log(2, "Try to load config %s", szCfg);
if (cfgLoadConfig(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) {
cfgUnloadConfig(&cfg);	cfgUnloadConfig(&cfg);
	endProg();
if (fileno(lf) > 2)	if (fileno(lf) > 2)
fclose(lf);	fclose(lf);
closelog();	closelog();
Line 381 main(int argc, char **argv)	Line 401 main(int argc, char **argv)
}	}
cfgUnloadConfig(&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.3.2.2
changed lines
	Added in v.1.3.2.3