--- suX/src/sux.c 2013/04/10 00:04:11 1.5 +++ suX/src/sux.c 2015/06/17 14:14:17 1.6 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ - * $Id: sux.c,v 1.5 2013/04/10 00:04:11 misho Exp $ + * $Id: sux.c,v 1.6 2015/06/17 14:14:17 misho Exp $ * *************************************************************************/ #include "global.h" @@ -26,7 +26,7 @@ Log(int lvl, const char *fmt, ...) vfprintf(lf, fmt, lst); va_end(lst); fprintf(lf, "\n"); - vsyslog(LOG_WARNING, fmt, cp); + vsyslog(LOG_INFO, fmt, cp); va_end(cp); } } @@ -48,7 +48,7 @@ Err(const char *fmt, ...) static inline void DumpProc(const char *txt) { - Log(0, "%s:: uid:gid=%d:%d UID:GID=%d:%d Prio=%d Class=%s Name=%s Dir=%s Cmd=%s " + Log(1, "%s:: uid:gid=%d:%d UID:GID=%d:%d Prio=%d Class=%s Name=%s Dir=%s Cmd=%s " "Script=%s From=%s:%s Get=%s", txt ? txt : __func__, geteuid(), getegid(), AIT_GET_I16(&proc.proc_uid), AIT_GET_I16(&proc.proc_gid), AIT_GET_I32(&proc.proc_prio), @@ -96,7 +96,7 @@ Usage() { printf( " -= suX =- suExecutor designed for web based applicaions\n" "(C)`11 AITNET ltd - Sofia/Bulgaria - \n\n" - " Syntax: %s [options] [arguments]\n" + " Syntax: %s [options] [arguments]\n" "\t-u \t\t\tUser for suID\n" "\t-g \t\t\tGroup for suID\n" "\t-p \t\tExecute with priority\n" @@ -124,7 +124,7 @@ setUIDGID(char flg, const char *name) uid = sb.st_uid; gid = sb.st_gid; } else { - pass = getpwnam(getenv("SUX_USER")); + pass = getpwnam(getenv("SUX_USER") ? getenv("SUX_USER") : DEFAULT_SUX_USER); if (!pass) { Err("Error:: User %s not found", getenv("SUX_USER")); endpwent(); @@ -180,9 +180,9 @@ LoadCfgData(char flg) Err("Error:: Unknown mode ..."); return -1; } - if (!strcasecmp(str, "SCRIPT") && getenv("SUX_USER")) { + if (!strcasecmp(str, "SCRIPT")) { mode = 1; - if (setUIDGID(flg, NULL) == -1) + if (setUIDGID(flg, (getenv("SUX_USER") ? NULL : getenv("PATH_TRANSLATED"))) == -1) return -1; } else if (!strcasecmp(str, "FILE")) { mode = 2; @@ -238,7 +238,9 @@ Run(char **argv, char flg) if (!(aarg = array_From((const char***) &argv, 0))) { array_Destroy(&acmd); return -1; - } else if (*array(acmd, 0, char*) == '!') { + } + /* '!' exclude associated wrapper aka direct args execution */ + if (*array(acmd, 0, char*) == '!') { if (array_Grow(acmd, 0, 0)) { array_Destroy(&aarg); array_Destroy(&acmd); @@ -248,7 +250,7 @@ Run(char **argv, char flg) } else cmd = array(acmd, 0, char*); - if (array_Concat(acmd, aarg) == -1) { + if (!(flg & SUX_GET_STDIN) && array_Concat(acmd, aarg) == -1) { array_Destroy(&aarg); array_Destroy(&acmd); return -1; @@ -275,14 +277,14 @@ Run(char **argv, char flg) goto err; } - DumpProc(__func__); - EVERBS(3) { char **el = args - 1; while (*++el) Log(3, "args: %s", *el); } + DumpProc(__func__); + fflush(lf); execve(cmd, args, environ); @@ -388,8 +390,12 @@ main(int argc, char **argv) return 1; } else AIT_SET_STR(&proc.proc_name, str); - } else + } else if (strcmp(*argv, "-")) AIT_SET_STR(&proc.proc_name, *argv); + else { + flg |= SUX_GET_STDIN; + AIT_SET_STR(&proc.proc_name, "-.stdin"); /* hack for associate to stdin */ + } Log(2, "Try to load config %s", szCfg); if (cfgLoadConfig(szCfg, &cfg)) { ELIBERR(cfg);