[gentoo-commits] gentoo-x86 commit in www-servers/lighttpd/files/1.4.18-r2: 03_all_lighttpd-1.4.11-errorlog-pipe.diff 04_all_lighttpd-1.4.13-deprecated-ldap-api.diff 05_all_lighttpd-fix-DoS.diff 06_all_lighttpd-1.4.18-mod_cgi_source_disclosure-changeset-211956.diff

[Thilo Bangert (bangert)]

bangert     08/03/01 17:34:54

  Added:                03_all_lighttpd-1.4.11-errorlog-pipe.diff
                        04_all_lighttpd-1.4.13-deprecated-ldap-api.diff
                        05_all_lighttpd-fix-DoS.diff
                        06_all_lighttpd-1.4.18-mod_cgi_source_disclosure-changeset-211956.diff
  Log:
  version bump - fix source disclosure - bug #211956
  (Portage version: 2.1.4.4)
   (Unsigned Manifest commit)

Revision  Changes    Path
1.1                  www-servers/lighttpd/files/1.4.18-r2/03_all_lighttpd-1.4.11-errorlog-pipe.diff

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/lighttpd/files/1.4.18-r2/03_all_lighttpd-1.4.11-errorlog-pipe.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/lighttpd/files/1.4.18-r2/03_all_lighttpd-1.4.11-errorlog-pipe.diff?rev=1.1&content-type=text/plain

Index: 03_all_lighttpd-1.4.11-errorlog-pipe.diff
===================================================================
diff -ur lighttpd-1.4.11.orig/src/base.h lighttpd-1.4.11/src/base.h
--- lighttpd-1.4.11.orig/src/base.h	2006-01-13 06:51:04.000000000 -0800
+++ lighttpd-1.4.11/src/base.h	2006-12-17 18:01:39.000000000 -0800
@@ -505,7 +505,7 @@
 	
 	/* the errorlog */
 	int errorlog_fd;
-	enum { ERRORLOG_STDERR, ERRORLOG_FILE, ERRORLOG_SYSLOG } errorlog_mode;
+	enum { ERRORLOG_STDERR, ERRORLOG_FILE, ERRORLOG_SYSLOG, ERRORLOG_PIPE } errorlog_mode;
 	buffer *errorlog_buf;
 	
 	fdevents *ev, *ev_ins;
diff -ur lighttpd-1.4.11.orig/src/log.c lighttpd-1.4.11/src/log.c
--- lighttpd-1.4.11.orig/src/log.c	2005-13-07 05:01:35.000000000 -0800
+++ lighttpd-1.4.11/src/log.c	2006-12-17 18:09:43.000000000 -0800
@@ -34,10 +34,11 @@
 /** 
  * open the errorlog
  * 
- * we have 3 possibilities:
+ * we have 4 possibilities:
  * - stderr (default)
  * - syslog 
  * - logfile
+ * - pipe
  * 
  * if the open failed, report to the user and die
  * 
@@ -57,21 +58,81 @@
 		srv->errorlog_mode = ERRORLOG_SYSLOG;
 	} else if (!buffer_is_empty(srv->srvconf.errorlog_file)) {
 		const char *logfile = srv->srvconf.errorlog_file->ptr;
-		
-		if (-1 == (srv->errorlog_fd = open(logfile, O_APPEND | O_WRONLY | O_CREAT | O_LARGEFILE, 0644))) {
-			log_error_write(srv, __FILE__, __LINE__, "SSSS", 
-					"opening errorlog '", logfile,
-					"' failed: ", strerror(errno));
-			
+
+		if (logfile[0] == '|') {
+#ifdef HAVE_FORK
+			/* create write pipe and spawn process */
+
+			int to_log_fds[2];
+			pid_t pid;
+
+			if (pipe(to_log_fds)) {
+				log_error_write(srv, __FILE__, __LINE__, "ss",
+				"pipe failed: ", strerror(errno));
+				return -1;
+			}
+
+			/* fork, execve */
+			switch (pid = fork()) {
+			case 0:
+				/* child */
+
+				close(STDIN_FILENO);
+				dup2(to_log_fds[0], STDIN_FILENO);
+				close(to_log_fds[0]);
+				/* not needed */
+				close(to_log_fds[1]);
+
+				/* we don't need the client socket */
+				for (fd = 3; fd < 256; fd++) {
+					close(fd);
+				}
+
+				/* exec the log-process (skip the | )
+				 *
+				 */
+
+				execl("/bin/sh", "sh", "-c", logfile + 1, NULL);
+				
+				log_error_write(srv, __FILE__, __LINE__, "sss",
+					"spawning log-process failed: ",
+					strerror(errno), logfile + 1);
+
+				exit(-1);
+				break;
+			case -1:
+				/* error */
+				log_error_write(srv, __FILE__, __LINE__, "ss", "fork failed:", strerror(errno));
+				break;
+			default:
+				close(to_log_fds[0]);
+
+				srv->errorlog_fd = to_log_fds[1];
+
+				break;
+			}
+			srv->errorlog_mode = ERRORLOG_PIPE;
+#else
+			log_error_write(srv, __FILE__, __LINE__, "SSS",
+				"opening errorlog '", logfile,"' impossible");
 			return -1;
