--- suexec.c.orig Wed Mar 5 18:50:29 2003
+++ suexec.c Thu Dec 11 20:51:55 2003
@@ -91,6 +91,18 @@

#include

+/* patch activates rlimits via login.conf including maxproc entry
+ * do not forget add -lutil -lkmv to Makefile
+ * any questions and suggestions dard at mail.ru
+ * credits: sg at di-net.ru
+ */
+
+#include
+#include
+#include
+#include
+#include
+
#include "suexec.h"

/*
@@ -280,6 +292,11 @@
struct group *gr; /* group entry holder */
struct stat dir_info; /* directory info holder */
struct stat prg_info; /* program info holder */
+ struct login_cap_t *lc;
+ kvm_t *kd;
+ static struct kinfo_proc *pbase;
+ static int nproc=0; /* number of user running processes */
+ rlim_t max_proc=1000; /* maximum allowed processes from login.conf */

/*
* Start with a "clean" environment
@@ -447,9 +464,74 @@
/*
* Save these for later since initgroups will hose the struct
*/
+ target_homedir = strdup(pw->pw_dir);
+
+ /*
+ * Stat the cwd and verify it is a directory, or error out.
+ */
+ if (getcwd(cwd, AP_MAXPATH) == NULL) {
+ log_err("emerg: cannot get current working directory\n");
+ exit(111);
+ }
+
+ if (((lstat(cwd, &dir_info)) != 0) || !(S_ISDIR(dir_info.st_mode))) {
+ log_err("error: cannot stat directory: (%s)\n", cwd);
+ exit(115);
+ }
+
+ /*
+ * Error out if cwd is writable by others.
+ */
+ if ((dir_info.st_mode & S_IWOTH) || (dir_info.st_mode & S_IWGRP)) {
+ log_err("error: directory is writable by others: (%s)\n", cwd);
+ exit(116);
+ }
+
+ /*
+ * Error out if we cannot stat the program.
+ */
+ if (((lstat(cmd, &prg_info)) != 0) || (S_ISLNK(prg_info.st_mode))) {
+ log_err("error: cannot stat program: (%s)\n", cmd);
+ exit(117);
+ }
+
+ /*
+ * Error out if the program is writable by others.
+ */
+ if ((prg_info.st_mode & S_IWOTH) || (prg_info.st_mode & S_IWGRP)) {
+ log_err("error: file is writable by others: (%s/%s)\n", cwd, cmd);
+ exit(118);
+ }
+
+ /*
+ * Error out if the file is setuid or setgid.
+ */
+ if ((prg_info.st_mode & S_ISUID) || (prg_info.st_mode & S_ISGID)) {
+ log_err("error: file is either setuid or setgid: (%s/%s)\n", cwd, cmd);
+ exit(119);
+ }
+
+ /*
+ * Error out if the target name/group is different from
+ * the name/group of the cwd or the program.
+ */
+ if ((prg_info.st_uid != dir_info.st_uid) ||
+ (prg_info.st_gid != dir_info.st_gid)) {
+ log_err("error: program uid/gid (%ld/%ld) mismatch "
+ "with directory (%ld/%ld)\n",
+ prg_info.st_uid, prg_info.st_gid,
+ dir_info.st_uid, dir_info.st_gid);
+ exit(120);
+ }
+
+ pw=getpwuid(prg_info.st_uid);
+ if (pw==NULL) {
+ log_err("error: invalid uid %ld\n",prg_info.st_uid);
+ exit(105);
+ }
+
uid = pw->pw_uid;
actual_uname = strdup(pw->pw_name);
- target_homedir = strdup(pw->pw_dir);

