--- suX/src/sux.c 2013/04/09 08:29:20 1.3.2.2 +++ suX/src/sux.c 2013/04/10 00:04:11 1.5 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ - * $Id: sux.c,v 1.3.2.2 2013/04/09 08:29:20 misho Exp $ + * $Id: sux.c,v 1.5 2013/04/10 00:04:11 misho Exp $ * *************************************************************************/ #include "global.h" @@ -20,7 +20,7 @@ Log(int lvl, const char *fmt, ...) { va_list lst, cp; - if (lvl <= Verbose) { + EVERBS(lvl) { va_start(lst, fmt); va_copy(cp, lst); vfprintf(lf, fmt, lst); @@ -45,16 +45,29 @@ Err(const char *fmt, ...) va_end(cp); } -static void -initProg() +static inline void +DumpProc(const char *txt) { - char d[MAXPATHLEN]; + Log(0, "%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), + AIT_GET_STR(&proc.proc_class), AIT_GET_STR(&proc.proc_name), + AIT_GET_STR(&proc.proc_dir), AIT_GET_STR(&proc.proc_cmd), + getenv("PATH_TRANSLATED"), getenv("REMOTE_ADDR"), + getenv("REMOTE_PORT"), getenv("REQUEST_URI")); +} +static int +initProg() +{ 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); + AIT_INIT_VAL2(&proc.proc_class, string); + AIT_INIT_VAL2(&proc.proc_dir, string); + AIT_INIT_VAL2(&proc.proc_name, string); + AIT_INIT_VAL2(&proc.proc_cmd, string); #if 0 lf = fopen(DEFAULT_LOG, "a"); @@ -63,9 +76,22 @@ initProg() lf = stdout; openlog(PACKAGE_NAME, LOG_CONS | LOG_PID | LOG_NDELAY, LOG_USER); + return 0; } 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() { printf( " -= suX =- suExecutor designed for web based applicaions\n" @@ -78,6 +104,7 @@ Usage() "\t-C \t\t\tChroot to directory\n" "\t-c \t\t\tConfig file\n" "\t-l \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-h\t\t\t\tThis help screen!\n\n", PACKAGE_NAME); } @@ -86,51 +113,60 @@ static inline int setUIDGID(char flg, const char *name) { struct stat sb; + struct passwd *pass; + short uid, gid; - if (stat(name, &sb) == -1) { - Err("Error:: %s stat #%d - %s", name, errno, strerror(errno)); - return -1; + if (name) { + if (stat(name, &sb) == -1) { + ESYSERR(0); + return -1; + } + uid = sb.st_uid; + gid = sb.st_gid; + } else { + pass = getpwnam(getenv("SUX_USER")); + if (!pass) { + Err("Error:: User %s not found", getenv("SUX_USER")); + endpwent(); + return -1; + } + uid = pass->pw_uid; + gid = pass->pw_gid; + endpwent(); } - if (!(flg & 1)) - AIT_SET_I16(&proc.proc_uid, sb.st_uid); - if (!(flg & 2)) - AIT_SET_I16(&proc.proc_gid, sb.st_gid); + if (!(flg & SUX_GET_UID)) + AIT_SET_I16(&proc.proc_uid, uid); + if (!(flg & SUX_GET_GID)) + AIT_SET_I16(&proc.proc_gid, gid); return 0; } static inline int -SetClass() +setClassDir() { - login_cap_t *cap; struct passwd *pass; + int ret = 0; pass = getpwuid(AIT_GET_I16(&proc.proc_uid)); if (!pass) { - Err("Error:: User with this UID %d not found", proc.proc_uid); - endpwent(); - return -1; - } else + Err("Error:: User with this UID %d not found", AIT_GET_I16(&proc.proc_uid)); + ret = -1; + } else { AIT_SET_STR(&proc.proc_class, pass->pw_class); + AIT_SET_STR(&proc.proc_dir, pass->pw_dir); - cap = login_getclass(AIT_GET_STR(&proc.proc_class)); - if (!cap) { - Err("Error:: Cant get login class %s", AIT_GET_STR(&proc.proc_class)); - endpwent(); - return -1; + if (setusercontext(NULL, pass, AIT_GET_I16(&proc.proc_uid), + LOGIN_SETLOGIN | LOGIN_SETGROUP | LOGIN_SETUSER | + LOGIN_SETPRIORITY | LOGIN_SETRESOURCES)) { + Err("Error:: Can't set login class %s", AIT_GET_STR(&proc.proc_class)); + ret = -1; + } } - if (setusercontext(cap, pass, AIT_GET_I16(&proc.proc_uid), LOGIN_SETALL)) { - Err("Error:: Cant set login class %s", AIT_GET_STR(&proc.proc_class)); - login_close(cap); - endpwent(); - return -1; - } - - login_close(cap); endpwent(); - return 0; + return ret; } static int @@ -144,27 +180,24 @@ LoadCfgData(char flg) Err("Error:: Unknown mode ..."); return -1; } - if (!strcasecmp(str, "SCRIPT")) { + if (!strcasecmp(str, "SCRIPT") && getenv("SUX_USER")) { mode = 1; - if (setUIDGID(flg, AIT_GET_STR(&proc.proc_name)) == -1) + if (setUIDGID(flg, NULL) == -1) return -1; } else if (!strcasecmp(str, "FILE")) { mode = 2; if (setUIDGID(flg, AIT_GET_STR(&proc.proc_name)) == -1) return -1; - } else if (!strcasecmp(str, "DIR") && - (str = cfg_getAttribute(&cfg, "global", "directory"))) { + } else if (!strcasecmp(str, "DIR")) { mode = 3; - if (!(flg & 8)) - AIT_SET_STR(&proc.proc_dir, str); - - if (setUIDGID(flg, AIT_GET_STR(&proc.proc_dir)) == -1) + str = AIT_GET_STR(&proc.proc_dir) ? AIT_GET_STR(&proc.proc_dir) : "."; + if (setUIDGID(flg, str) == -1) return -1; } else { Err("Error:: Unknown mode %s", str); return -1; } - if (!(flg & 4)) { + if (!(flg & SUX_GET_PRIO)) { str = cfg_getAttribute(&cfg, "global", "priority"); if (str) AIT_SET_I32(&proc.proc_prio, strtol(str, NULL, 10)); @@ -180,7 +213,8 @@ LoadCfgData(char flg) ELIBERR(cfg); return -1; case 0: - cfg_loadAttribute(&cfg, "associate", "default", &proc.proc_cmd, DEFAULT_CMD); + cfg_loadAttribute(&cfg, "associate", "default", + &proc.proc_cmd, DEFAULT_CMD); } } else AIT_SET_STR(&proc.proc_cmd, DEFAULT_CMD); @@ -189,7 +223,7 @@ LoadCfgData(char flg) } static int -Run(char **argv) +Run(char **argv, char flg) { char **args, *cmd; array_t *acmd, *aarg; @@ -226,39 +260,24 @@ Run(char **argv) } array_Destroy(&acmd); - if (SetClass()) { + if (setClassDir()) { if (args) - free(args); + e_free(args); return -1; } - /* - if (setgid(proc.proc_gid) == -1) { - Err("Error:: setgid #%d - %s\n", errno, strerror(errno)); - if (args) - free(args); - return -1; + if (flg & SUX_GET_FORCE) { + if (setegid(AIT_GET_I16(&proc.proc_gid)) == -1) + goto err; + if (seteuid(AIT_GET_I16(&proc.proc_uid)) == -1) + goto err; + if (setpriority(PRIO_PROCESS, 0, AIT_GET_I32(&proc.proc_prio)) == -1) + goto err; } - 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", - 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_cmd), getenv("PATH_TRANSLATED")); + DumpProc(__func__); - if (3 <= Verbose) { + EVERBS(3) { char **el = args - 1; while (*++el) Log(3, "args: %s", *el); @@ -267,9 +286,10 @@ Run(char **argv) fflush(lf); execve(cmd, args, environ); +err: + ESYSERR(0); if (args) - free(args); - Err("Error:: in exec() #%d - %s", errno, strerror(errno)); + e_free(args); return -1; } @@ -285,7 +305,7 @@ main(int argc, char **argv) initProg(); 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) { case 'l': f = fopen(optarg, "a"); @@ -299,18 +319,18 @@ main(int argc, char **argv) break; case 'd': AIT_SET_STR(&proc.proc_dir, optarg); - flg |= 8; + flg |= SUX_GET_DIR; break; case 'p': AIT_SET_I32(&proc.proc_prio, strtol(optarg, NULL, 0)); - flg |= 4; + flg |= SUX_GET_PRIO; break; case 'g': setgrent(); grp = getgrnam(optarg); if (grp) { AIT_SET_I16(&proc.proc_gid, grp->gr_gid); - flg |= 2; + flg |= SUX_GET_GID; } else Err("Error:: Group not found!"); endgrent(); @@ -320,7 +340,7 @@ main(int argc, char **argv) pass = getpwnam(optarg); if (pass) { AIT_SET_I16(&proc.proc_uid, pass->pw_uid); - flg |= 1; + flg |= SUX_GET_UID; } else Err("Error:: User not found!"); endpwent(); @@ -335,12 +355,16 @@ main(int argc, char **argv) if ((wrk = strstr(str, optarg))) setenv("PATH_TRANSLATED", str + strlen(optarg), 42); break; + case 'o': + flg |= SUX_GET_FORCE; + break; case 'v': - Verbose++; + e_incVerbose; break; case 'h': default: Usage(); + endProg(); if (fileno(lf) > 2) fclose(lf); return 1; @@ -348,7 +372,7 @@ main(int argc, char **argv) argc -= optind; argv += optind; - if (2 <= Verbose) { + EVERBS(2) { for (pp = argv; *pp; pp++) Log(2, "Args=%s\n", *pp); for (pp = environ; *pp; pp++) @@ -358,6 +382,7 @@ main(int argc, char **argv) if (!argc) { if (!(str = getenv("PATH_TRANSLATED"))) { Usage(); + endProg(); if (fileno(lf) > 2) fclose(lf); return 1; @@ -367,13 +392,15 @@ main(int argc, char **argv) AIT_SET_STR(&proc.proc_name, *argv); Log(2, "Try to load config %s", szCfg); if (cfgLoadConfig(szCfg, &cfg)) { - Err("Error:: can`t load config #%d - %s\n", cfg_GetErrno(), cfg_GetError()); + ELIBERR(cfg); + endProg(); if (fileno(lf) > 2) fclose(lf); return 2; } else if (LoadCfgData(flg) == -1) { cfgUnloadConfig(&cfg); + endProg(); if (fileno(lf) > 2) fclose(lf); closelog(); @@ -381,13 +408,15 @@ main(int argc, char **argv) } cfgUnloadConfig(&cfg); - if (Run(argv) == -1) { + if (Run(argv, flg) == -1) { + endProg(); if (fileno(lf) > 2) fclose(lf); closelog(); return 4; } + endProg(); if (fileno(lf) > 2) fclose(lf); closelog();