-		}
+#endif
+		} else {
+			if (-1 == (srv->errorlog_fd = open(logfile, O_APPEND | O_WRONLY | O_CREAT | O_LARGEFILE, 0644))) {
+				log_error_write(srv, __FILE__, __LINE__, "SSSS",
+  					"opening errorlog '", logfile,
+  					"' failed: ", strerror(errno));
+  
+				return -1;
+			}
+			srv->errorlog_mode = ERRORLOG_FILE;
+  		}
 #ifdef FD_CLOEXEC
-		/* close fd on exec (cgi) */
-		fcntl(srv->errorlog_fd, F_SETFD, FD_CLOEXEC);
+  		/* close fd on exec (cgi) */
+  		fcntl(srv->errorlog_fd, F_SETFD, FD_CLOEXEC);
 #endif
-		srv->errorlog_mode = ERRORLOG_FILE;
-	}
-	
+  	}
+  
 	log_error_write(srv, __FILE__, __LINE__, "s", "server started");
 	
 #ifdef HAVE_VALGRIND_VALGRIND_H
@@ -99,7 +160,7 @@
  */
 
 int log_error_cycle(server *srv) {
-	/* only cycle if we are not in syslog-mode */
+	/* only cycle if the error log is a file */
 	
 	if (srv->errorlog_mode == ERRORLOG_FILE) {
 		const char *logfile = srv->srvconf.errorlog_file->ptr;
@@ -135,6 +196,7 @@
 	log_error_write(srv, __FILE__, __LINE__, "s", "server stopped");
 	
 	switch(srv->errorlog_mode) {
+	case ERRORLOG_PIPE: /* fall through */
 	case ERRORLOG_FILE:
 		close(srv->errorlog_fd);
 		break;
@@ -154,6 +216,7 @@
 	va_list ap;
 	
 	switch(srv->errorlog_mode) {
+	case ERRORLOG_PIPE:
 	case ERRORLOG_FILE:
 	case ERRORLOG_STDERR:
 		/* cache the generated timestamp */
@@ -238,6 +301,7 @@
 	va_end(ap);
 	
 	switch(srv->errorlog_mode) {
+	case ERRORLOG_PIPE: /* fall through */
 	case ERRORLOG_FILE:
 		BUFFER_APPEND_STRING_CONST(srv->errorlog_buf, "\n");
 		write(srv->errorlog_fd, srv->errorlog_buf->ptr, srv->errorlog_buf->used - 1);
diff -ur lighttpd-1.4.11.orig/src/mod_cgi.c lighttpd-1.4.11/src/mod_cgi.c
--- lighttpd-1.4.11.orig/src/mod_cgi.c	2006-02-22 05:15:10.000000000 -0800
+++ lighttpd-1.4.11/src/mod_cgi.c	2006-12-17 18:01:39.000000000 -0800
@@ -750,7 +750,7 @@
 		 *
 		 * we feed the stderr of the CGI to our errorlog, if possible
 		 */
-		if (srv->errorlog_mode == ERRORLOG_FILE) {
+		if ((srv->errorlog_mode == ERRORLOG_FILE) || (srv->errorlog_mode == ERRORLOG_PIPE)) {
 			close(STDERR_FILENO);
 			dup2(srv->errorlog_fd, STDERR_FILENO);
 		}
diff -ur lighttpd-1.4.11.orig/src/mod_rrdtool.c lighttpd-1.4.11/src/mod_rrdtool.c
--- lighttpd-1.4.11.orig/src/mod_rrdtool.c	2005-08-21 15:52:24.000000000 -0700
+++ lighttpd-1.4.11/src/mod_rrdtool.c	2006-12-17 18:01:39.000000000 -0800
@@ -134,7 +134,7 @@
 		
 		close(STDERR_FILENO);
 		
-		if (srv->errorlog_mode == ERRORLOG_FILE) {
+		if ((srv->errorlog_mode == ERRORLOG_FILE) || (srv->errorlog_mode == ERRORLOG_PIPE)) {
 			dup2(srv->errorlog_fd, STDERR_FILENO);
 			close(srv->errorlog_fd);
 		}



1.1                  www-servers/lighttpd/files/1.4.18-r2/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/lighttpd/files/1.4.18-r2/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/lighttpd/files/1.4.18-r2/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff?rev=1.1&content-type=text/plain

Index: 04_all_lighttpd-1.4.13-deprecated-ldap-api.diff
===================================================================
--- lighttpd-1.4.13.old/src/Makefile.am	2006-10-09 12:19:34.000000000 -0400
+++ lighttpd-1.4.13/src/Makefile.am	2007-03-26 10:10:26.000000000 -0400
@@ -213,6 +213,7 @@
 mod_auth_la_SOURCES = mod_auth.c http_auth_digest.c http_auth.c
 mod_auth_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
 mod_auth_la_LIBADD = $(CRYPT_LIB) $(LDAP_LIB) $(LBER_LIB) $(common_libadd)
+mod_auth_la_CFLAGS = -DLDAP_DEPRECATED
 
 lib_LTLIBRARIES += mod_rewrite.la
 mod_rewrite_la_SOURCES = mod_rewrite.c



1.1                  www-servers/lighttpd/files/1.4.18-r2/05_all_lighttpd-fix-DoS.diff

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/lighttpd/files/1.4.18-r2/05_all_lighttpd-fix-DoS.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/lighttpd/files/1.4.18-r2/05_all_lighttpd-fix-DoS.diff?rev=1.1&content-type=text/plain

Index: 05_all_lighttpd-fix-DoS.diff
===================================================================
diff -ur lighttpd-1.4.18.orig/src/fdevent_solaris_devpoll.c lighttpd-1.4.18/src/fdevent_solaris_devpoll.c
--- lighttpd-1.4.18.orig/src/fdevent_solaris_devpoll.c	2006-10-04 14:26:23.000000000 +0100
+++ lighttpd-1.4.18/src/fdevent_solaris_devpoll.c	2008-02-24 15:41:13.000000000 +0000
@@ -67,7 +67,7 @@
 	int ret;
 
 	dopoll.dp_timeout = timeout_ms;
-	dopoll.dp_nfds = ev->maxfds;
+	dopoll.dp_nfds = ev->maxfds - 1;
 	dopoll.dp_fds = ev->devpollfds;
 
 	ret = ioctl(ev->devpoll_fd, DP_POLL, &dopoll);
diff -ur lighttpd-1.4.18.orig/src/server.c lighttpd-1.4.18/src/server.c
--- lighttpd-1.4.18.orig/src/server.c	2007-09-05 11:39:56.000000000 +0100
+++ lighttpd-1.4.18/src/server.c	2008-02-24 15:40:38.000000000 +0000
@@ -697,9 +697,6 @@
 			}
 		}
 
-		/* #372: solaris need some fds extra for devpoll */
-		if (rlim.rlim_cur > 10) rlim.rlim_cur -= 10;
-
 		if (srv->event_handler == FDEVENT_HANDLER_SELECT) {
 			srv->max_fds = rlim.rlim_cur < FD_SETSIZE - 200 ? rlim.rlim_cur : FD_SETSIZE - 200;
 		} else {



1.1                  www-servers/lighttpd/files/1.4.18-r2/06_all_lighttpd-1.4.18-mod_cgi_source_disclosure-changeset-211956.diff

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/lighttpd/files/1.4.18-r2/06_all_lighttpd-1.4.18-mod_cgi_source_disclosure-changeset-211956.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/lighttpd/files/1.4.18-r2/06_all_lighttpd-1.4.18-mod_cgi_source_disclosure-changeset-211956.diff?rev=1.1&content-type=text/plain

Index: 06_all_lighttpd-1.4.18-mod_cgi_source_disclosure-changeset-211956.diff
===================================================================
Index: /branches/lighttpd-1.4.x/src/mod_cgi.c
===================================================================
--- /branches/lighttpd-1.4.x/src/mod_cgi.c (revision 2065)
+++ /branches/lighttpd-1.4.x/src/mod_cgi.c (revision 2107)
@@ -1005,4 +1005,5 @@
 		/* error */
 		log_error_write(srv, __FILE__, __LINE__, "ss", "fork failed:", strerror(errno));
+		return -1;
 		break;
 	default: {
Index: /branches/lighttpd-1.4.x/NEWS
===================================================================
--- /branches/lighttpd-1.4.x/NEWS (revision 2106)
+++ /branches/lighttpd-1.4.x/NEWS (revision 2107)
@@ -46,4 +46,5 @@
   * fixed body handling of status 300 requests 
   * spawn-fcgi: only try to connect to unix socket (not tcp) before spawning (#1575)
+  * fix sending source of cgi script instead of 500 error if fork fails
 
 - 1.4.18 - 2007-09-09



-- 
gentoo-commits@l.g.o mailing list