/*
* Log the transaction here to be sure we have an open log
@@ -478,25 +560,44 @@
exit(108);
}

+ if ((kd = kvm_open(NULL,NULL,NULL,O_RDONLY,"kvm_open")) == NULL) {
+ log_err("crit: Error opening kernel memory.\n");
+ exit(199);
+ }
+ pbase = kvm_getprocs(kd, KERN_PROC_UID, uid, &nproc);
+ kvm_close(kd);
+
+ lc=login_getpwclass(pw);
+ if ((max_proc = login_getcapnum(lc, "maxproc", max_proc, max_proc)) == RLIM_INFINITY) {
+ log_err("info: maxproc is infinity for user id %d\n",uid);
+ }
+ login_close(lc);
+
+ if (((rlim_t)nproc) > max_proc) {
+ log_err("crit: maxproc limit exceeded by uid %d\n",uid);
+ exit(199);
+ }
+ setusercontext(lc,pw,pw->pw_uid,LOGIN_SETALL&~LOGIN_SETLOGIN);
+
/*
* Change UID/GID here so that the following tests work over NFS.
*
* Initialize the group access list for the target user,
* and setgid() to the target group. If unsuccessful, error out.
*/
- if (((setgid(gid)) != 0) || (initgroups(actual_uname, gid) != 0)) {
+/* if (((setgid(gid)) != 0) || (initgroups(actual_uname, gid) != 0)) {
log_err("emerg: failed to setgid (%ld: %s)\n", gid, cmd);
exit(109);
}
-
+*/
/*
* setuid() to the target user. Error out on fail.
*/
- if ((setuid(uid)) != 0) {
+/* if ((setuid(uid)) != 0) {
log_err("emerg: failed to setuid (%ld: %s)\n", uid, cmd);
exit(110);
}
-
+*/
/*
* Get the current working directory, as well as the proper
* document root (dependant upon whether or not it is a
@@ -505,10 +606,6 @@
* Use chdir()s and getcwd()s to avoid problems with symlinked
* directories. Yuck.
*/
- if (getcwd(cwd, AP_MAXPATH) == NULL) {
- log_err("emerg: cannot get current working directory\n");
- exit(111);
- }

if (userdir) {
if (((chdir(target_homedir)) != 0) ||
@@ -534,61 +631,6 @@
exit(114);
}

- /*
- * Stat the cwd and verify it is a directory, or error out.
- */
- if (((lstat(cwd, &dir_info)) != 0) || !(S_ISDIR(dir_info.st_mode))) {
- log_err("error: cannot stat directory: (%s)\n", cwd);
- exit(115);
- }
-
- /*
- * Error out if cwd is writable by others.
- */
- if ((dir_info.st_mode & S_IWOTH) || (dir_info.st_mode & S_IWGRP)) {
- log_err("error: directory is writable by others: (%s)\n", cwd);
- exit(116);
- }
-
- /*
- * Error out if we cannot stat the program.
- */
- if (((lstat(cmd, &prg_info)) != 0) || (S_ISLNK(prg_info.st_mode))) {
- log_err("error: cannot stat program: (%s)\n", cmd);
- exit(117);
- }
-
- /*
- * Error out if the program is writable by others.
- */
- if ((prg_info.st_mode & S_IWOTH) || (prg_info.st_mode & S_IWGRP)) {
- log_err("error: file is writable by others: (%s/%s)\n", cwd, cmd);
- exit(118);
- }
-
- /*
- * Error out if the file is setuid or setgid.
- */
- if ((prg_info.st_mode & S_ISUID) || (prg_info.st_mode & S_ISGID)) {
- log_err("error: file is either setuid or setgid: (%s/%s)\n", cwd, cmd);
- exit(119);
- }
-
- /*
- * Error out if the target name/group is different from
- * the name/group of the cwd or the program.
- */
- if ((uid != dir_info.st_uid) ||
- (gid != dir_info.st_gid) ||
- (uid != prg_info.st_uid) ||
- (gid != prg_info.st_gid)) {
- log_err("error: target uid/gid (%ld/%ld) mismatch "
- "with directory (%ld/%ld) or program (%ld/%ld)\n",
- uid, gid,
- dir_info.st_uid, dir_info.st_gid,
- prg_info.st_uid, prg_info.st_gid);
- exit(120);
- }
/*
* Error out if the program is not executable for the user.
* Otherwise, she won't find any error in the logs except for