diff options
Diffstat (limited to 'src')
74 files changed, 2065 insertions, 1422 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index a112789..1008b36 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,7 @@ AM_CFLAGS = $(FAM_CFLAGS) noinst_PROGRAMS=proc_open lemon # simple-fcgi #graphic evalo bench ajp ssl error_test adserver gen-license sbin_PROGRAMS=lighttpd lighttpd-angel bin_PROGRAMS=spawn-fcgi -LEMON=$(top_builddir)/src/lemon +LEMON=$(top_builddir)/src/lemon$(EXEEXT) lemon_SOURCES=lemon.c @@ -15,21 +15,26 @@ lighttpd_angel_SOURCES=lighttpd-angel.c if CROSS_COMPILING configparser.c configparser.h: mod_ssi_exprparser.c mod_ssi_exprparser.h: -else -$(srcdir)/configparser.y: lemon -$(srcdir)/mod_ssi_exprparser.y: lemon -configparser.c configparser.h: $(srcdir)/configparser.y +.PHONY: parsers +parsers: +else +configparser.h: configparser.c +configparser.c: $(srcdir)/configparser.y $(srcdir)/lempar.c lemon$(EXEEXT) rm -f configparser.h $(LEMON) -q $(srcdir)/configparser.y $(srcdir)/lempar.c -mod_ssi_exprparser.c mod_ssi_exprparser.h: $(srcdir)/mod_ssi_exprparser.y +mod_ssi_exprparser.h: mod_ssi_exprparser.c +mod_ssi_exprparser.c: $(srcdir)/mod_ssi_exprparser.y $(srcdir)/lempar.c lemon$(EXEEXT) rm -f mod_ssi_exprparser.h $(LEMON) -q $(srcdir)/mod_ssi_exprparser.y $(srcdir)/lempar.c + +.PHONY: parsers +parsers: configparser.c mod_ssi_exprparser.c endif -$(srcdir)/configfile.c: configparser.h -$(srcdir)/mod_ssi_expr.c: mod_ssi_exprparser.h +BUILT_SOURCES = parsers +MAINTAINERCLEANFILES = configparser.c configparser.h mod_ssi_exprparser.c mod_ssi_exprparser.h common_src=buffer.c log.c \ keyvalue.c chunk.c \ diff --git a/src/Makefile.in b/src/Makefile.in index 826af20..7105aa9 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -383,7 +383,7 @@ proc_open_LDADD = $(LDADD) am_spawn_fcgi_OBJECTS = spawn-fcgi.$(OBJEXT) spawn_fcgi_OBJECTS = $(am_spawn_fcgi_OBJECTS) spawn_fcgi_LDADD = $(LDADD) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -461,6 +461,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ -DLIBRARY_DIR="\"$(libdir)\"" -DSBIN_DIR="\"$(sbindir)\"" DEPDIR = @DEPDIR@ DL_LIB = @DL_LIB@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -495,6 +496,7 @@ MKDIR_P = @MKDIR_P@ MYSQL_CONFIG = @MYSQL_CONFIG@ MYSQL_INCLUDE = @MYSQL_INCLUDE@ MYSQL_LIBS = @MYSQL_LIBS@ +NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -507,6 +509,7 @@ PCRECONFIG = @PCRECONFIG@ PCRE_LIB = @PCRE_LIB@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ +SED = @SED@ SENDFILE_LIB = @SENDFILE_LIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -576,9 +579,11 @@ target_vendor = @target_vendor@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CFLAGS = $(FAM_CFLAGS) -LEMON = $(top_builddir)/src/lemon +LEMON = $(top_builddir)/src/lemon$(EXEEXT) lemon_SOURCES = lemon.c lighttpd_angel_SOURCES = lighttpd-angel.c +BUILT_SOURCES = parsers +MAINTAINERCLEANFILES = configparser.c configparser.h mod_ssi_exprparser.c mod_ssi_exprparser.h common_src = buffer.c log.c \ keyvalue.c chunk.c \ http_chunk.c stream.c fdevent.c \ @@ -756,7 +761,8 @@ proc_open_CPPFLAGS = -DDEBUG_PROC_OPEN #ajp_SOURCES = ajp.c noinst_HEADERS = $(hdr) EXTRA_DIST = mod_skeleton.c configparser.y mod_ssi_exprparser.y lempar.c SConscript -all: all-am +all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj @@ -795,8 +801,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ else :; fi; \ done @@ -804,8 +810,8 @@ uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ done clean-libLTLIBRARIES: @@ -891,8 +897,8 @@ install-binPROGRAMS: $(bin_PROGRAMS) || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -926,8 +932,8 @@ install-sbinPROGRAMS: $(sbin_PROGRAMS) || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \ else :; fi; \ done @@ -1480,8 +1486,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -1493,8 +1499,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -1504,13 +1510,12 @@ ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -1550,7 +1555,8 @@ distdir: $(DISTFILES) fi; \ done check-am: all-am -check: check-am +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) install-binPROGRAMS: install-libLTLIBRARIES @@ -1558,7 +1564,8 @@ installdirs: for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done -install: install-am +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -1582,6 +1589,8 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ @@ -1669,19 +1678,21 @@ uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES \ @CROSS_COMPILING_TRUE@configparser.c configparser.h: @CROSS_COMPILING_TRUE@mod_ssi_exprparser.c mod_ssi_exprparser.h: -@CROSS_COMPILING_FALSE@$(srcdir)/configparser.y: lemon -@CROSS_COMPILING_FALSE@$(srcdir)/mod_ssi_exprparser.y: lemon -@CROSS_COMPILING_FALSE@configparser.c configparser.h: $(srcdir)/configparser.y +@CROSS_COMPILING_TRUE@.PHONY: parsers +@CROSS_COMPILING_TRUE@parsers: +@CROSS_COMPILING_FALSE@configparser.h: configparser.c +@CROSS_COMPILING_FALSE@configparser.c: $(srcdir)/configparser.y $(srcdir)/lempar.c lemon$(EXEEXT) @CROSS_COMPILING_FALSE@ rm -f configparser.h @CROSS_COMPILING_FALSE@ $(LEMON) -q $(srcdir)/configparser.y $(srcdir)/lempar.c -@CROSS_COMPILING_FALSE@mod_ssi_exprparser.c mod_ssi_exprparser.h: $(srcdir)/mod_ssi_exprparser.y +@CROSS_COMPILING_FALSE@mod_ssi_exprparser.h: mod_ssi_exprparser.c +@CROSS_COMPILING_FALSE@mod_ssi_exprparser.c: $(srcdir)/mod_ssi_exprparser.y $(srcdir)/lempar.c lemon$(EXEEXT) @CROSS_COMPILING_FALSE@ rm -f mod_ssi_exprparser.h @CROSS_COMPILING_FALSE@ $(LEMON) -q $(srcdir)/mod_ssi_exprparser.y $(srcdir)/lempar.c -$(srcdir)/configfile.c: configparser.h -$(srcdir)/mod_ssi_expr.c: mod_ssi_exprparser.h +@CROSS_COMPILING_FALSE@.PHONY: parsers +@CROSS_COMPILING_FALSE@parsers: configparser.c mod_ssi_exprparser.c # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/src/SConscript b/src/SConscript index 0ad2a4e..21dabf6 100644 --- a/src/SConscript +++ b/src/SConscript @@ -43,6 +43,7 @@ modules = { 'mod_cgi' : { 'src' : [ 'mod_cgi.c' ] }, 'mod_fastcgi' : { 'src' : [ 'mod_fastcgi.c' ] }, 'mod_scgi' : { 'src' : [ 'mod_scgi.c' ] }, + 'mod_extforward' : { 'src' : [ 'mod_extforward.c' ] }, 'mod_staticfile' : { 'src' : [ 'mod_staticfile.c' ] }, 'mod_dirlisting' : { 'src' : [ 'mod_dirlisting.c' ], 'lib' : [ env['LIBPCRE'] ] }, 'mod_indexfile' : { 'src' : [ 'mod_indexfile.c' ] }, diff --git a/src/array.c b/src/array.c index e35455b..d8751aa 100644 --- a/src/array.c +++ b/src/array.c @@ -330,30 +330,30 @@ int main (int argc, char **argv) { a = array_init(); ds = data_string_init(); - buffer_copy_string(ds->key, "abc"); - buffer_copy_string(ds->value, "alfrag"); + buffer_copy_string_len(ds->key, CONST_STR_LEN("abc")); + buffer_copy_string_len(ds->value, CONST_STR_LEN("alfrag")); array_insert_unique(a, (data_unset *)ds); ds = data_string_init(); - buffer_copy_string(ds->key, "abc"); - buffer_copy_string(ds->value, "hameplman"); + buffer_copy_string_len(ds->key, CONST_STR_LEN("abc")); + buffer_copy_string_len(ds->value, CONST_STR_LEN("hameplman")); array_insert_unique(a, (data_unset *)ds); ds = data_string_init(); - buffer_copy_string(ds->key, "123"); - buffer_copy_string(ds->value, "alfrag"); + buffer_copy_string_len(ds->key, CONST_STR_LEN("123")); + buffer_copy_string_len(ds->value, CONST_STR_LEN("alfrag")); array_insert_unique(a, (data_unset *)ds); dc = data_count_init(); - buffer_copy_string(dc->key, "def"); + buffer_copy_string_len(dc->key, CONST_STR_LEN("def")); array_insert_unique(a, (data_unset *)dc); dc = data_count_init(); - buffer_copy_string(dc->key, "def"); + buffer_copy_string_len(dc->key, CONST_STR_LEN("def")); array_insert_unique(a, (data_unset *)dc); diff --git a/src/array.h b/src/array.h index 9dacf10..6efaac8 100644 --- a/src/array.h +++ b/src/array.h @@ -87,6 +87,7 @@ typedef enum { COMP_HTTP_HOST, COMP_HTTP_REFERER, COMP_HTTP_USER_AGENT, + COMP_HTTP_LANGUAGE, COMP_HTTP_COOKIE, COMP_HTTP_REMOTE_IP, COMP_HTTP_QUERY_STRING, @@ -259,6 +259,8 @@ typedef struct { unsigned short log_request_handling; unsigned short log_response_header; unsigned short log_condition_handling; + unsigned short log_ssl_noise; + unsigned short log_timeouts; /* server wide */ @@ -490,12 +492,13 @@ typedef struct { enum { STAT_CACHE_ENGINE_UNSET, STAT_CACHE_ENGINE_NONE, - STAT_CACHE_ENGINE_SIMPLE, + STAT_CACHE_ENGINE_SIMPLE #ifdef HAVE_FAM_H - STAT_CACHE_ENGINE_FAM + , STAT_CACHE_ENGINE_FAM #endif } stat_cache_engine; unsigned short enable_cores; + unsigned short reject_expect_100_with_417; } server_config; typedef struct { diff --git a/src/buffer.c b/src/buffer.c index ddd1c59..7300d7f 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -55,6 +55,8 @@ void buffer_reset(buffer *b) { free(b->ptr); b->ptr = NULL; b->size = 0; + } else if (b->size) { + b->ptr[0] = '\0'; } b->used = 0; @@ -157,7 +159,7 @@ int buffer_copy_string_buffer(buffer *b, const buffer *src) { if (!src) return -1; if (src->used == 0) { - b->used = 0; + buffer_reset(b); return 0; } return buffer_copy_string_len(b, src->ptr, src->used - 1); @@ -185,6 +187,7 @@ int buffer_append_string_rfill(buffer *b, const char *s, size_t maxlen) { if (!s || !b) return -1; s_len = strlen(s); + if (s_len > maxlen) s_len = maxlen; buffer_prepare_append(b, maxlen + 1); if (b->used == 0) b->used++; @@ -626,6 +629,7 @@ int buffer_copy_string_hex(buffer *b, const char *in, size_t in_len) { return 0; } +/* everything except: ! ( ) * - . 0-9 A-Z _ a-z */ const char encoded_chars_rel_uri_part[] = { /* 0 1 2 3 4 5 6 7 8 9 A B C D E F @@ -633,11 +637,11 @@ const char encoded_chars_rel_uri_part[] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 00 - 0F control chars */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 10 - 1F */ 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, /* 20 - 2F space " # $ % & ' + , / */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, /* 30 - 3F : ; = ? @ < > */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 40 - 4F */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 50 - 5F */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 60 - 6F */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, /* 70 - 7F DEL */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, /* 30 - 3F : ; < = > ? */ + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 40 - 4F @ */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, /* 50 - 5F [ \ ] ^ */ + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 60 - 6F ` */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, /* 70 - 7F { | } ~ DEL */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 80 - 8F */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 90 - 9F */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* A0 - AF */ @@ -648,18 +652,19 @@ const char encoded_chars_rel_uri_part[] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* F0 - FF */ }; +/* everything except: ! ( ) * - . / 0-9 A-Z _ a-z */ const char encoded_chars_rel_uri[] = { /* 0 1 2 3 4 5 6 7 8 9 A B C D E F */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 00 - 0F control chars */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 10 - 1F */ - 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, /* 20 - 2F space " # $ % & ' + , / */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, /* 30 - 3F : ; = ? @ < > */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 40 - 4F */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 50 - 5F */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 60 - 6F */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, /* 70 - 7F DEL */ + 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, /* 20 - 2F space " # $ % & ' + , */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, /* 30 - 3F : ; < = > ? */ + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 40 - 4F @ */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, /* 50 - 5F [ \ ] ^ */ + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 60 - 6F ` */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, /* 70 - 7F { | } ~ DEL */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 80 - 8F */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 90 - 9F */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* A0 - AF */ diff --git a/src/chunk.c b/src/chunk.c index f5ec564..6eb45c3 100644 --- a/src/chunk.c +++ b/src/chunk.c @@ -296,7 +296,7 @@ chunk *chunkqueue_get_append_tempfile(chunkqueue *cq) { buffer_copy_string_buffer(template, ds->value); BUFFER_APPEND_SLASH(template); - BUFFER_APPEND_STRING_CONST(template, "lighttpd-upload-XXXXXX"); + buffer_append_string_len(template, CONST_STR_LEN("lighttpd-upload-XXXXXX")); if (-1 != (c->file.fd = mkstemp(template->ptr))) { /* only trigger the unlink if we created the temp-file successfully */ diff --git a/src/configfile-glue.c b/src/configfile-glue.c index 66a596e..774589f 100644 --- a/src/configfile-glue.c +++ b/src/configfile-glue.c @@ -1,4 +1,5 @@ #include <string.h> +#include <stdlib.h> #include "base.h" #include "buffer.h" @@ -90,6 +91,22 @@ int config_insert_values_internal(server *srv, array *ca, const config_values_t case TYPE_STRING: { data_string *ds = (data_string *)du; + /* If the value came from an environment variable, then it is a + * data_string, although it may contain a number in ASCII + * decimal format. We try to interpret the string as a decimal + * short before giving up, in order to support setting numeric + * values with environment variables (eg, port number). + */ + if (ds->value->ptr && *ds->value->ptr) { + char *e; + long l = strtol(ds->value->ptr, &e, 10); + if (e != ds->value->ptr && !*e && l >=0 && l <= 65535) { + *((unsigned short *)(cv[i].destination)) = l; + break; + + } + } + log_error_write(srv, __FILE__, __LINE__, "ssb", "got a string but expected a short:", cv[i].key, ds->value); return -1; @@ -155,7 +172,7 @@ int config_insert_values_global(server *srv, array *ca, const config_values_t cv /* touched */ touched = data_string_init(); - buffer_copy_string(touched->value, ""); + buffer_copy_string_len(touched->value, CONST_STR_LEN("")); buffer_copy_string_buffer(touched->key, du->key); array_insert_unique(srv->config_touched, (data_unset *)touched); @@ -260,7 +277,7 @@ static cond_result_t config_check_cond_nocache(server *srv, connection *con, dat if (ck_colon) { /* condition "host:port" but client send "host" */ buffer_copy_string_buffer(srv->cond_check_buf, l); - BUFFER_APPEND_STRING_CONST(srv->cond_check_buf, ":"); + buffer_append_string_len(srv->cond_check_buf, CONST_STR_LEN(":")); buffer_append_long(srv->cond_check_buf, sock_addr_get_port(&(srv_sock->addr))); l = srv->cond_check_buf; } else if (!ck_colon) { @@ -396,6 +413,15 @@ static cond_result_t config_check_cond_nocache(server *srv, connection *con, dat break; } + case COMP_HTTP_LANGUAGE: { + data_string *ds; + if (NULL != (ds = (data_string *)array_get_element(con->request.headers, "Accept-Language"))) { + l = ds->value; + } else { + l = srv->empty_string; + } + break; + } default: return COND_RESULT_FALSE; } @@ -529,7 +555,7 @@ int config_check_cond(server *srv, connection *con, data_config *dc) { int config_append_cond_match_buffer(connection *con, data_config *dc, buffer *buf, int n) { cond_cache_t *cache = &con->cond_cache[dc->context_ndx]; - if (n > cache->patterncount) { + if (n >= cache->patterncount) { return 0; } diff --git a/src/configfile.c b/src/configfile.c index 09fe87d..e45db85 100644 --- a/src/configfile.c +++ b/src/configfile.c @@ -7,6 +7,7 @@ #include <string.h> #include <stdio.h> #include <ctype.h> +#include <limits.h> #include <assert.h> #include "server.h" @@ -74,24 +75,27 @@ static int config_insert(server *srv) { { "debug.log-request-handling", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 32 */ { "debug.log-response-header", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 33 */ { "debug.log-request-header", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 34 */ - - { "server.protocol-http11", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 35 */ - { "debug.log-request-header-on-error", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 36 */ - { "debug.log-state-handling", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 37 */ - { "ssl.ca-file", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_SERVER }, /* 38 */ - - { "server.errorlog-use-syslog", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 39 */ - { "server.range-requests", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 40 */ - { "server.stat-cache-engine", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 41 */ - { "server.max-connections", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_SERVER }, /* 42 */ - { "server.network-backend", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 43 */ - { "server.upload-dirs", NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_CONNECTION }, /* 44 */ - { "server.core-files", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 45 */ - { "ssl.cipher-list", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_SERVER }, /* 46 */ - { "ssl.use-sslv2", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 47 */ - { "etag.use-inode", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 48 */ - { "etag.use-mtime", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 49 */ - { "etag.use-size", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 50 */ + { "debug.log-ssl-noise", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 35 */ + + { "server.protocol-http11", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 36 */ + { "debug.log-request-header-on-error", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 37 */ + { "debug.log-state-handling", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 38 */ + { "ssl.ca-file", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_SERVER }, /* 39 */ + + { "server.errorlog-use-syslog", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 40 */ + { "server.range-requests", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 41 */ + { "server.stat-cache-engine", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 42 */ + { "server.max-connections", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_SERVER }, /* 43 */ + { "server.network-backend", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 44 */ + { "server.upload-dirs", NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_CONNECTION }, /* 45 */ + { "server.core-files", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 46 */ + { "ssl.cipher-list", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_SERVER }, /* 47 */ + { "ssl.use-sslv2", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 48 */ + { "etag.use-inode", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 49 */ + { "etag.use-mtime", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 50 */ + { "etag.use-size", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 51 */ + { "server.reject-expect-100-with-417", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 52 */ + { "debug.log-timeouts", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 53 */ { "server.host", "use server.bind instead", T_CONFIG_DEPRECATED, T_CONFIG_SCOPE_UNSET }, { "server.docroot", "use server.document-root instead", T_CONFIG_DEPRECATED, T_CONFIG_SCOPE_UNSET }, { "server.virtual-root", "load mod_simple_vhost and use simple-vhost.server-root instead", T_CONFIG_DEPRECATED, T_CONFIG_SCOPE_UNSET }, @@ -120,19 +124,20 @@ static int config_insert(server *srv) { cv[13].destination = &(srv->srvconf.max_worker); cv[23].destination = &(srv->srvconf.max_fds); - cv[36].destination = &(srv->srvconf.log_request_header_on_error); - cv[37].destination = &(srv->srvconf.log_state_handling); + cv[37].destination = &(srv->srvconf.log_request_header_on_error); + cv[38].destination = &(srv->srvconf.log_state_handling); - cv[39].destination = &(srv->srvconf.errorlog_use_syslog); + cv[40].destination = &(srv->srvconf.errorlog_use_syslog); stat_cache_string = buffer_init(); - cv[41].destination = stat_cache_string; - cv[43].destination = srv->srvconf.network_backend; - cv[44].destination = srv->srvconf.upload_tempdirs; - cv[45].destination = &(srv->srvconf.enable_cores); + cv[42].destination = stat_cache_string; + cv[44].destination = srv->srvconf.network_backend; + cv[45].destination = srv->srvconf.upload_tempdirs; + cv[46].destination = &(srv->srvconf.enable_cores); - cv[42].destination = &(srv->srvconf.max_conns); + cv[43].destination = &(srv->srvconf.max_conns); cv[12].destination = &(srv->srvconf.max_request_size); + cv[52].destination = &(srv->srvconf.reject_expect_100_with_417); srv->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *)); assert(srv->config_storage); @@ -157,7 +162,7 @@ static int config_insert(server *srv) { s->max_write_idle = 360; s->use_xattr = 0; s->is_ssl = 0; - s->ssl_use_sslv2 = 1; + s->ssl_use_sslv2 = 0; s->use_ipv6 = 0; #ifdef HAVE_LSTAT s->follow_symlink = 1; @@ -204,16 +209,18 @@ static int config_insert(server *srv) { cv[32].destination = &(s->log_request_handling); cv[33].destination = &(s->log_response_header); cv[34].destination = &(s->log_request_header); + cv[35].destination = &(s->log_ssl_noise); + cv[53].destination = &(s->log_timeouts); - cv[35].destination = &(s->allow_http11); - cv[38].destination = s->ssl_ca_file; - cv[40].destination = &(s->range_requests); + cv[36].destination = &(s->allow_http11); + cv[39].destination = s->ssl_ca_file; + cv[41].destination = &(s->range_requests); - cv[46].destination = s->ssl_cipher_list; - cv[47].destination = &(s->ssl_use_sslv2); - cv[48].destination = &(s->etag_use_inode); - cv[49].destination = &(s->etag_use_mtime); - cv[50].destination = &(s->etag_use_size); + cv[47].destination = s->ssl_cipher_list; + cv[48].destination = &(s->ssl_use_sslv2); + cv[49].destination = &(s->etag_use_inode); + cv[50].destination = &(s->etag_use_mtime); + cv[51].destination = &(s->etag_use_size); srv->config_storage[i] = s; @@ -279,6 +286,7 @@ int config_setup_connection(server *srv, connection *con) { PATCH(log_request_handling); PATCH(log_condition_handling); PATCH(log_file_not_found); + PATCH(log_ssl_noise); PATCH(range_requests); PATCH(force_lowercase_filenames); @@ -305,9 +313,6 @@ int config_patch_connection(server *srv, connection *con, comp_key_t comp) { data_config *dc = (data_config *)srv->config_context->data[i]; specific_config *s = srv->config_storage[i]; - /* not our stage */ - if (comp != dc->comp) continue; - /* condition didn't match */ if (!config_check_cond(srv, con, dc)) continue; @@ -371,6 +376,10 @@ int config_patch_connection(server *srv, connection *con, comp_key_t comp) { PATCH(log_condition_handling); } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("debug.log-file-not-found"))) { PATCH(log_file_not_found); + } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("debug.log-ssl-noise"))) { + PATCH(log_ssl_noise); + } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("debug.log-timeouts"))) { + PATCH(log_timeouts); } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("server.protocol-http11"))) { PATCH(allow_http11); } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("server.force-lowercase-filenames"))) { @@ -410,8 +419,8 @@ typedef struct { #if 0 static int tokenizer_open(server *srv, tokenizer_t *t, buffer *basedir, const char *fn) { - if (buffer_is_empty(basedir) && - (fn[0] == '/' || fn[0] == '\\') && + if (buffer_is_empty(basedir) || + (fn[0] == '/' || fn[0] == '\\') || (fn[0] == '.' && (fn[1] == '/' || fn[1] == '\\'))) { t->file = buffer_init_string(fn); } else { @@ -480,7 +489,7 @@ static int config_tokenizer(server *srv, tokenizer_t *t, int *token_id, buffer * if (t->input[t->offset + 1] == '>') { t->offset += 2; - buffer_copy_string(token, "=>"); + buffer_copy_string_len(token, CONST_STR_LEN("=>")); tid = TK_ARRAY_ASSIGN; } else { @@ -494,13 +503,13 @@ static int config_tokenizer(server *srv, tokenizer_t *t, int *token_id, buffer * if (t->input[t->offset + 1] == '=') { t->offset += 2; - buffer_copy_string(token, "=="); + buffer_copy_string_len(token, CONST_STR_LEN("==")); tid = TK_EQ; } else if (t->input[t->offset + 1] == '~') { t->offset += 2; - buffer_copy_string(token, "=~"); + buffer_copy_string_len(token, CONST_STR_LEN("=~")); tid = TK_MATCH; } else { @@ -533,13 +542,13 @@ static int config_tokenizer(server *srv, tokenizer_t *t, int *token_id, buffer * if (t->input[t->offset + 1] == '=') { t->offset += 2; - buffer_copy_string(token, "!="); + buffer_copy_string_len(token, CONST_STR_LEN("!=")); tid = TK_NE; } else if (t->input[t->offset + 1] == '~') { t->offset += 2; - buffer_copy_string(token, "!~"); + buffer_copy_string_len(token, CONST_STR_LEN("!~")); tid = TK_NOMATCH; } else { @@ -594,7 +603,7 @@ static int config_tokenizer(server *srv, tokenizer_t *t, int *token_id, buffer * } t->in_key = 1; tid = TK_EOL; - buffer_copy_string(token, "(EOL)"); + buffer_copy_string_len(token, CONST_STR_LEN("(EOL)")); } else { config_skip_newline(t); t->line_pos = 1; @@ -605,7 +614,7 @@ static int config_tokenizer(server *srv, tokenizer_t *t, int *token_id, buffer * if (t->in_brace > 0) { tid = TK_COMMA; - buffer_copy_string(token, "(COMMA)"); + buffer_copy_string_len(token, CONST_STR_LEN("(COMMA)")); } t->offset++; @@ -614,7 +623,7 @@ static int config_tokenizer(server *srv, tokenizer_t *t, int *token_id, buffer * case '"': /* search for the terminating " */ start = t->input + t->offset + 1; - buffer_copy_string(token, ""); + buffer_copy_string_len(token, CONST_STR_LEN("")); for (i = 1; t->input[t->offset + i]; i++) { if (t->input[t->offset + i] == '\\' && @@ -660,7 +669,7 @@ static int config_tokenizer(server *srv, tokenizer_t *t, int *token_id, buffer * tid = TK_LPARAN; - buffer_copy_string(token, "("); + buffer_copy_string_len(token, CONST_STR_LEN("(")); break; case ')': t->offset++; @@ -668,7 +677,7 @@ static int config_tokenizer(server *srv, tokenizer_t *t, int *token_id, buffer * tid = TK_RPARAN; - buffer_copy_string(token, ")"); + buffer_copy_string_len(token, CONST_STR_LEN(")")); break; case '$': t->offset++; @@ -677,19 +686,19 @@ static int config_tokenizer(server *srv, tokenizer_t *t, int *token_id, buffer * t->in_cond = 1; t->in_key = 0; - buffer_copy_string(token, "$"); + buffer_copy_string_len(token, CONST_STR_LEN("$")); break; case '+': if (t->input[t->offset + 1] == '=') { t->offset += 2; - buffer_copy_string(token, "+="); + buffer_copy_string_len(token, CONST_STR_LEN("+=")); tid = TK_APPEND; } else { t->offset++; tid = TK_PLUS; - buffer_copy_string(token, "+"); + buffer_copy_string_len(token, CONST_STR_LEN("+")); } break; @@ -698,7 +707,7 @@ static int config_tokenizer(server *srv, tokenizer_t *t, int *token_id, buffer * tid = TK_LCURLY; - buffer_copy_string(token, "{"); + buffer_copy_string_len(token, CONST_STR_LEN("{")); break; @@ -707,7 +716,7 @@ static int config_tokenizer(server *srv, tokenizer_t *t, int *token_id, buffer * tid = TK_RCURLY; - buffer_copy_string(token, "}"); + buffer_copy_string_len(token, CONST_STR_LEN("}")); break; @@ -716,7 +725,7 @@ static int config_tokenizer(server *srv, tokenizer_t *t, int *token_id, buffer * tid = TK_LBRACKET; - buffer_copy_string(token, "["); + buffer_copy_string_len(token, CONST_STR_LEN("[")); break; @@ -725,7 +734,7 @@ static int config_tokenizer(server *srv, tokenizer_t *t, int *token_id, buffer * tid = TK_RBRACKET; - buffer_copy_string(token, "]"); + buffer_copy_string_len(token, CONST_STR_LEN("]")); break; case '#': @@ -884,8 +893,8 @@ int config_parse_file(server *srv, config_t *context, const char *fn) { int ret; buffer *filename; - if (buffer_is_empty(context->basedir) && - (fn[0] == '/' || fn[0] == '\\') && + if (buffer_is_empty(context->basedir) || + (fn[0] == '/' || fn[0] == '\\') || (fn[0] == '.' && (fn[1] == '/' || fn[1] == '\\'))) { filename = buffer_init_string(fn); } else { @@ -912,15 +921,38 @@ int config_parse_file(server *srv, config_t *context, const char *fn) { return ret; } +static char* getCWD() { + char *s, *s1; + size_t len; +#ifdef PATH_MAX + len = PATH_MAX; +#else + len = 4096; +#endif + + s = malloc(len); + if (!s) return NULL; + while (NULL == getcwd(s, len)) { + if (errno != ERANGE || SSIZE_MAX - len < len) return NULL; + len *= 2; + s1 = realloc(s, len); + if (!s1) { + free(s); + return NULL; + } + s = s1; + } + return s; +} + int config_parse_cmd(server *srv, config_t *context, const char *cmd) { - proc_handler_t proc; tokenizer_t t; int ret; buffer *source; buffer *out; - char oldpwd[PATH_MAX]; + char *oldpwd; - if (NULL == getcwd(oldpwd, sizeof(oldpwd))) { + if (NULL == (oldpwd = getCWD())) { log_error_write(srv, __FILE__, __LINE__, "s", "cannot get cwd", strerror(errno)); return -1; @@ -933,7 +965,7 @@ int config_parse_cmd(server *srv, config_t *context, const char *cmd) { chdir(context->basedir->ptr); } - if (0 != proc_open_buffer(&proc, cmd, NULL, out, NULL)) { + if (0 != proc_open_buffer(cmd, NULL, out, NULL)) { log_error_write(srv, __FILE__, __LINE__, "sbss", "opening", source, "failed:", strerror(errno)); ret = -1; @@ -945,6 +977,7 @@ int config_parse_cmd(server *srv, config_t *context, const char *cmd) { buffer_free(source); buffer_free(out); chdir(oldpwd); + free(oldpwd); return ret; } @@ -973,20 +1006,18 @@ int config_read(server *srv, const char *fn) { context_init(srv, &context); context.all_configs = srv->config_context; - pos = strrchr(fn, #ifdef __WIN32 - '\\' + pos = strrchr(fn, '\\'); #else - '/' + pos = strrchr(fn, '/'); #endif - ); if (pos) { buffer_copy_string_len(context.basedir, fn, pos - fn + 1); fn = pos + 1; } dc = data_config_init(); - buffer_copy_string(dc->key, "global"); + buffer_copy_string_len(dc->key, CONST_STR_LEN("global")); assert(context.all_configs->used == 0); dc->context_ndx = context.all_configs->used; @@ -997,14 +1028,14 @@ int config_read(server *srv, const char *fn) { srv->config = dc->value; dpid = data_integer_init(); dpid->value = getpid(); - buffer_copy_string(dpid->key, "var.PID"); + buffer_copy_string_len(dpid->key, CONST_STR_LEN("var.PID")); array_insert_unique(srv->config, (data_unset *)dpid); dcwd = data_string_init(); buffer_prepare_copy(dcwd->value, 1024); if (NULL != getcwd(dcwd->value->ptr, dcwd->value->size - 1)) { dcwd->value->used = strlen(dcwd->value->ptr) + 1; - buffer_copy_string(dcwd->key, "var.CWD"); + buffer_copy_string_len(dcwd->key, CONST_STR_LEN("var.CWD")); array_insert_unique(srv->config, (data_unset *)dcwd); } @@ -1038,7 +1069,7 @@ int config_read(server *srv, const char *fn) { /* prepend default modules */ if (NULL == array_get_element(modules->value, "mod_indexfile")) { ds = data_string_init(); - buffer_copy_string(ds->value, "mod_indexfile"); + buffer_copy_string_len(ds->value, CONST_STR_LEN("mod_indexfile")); array_insert_unique(prepends->value, (data_unset *)ds); } @@ -1051,13 +1082,13 @@ int config_read(server *srv, const char *fn) { /* append default modules */ if (NULL == array_get_element(modules->value, "mod_dirlisting")) { ds = data_string_init(); - buffer_copy_string(ds->value, "mod_dirlisting"); + buffer_copy_string_len(ds->value, CONST_STR_LEN("mod_dirlisting")); array_insert_unique(modules->value, (data_unset *)ds); } if (NULL == array_get_element(modules->value, "mod_staticfile")) { ds = data_string_init(); - buffer_copy_string(ds->value, "mod_staticfile"); + buffer_copy_string_len(ds->value, CONST_STR_LEN("mod_staticfile")); array_insert_unique(modules->value, (data_unset *)ds); } } else { @@ -1067,18 +1098,18 @@ int config_read(server *srv, const char *fn) { /* server.modules is not set */ ds = data_string_init(); - buffer_copy_string(ds->value, "mod_indexfile"); + buffer_copy_string_len(ds->value, CONST_STR_LEN("mod_indexfile")); array_insert_unique(modules->value, (data_unset *)ds); ds = data_string_init(); - buffer_copy_string(ds->value, "mod_dirlisting"); + buffer_copy_string_len(ds->value, CONST_STR_LEN("mod_dirlisting")); array_insert_unique(modules->value, (data_unset *)ds); ds = data_string_init(); - buffer_copy_string(ds->value, "mod_staticfile"); + buffer_copy_string_len(ds->value, CONST_STR_LEN("mod_staticfile")); array_insert_unique(modules->value, (data_unset *)ds); - buffer_copy_string(modules->key, "server.modules"); + buffer_copy_string_len(modules->key, CONST_STR_LEN("server.modules")); array_insert_unique(srv->config, (data_unset *)modules); } diff --git a/src/configparser.c b/src/configparser.c index 58a03fe..5dd2739 100644 --- a/src/configparser.c +++ b/src/configparser.c @@ -4,7 +4,7 @@ /* First off, code is include which follows the "include" declaration ** in the input file. */ #include <stdio.h> -#line 5 "./configparser.y" +#line 5 "../../src/configparser.y" #include <assert.h> #include <stdio.h> @@ -24,6 +24,10 @@ static void configparser_push(config_t *ctx, data_config *dc, int isnew) { dc->parent = ctx->current; array_insert_unique(dc->parent->childs, (data_unset *)dc); } + if (ctx->configs_stack->used > 0 && ctx->current->context_ndx == 0) { + fprintf(stderr, "Cannot use conditionals inside a global { ... } block\n"); + exit(-1); + } array_insert_unique(ctx->configs_stack, (data_unset *)ctx->current); ctx->current = dc; } @@ -105,7 +109,7 @@ data_unset *configparser_merge_data(data_unset *op1, const data_unset *op2) { } -#line 109 "configparser.c" +#line 113 "configparser.c" /* Next is all token values, in a form suitable for use by makeheaders. ** This section will be null unless lemon is run with the -m switch. */ @@ -359,12 +363,14 @@ static char *yyTracePrompt = 0; ** Outputs: ** None. */ +#if 0 void configparserTrace(FILE *TraceFILE, char *zTracePrompt){ yyTraceFILE = TraceFILE; yyTracePrompt = zTracePrompt; if( yyTraceFILE==0 ) yyTracePrompt = 0; else if( yyTracePrompt==0 ) yyTraceFILE = 0; } +#endif #endif /* NDEBUG */ #ifndef NDEBUG @@ -437,9 +443,10 @@ static const char *yyRuleName[] = { ** This function returns the symbolic name associated with a token ** value. */ +#if 0 const char *configparserTokenName(int tokenType){ #ifndef NDEBUG - if( tokenType>0 && tokenType<(sizeof(yyTokenName)/sizeof(yyTokenName[0])) ){ + if( tokenType>0 && (size_t)tokenType<(sizeof(yyTokenName)/sizeof(yyTokenName[0])) ){ return yyTokenName[tokenType]; }else{ return "Unknown"; @@ -448,6 +455,7 @@ const char *configparserTokenName(int tokenType){ return ""; #endif } +#endif /* ** This function allocates a new parser. @@ -512,44 +520,44 @@ static void yy_destructor(YYCODETYPE yymajor, YYMINORTYPE *yypminor){ case 23: case 24: case 25: -#line 142 "./configparser.y" +#line 146 "../../src/configparser.y" { buffer_free((yypminor->yy0)); } -#line 517 "configparser.c" +#line 525 "configparser.c" break; case 35: -#line 133 "./configparser.y" +#line 137 "../../src/configparser.y" { (yypminor->yy41)->free((yypminor->yy41)); } -#line 522 "configparser.c" +#line 530 "configparser.c" break; case 36: -#line 134 "./configparser.y" +#line 138 "../../src/configparser.y" { (yypminor->yy41)->free((yypminor->yy41)); } -#line 527 "configparser.c" +#line 535 "configparser.c" break; case 37: -#line 135 "./configparser.y" +#line 139 "../../src/configparser.y" { (yypminor->yy41)->free((yypminor->yy41)); } -#line 532 "configparser.c" +#line 540 "configparser.c" break; case 39: -#line 136 "./configparser.y" +#line 140 "../../src/configparser.y" { array_free((yypminor->yy40)); } -#line 537 "configparser.c" +#line 545 "configparser.c" break; case 40: -#line 137 "./configparser.y" +#line 141 "../../src/configparser.y" { array_free((yypminor->yy40)); } -#line 542 "configparser.c" +#line 550 "configparser.c" break; case 41: -#line 138 "./configparser.y" +#line 142 "../../src/configparser.y" { buffer_free((yypminor->yy43)); } -#line 547 "configparser.c" +#line 555 "configparser.c" break; case 42: -#line 139 "./configparser.y" +#line 143 "../../src/configparser.y" { buffer_free((yypminor->yy43)); } -#line 552 "configparser.c" +#line 560 "configparser.c" break; default: break; /* If no destructor action specified: do nothing */ } @@ -627,7 +635,7 @@ static int yy_find_shift_action( return YY_NO_ACTION; } i += iLookAhead; - if( i<0 || i>=YY_SZ_ACTTAB || yy_lookahead[i]!=iLookAhead ){ + if( i<0 || (size_t)i>=YY_SZ_ACTTAB || yy_lookahead[i]!=iLookAhead ){ #ifdef YYFALLBACK int iFallback; /* Fallback token */ if( iLookAhead<sizeof(yyFallback)/sizeof(yyFallback[0]) @@ -670,7 +678,7 @@ static int yy_find_reduce_action( return YY_NO_ACTION; } i += iLookAhead; - if( i<0 || i>=YY_SZ_ACTTAB || yy_lookahead[i]!=iLookAhead ){ + if( i<0 || (size_t)i>=YY_SZ_ACTTAB || yy_lookahead[i]!=iLookAhead ){ return yy_default[stateno]; }else{ return yy_action[i]; @@ -786,7 +794,7 @@ static void yy_reduce( yymsp = &yypParser->yystack[yypParser->yyidx]; #ifndef NDEBUG if( yyTraceFILE && yyruleno>=0 - && yyruleno<sizeof(yyRuleName)/sizeof(yyRuleName[0]) ){ + && (size_t)yyruleno<sizeof(yyRuleName)/sizeof(yyRuleName[0]) ){ fprintf(yyTraceFILE, "%sReduce [%s].\n", yyTracePrompt, yyRuleName[yyruleno]); } @@ -817,9 +825,9 @@ static void yy_reduce( /* No destructor defined for global */ break; case 5: -#line 115 "./configparser.y" +#line 119 "../../src/configparser.y" { yymsp[-1].minor.yy78 = NULL; } -#line 822 "configparser.c" +#line 830 "configparser.c" yy_destructor(1,&yymsp[0].minor); break; case 6: @@ -832,7 +840,7 @@ static void yy_reduce( yy_destructor(1,&yymsp[0].minor); break; case 9: -#line 144 "./configparser.y" +#line 148 "../../src/configparser.y" { if (ctx->ok) { buffer_copy_string_buffer(yymsp[0].minor.yy41->key, yymsp[-2].minor.yy43); @@ -856,11 +864,11 @@ static void yy_reduce( buffer_free(yymsp[-2].minor.yy43); yymsp[-2].minor.yy43 = NULL; } -#line 859 "configparser.c" +#line 867 "configparser.c" yy_destructor(2,&yymsp[-1].minor); break; case 10: -#line 168 "./configparser.y" +#line 172 "../../src/configparser.y" { array *vars = ctx->current->value; data_unset *du; @@ -900,11 +908,11 @@ static void yy_reduce( yymsp[-2].minor.yy43 = NULL; yymsp[0].minor.yy41 = NULL; } -#line 903 "configparser.c" +#line 911 "configparser.c" yy_destructor(3,&yymsp[-1].minor); break; case 11: -#line 208 "./configparser.y" +#line 212 "../../src/configparser.y" { if (strchr(yymsp[0].minor.yy0->ptr, '.') == NULL) { yygotominor.yy43 = buffer_init_string("var."); @@ -916,10 +924,10 @@ static void yy_reduce( yymsp[0].minor.yy0 = NULL; } } -#line 919 "configparser.c" +#line 927 "configparser.c" break; case 12: -#line 220 "./configparser.y" +#line 224 "../../src/configparser.y" { yygotominor.yy41 = configparser_merge_data(yymsp[-2].minor.yy41, yymsp[0].minor.yy41); if (NULL == yygotominor.yy41) { @@ -929,19 +937,19 @@ static void yy_reduce( yymsp[0].minor.yy41->free(yymsp[0].minor.yy41); yymsp[0].minor.yy41 = NULL; } -#line 932 "configparser.c" +#line 940 "configparser.c" yy_destructor(5,&yymsp[-1].minor); break; case 13: -#line 230 "./configparser.y" +#line 234 "../../src/configparser.y" { yygotominor.yy41 = yymsp[0].minor.yy41; yymsp[0].minor.yy41 = NULL; } -#line 941 "configparser.c" +#line 949 "configparser.c" break; case 14: -#line 235 "./configparser.y" +#line 239 "../../src/configparser.y" { yygotominor.yy41 = NULL; if (strncmp(yymsp[0].minor.yy43->ptr, "env.", sizeof("env.") - 1) == 0) { @@ -968,59 +976,59 @@ static void yy_reduce( buffer_free(yymsp[0].minor.yy43); yymsp[0].minor.yy43 = NULL; } -#line 971 "configparser.c" +#line 979 "configparser.c" break; case 15: -#line 262 "./configparser.y" +#line 266 "../../src/configparser.y" { yygotominor.yy41 = (data_unset *)data_string_init(); buffer_copy_string_buffer(((data_string *)(yygotominor.yy41))->value, yymsp[0].minor.yy0); buffer_free(yymsp[0].minor.yy0); yymsp[0].minor.yy0 = NULL; } -#line 981 "configparser.c" +#line 989 "configparser.c" break; case 16: -#line 269 "./configparser.y" +#line 273 "../../src/configparser.y" { yygotominor.yy41 = (data_unset *)data_integer_init(); ((data_integer *)(yygotominor.yy41))->value = strtol(yymsp[0].minor.yy0->ptr, NULL, 10); buffer_free(yymsp[0].minor.yy0); yymsp[0].minor.yy0 = NULL; } -#line 991 "configparser.c" +#line 999 "configparser.c" break; case 17: -#line 275 "./configparser.y" +#line 279 "../../src/configparser.y" { yygotominor.yy41 = (data_unset *)data_array_init(); array_free(((data_array *)(yygotominor.yy41))->value); ((data_array *)(yygotominor.yy41))->value = yymsp[0].minor.yy40; yymsp[0].minor.yy40 = NULL; } -#line 1001 "configparser.c" +#line 1009 "configparser.c" break; case 18: -#line 281 "./configparser.y" +#line 285 "../../src/configparser.y" { yygotominor.yy40 = array_init(); } -#line 1008 "configparser.c" +#line 1016 "configparser.c" yy_destructor(8,&yymsp[-1].minor); yy_destructor(9,&yymsp[0].minor); break; case 19: -#line 284 "./configparser.y" +#line 288 "../../src/configparser.y" { yygotominor.yy40 = yymsp[-1].minor.yy40; yymsp[-1].minor.yy40 = NULL; } -#line 1018 "configparser.c" +#line 1026 "configparser.c" yy_destructor(8,&yymsp[-2].minor); yy_destructor(9,&yymsp[0].minor); break; case 20: -#line 289 "./configparser.y" +#line 293 "../../src/configparser.y" { if (buffer_is_empty(yymsp[0].minor.yy41->key) || NULL == array_get_element(yymsp[-2].minor.yy40, yymsp[0].minor.yy41->key->ptr)) { @@ -1037,37 +1045,37 @@ static void yy_reduce( yygotominor.yy40 = yymsp[-2].minor.yy40; yymsp[-2].minor.yy40 = NULL; } -#line 1040 "configparser.c" +#line 1048 "configparser.c" yy_destructor(10,&yymsp[-1].minor); break; case 21: -#line 306 "./configparser.y" +#line 310 "../../src/configparser.y" { yygotominor.yy40 = yymsp[-1].minor.yy40; yymsp[-1].minor.yy40 = NULL; } -#line 1049 "configparser.c" +#line 1057 "configparser.c" yy_destructor(10,&yymsp[0].minor); break; case 22: -#line 311 "./configparser.y" +#line 315 "../../src/configparser.y" { yygotominor.yy40 = array_init(); array_insert_unique(yygotominor.yy40, yymsp[0].minor.yy41); yymsp[0].minor.yy41 = NULL; } -#line 1059 "configparser.c" +#line 1067 "configparser.c" break; case 23: -#line 317 "./configparser.y" +#line 321 "../../src/configparser.y" { yygotominor.yy41 = yymsp[0].minor.yy41; yymsp[0].minor.yy41 = NULL; } -#line 1067 "configparser.c" +#line 1075 "configparser.c" break; case 24: -#line 321 "./configparser.y" +#line 325 "../../src/configparser.y" { buffer_copy_string_buffer(yymsp[0].minor.yy41->key, yymsp[-2].minor.yy43); buffer_free(yymsp[-2].minor.yy43); @@ -1076,7 +1084,7 @@ static void yy_reduce( yygotominor.yy41 = yymsp[0].minor.yy41; yymsp[0].minor.yy41 = NULL; } -#line 1079 "configparser.c" +#line 1087 "configparser.c" yy_destructor(11,&yymsp[-1].minor); break; case 25: @@ -1085,18 +1093,18 @@ static void yy_reduce( case 26: break; case 27: -#line 333 "./configparser.y" +#line 337 "../../src/configparser.y" { data_config *dc; dc = (data_config *)array_get_element(ctx->srv->config_context, "global"); assert(dc); configparser_push(ctx, dc, 0); } -#line 1095 "configparser.c" +#line 1103 "configparser.c" yy_destructor(12,&yymsp[0].minor); break; case 28: -#line 340 "./configparser.y" +#line 344 "../../src/configparser.y" { data_config *cur; @@ -1107,14 +1115,14 @@ static void yy_reduce( yygotominor.yy78 = cur; } -#line 1110 "configparser.c" +#line 1118 "configparser.c" /* No destructor defined for globalstart */ yy_destructor(13,&yymsp[-2].minor); /* No destructor defined for metalines */ yy_destructor(14,&yymsp[0].minor); break; case 29: -#line 351 "./configparser.y" +#line 355 "../../src/configparser.y" { assert(yymsp[-3].minor.yy78->context_ndx < yymsp[0].minor.yy78->context_ndx); yymsp[0].minor.yy78->prev = yymsp[-3].minor.yy78; @@ -1123,20 +1131,20 @@ static void yy_reduce( yymsp[-3].minor.yy78 = NULL; yymsp[0].minor.yy78 = NULL; } -#line 1126 "configparser.c" +#line 1134 "configparser.c" /* No destructor defined for eols */ yy_destructor(15,&yymsp[-1].minor); break; case 30: -#line 360 "./configparser.y" +#line 364 "../../src/configparser.y" { yygotominor.yy78 = yymsp[0].minor.yy78; yymsp[0].minor.yy78 = NULL; } -#line 1136 "configparser.c" +#line 1144 "configparser.c" break; case 31: -#line 365 "./configparser.y" +#line 369 "../../src/configparser.y" { data_config *cur; @@ -1147,14 +1155,14 @@ static void yy_reduce( yygotominor.yy78 = cur; } -#line 1150 "configparser.c" +#line 1158 "configparser.c" /* No destructor defined for context */ yy_destructor(13,&yymsp[-2].minor); /* No destructor defined for metalines */ yy_destructor(14,&yymsp[0].minor); break; case 32: -#line 376 "./configparser.y" +#line 380 "../../src/configparser.y" { data_config *dc; buffer *b, *rvalue, *op; @@ -1205,6 +1213,7 @@ static void yy_reduce( { COMP_HTTP_REFERER, CONST_STR_LEN("HTTP[\"referer\"]" ) }, { COMP_HTTP_USER_AGENT, CONST_STR_LEN("HTTP[\"useragent\"]" ) }, { COMP_HTTP_USER_AGENT, CONST_STR_LEN("HTTP[\"user-agent\"]" ) }, + { COMP_HTTP_LANGUAGE, CONST_STR_LEN("HTTP[\"language\"]" ) }, { COMP_HTTP_COOKIE, CONST_STR_LEN("HTTP[\"cookie\"]" ) }, { COMP_HTTP_REMOTE_IP, CONST_STR_LEN("HTTP[\"remoteip\"]" ) }, { COMP_HTTP_REMOTE_IP, CONST_STR_LEN("HTTP[\"remote-ip\"]" ) }, @@ -1295,45 +1304,45 @@ static void yy_reduce( yymsp[0].minor.yy41->free(yymsp[0].minor.yy41); yymsp[0].minor.yy41 = NULL; } -#line 1298 "configparser.c" +#line 1307 "configparser.c" yy_destructor(16,&yymsp[-6].minor); yy_destructor(18,&yymsp[-4].minor); yy_destructor(19,&yymsp[-2].minor); break; case 33: -#line 516 "./configparser.y" +#line 521 "../../src/configparser.y" { yygotominor.yy27 = CONFIG_COND_EQ; } -#line 1308 "configparser.c" +#line 1317 "configparser.c" yy_destructor(20,&yymsp[0].minor); break; case 34: -#line 519 "./configparser.y" +#line 524 "../../src/configparser.y" { yygotominor.yy27 = CONFIG_COND_MATCH; } -#line 1316 "configparser.c" +#line 1325 "configparser.c" yy_destructor(21,&yymsp[0].minor); break; case 35: -#line 522 "./configparser.y" +#line 527 "../../src/configparser.y" { yygotominor.yy27 = CONFIG_COND_NE; } -#line 1324 "configparser.c" +#line 1333 "configparser.c" yy_destructor(22,&yymsp[0].minor); break; case 36: -#line 525 "./configparser.y" +#line 530 "../../src/configparser.y" { yygotominor.yy27 = CONFIG_COND_NOMATCH; } -#line 1332 "configparser.c" +#line 1341 "configparser.c" yy_destructor(23,&yymsp[0].minor); break; case 37: -#line 529 "./configparser.y" +#line 534 "../../src/configparser.y" { yygotominor.yy43 = NULL; if (ctx->ok) { @@ -1350,10 +1359,10 @@ static void yy_reduce( yymsp[0].minor.yy41->free(yymsp[0].minor.yy41); yymsp[0].minor.yy41 = NULL; } -#line 1353 "configparser.c" +#line 1362 "configparser.c" break; case 38: -#line 546 "./configparser.y" +#line 551 "../../src/configparser.y" { if (ctx->ok) { if (0 != config_parse_file(ctx->srv, ctx, yymsp[0].minor.yy43->ptr)) { @@ -1363,11 +1372,11 @@ static void yy_reduce( yymsp[0].minor.yy43 = NULL; } } -#line 1366 "configparser.c" +#line 1375 "configparser.c" yy_destructor(24,&yymsp[-1].minor); break; case 39: -#line 556 "./configparser.y" +#line 561 "../../src/configparser.y" { if (ctx->ok) { if (0 != config_parse_cmd(ctx->srv, ctx, yymsp[0].minor.yy43->ptr)) { @@ -1377,7 +1386,7 @@ static void yy_reduce( yymsp[0].minor.yy43 = NULL; } } -#line 1380 "configparser.c" +#line 1389 "configparser.c" yy_destructor(25,&yymsp[-1].minor); break; }; @@ -1407,11 +1416,11 @@ static void yy_parse_failed( while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser); /* Here code is inserted which will be executed whenever the ** parser fails */ -#line 106 "./configparser.y" +#line 110 "../../src/configparser.y" ctx->ok = 0; -#line 1414 "configparser.c" +#line 1423 "configparser.c" configparserARG_STORE; /* Suppress warning about unused %extra_argument variable */ } @@ -1424,6 +1433,8 @@ static void yy_syntax_error( YYMINORTYPE yyminor /* The minor type of the error token */ ){ configparserARG_FETCH; + UNUSED(yymajor); + UNUSED(yyminor); #define TOKEN (yyminor.yy0) configparserARG_STORE; /* Suppress warning about unused %extra_argument variable */ } diff --git a/src/configparser.y b/src/configparser.y index 57e2dc5..d6c33a9 100644 --- a/src/configparser.y +++ b/src/configparser.y @@ -21,6 +21,10 @@ static void configparser_push(config_t *ctx, data_config *dc, int isnew) { dc->parent = ctx->current; array_insert_unique(dc->parent->childs, (data_unset *)dc); } + if (ctx->configs_stack->used > 0 && ctx->current->context_ndx == 0) { + fprintf(stderr, "Cannot use conditionals inside a global { ... } block\n"); + exit(-1); + } array_insert_unique(ctx->configs_stack, (data_unset *)ctx->current); ctx->current = dc; } @@ -423,6 +427,7 @@ context ::= DOLLAR SRVVARNAME(B) LBRACKET stringop(C) RBRACKET cond(E) expressio { COMP_HTTP_REFERER, CONST_STR_LEN("HTTP[\"referer\"]" ) }, { COMP_HTTP_USER_AGENT, CONST_STR_LEN("HTTP[\"useragent\"]" ) }, { COMP_HTTP_USER_AGENT, CONST_STR_LEN("HTTP[\"user-agent\"]" ) }, + { COMP_HTTP_LANGUAGE, CONST_STR_LEN("HTTP[\"language\"]" ) }, { COMP_HTTP_COOKIE, CONST_STR_LEN("HTTP[\"cookie\"]" ) }, { COMP_HTTP_REMOTE_IP, CONST_STR_LEN("HTTP[\"remoteip\"]" ) }, { COMP_HTTP_REMOTE_IP, CONST_STR_LEN("HTTP[\"remote-ip\"]" ) }, diff --git a/src/connections-glue.c b/src/connections-glue.c index 89180b4..5ef7a1e 100644 --- a/src/connections-glue.c +++ b/src/connections-glue.c @@ -1,4 +1,5 @@ #include "base.h" +#include "connections.h" const char *connection_get_state(connection_state_t state) { switch (state) { diff --git a/src/connections.c b/src/connections.c index 184ecb9..994c1d2 100644 --- a/src/connections.c +++ b/src/connections.c @@ -199,6 +199,7 @@ static int connection_handle_read_ssl(server *srv, connection *con) { /* don't resize the buffer if we were in SSL_ERROR_WANT_* */ + ERR_clear_error(); do { if (!con->ssl_error_want_reuse_buffer) { b = buffer_init(); @@ -275,9 +276,19 @@ static int connection_handle_read_ssl(server *srv, connection *con) { /* fall thourgh */ default: while((ssl_err = ERR_get_error())) { + switch (ERR_GET_REASON(ssl_err)) { + case SSL_R_SSL_HANDSHAKE_FAILURE: + case SSL_R_TLSV1_ALERT_UNKNOWN_CA: + case SSL_R_SSLV3_ALERT_CERTIFICATE_UNKNOWN: + case SSL_R_SSLV3_ALERT_BAD_CERTIFICATE: + if (!con->conf.log_ssl_noise) continue; + break; + default: + break; + } /* get all errors from the error-queue */ log_error_write(srv, __FILE__, __LINE__, "sds", "SSL:", - r, ERR_error_string(ssl_err, NULL)); + r, ERR_error_string(ssl_err, NULL)); } break; } @@ -299,6 +310,8 @@ static int connection_handle_read_ssl(server *srv, connection *con) { return 0; #else + UNUSED(srv); + UNUSED(con); return -1; #endif } @@ -317,15 +330,13 @@ static int connection_handle_read(server *srv, connection *con) { buffer_prepare_copy(b, 4 * 1024); len = recv(con->fd, b->ptr, b->size - 1, 0); #else - if (ioctl(con->fd, FIONREAD, &toread)) { - log_error_write(srv, __FILE__, __LINE__, "sd", - "unexpected end-of-file:", - con->fd); - return -1; + if (ioctl(con->fd, FIONREAD, &toread) || toread == 0) { + b = chunkqueue_get_append_buffer(con->read_queue); + buffer_prepare_copy(b, 4 * 1024); + } else { + b = chunkqueue_get_append_buffer(con->read_queue); + buffer_prepare_copy(b, toread + 1); } - b = chunkqueue_get_append_buffer(con->read_queue); - buffer_prepare_copy(b, toread + 1); - len = read(con->fd, b->ptr, b->size - 1); #endif @@ -427,21 +438,22 @@ static int connection_handle_write_prepare(server *srv, connection *con) { } switch(con->http_status) { - case 400: /* class: header + custom body */ - case 401: - case 403: - case 404: - case 408: - case 409: - case 411: - case 416: - case 423: - case 500: - case 501: - case 503: - case 505: + case 204: /* class: header only */ + case 205: + case 304: + /* disable chunked encoding again as we have no body */ + con->response.transfer_encoding &= ~HTTP_TRANSFER_ENCODING_CHUNKED; + con->parsed_response &= ~HTTP_CONTENT_LENGTH; + chunkqueue_reset(con->write_queue); + + con->file_finished = 1; + break; + default: /* class: header + body */ if (con->mode != DIRECT) break; + /* only custom body for 4xx and 5xx */ + if (con->http_status < 400 || con->http_status >= 600) break; + con->file_finished = 0; buffer_reset(con->physical.path); @@ -451,7 +463,8 @@ static int connection_handle_write_prepare(server *srv, connection *con) { stat_cache_entry *sce = NULL; buffer_copy_string_buffer(con->physical.path, con->conf.errorfile_prefix); - buffer_append_string(con->physical.path, get_http_status_body_name(con->http_status)); + buffer_append_long(con->physical.path, con->http_status); + buffer_append_string_len(con->physical.path, CONST_STR_LEN(".html")); if (HANDLER_ERROR != stat_cache_get_entry(srv, con, con->physical.path, &sce)) { con->file_finished = 1; @@ -470,56 +483,33 @@ static int connection_handle_write_prepare(server *srv, connection *con) { b = chunkqueue_get_append_buffer(con->write_queue); /* build default error-page */ - buffer_copy_string(b, + buffer_copy_string_len(b, CONST_STR_LEN( "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\n" "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n" " \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n" "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\">\n" " <head>\n" - " <title>"); + " <title>")); buffer_append_long(b, con->http_status); - buffer_append_string(b, " - "); + buffer_append_string_len(b, CONST_STR_LEN(" - ")); buffer_append_string(b, get_http_status_name(con->http_status)); - buffer_append_string(b, + buffer_append_string_len(b, CONST_STR_LEN( "</title>\n" " </head>\n" " <body>\n" - " <h1>"); + " <h1>")); buffer_append_long(b, con->http_status); - buffer_append_string(b, " - "); + buffer_append_string_len(b, CONST_STR_LEN(" - ")); buffer_append_string(b, get_http_status_name(con->http_status)); - buffer_append_string(b,"</h1>\n" + buffer_append_string_len(b, CONST_STR_LEN("</h1>\n" " </body>\n" "</html>\n" - ); + )); response_header_overwrite(srv, con, CONST_STR_LEN("Content-Type"), CONST_STR_LEN("text/html")); } - /* fall through */ - case 207: - case 200: /* class: header + body */ - case 201: - case 300: - case 301: - case 302: - case 303: - case 307: - break; - - case 206: /* write_queue is already prepared */ - break; - case 204: - case 205: /* class: header only */ - case 304: - default: - /* disable chunked encoding again as we have no body */ - con->response.transfer_encoding &= ~HTTP_TRANSFER_ENCODING_CHUNKED; - con->parsed_response &= ~HTTP_CONTENT_LENGTH; - chunkqueue_reset(con->write_queue); - - con->file_finished = 1; break; } @@ -544,7 +534,7 @@ static int connection_handle_write_prepare(server *srv, connection *con) { data_string *ds; /* no Content-Body, no Content-Length */ if (NULL != (ds = (data_string*) array_get_element(con->response.headers, "Content-Length"))) { - buffer_reset(ds->value); // Headers with empty values are ignored for output + buffer_reset(ds->value); /* Headers with empty values are ignored for output */ } } else if (qlen > 0 || con->request.http_method != HTTP_METHOD_HEAD) { /* qlen = 0 is important for Redirects (301, ...) as they MAY have @@ -846,7 +836,7 @@ int connection_reset(server *srv, connection *con) { } /* The cond_cache gets reset in response.c */ -// config_cond_cache_reset(srv, con); + /* config_cond_cache_reset(srv, con); */ #ifdef USE_OPENSSL if (con->ssl_error_want_reuse_buffer) { @@ -1074,6 +1064,9 @@ int connection_handle_read_state(server *srv, connection *con) { if (dst_c->file.fd == -1) { /* this should not happen as we cache the fd, but you never know */ dst_c->file.fd = open(dst_c->file.name->ptr, O_WRONLY | O_APPEND); +#ifdef FD_CLOEXEC + fcntl(dst_c->file.fd, F_SETFD, FD_CLOEXEC); +#endif } } else { /* the chunk is too large now, close it */ @@ -1668,21 +1661,51 @@ int connection_state_machine(server *srv, connection *con) { } #ifdef USE_OPENSSL if (srv_sock->is_ssl) { - int ret; + int ret, ssl_r; + unsigned long err; + ERR_clear_error(); switch ((ret = SSL_shutdown(con->ssl))) { case 1: /* ok */ break; case 0: - SSL_shutdown(con->ssl); - break; + ERR_clear_error(); + if (-1 != (ret = SSL_shutdown(con->ssl))) break; + + /* fall through */ default: - log_error_write(srv, __FILE__, __LINE__, "sds", "SSL:", - SSL_get_error(con->ssl, ret), - ERR_error_string(ERR_get_error(), NULL)); - return -1; + + switch ((ssl_r = SSL_get_error(con->ssl, ret))) { + case SSL_ERROR_WANT_WRITE: + case SSL_ERROR_WANT_READ: + break; + case SSL_ERROR_SYSCALL: + /* perhaps we have error waiting in our error-queue */ + if (0 != (err = ERR_get_error())) { + do { + log_error_write(srv, __FILE__, __LINE__, "sdds", "SSL:", + ssl_r, ret, + ERR_error_string(err, NULL)); + } while((err = ERR_get_error())); + } else { + log_error_write(srv, __FILE__, __LINE__, "sddds", "SSL (error):", + ssl_r, ret, errno, + strerror(errno)); + } + + break; + default: + while((err = ERR_get_error())) { + log_error_write(srv, __FILE__, __LINE__, "sdds", "SSL:", + ssl_r, ret, + ERR_error_string(err, NULL)); + } + + break; + } } } + ERR_clear_error(); #endif switch(con->mode) { diff --git a/src/data_string.c b/src/data_string.c index e7aab1a..5b2678d 100644 --- a/src/data_string.c +++ b/src/data_string.c @@ -37,7 +37,7 @@ static int data_string_insert_dup(data_unset *dst, data_unset *src) { data_string *ds_src = (data_string *)src; if (ds_dst->value->used) { - buffer_append_string(ds_dst->value, ", "); + buffer_append_string_len(ds_dst->value, CONST_STR_LEN(", ")); buffer_append_string_buffer(ds_dst->value, ds_src->value); } else { buffer_copy_string_buffer(ds_dst->value, ds_src->value); @@ -53,9 +53,9 @@ static int data_response_insert_dup(data_unset *dst, data_unset *src) { data_string *ds_src = (data_string *)src; if (ds_dst->value->used) { - buffer_append_string(ds_dst->value, "\r\n"); + buffer_append_string_len(ds_dst->value, CONST_STR_LEN("\r\n")); buffer_append_string_buffer(ds_dst->value, ds_dst->key); - buffer_append_string(ds_dst->value, ": "); + buffer_append_string_len(ds_dst->value, CONST_STR_LEN(": ")); buffer_append_string_buffer(ds_dst->value, ds_src->value); } else { buffer_copy_string_buffer(ds_dst->value, ds_src->value); diff --git a/src/fdevent_linux_sysepoll.c b/src/fdevent_linux_sysepoll.c index 64125f0..eb3ce11 100644 --- a/src/fdevent_linux_sysepoll.c +++ b/src/fdevent_linux_sysepoll.c @@ -91,7 +91,7 @@ static int fdevent_linux_sysepoll_event_get_revent(fdevents *ev, size_t ndx) { if (e & EPOLLHUP) events |= FDEVENT_HUP; if (e & EPOLLPRI) events |= FDEVENT_PRI; - return e; + return events; } static int fdevent_linux_sysepoll_event_get_fd(fdevents *ev, size_t ndx) { diff --git a/src/http-header-glue.c b/src/http-header-glue.c index 7903c05..5aa6a23 100644 --- a/src/http-header-glue.c +++ b/src/http-header-glue.c @@ -9,6 +9,7 @@ #include "buffer.h" #include "log.h" #include "etag.h" +#include "response.h" /* * This was 'borrowed' from tcpdump. @@ -109,9 +110,9 @@ int http_response_redirect_to_directory(server *srv, connection *con) { o = buffer_init(); if (con->conf.is_ssl) { - buffer_copy_string(o, "https://"); + buffer_copy_string_len(o, CONST_STR_LEN("https://")); } else { - buffer_copy_string(o, "http://"); + buffer_copy_string_len(o, CONST_STR_LEN("http://")); } if (con->uri.authority->used) { buffer_append_string_buffer(o, con->uri.authority); @@ -180,14 +181,14 @@ int http_response_redirect_to_directory(server *srv, connection *con) { if (!((con->conf.is_ssl == 0 && srv->srvconf.port == 80) || (con->conf.is_ssl == 1 && srv->srvconf.port == 443))) { - buffer_append_string(o, ":"); + buffer_append_string_len(o, CONST_STR_LEN(":")); buffer_append_long(o, srv->srvconf.port); } } buffer_append_string_buffer(o, con->uri.path); - buffer_append_string(o, "/"); + buffer_append_string_len(o, CONST_STR_LEN("/")); if (!buffer_is_empty(con->uri.query)) { - buffer_append_string(o, "?"); + buffer_append_string_len(o, CONST_STR_LEN("?")); buffer_append_string_buffer(o, con->uri.query); } @@ -272,6 +273,7 @@ int http_response_handle_cachable(server *srv, connection *con, buffer *mtime) { con->request.http_if_modified_since, used_len, sizeof(buf) - 1); con->http_status = 412; + con->mode = DIRECT; return HANDLER_FINISHED; } @@ -279,8 +281,10 @@ int http_response_handle_cachable(server *srv, connection *con, buffer *mtime) { strncpy(buf, con->request.http_if_modified_since, used_len); buf[used_len] = '\0'; + tm.tm_isdst = 0; if (NULL == strptime(buf, "%a, %d %b %Y %H:%M:%S GMT", &tm)) { con->http_status = 412; + con->mode = DIRECT; return HANDLER_FINISHED; } t_header = mktime(&tm); @@ -299,6 +303,7 @@ int http_response_handle_cachable(server *srv, connection *con, buffer *mtime) { } } else { con->http_status = 412; + con->mode = DIRECT; return HANDLER_FINISHED; } } @@ -326,6 +331,7 @@ int http_response_handle_cachable(server *srv, connection *con, buffer *mtime) { strncpy(buf, con->request.http_if_modified_since, used_len); buf[used_len] = '\0'; + tm.tm_isdst = 0; if (NULL == strptime(buf, "%a, %d %b %Y %H:%M:%S GMT", &tm)) { /** * parsing failed, let's get out of here diff --git a/src/http_auth.c b/src/http_auth.c index 89abde6..ccd087e 100644 --- a/src/http_auth.c +++ b/src/http_auth.c @@ -57,22 +57,25 @@ handler_t auth_ldap_init(server *srv, mod_auth_plugin_config *s); static const char base64_pad = '='; +/* "A-Z a-z 0-9 + /" maps to 0-63 */ static const short base64_reverse_table[256] = { - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, - 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, - -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, - -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, - 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 +/* 0 1 2 3 4 5 6 7 8 9 A B C D E F */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x00 - 0x0F */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x10 - 0x1F */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, /* 0x20 - 0x2F */ + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, /* 0x30 - 0x3F */ + -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, /* 0x40 - 0x4F */ + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, /* 0x50 - 0x5F */ + -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, /* 0x60 - 0x6F */ + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1, /* 0x70 - 0x7F */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x80 - 0x8F */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x90 - 0x9F */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0xA0 - 0xAF */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0xB0 - 0xBF */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0xC0 - 0xCF */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0xD0 - 0xDF */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0xE0 - 0xEF */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0xF0 - 0xFF */ }; @@ -744,20 +747,26 @@ static int http_auth_basic_password_compare(server *srv, mod_auth_plugin_data *p /* 2. */ - if (p->conf.ldap == NULL || - LDAP_SUCCESS != (ret = ldap_search_s(p->conf.ldap, p->conf.auth_ldap_basedn->ptr, LDAP_SCOPE_SUBTREE, p->ldap_filter->ptr, attrs, 0, &lm))) { - if (auth_ldap_init(srv, &p->conf) != HANDLER_GO_ON) - return -1; - if (LDAP_SUCCESS != (ret = ldap_search_s(p->conf.ldap, p->conf.auth_ldap_basedn->ptr, LDAP_SCOPE_SUBTREE, p->ldap_filter->ptr, attrs, 0, &lm))) { + if (p->anon_conf->ldap == NULL || + LDAP_SUCCESS != (ret = ldap_search_s(p->anon_conf->ldap, p->conf.auth_ldap_basedn->ptr, LDAP_SCOPE_SUBTREE, p->ldap_filter->ptr, attrs, 0, &lm))) { - log_error_write(srv, __FILE__, __LINE__, "sssb", - "ldap:", ldap_err2string(ret), "filter:", p->ldap_filter); + /* try again; the ldap library sometimes fails for the first call but reconnects */ + if (p->anon_conf->ldap == NULL || ret != LDAP_SERVER_DOWN || + LDAP_SUCCESS != (ret = ldap_search_s(p->anon_conf->ldap, p->conf.auth_ldap_basedn->ptr, LDAP_SCOPE_SUBTREE, p->ldap_filter->ptr, attrs, 0, &lm))) { - return -1; + if (auth_ldap_init(srv, p->anon_conf) != HANDLER_GO_ON) + return -1; + + if (p->anon_conf->ldap == NULL || + LDAP_SUCCESS != (ret = ldap_search_s(p->anon_conf->ldap, p->conf.auth_ldap_basedn->ptr, LDAP_SCOPE_SUBTREE, p->ldap_filter->ptr, attrs, 0, &lm))) { + log_error_write(srv, __FILE__, __LINE__, "sssb", + "ldap:", ldap_err2string(ret), "filter:", p->ldap_filter); + return -1; + } } } - if (NULL == (first = ldap_first_entry(p->conf.ldap, lm))) { + if (NULL == (first = ldap_first_entry(p->anon_conf->ldap, lm))) { log_error_write(srv, __FILE__, __LINE__, "s", "ldap ..."); ldap_msgfree(lm); @@ -765,7 +774,7 @@ static int http_auth_basic_password_compare(server *srv, mod_auth_plugin_data *p return -1; } - if (NULL == (dn = ldap_get_dn(p->conf.ldap, first))) { + if (NULL == (dn = ldap_get_dn(p->anon_conf->ldap, first))) { log_error_write(srv, __FILE__, __LINE__, "s", "ldap ..."); ldap_msgfree(lm); diff --git a/src/http_auth.h b/src/http_auth.h index f956bd1..5828a7e 100644 --- a/src/http_auth.h +++ b/src/http_auth.h @@ -63,7 +63,7 @@ typedef struct { mod_auth_plugin_config **config_storage; - mod_auth_plugin_config conf; /* this is only used as long as no handler_ctx is setup */ + mod_auth_plugin_config conf, *anon_conf; /* this is only used as long as no handler_ctx is setup */ } mod_auth_plugin_data; int http_auth_basic_check(server *srv, connection *con, mod_auth_plugin_data *p, array *req, buffer *url, const char *realm_str); diff --git a/src/http_chunk.c b/src/http_chunk.c index 669ff32..37e829d 100644 --- a/src/http_chunk.c +++ b/src/http_chunk.c @@ -27,7 +27,7 @@ static int http_chunk_append_len(server *srv, connection *con, size_t len) { b = srv->tmp_chunk_len; if (len == 0) { - buffer_copy_string(b, "0"); + buffer_copy_string_len(b, CONST_STR_LEN("0")); } else { for (i = 0; i < 8 && len; i++) { len >>= 4; @@ -44,7 +44,7 @@ static int http_chunk_append_len(server *srv, connection *con, size_t len) { b->ptr[b->used++] = '\0'; } - buffer_append_string(b, "\r\n"); + buffer_append_string_len(b, CONST_STR_LEN("\r\n")); chunkqueue_append_buffer(con->write_queue, b); return 0; diff --git a/src/inet_ntop_cache.c b/src/inet_ntop_cache.c index 76d40f3..51755df 100644 --- a/src/inet_ntop_cache.c +++ b/src/inet_ntop_cache.c @@ -11,7 +11,7 @@ const char * inet_ntop_cache_get_ip(server *srv, sock_addr *addr) { #ifdef HAVE_IPV6 size_t ndx = 0, i; for (i = 0; i < INET_NTOP_CACHE_MAX; i++) { - if (srv->inet_ntop_cache[i].ts != 0) { + if (srv->inet_ntop_cache[i].ts != 0 && srv->inet_ntop_cache[i].family == addr->plain.sa_family) { if (srv->inet_ntop_cache[i].family == AF_INET6 && 0 == memcmp(srv->inet_ntop_cache[i].addr.ipv6.s6_addr, addr->ipv6.sin6_addr.s6_addr, 16)) { /* IPv6 found in cache */ diff --git a/src/lemon.c b/src/lemon.c index 5dcf144..d4c71ef 100644 --- a/src/lemon.c +++ b/src/lemon.c @@ -12,6 +12,19 @@ #include <ctype.h> #include <stdlib.h> +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#ifdef HAVE_STDINT_H +# include <stdint.h> +#endif +#ifdef HAVE_INTTYPES_H +# include <inttypes.h> +#endif + +#define UNUSED(x) ( (void)(x) ) + extern void qsort(); extern double strtod(); extern long strtol(); @@ -983,6 +996,7 @@ struct symbol *errsym; /* The error symbol (if defined. NULL otherwise) */ { struct symbol *spx, *spy; int errcnt = 0; + UNUSED(errsym); assert( apx->sp==apy->sp ); /* Otherwise there would be no conflict */ if( apx->type==SHIFT && apy->type==REDUCE ){ spx = apx->sp; @@ -1347,6 +1361,7 @@ char **argv; struct lemon lem; char *def_tmpl_name = "lempar.c"; + UNUSED(argc); OptInit(argv,options,stderr); if( version ){ printf("Lemon version 1.0\n"); @@ -1651,7 +1666,7 @@ FILE *err; }else if( op[j].type==OPT_FLAG ){ *((int*)op[j].arg) = v; }else if( op[j].type==OPT_FFLAG ){ - (*(void(*)())(op[j].arg))(v); + (*(void(*)())(intptr_t)(op[j].arg))(v); }else{ if( err ){ fprintf(err,"%smissing argument on switch.\n",emsg); @@ -1733,19 +1748,19 @@ FILE *err; *(double*)(op[j].arg) = dv; break; case OPT_FDBL: - (*(void(*)())(op[j].arg))(dv); + (*(void(*)())(intptr_t)(op[j].arg))(dv); break; case OPT_INT: *(int*)(op[j].arg) = lv; break; case OPT_FINT: - (*(void(*)())(op[j].arg))((int)lv); + (*(void(*)())(intptr_t)(op[j].arg))((int)lv); break; case OPT_STR: *(char**)(op[j].arg) = sv; break; case OPT_FSTR: - (*(void(*)())(op[j].arg))(sv); + (*(void(*)())(intptr_t)(op[j].arg))(sv); break; } } @@ -2286,10 +2301,10 @@ to follow the previous rule."); ** token is passed to the function "parseonetoken" which builds all ** the appropriate data structures in the global state vector "gp". */ +struct pstate ps; void Parse(gp) struct lemon *gp; { - struct pstate ps; FILE *fp; char *filebuf; size_t filesize; diff --git a/src/lempar.c b/src/lempar.c index 9ab9075..26708ea 100644 --- a/src/lempar.c +++ b/src/lempar.c @@ -180,12 +180,14 @@ static char *yyTracePrompt = 0; ** Outputs: ** None. */ +#if 0 void ParseTrace(FILE *TraceFILE, char *zTracePrompt){ yyTraceFILE = TraceFILE; yyTracePrompt = zTracePrompt; if( yyTraceFILE==0 ) yyTracePrompt = 0; else if( yyTracePrompt==0 ) yyTraceFILE = 0; } +#endif #endif /* NDEBUG */ #ifndef NDEBUG @@ -208,9 +210,10 @@ static const char *yyRuleName[] = { ** This function returns the symbolic name associated with a token ** value. */ +#if 0 const char *ParseTokenName(int tokenType){ #ifndef NDEBUG - if( tokenType>0 && tokenType<(sizeof(yyTokenName)/sizeof(yyTokenName[0])) ){ + if( tokenType>0 && (size_t)tokenType<(sizeof(yyTokenName)/sizeof(yyTokenName[0])) ){ return yyTokenName[tokenType]; }else{ return "Unknown"; @@ -219,6 +222,7 @@ const char *ParseTokenName(int tokenType){ return ""; #endif } +#endif /* ** This function allocates a new parser. @@ -335,7 +339,7 @@ static int yy_find_shift_action( return YY_NO_ACTION; } i += iLookAhead; - if( i<0 || i>=YY_SZ_ACTTAB || yy_lookahead[i]!=iLookAhead ){ + if( i<0 || (size_t)i>=YY_SZ_ACTTAB || yy_lookahead[i]!=iLookAhead ){ #ifdef YYFALLBACK int iFallback; /* Fallback token */ if( iLookAhead<sizeof(yyFallback)/sizeof(yyFallback[0]) @@ -378,7 +382,7 @@ static int yy_find_reduce_action( return YY_NO_ACTION; } i += iLookAhead; - if( i<0 || i>=YY_SZ_ACTTAB || yy_lookahead[i]!=iLookAhead ){ + if( i<0 || (size_t)i>=YY_SZ_ACTTAB || yy_lookahead[i]!=iLookAhead ){ return yy_default[stateno]; }else{ return yy_action[i]; @@ -456,7 +460,7 @@ static void yy_reduce( yymsp = &yypParser->yystack[yypParser->yyidx]; #ifndef NDEBUG if( yyTraceFILE && yyruleno>=0 - && yyruleno<sizeof(yyRuleName)/sizeof(yyRuleName[0]) ){ + && (size_t)yyruleno<sizeof(yyRuleName)/sizeof(yyRuleName[0]) ){ fprintf(yyTraceFILE, "%sReduce [%s].\n", yyTracePrompt, yyRuleName[yyruleno]); } @@ -512,6 +516,8 @@ static void yy_syntax_error( YYMINORTYPE yyminor /* The minor type of the error token */ ){ ParseARG_FETCH; + UNUSED(yymajor); + UNUSED(yyminor); #define TOKEN (yyminor.yy0) %% ParseARG_STORE; /* Suppress warning about unused %extra_argument variable */ diff --git a/src/lighttpd-angel.c b/src/lighttpd-angel.c index a6e3741..d7dd1f4 100644 --- a/src/lighttpd-angel.c +++ b/src/lighttpd-angel.c @@ -28,9 +28,12 @@ static volatile sig_atomic_t start_process = 1; static volatile sig_atomic_t graceful_restart = 0; static volatile pid_t pid = -1; +#define UNUSED(x) ( (void)(x) ) + static void sigaction_handler(int sig, siginfo_t *si, void *context) { int exitcode; + UNUSED(context); switch (sig) { case SIGINT: case SIGTERM: @@ -60,6 +63,8 @@ int main(int argc, char **argv) { int is_shutdown = 0; struct sigaction act; + UNUSED(argc); + /** * we are running as root BEWARE */ @@ -31,6 +31,29 @@ # define O_LARGEFILE 0 #endif +/* Close fd and _try_ to get a /dev/null for it instead. + * close() alone may trigger some bugs when a + * process opens another file and gets fd = STDOUT_FILENO or STDERR_FILENO + * and later tries to just print on stdout/stderr + * + * Returns 0 on success and -1 on failure (fd gets closed in all cases) + */ +int openDevNull(int fd) { + int tmpfd; + close(fd); +#if defined(__WIN32) + /* Cygwin should work with /dev/null */ + tmpfd = open("nul", O_RDWR); +#else + tmpfd = open("/dev/null", O_RDWR); +#endif + if (tmpfd != -1 && tmpfd != fd) { + dup2(tmpfd, fd); + close(tmpfd); + } + return (tmpfd != -1) ? 0 : -1; +} + /** * open the errorlog * @@ -44,7 +67,6 @@ */ int log_error_open(server *srv) { - int fd; int close_stderr = 1; #ifdef HAVE_SYSLOG_H @@ -78,15 +100,16 @@ int log_error_open(server *srv) { /* don't close stderr for debugging purposes if run in valgrind */ if (RUNNING_ON_VALGRIND) close_stderr = 0; #endif - if (srv->errorlog_mode == ERRORLOG_STDERR) close_stderr = 0; - /* move stderr to /dev/null */ - if (close_stderr && - -1 != (fd = open("/dev/null", O_WRONLY))) { - close(STDERR_FILENO); - dup2(fd, STDERR_FILENO); - close(fd); + if (srv->errorlog_mode == ERRORLOG_STDERR && srv->srvconf.dont_daemonize) { + /* We can only log to stderr in dont-daemonize mode; + * if we do daemonize and no errorlog file is specified, we log into /dev/null + */ + close_stderr = 0; } + + /* move stderr to /dev/null */ + if (close_stderr) openDevNull(STDERR_FILENO); return 0; } @@ -123,6 +146,10 @@ int log_error_cycle(server *srv) { /* ok, new log is open, close the old one */ close(srv->errorlog_fd); srv->errorlog_fd = new_fd; +#ifdef FD_CLOEXEC + /* close fd on exec (cgi) */ + fcntl(srv->errorlog_fd, F_SETFD, FD_CLOEXEC); +#endif } } @@ -162,18 +189,18 @@ int log_error_write(server *srv, const char *filename, unsigned int line, const } buffer_copy_string_buffer(srv->errorlog_buf, srv->ts_debug_str); - BUFFER_APPEND_STRING_CONST(srv->errorlog_buf, ": ("); + buffer_append_string_len(srv->errorlog_buf, CONST_STR_LEN(": (")); break; case ERRORLOG_SYSLOG: /* syslog is generating its own timestamps */ - BUFFER_COPY_STRING_CONST(srv->errorlog_buf, "("); + buffer_copy_string_len(srv->errorlog_buf, CONST_STR_LEN("(")); break; } buffer_append_string(srv->errorlog_buf, filename); - BUFFER_APPEND_STRING_CONST(srv->errorlog_buf, "."); + buffer_append_string_len(srv->errorlog_buf, CONST_STR_LEN(".")); buffer_append_long(srv->errorlog_buf, line); - BUFFER_APPEND_STRING_CONST(srv->errorlog_buf, ") "); + buffer_append_string_len(srv->errorlog_buf, CONST_STR_LEN(") ")); for(va_start(ap, fmt); *fmt; fmt++) { @@ -186,28 +213,28 @@ int log_error_write(server *srv, const char *filename, unsigned int line, const case 's': /* string */ s = va_arg(ap, char *); buffer_append_string(srv->errorlog_buf, s); - BUFFER_APPEND_STRING_CONST(srv->errorlog_buf, " "); + buffer_append_string_len(srv->errorlog_buf, CONST_STR_LEN(" ")); break; case 'b': /* buffer */ b = va_arg(ap, buffer *); buffer_append_string_buffer(srv->errorlog_buf, b); - BUFFER_APPEND_STRING_CONST(srv->errorlog_buf, " "); + buffer_append_string_len(srv->errorlog_buf, CONST_STR_LEN(" ")); break; case 'd': /* int */ d = va_arg(ap, int); buffer_append_long(srv->errorlog_buf, d); - BUFFER_APPEND_STRING_CONST(srv->errorlog_buf, " "); + buffer_append_string_len(srv->errorlog_buf, CONST_STR_LEN(" ")); break; case 'o': /* off_t */ o = va_arg(ap, off_t); buffer_append_off_t(srv->errorlog_buf, o); - BUFFER_APPEND_STRING_CONST(srv->errorlog_buf, " "); + buffer_append_string_len(srv->errorlog_buf, CONST_STR_LEN(" ")); break; case 'x': /* int (hex) */ d = va_arg(ap, int); - BUFFER_APPEND_STRING_CONST(srv->errorlog_buf, "0x"); + buffer_append_string_len(srv->errorlog_buf, CONST_STR_LEN("0x")); buffer_append_long_hex(srv->errorlog_buf, d); - BUFFER_APPEND_STRING_CONST(srv->errorlog_buf, " "); + buffer_append_string_len(srv->errorlog_buf, CONST_STR_LEN(" ")); break; case 'S': /* string */ s = va_arg(ap, char *); @@ -221,6 +248,15 @@ int log_error_write(server *srv, const char *filename, unsigned int line, const d = va_arg(ap, int); buffer_append_long(srv->errorlog_buf, d); break; + case 'O': /* off_t */ + o = va_arg(ap, off_t); + buffer_append_off_t(srv->errorlog_buf, o); + break; + case 'X': /* int (hex) */ + d = va_arg(ap, int); + buffer_append_string_len(srv->errorlog_buf, CONST_STR_LEN("0x")); + buffer_append_long_hex(srv->errorlog_buf, d); + break; case '(': case ')': case '<': @@ -235,11 +271,11 @@ int log_error_write(server *srv, const char *filename, unsigned int line, const switch(srv->errorlog_mode) { case ERRORLOG_FILE: - BUFFER_APPEND_STRING_CONST(srv->errorlog_buf, "\n"); + buffer_append_string_len(srv->errorlog_buf, CONST_STR_LEN("\n")); write(srv->errorlog_fd, srv->errorlog_buf->ptr, srv->errorlog_buf->used - 1); break; case ERRORLOG_STDERR: - BUFFER_APPEND_STRING_CONST(srv->errorlog_buf, "\n"); + buffer_append_string_len(srv->errorlog_buf, CONST_STR_LEN("\n")); write(STDERR_FILENO, srv->errorlog_buf->ptr, srv->errorlog_buf->used - 1); break; case ERRORLOG_SYSLOG: @@ -3,6 +3,11 @@ #include "server.h" +/* Close fd and _try_ to get a /dev/null for it instead. + * Returns 0 on success and -1 on failure (fd gets closed in all cases) + */ +int openDevNull(int fd); + #define WP() log_error_write(srv, __FILE__, __LINE__, ""); int log_error_open(server *srv); @@ -52,9 +52,9 @@ documentation and/or software. #define S43 15 #define S44 21 -static void MD5Transform (UINT4 [4], unsigned char [64]); +static void MD5Transform (UINT4 [4], const unsigned char [64]); static void Encode (unsigned char *, UINT4 *, unsigned int); -static void Decode (UINT4 *, unsigned char *, unsigned int); +static void Decode (UINT4 *, const unsigned char *, unsigned int); #ifdef HAVE_MEMCPY #define MD5_memcpy(output, input, len) memcpy((output), (input), (len)) @@ -126,12 +126,13 @@ MD5_CTX *context; /* context */ operation, processing another message block, and updating the context. */ -void MD5_Update (context, input, inputLen) +void MD5_Update (context, _input, inputLen) MD5_CTX *context; /* context */ -unsigned char *input; /* input block */ +const void *_input; /* input block */ unsigned int inputLen; /* length of input block */ { unsigned int i, ndx, partLen; + const unsigned char *input = (const unsigned char*) _input; /* Compute number of bytes mod 64 */ ndx = (unsigned int)((context->count[0] >> 3) & 0x3F); @@ -200,7 +201,7 @@ MD5_CTX *context; /* context */ */ static void MD5Transform (state, block) UINT4 state[4]; -unsigned char block[64]; +const unsigned char block[64]; { UINT4 a = state[0], b = state[1], c = state[2], d = state[3], x[16]; @@ -313,7 +314,7 @@ unsigned int len; */ static void Decode (output, input, len) UINT4 *output; -unsigned char *input; +const unsigned char *input; unsigned int len; { unsigned int i, j; @@ -42,6 +42,6 @@ typedef struct { } MD5_CTX; void MD5_Init (MD5_CTX *); -void MD5_Update (MD5_CTX *, unsigned char *, unsigned int); +void MD5_Update (MD5_CTX *, const void *, unsigned int); void MD5_Final (unsigned char [16], MD5_CTX *); diff --git a/src/mod_access.c b/src/mod_access.c index f100c80..67b6802 100644 --- a/src/mod_access.c +++ b/src/mod_access.c @@ -159,6 +159,7 @@ URIHANDLER_FUNC(mod_access_uri_handler) { if (denied) { con->http_status = 403; + con->mode = DIRECT; if (con->conf.log_request_handling) { log_error_write(srv, __FILE__, __LINE__, "sb", diff --git a/src/mod_accesslog.c b/src/mod_accesslog.c index a3516d5..e5ba553 100644 --- a/src/mod_accesslog.c +++ b/src/mod_accesslog.c @@ -169,13 +169,13 @@ int accesslog_parse_format(server *srv, format_fields *fields, buffer *format) { if (fields->size == 0) { fields->size = 16; fields->used = 0; - fields->ptr = malloc(fields->size * sizeof(format_fields * )); + fields->ptr = malloc(fields->size * sizeof(format_field * )); } else if (fields->used == fields->size) { fields->size += 16; - fields->ptr = realloc(fields->ptr, fields->size * sizeof(format_fields * )); + fields->ptr = realloc(fields->ptr, fields->size * sizeof(format_field * )); } - fields->ptr[fields->used] = malloc(sizeof(format_fields)); + fields->ptr[fields->used] = malloc(sizeof(format_field)); fields->ptr[fields->used]->type = FIELD_STRING; fields->ptr[fields->used]->string = buffer_init(); @@ -189,10 +189,10 @@ int accesslog_parse_format(server *srv, format_fields *fields, buffer *format) { if (fields->size == 0) { fields->size = 16; fields->used = 0; - fields->ptr = malloc(fields->size * sizeof(format_fields * )); + fields->ptr = malloc(fields->size * sizeof(format_field * )); } else if (fields->used == fields->size) { fields->size += 16; - fields->ptr = realloc(fields->ptr, fields->size * sizeof(format_fields * )); + fields->ptr = realloc(fields->ptr, fields->size * sizeof(format_field * )); } /* search for the terminating command */ @@ -211,7 +211,7 @@ int accesslog_parse_format(server *srv, format_fields *fields, buffer *format) { /* found key */ - fields->ptr[fields->used] = malloc(sizeof(format_fields)); + fields->ptr[fields->used] = malloc(sizeof(format_field)); fields->ptr[fields->used]->type = FIELD_FORMAT; fields->ptr[fields->used]->field = fmap[j].type; fields->ptr[fields->used]->string = NULL; @@ -258,7 +258,7 @@ int accesslog_parse_format(server *srv, format_fields *fields, buffer *format) { /* found key */ - fields->ptr[fields->used] = malloc(sizeof(format_fields)); + fields->ptr[fields->used] = malloc(sizeof(format_field)); fields->ptr[fields->used]->type = FIELD_FORMAT; fields->ptr[fields->used]->field = fmap[j].type; fields->ptr[fields->used]->string = buffer_init(); @@ -291,7 +291,7 @@ int accesslog_parse_format(server *srv, format_fields *fields, buffer *format) { /* found key */ - fields->ptr[fields->used] = malloc(sizeof(format_fields)); + fields->ptr[fields->used] = malloc(sizeof(format_field)); fields->ptr[fields->used]->type = FIELD_FORMAT; fields->ptr[fields->used]->field = fmap[j].type; fields->ptr[fields->used]->string = NULL; @@ -321,13 +321,13 @@ int accesslog_parse_format(server *srv, format_fields *fields, buffer *format) { if (fields->size == 0) { fields->size = 16; fields->used = 0; - fields->ptr = malloc(fields->size * sizeof(format_fields * )); + fields->ptr = malloc(fields->size * sizeof(format_field * )); } else if (fields->used == fields->size) { fields->size += 16; - fields->ptr = realloc(fields->ptr, fields->size * sizeof(format_fields * )); + fields->ptr = realloc(fields->ptr, fields->size * sizeof(format_field * )); } - fields->ptr[fields->used] = malloc(sizeof(format_fields)); + fields->ptr[fields->used] = malloc(sizeof(format_field)); fields->ptr[fields->used]->type = FIELD_STRING; fields->ptr[fields->used]->string = buffer_init(); @@ -356,7 +356,7 @@ FREE_FUNC(mod_accesslog_free) { if (s->use_syslog) { # ifdef HAVE_SYSLOG_H if (s->access_logbuffer->used > 2) { - syslog(LOG_INFO, "%*s", s->access_logbuffer->used - 2, s->access_logbuffer->ptr); + syslog(LOG_INFO, "%*s", (int) s->access_logbuffer->used - 2, s->access_logbuffer->ptr); } # endif } else if (s->log_access_fd != -1) { @@ -433,7 +433,7 @@ SETDEFAULTS_FUNC(log_access_open) { if (i == 0 && buffer_is_empty(s->format)) { /* set a default logfile string */ - buffer_copy_string(s->format, "%h %V %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\""); + buffer_copy_string_len(s->format, CONST_STR_LEN("%h %V %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"")); } /* parse */ @@ -473,7 +473,7 @@ SETDEFAULTS_FUNC(log_access_open) { continue; } - if (buffer_is_empty(s->access_logfile)) continue; + if (s->access_logfile->used < 2) continue; if (s->access_logfile->ptr[0] == '|') { #ifdef HAVE_FORK @@ -498,6 +498,8 @@ SETDEFAULTS_FUNC(log_access_open) { /* not needed */ close(to_log_fds[1]); + openDevNull(STDERR_FILENO); + /* we don't need the client socket */ for (i = 3; i < 256; i++) { close(i); @@ -538,8 +540,9 @@ SETDEFAULTS_FUNC(log_access_open) { return HANDLER_ERROR; } +#ifdef FD_CLOEXEC fcntl(s->log_access_fd, F_SETFD, FD_CLOEXEC); - +#endif } return HANDLER_GO_ON; @@ -559,7 +562,7 @@ SIGHUP_FUNC(log_access_cycle) { #ifdef HAVE_SYSLOG_H if (s->access_logbuffer->used > 2) { /* syslog appends a \n on its own */ - syslog(LOG_INFO, "%*s", s->access_logbuffer->used - 2, s->access_logbuffer->ptr); + syslog(LOG_INFO, "%*s", (int) s->access_logbuffer->used - 2, s->access_logbuffer->ptr); } #endif } else if (s->log_access_fd != -1) { @@ -570,7 +573,7 @@ SIGHUP_FUNC(log_access_cycle) { } if (s->use_syslog == 0 && - !buffer_is_empty(s->access_logfile) && + s->access_logfile->used > 1 && s->access_logfile->ptr[0] != '|') { close(s->log_access_fd); @@ -582,6 +585,9 @@ SIGHUP_FUNC(log_access_cycle) { return HANDLER_ERROR; } +#ifdef FD_CLOEXEC + fcntl(s->log_access_fd, F_SETFD, FD_CLOEXEC); +#endif } } @@ -647,9 +653,12 @@ REQUESTDONE_FUNC(log_access_write) { mod_accesslog_patch_connection(srv, con, p); + /* No output device, nothing to do */ + if (!p->conf.use_syslog && p->conf.log_access_fd == -1) return HANDLER_GO_ON; + b = p->conf.access_logbuffer; if (b->used == 0) { - buffer_copy_string(b, ""); + buffer_copy_string_len(b, CONST_STR_LEN("")); } for (j = 0; j < p->conf.parsed_format->used; j++) { @@ -674,23 +683,23 @@ REQUESTDONE_FUNC(log_access_write) { localtime_r(&(srv->cur_ts), &tm); strftime(p->conf.ts_accesslog_str->ptr, p->conf.ts_accesslog_str->size - 1, "[%d/%b/%Y:%H:%M:%S ", &tm); # else - strftime(p->conf.ts_accesslog_str->ptr, p->conf.ts_accesslog_str->size - 1, "[%d/%b/%Y:%H:%M:%S ", localtime_r(&(srv->cur_ts))); + strftime(p->conf.ts_accesslog_str->ptr, p->conf.ts_accesslog_str->size - 1, "[%d/%b/%Y:%H:%M:%S ", localtime(&(srv->cur_ts))); # endif p->conf.ts_accesslog_str->used = strlen(p->conf.ts_accesslog_str->ptr) + 1; - buffer_append_string(p->conf.ts_accesslog_str, tm.tm_gmtoff >= 0 ? "+" : "-"); + buffer_append_string_len(p->conf.ts_accesslog_str, tm.tm_gmtoff >= 0 ? "+" : "-", 1); scd = abs(tm.tm_gmtoff); hrs = scd / 3600; min = (scd % 3600) / 60; /* hours */ - if (hrs < 10) buffer_append_string(p->conf.ts_accesslog_str, "0"); + if (hrs < 10) buffer_append_string_len(p->conf.ts_accesslog_str, CONST_STR_LEN("0")); buffer_append_long(p->conf.ts_accesslog_str, hrs); - if (min < 10) buffer_append_string(p->conf.ts_accesslog_str, "0"); + if (min < 10) buffer_append_string_len(p->conf.ts_accesslog_str, CONST_STR_LEN("0")); buffer_append_long(p->conf.ts_accesslog_str, min); - BUFFER_APPEND_STRING_CONST(p->conf.ts_accesslog_str, "]"); + buffer_append_string_len(p->conf.ts_accesslog_str, CONST_STR_LEN("]")); #else #ifdef HAVE_GMTIME_R gmtime_r(&(srv->cur_ts), &tm); @@ -717,13 +726,13 @@ REQUESTDONE_FUNC(log_access_write) { break; case FORMAT_REMOTE_IDENT: /* ident */ - BUFFER_APPEND_STRING_CONST(b, "-"); + buffer_append_string_len(b, CONST_STR_LEN("-")); break; case FORMAT_REMOTE_USER: if (con->authed_user->used > 1) { buffer_append_string_buffer(b, con->authed_user); } else { - BUFFER_APPEND_STRING_CONST(b, "-"); + buffer_append_string_len(b, CONST_STR_LEN("-")); } break; case FORMAT_REQUEST_LINE: @@ -740,42 +749,42 @@ REQUESTDONE_FUNC(log_access_write) { buffer_append_off_t(b, con->bytes_written - con->bytes_header <= 0 ? 0 : con->bytes_written - con->bytes_header); } else { - BUFFER_APPEND_STRING_CONST(b, "-"); + buffer_append_string_len(b, CONST_STR_LEN("-")); } break; case FORMAT_HEADER: if (NULL != (ds = (data_string *)array_get_element(con->request.headers, p->conf.parsed_format->ptr[j]->string->ptr))) { buffer_append_string_buffer(b, ds->value); } else { - BUFFER_APPEND_STRING_CONST(b, "-"); + buffer_append_string_len(b, CONST_STR_LEN("-")); } break; case FORMAT_RESPONSE_HEADER: if (NULL != (ds = (data_string *)array_get_element(con->response.headers, p->conf.parsed_format->ptr[j]->string->ptr))) { buffer_append_string_buffer(b, ds->value); } else { - BUFFER_APPEND_STRING_CONST(b, "-"); + buffer_append_string_len(b, CONST_STR_LEN("-")); } break; case FORMAT_FILENAME: if (con->physical.path->used > 1) { buffer_append_string_buffer(b, con->physical.path); } else { - BUFFER_APPEND_STRING_CONST(b, "-"); + buffer_append_string_len(b, CONST_STR_LEN("-")); } break; case FORMAT_BYTES_OUT: if (con->bytes_written > 0) { buffer_append_off_t(b, con->bytes_written); } else { - BUFFER_APPEND_STRING_CONST(b, "-"); + buffer_append_string_len(b, CONST_STR_LEN("-")); } break; case FORMAT_BYTES_IN: if (con->bytes_read > 0) { buffer_append_off_t(b, con->bytes_read); } else { - BUFFER_APPEND_STRING_CONST(b, "-"); + buffer_append_string_len(b, CONST_STR_LEN("-")); } break; case FORMAT_TIME_USED: @@ -785,28 +794,35 @@ REQUESTDONE_FUNC(log_access_write) { if (con->server_name->used > 1) { buffer_append_string_buffer(b, con->server_name); } else { - BUFFER_APPEND_STRING_CONST(b, "-"); + buffer_append_string_len(b, CONST_STR_LEN("-")); } break; case FORMAT_HTTP_HOST: if (con->uri.authority->used > 1) { buffer_append_string_buffer(b, con->uri.authority); } else { - BUFFER_APPEND_STRING_CONST(b, "-"); + buffer_append_string_len(b, CONST_STR_LEN("-")); } break; case FORMAT_REQUEST_PROTOCOL: - buffer_append_string(b, - con->request.http_version == HTTP_VERSION_1_1 ? "HTTP/1.1" : "HTTP/1.0"); + buffer_append_string_len(b, + con->request.http_version == HTTP_VERSION_1_1 ? "HTTP/1.1" : "HTTP/1.0", 8); break; case FORMAT_REQUEST_METHOD: buffer_append_string(b, get_http_method_name(con->request.http_method)); break; case FORMAT_PERCENT: - buffer_append_string(b, "%"); + buffer_append_string_len(b, CONST_STR_LEN("%")); break; case FORMAT_SERVER_PORT: - buffer_append_long(b, srv->srvconf.port); + { + char *colon = strchr(((server_socket*)(con->srv_socket))->srv_token->ptr, ':'); + if (colon) { + buffer_append_string(b, colon+1); + } else { + buffer_append_long(b, srv->srvconf.port); + } + } break; case FORMAT_QUERY_STRING: buffer_append_string_buffer(b, con->uri.query); @@ -816,8 +832,8 @@ REQUESTDONE_FUNC(log_access_write) { break; case FORMAT_CONNECTION_STATUS: switch(con->keep_alive) { - case 0: buffer_append_string(b, "-"); break; - default: buffer_append_string(b, "+"); break; + case 0: buffer_append_string_len(b, CONST_STR_LEN("-")); break; + default: buffer_append_string_len(b, CONST_STR_LEN("+")); break; } break; default: @@ -837,7 +853,7 @@ REQUESTDONE_FUNC(log_access_write) { } } - BUFFER_APPEND_STRING_CONST(b, "\n"); + buffer_append_string_len(b, CONST_STR_LEN("\n")); if (p->conf.use_syslog || /* syslog doesn't cache */ (p->conf.access_logfile->used && p->conf.access_logfile->ptr[0] == '|') || /* pipes don't cache */ @@ -847,7 +863,7 @@ REQUESTDONE_FUNC(log_access_write) { #ifdef HAVE_SYSLOG_H if (b->used > 2) { /* syslog appends a \n on its own */ - syslog(LOG_INFO, "%*s", b->used - 2, b->ptr); + syslog(LOG_INFO, "%*s", (int) b->used - 2, b->ptr); } #endif } else if (p->conf.log_access_fd != -1) { diff --git a/src/mod_alias.c b/src/mod_alias.c index a7d9b7e..8a54547 100644 --- a/src/mod_alias.c +++ b/src/mod_alias.c @@ -103,9 +103,8 @@ SETDEFAULTS_FUNC(mod_alias_set_defaults) { } /* ok, they have same prefix. check position */ if (a->sorted[j] < a->sorted[k]) { - fprintf(stderr, "url.alias: `%s' will never match as `%s' matched first\n", - key->ptr, - prefix->ptr); + log_error_write(srv, __FILE__, __LINE__, "SBSBS", + "url.alias: `", key, "' will never match as `", prefix, "' matched first"); return HANDLER_ERROR; } } diff --git a/src/mod_auth.c b/src/mod_auth.c index 7bd306d..77d30f2 100644 --- a/src/mod_auth.c +++ b/src/mod_auth.c @@ -115,7 +115,7 @@ static int mod_auth_patch_connection(server *srv, connection *con, mod_auth_plug PATCH(auth_ldap_starttls); PATCH(auth_ldap_allow_empty_pw); #ifdef USE_LDAP - PATCH(ldap); + p->anon_conf = s; PATCH(ldap_filter_pre); PATCH(ldap_filter_post); #endif @@ -149,18 +149,24 @@ static int mod_auth_patch_connection(server *srv, connection *con, mod_auth_plug } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.ldap.hostname"))) { PATCH(auth_ldap_hostname); #ifdef USE_LDAP - PATCH(ldap); - PATCH(ldap_filter_pre); - PATCH(ldap_filter_post); + p->anon_conf = s; #endif } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.ldap.base-dn"))) { PATCH(auth_ldap_basedn); } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.ldap.filter"))) { PATCH(auth_ldap_filter); +#ifdef USE_LDAP + PATCH(ldap_filter_pre); + PATCH(ldap_filter_post); +#endif } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.ldap.ca-file"))) { PATCH(auth_ldap_cafile); } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.ldap.starttls"))) { PATCH(auth_ldap_starttls); + } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.ldap.bind-dn"))) { + PATCH(auth_ldap_binddn); + } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.ldap.bind-pw"))) { + PATCH(auth_ldap_bindpw); } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.ldap.allow-empty-pw"))) { PATCH(auth_ldap_allow_empty_pw); } @@ -248,6 +254,7 @@ static handler_t mod_auth_uri_handler(server *srv, connection *con, void *p_d) { if (0 == strcmp(method->value->ptr, "digest")) { if (-1 == (auth_satisfied = http_auth_digest_check(srv, con, p, req, con->uri.path, auth_realm+1))) { con->http_status = 400; + con->mode = DIRECT; /* a field was missing */ @@ -268,22 +275,23 @@ static handler_t mod_auth_uri_handler(server *srv, connection *con, void *p_d) { realm = (data_string *)array_get_element(req, "realm"); con->http_status = 401; + con->mode = DIRECT; if (0 == strcmp(method->value->ptr, "basic")) { - buffer_copy_string(p->tmp_buf, "Basic realm=\""); + buffer_copy_string_len(p->tmp_buf, CONST_STR_LEN("Basic realm=\"")); buffer_append_string_buffer(p->tmp_buf, realm->value); - buffer_append_string(p->tmp_buf, "\""); + buffer_append_string_len(p->tmp_buf, CONST_STR_LEN("\"")); response_header_insert(srv, con, CONST_STR_LEN("WWW-Authenticate"), CONST_BUF_LEN(p->tmp_buf)); } else if (0 == strcmp(method->value->ptr, "digest")) { char hh[33]; http_auth_digest_generate_nonce(srv, p, srv->tmp_buf, hh); - buffer_copy_string(p->tmp_buf, "Digest realm=\""); + buffer_copy_string_len(p->tmp_buf, CONST_STR_LEN("Digest realm=\"")); buffer_append_string_buffer(p->tmp_buf, realm->value); - buffer_append_string(p->tmp_buf, "\", nonce=\""); + buffer_append_string_len(p->tmp_buf, CONST_STR_LEN("\", nonce=\"")); buffer_append_string(p->tmp_buf, hh); - buffer_append_string(p->tmp_buf, "\", qop=\"auth\""); + buffer_append_string_len(p->tmp_buf, CONST_STR_LEN("\", qop=\"auth\"")); response_header_insert(srv, con, CONST_STR_LEN("WWW-Authenticate"), CONST_BUF_LEN(p->tmp_buf)); } else { @@ -393,6 +401,23 @@ SETDEFAULTS_FUNC(mod_auth_set_defaults) { } } +#ifdef USE_LDAP + if (s->auth_ldap_filter->used) { + char *dollar; + + /* parse filter */ + + if (NULL == (dollar = strchr(s->auth_ldap_filter->ptr, '$'))) { + log_error_write(srv, __FILE__, __LINE__, "s", "ldap: auth.backend.ldap.filter is missing a replace-operator '$'"); + + return HANDLER_ERROR; + } + + buffer_copy_string_len(s->ldap_filter_pre, s->auth_ldap_filter->ptr, dollar - s->auth_ldap_filter->ptr); + buffer_copy_string(s->ldap_filter_post, dollar+1); + } +#endif + /* no auth.require for this section */ if (NULL == (da = (data_array *)array_get_element(ca, "auth.require"))) continue; @@ -479,21 +504,21 @@ SETDEFAULTS_FUNC(mod_auth_set_defaults) { ds = data_string_init(); - buffer_copy_string(ds->key, "method"); + buffer_copy_string_len(ds->key, CONST_STR_LEN("method")); buffer_copy_string(ds->value, method); array_insert_unique(a->value, (data_unset *)ds); ds = data_string_init(); - buffer_copy_string(ds->key, "realm"); + buffer_copy_string_len(ds->key, CONST_STR_LEN("realm")); buffer_copy_string(ds->value, realm); array_insert_unique(a->value, (data_unset *)ds); ds = data_string_init(); - buffer_copy_string(ds->key, "require"); + buffer_copy_string_len(ds->key, CONST_STR_LEN("require")); buffer_copy_string(ds->value, require); array_insert_unique(a->value, (data_unset *)ds); @@ -502,102 +527,91 @@ SETDEFAULTS_FUNC(mod_auth_set_defaults) { } } - switch(s->auth_backend) { + switch(s->auth_ldap_hostname->used) { case AUTH_BACKEND_LDAP: { handler_t ret = auth_ldap_init(srv, s); if (ret == HANDLER_ERROR) return (ret); - break; + break; + } + default: + break; } - default: - break; - } - } + } - return HANDLER_GO_ON; + return HANDLER_GO_ON; } handler_t auth_ldap_init(server *srv, mod_auth_plugin_config *s) { #ifdef USE_LDAP - int ret; + int ret; #if 0 - if (s->auth_ldap_basedn->used == 0) { - log_error_write(srv, __FILE__, __LINE__, "s", "ldap: auth.backend.ldap.base-dn has to be set"); + if (s->auth_ldap_basedn->used == 0) { + log_error_write(srv, __FILE__, __LINE__, "s", "ldap: auth.backend.ldap.base-dn has to be set"); - return HANDLER_ERROR; - } + return HANDLER_ERROR; + } #endif - if (s->auth_ldap_filter->used) { - char *dollar; + if (s->auth_ldap_hostname->used) { + /* free old context */ + if (NULL != s->ldap) ldap_unbind_s(s->ldap); - /* parse filter */ + if (NULL == (s->ldap = ldap_init(s->auth_ldap_hostname->ptr, LDAP_PORT))) { + log_error_write(srv, __FILE__, __LINE__, "ss", "ldap ...", strerror(errno)); - if (NULL == (dollar = strchr(s->auth_ldap_filter->ptr, '$'))) { - log_error_write(srv, __FILE__, __LINE__, "s", "ldap: auth.backend.ldap.filter is missing a replace-operator '$'"); - - return HANDLER_ERROR; - } - - buffer_copy_string_len(s->ldap_filter_pre, s->auth_ldap_filter->ptr, dollar - s->auth_ldap_filter->ptr); - buffer_copy_string(s->ldap_filter_post, dollar+1); - } + return HANDLER_ERROR; + } - if (s->auth_ldap_hostname->used) { - if (NULL == (s->ldap = ldap_init(s->auth_ldap_hostname->ptr, LDAP_PORT))) { - log_error_write(srv, __FILE__, __LINE__, "ss", "ldap ...", strerror(errno)); + ret = LDAP_VERSION3; + if (LDAP_OPT_SUCCESS != (ret = ldap_set_option(s->ldap, LDAP_OPT_PROTOCOL_VERSION, &ret))) { + log_error_write(srv, __FILE__, __LINE__, "ss", "ldap:", ldap_err2string(ret)); - return HANDLER_ERROR; - } + return HANDLER_ERROR; + } - ret = LDAP_VERSION3; - if (LDAP_OPT_SUCCESS != (ret = ldap_set_option(s->ldap, LDAP_OPT_PROTOCOL_VERSION, &ret))) { - log_error_write(srv, __FILE__, __LINE__, "ss", "ldap:", ldap_err2string(ret)); + if (s->auth_ldap_starttls) { + /* if no CA file is given, it is ok, as we will use encryption + * if the server requires a CAfile it will tell us */ + if (!buffer_is_empty(s->auth_ldap_cafile)) { + if (LDAP_OPT_SUCCESS != (ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_CACERTFILE, + s->auth_ldap_cafile->ptr))) { + log_error_write(srv, __FILE__, __LINE__, "ss", + "Loading CA certificate failed:", ldap_err2string(ret)); return HANDLER_ERROR; } + } - if (s->auth_ldap_starttls) { - /* if no CA file is given, it is ok, as we will use encryption - * if the server requires a CAfile it will tell us */ - if (!buffer_is_empty(s->auth_ldap_cafile)) { - if (LDAP_OPT_SUCCESS != (ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_CACERTFILE, - s->auth_ldap_cafile->ptr))) { - log_error_write(srv, __FILE__, __LINE__, "ss", - "Loading CA certificate failed:", ldap_err2string(ret)); - - return HANDLER_ERROR; - } - } - - if (LDAP_OPT_SUCCESS != (ret = ldap_start_tls_s(s->ldap, NULL, NULL))) { - log_error_write(srv, __FILE__, __LINE__, "ss", "ldap startTLS failed:", ldap_err2string(ret)); + if (LDAP_OPT_SUCCESS != (ret = ldap_start_tls_s(s->ldap, NULL, NULL))) { + log_error_write(srv, __FILE__, __LINE__, "ss", "ldap startTLS failed:", ldap_err2string(ret)); - return HANDLER_ERROR; - } - } + return HANDLER_ERROR; + } + } - /* 1. */ - if (s->auth_ldap_binddn->used) { - if (LDAP_SUCCESS != (ret = ldap_simple_bind_s(s->ldap, s->auth_ldap_binddn->ptr, s->auth_ldap_bindpw->ptr))) { - log_error_write(srv, __FILE__, __LINE__, "ss", "ldap:", ldap_err2string(ret)); + /* 1. */ + if (s->auth_ldap_binddn->used) { + if (LDAP_SUCCESS != (ret = ldap_simple_bind_s(s->ldap, s->auth_ldap_binddn->ptr, s->auth_ldap_bindpw->ptr))) { + log_error_write(srv, __FILE__, __LINE__, "ss", "ldap:", ldap_err2string(ret)); - return HANDLER_ERROR; - } - } else { - if (LDAP_SUCCESS != (ret = ldap_simple_bind_s(s->ldap, NULL, NULL))) { - log_error_write(srv, __FILE__, __LINE__, "ss", "ldap:", ldap_err2string(ret)); + return HANDLER_ERROR; + } + } else { + if (LDAP_SUCCESS != (ret = ldap_simple_bind_s(s->ldap, NULL, NULL))) { + log_error_write(srv, __FILE__, __LINE__, "ss", "ldap:", ldap_err2string(ret)); - return HANDLER_ERROR; - } - } + return HANDLER_ERROR; } + } + } + return HANDLER_GO_ON; #else - log_error_write(srv, __FILE__, __LINE__, "s", "no ldap support available"); - return HANDLER_ERROR; + UNUSED(s); + log_error_write(srv, __FILE__, __LINE__, "s", "no ldap support available"); + return HANDLER_ERROR; #endif - return HANDLER_GO_ON; } int mod_auth_plugin_init(plugin *p) { diff --git a/src/mod_cgi.c b/src/mod_cgi.c index 82ae78b..3b032f1 100644 --- a/src/mod_cgi.c +++ b/src/mod_cgi.c @@ -822,15 +822,27 @@ static int cgi_create_env(server *srv, connection *con, plugin_data *p, buffer * ); cgi_env_add(&env, CONST_STR_LEN("SERVER_PORT"), buf, strlen(buf)); + switch (srv_sock->addr.plain.sa_family) { #ifdef HAVE_IPV6 - s = inet_ntop(srv_sock->addr.plain.sa_family, - srv_sock->addr.plain.sa_family == AF_INET6 ? - (const void *) &(srv_sock->addr.ipv6.sin6_addr) : - (const void *) &(srv_sock->addr.ipv4.sin_addr), - b2, sizeof(b2)-1); + case AF_INET6: + s = inet_ntop(srv_sock->addr.plain.sa_family, + (const void *) &(srv_sock->addr.ipv6.sin6_addr), + b2, sizeof(b2)-1); + break; + case AF_INET: + s = inet_ntop(srv_sock->addr.plain.sa_family, + (const void *) &(srv_sock->addr.ipv4.sin_addr), + b2, sizeof(b2)-1); + break; #else - s = inet_ntoa(srv_sock->addr.ipv4.sin_addr); + case AF_INET: + s = inet_ntoa(srv_sock->addr.ipv4.sin_addr); + break; #endif + default: + s = ""; + break; + } cgi_env_add(&env, CONST_STR_LEN("SERVER_ADDR"), s, strlen(s)); s = get_http_method_name(con->request.http_method); @@ -848,15 +860,27 @@ static int cgi_create_env(server *srv, connection *con, plugin_data *p, buffer * } + switch (con->dst_addr.plain.sa_family) { #ifdef HAVE_IPV6 - s = inet_ntop(con->dst_addr.plain.sa_family, - con->dst_addr.plain.sa_family == AF_INET6 ? - (const void *) &(con->dst_addr.ipv6.sin6_addr) : - (const void *) &(con->dst_addr.ipv4.sin_addr), - b2, sizeof(b2)-1); + case AF_INET6: + s = inet_ntop(con->dst_addr.plain.sa_family, + (const void *) &(con->dst_addr.ipv6.sin6_addr), + b2, sizeof(b2)-1); + break; + case AF_INET: + s = inet_ntop(con->dst_addr.plain.sa_family, + (const void *) &(con->dst_addr.ipv4.sin_addr), + b2, sizeof(b2)-1); + break; #else - s = inet_ntoa(con->dst_addr.ipv4.sin_addr); + case AF_INET: + s = inet_ntoa(con->dst_addr.ipv4.sin_addr); + break; #endif + default: + s = ""; + break; + } cgi_env_add(&env, CONST_STR_LEN("REMOTE_ADDR"), s, strlen(s)); LI_ltostr(buf, @@ -912,7 +936,7 @@ static int cgi_create_env(server *srv, connection *con, plugin_data *p, buffer * buffer_reset(p->tmp_buf); if (0 != strcasecmp(ds->key->ptr, "CONTENT-TYPE")) { - buffer_copy_string(p->tmp_buf, "HTTP_"); + buffer_copy_string_len(p->tmp_buf, CONST_STR_LEN("HTTP_")); p->tmp_buf->used--; /* strip \0 after HTTP_ */ } @@ -949,7 +973,7 @@ static int cgi_create_env(server *srv, connection *con, plugin_data *p, buffer * for (j = 0; j < ds->key->used - 1; j++) { p->tmp_buf->ptr[p->tmp_buf->used++] = - isalpha((unsigned char)ds->key->ptr[j]) ? + light_isalnum((unsigned char)ds->key->ptr[j]) ? toupper((unsigned char)ds->key->ptr[j]) : '_'; } p->tmp_buf->ptr[p->tmp_buf->used++] = '\0'; @@ -987,6 +1011,8 @@ static int cgi_create_env(server *srv, connection *con, plugin_data *p, buffer * *c = '/'; } + openDevNull(STDERR_FILENO); + /* we don't need the client socket */ for (i = 3; i < 256; i++) { if (i != srv->errorlog_fd) close(i); @@ -995,7 +1021,7 @@ static int cgi_create_env(server *srv, connection *con, plugin_data *p, buffer * /* exec the cgi */ execve(args[0], args, env.ptr); - log_error_write(srv, __FILE__, __LINE__, "sss", "CGI failed:", strerror(errno), args[0]); + /* log_error_write(srv, __FILE__, __LINE__, "sss", "CGI failed:", strerror(errno), args[0]); */ /* */ SEGFAULT(); @@ -1058,8 +1084,9 @@ static int cgi_create_env(server *srv, connection *con, plugin_data *p, buffer * switch(errno) { case ENOSPC: con->http_status = 507; - break; + case EINTR: + continue; default: con->http_status = 403; break; @@ -1071,8 +1098,9 @@ static int cgi_create_env(server *srv, connection *con, plugin_data *p, buffer * switch(errno) { case ENOSPC: con->http_status = 507; - break; + case EINTR: + continue; default: con->http_status = 403; break; @@ -1087,6 +1115,8 @@ static int cgi_create_env(server *srv, connection *con, plugin_data *p, buffer * c->offset += r; cq->bytes_out += r; } else { + log_error_write(srv, __FILE__, __LINE__, "ss", "write() failed due to: ", strerror(errno)); + con->http_status = 500; break; } chunkqueue_remove_finished_chunks(cq); @@ -1174,6 +1204,8 @@ URIHANDLER_FUNC(cgi_is_handled) { plugin_data *p = p_d; buffer *fn = con->physical.path; + if (con->mode != DIRECT) return HANDLER_GO_ON; + if (fn->used == 0) return HANDLER_GO_ON; mod_cgi_patch_connection(srv, con, p); @@ -1189,6 +1221,7 @@ URIHANDLER_FUNC(cgi_is_handled) { if (0 == strncmp(fn->ptr + s_len - ct_len, ds->key->ptr, ct_len)) { if (cgi_create_env(srv, con, p, ds->value)) { + con->mode = DIRECT; con->http_status = 500; buffer_reset(con->physical.path); diff --git a/src/mod_cml_lua.c b/src/mod_cml_lua.c index 8bfb1ab..08df0c9 100644 --- a/src/mod_cml_lua.c +++ b/src/mod_cml_lua.c @@ -282,11 +282,11 @@ int cache_parse_lua(server *srv, connection *con, plugin_data *p, buffer *fn) { /* 2 default constants */ lua_pushliteral(L, "CACHE_HIT"); - lua_pushboolean(L, 0); + lua_pushnumber(L, 0); lua_settable(L, LUA_GLOBALSINDEX); lua_pushliteral(L, "CACHE_MISS"); - lua_pushboolean(L, 1); + lua_pushnumber(L, 1); lua_settable(L, LUA_GLOBALSINDEX); /* load lua program */ diff --git a/src/mod_compress.c b/src/mod_compress.c index 79f6e74..2127ad3 100644 --- a/src/mod_compress.c +++ b/src/mod_compress.c @@ -49,6 +49,7 @@ typedef struct { buffer *compress_cache_dir; array *compress; off_t compress_max_filesize; /** max filesize in kb */ + int allowed_encodings; } plugin_config; typedef struct { @@ -102,7 +103,7 @@ FREE_FUNC(mod_compress_free) { return HANDLER_GO_ON; } -// 0 on success, -1 for error +/* 0 on success, -1 for error */ int mkdir_recursive(char *dir) { char *p = dir; @@ -118,13 +119,13 @@ int mkdir_recursive(char *dir) { } *p++ = '/'; - if (!*p) return 0; // Ignore trailing slash + if (!*p) return 0; /* Ignore trailing slash */ } return (mkdir(dir, 0700) != 0) && (errno != EEXIST) ? -1 : 0; } -// 0 on success, -1 for error +/* 0 on success, -1 for error */ int mkdir_for_file(char *filename) { char *p = filename; @@ -140,7 +141,7 @@ int mkdir_for_file(char *filename) { } *p++ = '/'; - if (!*p) return -1; // Unexpected trailing slash in filename + if (!*p) return -1; /* Unexpected trailing slash in filename */ } return 0; @@ -154,6 +155,7 @@ SETDEFAULTS_FUNC(mod_compress_setdefaults) { { "compress.cache-dir", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, { "compress.filetype", NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_CONNECTION }, { "compress.max-filesize", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, + { "compress.allowed-encodings", NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_CONNECTION }, { NULL, NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET } }; @@ -161,15 +163,18 @@ SETDEFAULTS_FUNC(mod_compress_setdefaults) { for (i = 0; i < srv->config_context->used; i++) { plugin_config *s; + array *encodings_arr = array_init(); s = calloc(1, sizeof(plugin_config)); s->compress_cache_dir = buffer_init(); s->compress = array_init(); s->compress_max_filesize = 0; + s->allowed_encodings = 0; cv[0].destination = s->compress_cache_dir; cv[1].destination = s->compress; cv[2].destination = &(s->compress_max_filesize); + cv[3].destination = encodings_arr; /* temp array for allowed encodings list */ p->config_storage[i] = s; @@ -177,10 +182,43 @@ SETDEFAULTS_FUNC(mod_compress_setdefaults) { return HANDLER_ERROR; } + if (encodings_arr->used) { + size_t j = 0; + for (j = 0; j < encodings_arr->used; j++) { + data_string *ds = (data_string *)encodings_arr->data[j]; +#ifdef USE_ZLIB + if (NULL != strstr(ds->value->ptr, "gzip")) + s->allowed_encodings |= HTTP_ACCEPT_ENCODING_GZIP; + if (NULL != strstr(ds->value->ptr, "deflate")) + s->allowed_encodings |= HTTP_ACCEPT_ENCODING_DEFLATE; + /* + if (NULL != strstr(ds->value->ptr, "compress")) + s->allowed_encodings |= HTTP_ACCEPT_ENCODING_COMPRESS; + */ +#endif +#ifdef USE_BZ2LIB + if (NULL != strstr(ds->value->ptr, "bzip2")) + s->allowed_encodings |= HTTP_ACCEPT_ENCODING_BZIP2; +#endif + } + } else { + /* default encodings */ + s->allowed_encodings = 0 +#ifdef USE_ZLIB + | HTTP_ACCEPT_ENCODING_GZIP | HTTP_ACCEPT_ENCODING_DEFLATE +#endif +#ifdef USE_BZ2LIB + | HTTP_ACCEPT_ENCODING_BZIP2 +#endif + ; + } + + array_free(encodings_arr); + if (!buffer_is_empty(s->compress_cache_dir)) { + struct stat st; mkdir_recursive(s->compress_cache_dir->ptr); - struct stat st; if (0 != stat(s->compress_cache_dir->ptr, &st)) { log_error_write(srv, __FILE__, __LINE__, "sbs", "can't stat compress.cache-dir", s->compress_cache_dir, strerror(errno)); @@ -396,13 +434,13 @@ static int deflate_file_to_file(server *srv, connection *con, plugin_data *p, bu switch(type) { case HTTP_ACCEPT_ENCODING_GZIP: - buffer_append_string(p->ofn, "-gzip-"); + buffer_append_string_len(p->ofn, CONST_STR_LEN("-gzip-")); break; case HTTP_ACCEPT_ENCODING_DEFLATE: - buffer_append_string(p->ofn, "-deflate-"); + buffer_append_string_len(p->ofn, CONST_STR_LEN("-deflate-")); break; case HTTP_ACCEPT_ENCODING_BZIP2: - buffer_append_string(p->ofn, "-bzip2-"); + buffer_append_string_len(p->ofn, CONST_STR_LEN("-bzip2-")); break; default: log_error_write(srv, __FILE__, __LINE__, "sd", "unknown compression type", type); @@ -587,6 +625,7 @@ static int mod_compress_patch_connection(server *srv, connection *con, plugin_da PATCH(compress_cache_dir); PATCH(compress); PATCH(compress_max_filesize); + PATCH(allowed_encodings); /* skip the first, the global context */ for (i = 1; i < srv->config_context->used; i++) { @@ -606,6 +645,8 @@ static int mod_compress_patch_connection(server *srv, connection *con, plugin_da PATCH(compress); } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("compress.max-filesize"))) { PATCH(compress_max_filesize); + } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("compress.allowed-encodings"))) { + PATCH(allowed_encodings); } } } @@ -619,6 +660,7 @@ PHYSICALPATH_FUNC(mod_compress_physical) { size_t m; off_t max_fsize; stat_cache_entry *sce = NULL; + buffer *mtime = NULL; if (con->mode != DIRECT || con->http_status) return HANDLER_GO_ON; @@ -636,7 +678,29 @@ PHYSICALPATH_FUNC(mod_compress_physical) { max_fsize = p->conf.compress_max_filesize; - stat_cache_get_entry(srv, con, con->physical.path, &sce); + if (con->conf.log_request_handling) { + log_error_write(srv, __FILE__, __LINE__, "s", "-- handling file as static file"); + } + + if (HANDLER_ERROR == stat_cache_get_entry(srv, con, con->physical.path, &sce)) { + con->http_status = 403; + + log_error_write(srv, __FILE__, __LINE__, "sbsb", + "not a regular file:", con->uri.path, + "->", con->physical.path); + + return HANDLER_FINISHED; + } + + /* we only handle regular files */ +#ifdef HAVE_LSTAT + if ((sce->is_symlink == 1) && !con->conf.follow_symlink) { + return HANDLER_GO_ON; + } +#endif + if (!S_ISREG(sce->st.st_mode)) { + return HANDLER_GO_ON; + } /* don't compress files that are too large as we need to much time to handle them */ if (max_fsize && (sce->st.st_size >> 10) > max_fsize) return HANDLER_GO_ON; @@ -668,27 +732,21 @@ PHYSICALPATH_FUNC(mod_compress_physical) { if (NULL != (ds = (data_string *)array_get_element(con->request.headers, "Accept-Encoding"))) { int accept_encoding = 0; char *value = ds->value->ptr; - int srv_encodings = 0; int matched_encodings = 0; /* get client side support encodings */ +#ifdef USE_ZLIB if (NULL != strstr(value, "gzip")) accept_encoding |= HTTP_ACCEPT_ENCODING_GZIP; if (NULL != strstr(value, "deflate")) accept_encoding |= HTTP_ACCEPT_ENCODING_DEFLATE; if (NULL != strstr(value, "compress")) accept_encoding |= HTTP_ACCEPT_ENCODING_COMPRESS; - if (NULL != strstr(value, "bzip2")) accept_encoding |= HTTP_ACCEPT_ENCODING_BZIP2; - if (NULL != strstr(value, "identity")) accept_encoding |= HTTP_ACCEPT_ENCODING_IDENTITY; - - /* get server side supported ones */ -#ifdef USE_BZ2LIB - srv_encodings |= HTTP_ACCEPT_ENCODING_BZIP2; #endif -#ifdef USE_ZLIB - srv_encodings |= HTTP_ACCEPT_ENCODING_GZIP; - srv_encodings |= HTTP_ACCEPT_ENCODING_DEFLATE; +#ifdef USE_BZ2LIB + if (NULL != strstr(value, "bzip2")) accept_encoding |= HTTP_ACCEPT_ENCODING_BZIP2; #endif + if (NULL != strstr(value, "identity")) accept_encoding |= HTTP_ACCEPT_ENCODING_IDENTITY; /* find matching entries */ - matched_encodings = accept_encoding & srv_encodings; + matched_encodings = accept_encoding & p->conf.allowed_encodings; if (matched_encodings) { const char *dflt_gzip = "gzip"; @@ -698,6 +756,17 @@ PHYSICALPATH_FUNC(mod_compress_physical) { const char *compression_name = NULL; int compression_type = 0; + mtime = strftime_cache_get(srv, sce->st.st_mtime); + + /* try matching original etag of uncompressed version */ + etag_mutate(con->physical.etag, sce->etag); + if (HANDLER_FINISHED == http_response_handle_cachable(srv, con, mtime)) { + response_header_overwrite(srv, con, CONST_STR_LEN("Content-Type"), CONST_BUF_LEN(sce->content_type)); + response_header_overwrite(srv, con, CONST_STR_LEN("Last-Modified"), CONST_BUF_LEN(mtime)); + response_header_overwrite(srv, con, CONST_STR_LEN("ETag"), CONST_BUF_LEN(con->physical.etag)); + return HANDLER_FINISHED; + } + /* select best matching encoding */ if (matched_encodings & HTTP_ACCEPT_ENCODING_BZIP2) { compression_type = HTTP_ACCEPT_ENCODING_BZIP2; @@ -710,41 +779,34 @@ PHYSICALPATH_FUNC(mod_compress_physical) { compression_name = dflt_deflate; } - /* deflate it */ - if (p->conf.compress_cache_dir->used) { - if (0 == deflate_file_to_file(srv, con, p, - con->physical.path, sce, compression_type)) { - buffer *mtime; - - response_header_overwrite(srv, con, CONST_STR_LEN("Content-Encoding"), compression_name, strlen(compression_name)); - - mtime = strftime_cache_get(srv, sce->st.st_mtime); - response_header_overwrite(srv, con, CONST_STR_LEN("Last-Modified"), CONST_BUF_LEN(mtime)); - - etag_mutate(con->physical.etag, sce->etag); - response_header_overwrite(srv, con, CONST_STR_LEN("ETag"), CONST_BUF_LEN(con->physical.etag)); - - response_header_overwrite(srv, con, CONST_STR_LEN("Content-Type"), CONST_BUF_LEN(sce->content_type)); - - return HANDLER_GO_ON; - } - } else if (0 == deflate_file_to_buffer(srv, con, p, - con->physical.path, sce, compression_type)) { - buffer *mtime; + /* try matching etag of compressed version */ + buffer_copy_string_buffer(srv->tmp_buf, sce->etag); + buffer_append_string_len(srv->tmp_buf, CONST_STR_LEN("-")); + buffer_append_string(srv->tmp_buf, compression_name); + etag_mutate(con->physical.etag, srv->tmp_buf); + if (HANDLER_FINISHED == http_response_handle_cachable(srv, con, mtime)) { response_header_overwrite(srv, con, CONST_STR_LEN("Content-Encoding"), compression_name, strlen(compression_name)); - - mtime = strftime_cache_get(srv, sce->st.st_mtime); + response_header_overwrite(srv, con, CONST_STR_LEN("Content-Type"), CONST_BUF_LEN(sce->content_type)); response_header_overwrite(srv, con, CONST_STR_LEN("Last-Modified"), CONST_BUF_LEN(mtime)); - - etag_mutate(con->physical.etag, sce->etag); response_header_overwrite(srv, con, CONST_STR_LEN("ETag"), CONST_BUF_LEN(con->physical.etag)); - - response_header_overwrite(srv, con, CONST_STR_LEN("Content-Type"), CONST_BUF_LEN(sce->content_type)); - return HANDLER_FINISHED; } - break; + + /* deflate it */ + if (p->conf.compress_cache_dir->used) { + if (0 != deflate_file_to_file(srv, con, p, con->physical.path, sce, compression_type)) + return HANDLER_GO_ON; + } else { + if (0 != deflate_file_to_buffer(srv, con, p, con->physical.path, sce, compression_type)) + return HANDLER_GO_ON; + } + response_header_overwrite(srv, con, CONST_STR_LEN("Content-Encoding"), compression_name, strlen(compression_name)); + response_header_overwrite(srv, con, CONST_STR_LEN("Last-Modified"), CONST_BUF_LEN(mtime)); + response_header_overwrite(srv, con, CONST_STR_LEN("ETag"), CONST_BUF_LEN(con->physical.etag)); + response_header_overwrite(srv, con, CONST_STR_LEN("Content-Type"), CONST_BUF_LEN(sce->content_type)); + /* let mod_staticfile handle the cached compressed files, physical path was modified */ + return p->conf.compress_cache_dir->used ? HANDLER_GO_ON : HANDLER_FINISHED; } } } diff --git a/src/mod_dirlisting.c b/src/mod_dirlisting.c index 50d3046..511003f 100644 --- a/src/mod_dirlisting.c +++ b/src/mod_dirlisting.c @@ -454,21 +454,21 @@ static int http_list_directory_sizefmt(char *buf, off_t size) { static void http_list_directory_header(server *srv, connection *con, plugin_data *p, buffer *out) { UNUSED(srv); - BUFFER_APPEND_STRING_CONST(out, + buffer_append_string_len(out, CONST_STR_LEN( "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">\n" "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\">\n" "<head>\n" "<title>Index of " - ); + )); buffer_append_string_encoded(out, CONST_BUF_LEN(con->uri.path), ENCODING_MINIMAL_XML); - BUFFER_APPEND_STRING_CONST(out, "</title>\n"); + buffer_append_string_len(out, CONST_STR_LEN("</title>\n")); if (p->conf.external_css->used > 1) { - BUFFER_APPEND_STRING_CONST(out, "<link rel=\"stylesheet\" type=\"text/css\" href=\""); + buffer_append_string_len(out, CONST_STR_LEN("<link rel=\"stylesheet\" type=\"text/css\" href=\"")); buffer_append_string_buffer(out, p->conf.external_css); - BUFFER_APPEND_STRING_CONST(out, "\" />\n"); + buffer_append_string_len(out, CONST_STR_LEN("\" />\n")); } else { - BUFFER_APPEND_STRING_CONST(out, + buffer_append_string_len(out, CONST_STR_LEN( "<style type=\"text/css\">\n" "a, a:active {text-decoration: none; color: blue;}\n" "a:visited {color: #48468F;}\n" @@ -485,8 +485,6 @@ static void http_list_directory_header(server *srv, connection *con, plugin_data " padding-right: 14px;" " padding-bottom: 3px;" "}\n" - ); - BUFFER_APPEND_STRING_CONST(out, "td {padding-right: 14px;}\n" "td.s, th.s {text-align: right;}\n" "div.list {" @@ -502,10 +500,10 @@ static void http_list_directory_header(server *srv, connection *con, plugin_data " padding-top: 4px;" "}\n" "</style>\n" - ); + )); } - BUFFER_APPEND_STRING_CONST(out, "</head>\n<body>\n"); + buffer_append_string_len(out, CONST_STR_LEN("</head>\n<body>\n")); /* HEADER.txt */ if (p->conf.show_header) { @@ -514,19 +512,19 @@ static void http_list_directory_header(server *srv, connection *con, plugin_data buffer_copy_string_buffer(p->tmp_buf, con->physical.path); BUFFER_APPEND_SLASH(p->tmp_buf); - BUFFER_APPEND_STRING_CONST(p->tmp_buf, "HEADER.txt"); + buffer_append_string_len(p->tmp_buf, CONST_STR_LEN("HEADER.txt")); if (-1 != stream_open(&s, p->tmp_buf)) { - BUFFER_APPEND_STRING_CONST(out, "<pre class=\"header\">"); + buffer_append_string_len(out, CONST_STR_LEN("<pre class=\"header\">")); buffer_append_string_encoded(out, s.start, s.size, ENCODING_MINIMAL_XML); - BUFFER_APPEND_STRING_CONST(out, "</pre>"); + buffer_append_string_len(out, CONST_STR_LEN("</pre>")); } stream_close(&s); } - BUFFER_APPEND_STRING_CONST(out, "<h2>Index of "); + buffer_append_string_len(out, CONST_STR_LEN("<h2>Index of ")); buffer_append_string_encoded(out, CONST_BUF_LEN(con->uri.path), ENCODING_MINIMAL_XML); - BUFFER_APPEND_STRING_CONST(out, + buffer_append_string_len(out, CONST_STR_LEN( "</h2>\n" "<div class=\"list\">\n" "<table summary=\"Directory Listing\" cellpadding=\"0\" cellspacing=\"0\">\n" @@ -545,17 +543,17 @@ static void http_list_directory_header(server *srv, connection *con, plugin_data "<td class=\"s\">- </td>" "<td class=\"t\">Directory</td>" "</tr>\n" - ); + )); } static void http_list_directory_footer(server *srv, connection *con, plugin_data *p, buffer *out) { UNUSED(srv); - BUFFER_APPEND_STRING_CONST(out, + buffer_append_string_len(out, CONST_STR_LEN( "</tbody>\n" "</table>\n" "</div>\n" - ); + )); if (p->conf.show_readme) { stream s; @@ -563,33 +561,33 @@ static void http_list_directory_footer(server *srv, connection *con, plugin_data buffer_copy_string_buffer(p->tmp_buf, con->physical.path); BUFFER_APPEND_SLASH(p->tmp_buf); - BUFFER_APPEND_STRING_CONST(p->tmp_buf, "README.txt"); + buffer_append_string_len(p->tmp_buf, CONST_STR_LEN("README.txt")); if (-1 != stream_open(&s, p->tmp_buf)) { - BUFFER_APPEND_STRING_CONST(out, "<pre class=\"readme\">"); + buffer_append_string_len(out, CONST_STR_LEN("<pre class=\"readme\">")); buffer_append_string_encoded(out, s.start, s.size, ENCODING_MINIMAL_XML); - BUFFER_APPEND_STRING_CONST(out, "</pre>"); + buffer_append_string_len(out, CONST_STR_LEN("</pre>")); } stream_close(&s); } - BUFFER_APPEND_STRING_CONST(out, + buffer_append_string_len(out, CONST_STR_LEN( "<div class=\"foot\">" - ); + )); if (p->conf.set_footer->used > 1) { buffer_append_string_buffer(out, p->conf.set_footer); } else if (buffer_is_empty(con->conf.server_tag)) { - BUFFER_APPEND_STRING_CONST(out, PACKAGE_NAME "/" PACKAGE_VERSION); + buffer_append_string_len(out, CONST_STR_LEN(PACKAGE_NAME "/" PACKAGE_VERSION)); } else { buffer_append_string_buffer(out, con->conf.server_tag); } - BUFFER_APPEND_STRING_CONST(out, + buffer_append_string_len(out, CONST_STR_LEN( "</div>\n" "</body>\n" "</html>\n" - ); + )); } static int http_list_directory(server *srv, connection *con, plugin_data *p, buffer *dir) { @@ -742,13 +740,13 @@ static int http_list_directory(server *srv, connection *con, plugin_data *p, buf if (files.used) http_dirls_sort(files.ent, files.used); out = chunkqueue_get_append_buffer(con->write_queue); - BUFFER_COPY_STRING_CONST(out, "<?xml version=\"1.0\" encoding=\""); + buffer_copy_string_len(out, CONST_STR_LEN("<?xml version=\"1.0\" encoding=\"")); if (buffer_is_empty(p->conf.encoding)) { - BUFFER_APPEND_STRING_CONST(out, "iso-8859-1"); + buffer_append_string_len(out, CONST_STR_LEN("iso-8859-1")); } else { buffer_append_string_buffer(out, p->conf.encoding); } - BUFFER_APPEND_STRING_CONST(out, "\"?>\n"); + buffer_append_string_len(out, CONST_STR_LEN("\"?>\n")); http_list_directory_header(srv, con, p, out); /* directories */ @@ -762,13 +760,13 @@ static int http_list_directory(server *srv, connection *con, plugin_data *p, buf strftime(datebuf, sizeof(datebuf), "%Y-%b-%d %H:%M:%S", localtime(&(tmp->mtime))); #endif - BUFFER_APPEND_STRING_CONST(out, "<tr><td class=\"n\"><a href=\""); + buffer_append_string_len(out, CONST_STR_LEN("<tr><td class=\"n\"><a href=\"")); buffer_append_string_encoded(out, DIRLIST_ENT_NAME(tmp), tmp->namelen, ENCODING_REL_URI_PART); - BUFFER_APPEND_STRING_CONST(out, "/\">"); + buffer_append_string_len(out, CONST_STR_LEN("/\">")); buffer_append_string_encoded(out, DIRLIST_ENT_NAME(tmp), tmp->namelen, ENCODING_MINIMAL_XML); - BUFFER_APPEND_STRING_CONST(out, "</a>/</td><td class=\"m\">"); + buffer_append_string_len(out, CONST_STR_LEN("</a>/</td><td class=\"m\">")); buffer_append_string_len(out, datebuf, sizeof(datebuf) - 1); - BUFFER_APPEND_STRING_CONST(out, "</td><td class=\"s\">- </td><td class=\"t\">Directory</td></tr>\n"); + buffer_append_string_len(out, CONST_STR_LEN("</td><td class=\"s\">- </td><td class=\"t\">Directory</td></tr>\n")); free(tmp); } @@ -818,17 +816,17 @@ static int http_list_directory(server *srv, connection *con, plugin_data *p, buf #endif http_list_directory_sizefmt(sizebuf, tmp->size); - BUFFER_APPEND_STRING_CONST(out, "<tr><td class=\"n\"><a href=\""); + buffer_append_string_len(out, CONST_STR_LEN("<tr><td class=\"n\"><a href=\"")); buffer_append_string_encoded(out, DIRLIST_ENT_NAME(tmp), tmp->namelen, ENCODING_REL_URI_PART); - BUFFER_APPEND_STRING_CONST(out, "\">"); + buffer_append_string_len(out, CONST_STR_LEN("\">")); buffer_append_string_encoded(out, DIRLIST_ENT_NAME(tmp), tmp->namelen, ENCODING_MINIMAL_XML); - BUFFER_APPEND_STRING_CONST(out, "</a></td><td class=\"m\">"); + buffer_append_string_len(out, CONST_STR_LEN("</a></td><td class=\"m\">")); buffer_append_string_len(out, datebuf, sizeof(datebuf) - 1); - BUFFER_APPEND_STRING_CONST(out, "</td><td class=\"s\">"); + buffer_append_string_len(out, CONST_STR_LEN("</td><td class=\"s\">")); buffer_append_string(out, sizebuf); - BUFFER_APPEND_STRING_CONST(out, "</td><td class=\"t\">"); + buffer_append_string_len(out, CONST_STR_LEN("</td><td class=\"t\">")); buffer_append_string(out, content_type); - BUFFER_APPEND_STRING_CONST(out, "</td></tr>\n"); + buffer_append_string_len(out, CONST_STR_LEN("</td></tr>\n")); free(tmp); } @@ -841,11 +839,11 @@ static int http_list_directory(server *srv, connection *con, plugin_data *p, buf /* Insert possible charset to Content-Type */ if (buffer_is_empty(p->conf.encoding)) { - response_header_insert(srv, con, CONST_STR_LEN("Content-Type"), CONST_STR_LEN("text/html")); + response_header_overwrite(srv, con, CONST_STR_LEN("Content-Type"), CONST_STR_LEN("text/html")); } else { - buffer_copy_string(p->content_charset, "text/html; charset="); + buffer_copy_string_len(p->content_charset, CONST_STR_LEN("text/html; charset=")); buffer_append_string_buffer(p->content_charset, p->conf.encoding); - response_header_insert(srv, con, CONST_STR_LEN("Content-Type"), CONST_BUF_LEN(p->content_charset)); + response_header_overwrite(srv, con, CONST_STR_LEN("Content-Type"), CONST_BUF_LEN(p->content_charset)); } con->file_finished = 1; @@ -861,6 +859,18 @@ URIHANDLER_FUNC(mod_dirlisting_subrequest) { UNUSED(srv); + /* we only handle GET, POST and HEAD */ + switch(con->request.http_method) { + case HTTP_METHOD_GET: + case HTTP_METHOD_POST: + case HTTP_METHOD_HEAD: + break; + default: + return HANDLER_GO_ON; + } + + if (con->mode != DIRECT) return HANDLER_GO_ON; + if (con->physical.path->used == 0) return HANDLER_GO_ON; if (con->uri.path->used == 0) return HANDLER_GO_ON; if (con->uri.path->ptr[con->uri.path->used - 2] != '/') return HANDLER_GO_ON; diff --git a/src/mod_evasive.c b/src/mod_evasive.c index 3415953..2970711 100644 --- a/src/mod_evasive.c +++ b/src/mod_evasive.c @@ -138,24 +138,47 @@ URIHANDLER_FUNC(mod_evasive_uri_handler) { /* no limit set, nothing to block */ if (p->conf.max_conns == 0) return HANDLER_GO_ON; + switch (con->dst_addr.plain.sa_family) { + case AF_INET: +#ifdef HAVE_IPV6 + case AF_INET6: +#endif + break; + default: /* Address family not supported */ + return HANDLER_GO_ON; + }; + for (j = 0; j < srv->conns->used; j++) { connection *c = srv->conns->ptr[j]; /* check if other connections are already actively serving data for the same IP * we can only ban connections which are already behind the 'read request' state * */ - if (c->dst_addr.ipv4.sin_addr.s_addr == con->dst_addr.ipv4.sin_addr.s_addr && - c->state > CON_STATE_REQUEST_END) { - conns_by_ip++; - - if (conns_by_ip > p->conf.max_conns) { - log_error_write(srv, __FILE__, __LINE__, "ss", - inet_ntop_cache_get_ip(srv, &(con->dst_addr)), - "turned away. Too many connections."); - - con->http_status = 403; - return HANDLER_FINISHED; - } + if (c->dst_addr.plain.sa_family != con->dst_addr.plain.sa_family) continue; + if (c->state <= CON_STATE_REQUEST_END) continue; + + switch (con->dst_addr.plain.sa_family) { + case AF_INET: + if (c->dst_addr.ipv4.sin_addr.s_addr != con->dst_addr.ipv4.sin_addr.s_addr) continue; + break; +#ifdef HAVE_IPV6 + case AF_INET6: + if (0 != memcmp(c->dst_addr.ipv6.sin6_addr.s6_addr, con->dst_addr.ipv6.sin6_addr.s6_addr, 16)) continue; + break; +#endif + default: /* Address family not supported, should never be reached */ + continue; + }; + conns_by_ip++; + + if (conns_by_ip > p->conf.max_conns) { + log_error_write(srv, __FILE__, __LINE__, "ss", + inet_ntop_cache_get_ip(srv, &(con->dst_addr)), + "turned away. Too many connections."); + + con->http_status = 403; + con->mode = DIRECT; + return HANDLER_FINISHED; } } diff --git a/src/mod_evhost.c b/src/mod_evhost.c index daf4494..09a90a2 100644 --- a/src/mod_evhost.c +++ b/src/mod_evhost.c @@ -95,7 +95,7 @@ static void mod_evhost_parse_pattern(plugin_config *s) { s->path_pieces = realloc(s->path_pieces,(s->len+1) * sizeof(*s->path_pieces)); s->path_pieces[s->len] = buffer_init(); - buffer_append_memory(s->path_pieces[s->len],pos,ptr-pos); + buffer_copy_string_len(s->path_pieces[s->len],pos,ptr-pos); s->len += 1; } @@ -181,7 +181,7 @@ static int mod_evhost_parse_host(connection *con,array *host) { } ds = data_string_init(); - buffer_copy_string(ds->key,"%0"); + buffer_copy_string_len(ds->key,CONST_STR_LEN("%0")); /* if we stopped at a dot, skip the dot */ if (*ptr == '.') ptr++; @@ -197,7 +197,7 @@ static int mod_evhost_parse_host(connection *con,array *host) { if (ptr != colon - 1) { /* is something between the dots */ ds = data_string_init(); - buffer_copy_string(ds->key,"%"); + buffer_copy_string_len(ds->key,CONST_STR_LEN("%")); buffer_append_long(ds->key, i++); buffer_copy_string_len(ds->value,ptr+1,colon-ptr-1); @@ -210,7 +210,7 @@ static int mod_evhost_parse_host(connection *con,array *host) { /* if the . is not the first charactor of the hostname */ if (colon != ptr) { ds = data_string_init(); - buffer_copy_string(ds->key,"%"); + buffer_copy_string_len(ds->key,CONST_STR_LEN("%")); buffer_append_long(ds->key, i++); buffer_copy_string_len(ds->value,ptr,colon-ptr); @@ -286,7 +286,7 @@ static handler_t mod_evhost_uri_handler(server *srv, connection *con, void *p_d) if (*(ptr+1) == '%') { /* %% */ - BUFFER_APPEND_STRING_CONST(p->tmp_buf,"%"); + buffer_append_string_len(p->tmp_buf,CONST_STR_LEN("%")); } else if (NULL != (ds = (data_string *)array_get_element(parsed_host,p->conf.path_pieces[i]->ptr))) { if (ds->value->used) { buffer_append_string_buffer(p->tmp_buf,ds->value); diff --git a/src/mod_expire.c b/src/mod_expire.c index b58b97d..6aed514 100644 --- a/src/mod_expire.c +++ b/src/mod_expire.c @@ -339,7 +339,7 @@ URIHANDLER_FUNC(mod_expire_path_handler) { response_header_overwrite(srv, con, CONST_STR_LEN("Expires"), CONST_BUF_LEN(p->expire_tstmp)); /* HTTP/1.1 */ - buffer_copy_string(p->expire_tstmp, "max-age="); + buffer_copy_string_len(p->expire_tstmp, CONST_STR_LEN("max-age=")); buffer_append_long(p->expire_tstmp, ts); response_header_overwrite(srv, con, CONST_STR_LEN("Cache-Control"), CONST_BUF_LEN(p->expire_tstmp)); diff --git a/src/mod_extforward.c b/src/mod_extforward.c index be7dd0f..0b457d6 100644 --- a/src/mod_extforward.c +++ b/src/mod_extforward.c @@ -281,8 +281,9 @@ static int is_proxy_trusted(const char *ipstr, plugin_data *p) static const char *last_not_in_array(array *a, plugin_data *p) { array *forwarder = p->conf.forwarder; + int i; - for (int i = a->used - 1; i >= 0; i--) { + for (i = a->used - 1; i >= 0; i--) { data_string *ds = (data_string *)a->data[i]; const char *ip = ds->value->ptr; diff --git a/src/mod_fastcgi.c b/src/mod_fastcgi.c index 9ce9556..2f4b03c 100644 --- a/src/mod_fastcgi.c +++ b/src/mod_fastcgi.c @@ -236,6 +236,16 @@ typedef struct { unsigned short break_scriptfilename_for_php; /* + * workaround for program when prefix="/" + * + * rule to build PATH_INFO is hardcoded for when check_local is disabled + * enable this option to use the workaround + * + */ + + unsigned short fix_root_path_name; + + /* * If the backend includes X-LIGHTTPD-send-file in the response * we use the value as filename and ignore the content. * @@ -380,10 +390,10 @@ typedef struct { static handler_t fcgi_handle_fdevent(void *s, void *ctx, int revents); int fastcgi_status_copy_procname(buffer *b, fcgi_extension_host *host, fcgi_proc *proc) { - buffer_copy_string(b, "fastcgi.backend."); + buffer_copy_string_len(b, CONST_STR_LEN("fastcgi.backend.")); buffer_append_string_buffer(b, host->id); if (proc) { - buffer_append_string(b, "."); + buffer_append_string_len(b, CONST_STR_LEN(".")); buffer_append_long(b, proc->id); } @@ -393,7 +403,7 @@ int fastcgi_status_copy_procname(buffer *b, fcgi_extension_host *host, fcgi_proc int fastcgi_status_init(server *srv, buffer *b, fcgi_extension_host *host, fcgi_proc *proc) { #define CLEAN(x) \ fastcgi_status_copy_procname(b, host, proc); \ - buffer_append_string(b, x); \ + buffer_append_string_len(b, CONST_STR_LEN(x)); \ status_counter_set(srv, CONST_BUF_LEN(b), 0); CLEAN(".disabled"); @@ -406,7 +416,7 @@ int fastcgi_status_init(server *srv, buffer *b, fcgi_extension_host *host, fcgi_ #define CLEAN(x) \ fastcgi_status_copy_procname(b, host, NULL); \ - buffer_append_string(b, x); \ + buffer_append_string_len(b, CONST_STR_LEN(x)); \ status_counter_set(srv, CONST_BUF_LEN(b), 0); CLEAN(".load"); @@ -693,6 +703,7 @@ FREE_FUNC(mod_fastcgi_free) { static int env_add(char_array *env, const char *key, size_t key_len, const char *val, size_t val_len) { char *dst; + size_t i; if (!key || !val) return -1; @@ -702,6 +713,15 @@ static int env_add(char_array *env, const char *key, size_t key_len, const char /* add the \0 from the value */ memcpy(dst + key_len + 1, val, val_len + 1); + for (i = 0; i < env->used; i++) { + if (0 == strncmp(dst, env->ptr[i], key_len + 1)) { + /* don't care about free as we are in a forked child which is going to exec(...) */ + /* free(env->ptr[i]); */ + env->ptr[i] = dst; + return 0; + } + } + if (env->size == 0) { env->size = 16; env->ptr = malloc(env->size * sizeof(*env->ptr)); @@ -811,7 +831,7 @@ static int fcgi_spawn_connection(server *srv, socket_type = AF_UNIX; fcgi_addr = (struct sockaddr *) &fcgi_addr_un; - buffer_copy_string(proc->connection_name, "unix:"); + buffer_copy_string_len(proc->connection_name, CONST_STR_LEN("unix:")); buffer_append_string_buffer(proc->connection_name, proc->unixsocket); #else @@ -857,13 +877,13 @@ static int fcgi_spawn_connection(server *srv, socket_type = AF_INET; fcgi_addr = (struct sockaddr *) &fcgi_addr_in; - buffer_copy_string(proc->connection_name, "tcp:"); + buffer_copy_string_len(proc->connection_name, CONST_STR_LEN("tcp:")); if (!buffer_is_empty(host->host)) { buffer_append_string_buffer(proc->connection_name, host->host); } else { - buffer_append_string(proc->connection_name, "localhost"); + buffer_append_string_len(proc->connection_name, CONST_STR_LEN("localhost")); } - buffer_append_string(proc->connection_name, ":"); + buffer_append_string_len(proc->connection_name, CONST_STR_LEN(":")); buffer_append_long(proc->connection_name, proc->port); } @@ -937,6 +957,8 @@ static int fcgi_spawn_connection(server *srv, close(fcgi_fd); } + openDevNull(STDERR_FILENO); + /* we don't need the client socket */ for (i = 3; i < 256; i++) { close(i); @@ -1000,8 +1022,8 @@ static int fcgi_spawn_connection(server *srv, /* exec the cgi */ execve(arg.ptr[0], arg.ptr, env.ptr); - log_error_write(srv, __FILE__, __LINE__, "sbs", - "execve failed for:", host->bin_path, strerror(errno)); + /* log_error_write(srv, __FILE__, __LINE__, "sbs", + "execve failed for:", host->bin_path, strerror(errno)); */ exit(errno); @@ -1193,6 +1215,7 @@ SETDEFAULTS_FUNC(mod_fastcgi_set_defaults) { { "allow-x-send-file", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 15 */ { "strip-request-uri", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 16 */ { "kill-signal", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, /* 17 */ + { "fix-root-scriptname", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 18 */ { NULL, NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET } }; @@ -1220,6 +1243,7 @@ SETDEFAULTS_FUNC(mod_fastcgi_set_defaults) { host->break_scriptfilename_for_php = 0; host->allow_xsendfile = 0; /* handle X-LIGHTTPD-send-file */ host->kill_signal = SIGTERM; + host->fix_root_path_name = 0; fcv[0].destination = host->host; fcv[1].destination = host->docroot; @@ -1241,6 +1265,7 @@ SETDEFAULTS_FUNC(mod_fastcgi_set_defaults) { fcv[15].destination = &(host->allow_xsendfile); fcv[16].destination = host->strip_request_uri; fcv[17].destination = &(host->kill_signal); + fcv[18].destination = &(host->fix_root_path_name); if (0 != config_insert_values_internal(srv, da_host->value, fcv)) { return HANDLER_ERROR; @@ -1324,7 +1349,7 @@ SETDEFAULTS_FUNC(mod_fastcgi_set_defaults) { proc->port = host->port + pno; } else { buffer_copy_string_buffer(proc->unixsocket, host->unixsocket); - buffer_append_string(proc->unixsocket, "-"); + buffer_append_string_len(proc->unixsocket, CONST_STR_LEN("-")); buffer_append_long(proc->unixsocket, pno); } @@ -1482,7 +1507,7 @@ void fcgi_connection_close(server *srv, handler_ctx *hctx) { status_counter_dec(srv, CONST_STR_LEN("fastcgi.active-requests")); fastcgi_status_copy_procname(p->statuskey, hctx->host, hctx->proc); - buffer_append_string(p->statuskey, ".load"); + buffer_append_string_len(p->statuskey, CONST_STR_LEN(".load")); status_counter_set(srv, CONST_BUF_LEN(p->statuskey), hctx->proc->load); @@ -1683,7 +1708,7 @@ static connection_result_t fcgi_establish_connection(server *srv, handler_ctx *h if (buffer_is_empty(proc->connection_name)) { /* on remote spawing we have to set the connection-name now */ - buffer_copy_string(proc->connection_name, "unix:"); + buffer_copy_string_len(proc->connection_name, CONST_STR_LEN("unix:")); buffer_append_string_buffer(proc->connection_name, proc->unixsocket); } #else @@ -1709,13 +1734,13 @@ static connection_result_t fcgi_establish_connection(server *srv, handler_ctx *h if (buffer_is_empty(proc->connection_name)) { /* on remote spawing we have to set the connection-name now */ - buffer_copy_string(proc->connection_name, "tcp:"); + buffer_copy_string_len(proc->connection_name, CONST_STR_LEN("tcp:")); if (!buffer_is_empty(host->host)) { buffer_append_string_buffer(proc->connection_name, host->host); } else { - buffer_append_string(proc->connection_name, "localhost"); + buffer_append_string_len(proc->connection_name, CONST_STR_LEN("localhost")); } - buffer_append_string(proc->connection_name, ":"); + buffer_append_string_len(proc->connection_name, CONST_STR_LEN(":")); buffer_append_long(proc->connection_name, proc->port); } } @@ -1771,7 +1796,7 @@ static int fcgi_env_add_request_headers(server *srv, connection *con, plugin_dat buffer_reset(srv->tmp_buf); if (0 != strcasecmp(ds->key->ptr, "CONTENT-TYPE")) { - BUFFER_COPY_STRING_CONST(srv->tmp_buf, "HTTP_"); + buffer_copy_string_len(srv->tmp_buf, CONST_STR_LEN("HTTP_")); srv->tmp_buf->used--; } @@ -2026,7 +2051,7 @@ static int fcgi_create_env(server *srv, handler_ctx *hctx, size_t request_id) { */ if ('/' != host->strip_request_uri->ptr[host->strip_request_uri->used - 2]) { /* fix the user-input to have / as last char */ - buffer_append_string(host->strip_request_uri, "/"); + buffer_append_string_len(host->strip_request_uri, CONST_STR_LEN("/")); } if (con->request.orig_uri->used >= host->strip_request_uri->used && @@ -2094,12 +2119,12 @@ static int fcgi_create_env(server *srv, handler_ctx *hctx, size_t request_id) { hctx->wb->bytes_in += sizeof(header); if (p->conf.debug > 10) { - fprintf(stderr, "%s.%d: tosend: %lld / %lld\n", __FILE__, __LINE__, offset, req_cq->bytes_in); + log_error_write(srv, __FILE__, __LINE__, "soso", "tosend:", offset, "/", req_cq->bytes_in); } for (written = 0; written != weWant; ) { if (p->conf.debug > 10) { - fprintf(stderr, "%s.%d: chunk: %lld / %lld\n", __FILE__, __LINE__, written, weWant); + log_error_write(srv, __FILE__, __LINE__, "soso", "chunk:", written, "/", weWant); } switch (req_c->type) { @@ -2109,12 +2134,10 @@ static int fcgi_create_env(server *srv, handler_ctx *hctx, size_t request_id) { if (weHave > weWant - written) weHave = weWant - written; if (p->conf.debug > 10) { - fprintf(stderr, "%s.%d: sending %lld bytes from (%lld / %lld) %s\n", - __FILE__, __LINE__, - weHave, - req_c->offset, - req_c->file.length, - req_c->file.name->ptr); + log_error_write(srv, __FILE__, __LINE__, "soSosOsb", + "sending", weHave, "bytes from (", + req_c->offset, "/", req_c->file.length, ")", + req_c->file.name); } assert(weHave != 0); @@ -2143,7 +2166,7 @@ static int fcgi_create_env(server *srv, handler_ctx *hctx, size_t request_id) { chunk *c; if (p->conf.debug > 10) { - fprintf(stderr, "%s.%d: next chunk\n", __FILE__, __LINE__); + log_error_write(srv, __FILE__, __LINE__, "s", "next chunk"); } c = hctx->wb->last; @@ -2173,7 +2196,7 @@ static int fcgi_create_env(server *srv, handler_ctx *hctx, size_t request_id) { hctx->wb->bytes_in += weHave; - if (req_c->offset == req_c->mem->used - 1) { + if (req_c->offset == (off_t) req_c->mem->used - 1) { chunkqueue_remove_finished_chunks(req_cq); req_c = req_cq->first; @@ -2368,7 +2391,7 @@ static int fastcgi_get_packet(server *srv, handler_ctx *hctx, fastcgi_response_p offset = sizeof(*header); /* ->b should only be the content */ - buffer_copy_string(packet->b, ""); /* used == 1 */ + buffer_copy_string_len(packet->b, CONST_STR_LEN("")); /* used == 1 */ if (packet->len) { /* copy the content */ @@ -2544,7 +2567,10 @@ static int fcgi_demux_response(server *srv, handler_ctx *hctx) { stat_cache_entry *sce; if (HANDLER_ERROR != stat_cache_get_entry(srv, con, ds->value, &sce)) { - data_string *dcls = data_string_init(); + data_string *dcls; + if (NULL == (dcls = (data_string *)array_get_unused_element(con->response.headers, TYPE_STRING))) { + dcls = data_response_init(); + } /* found */ http_chunk_append_file(srv, con, ds->value, 0, sce->st.st_size); hctx->send_content_body = 0; /* ignore the content */ @@ -2663,30 +2689,48 @@ static int fcgi_restart_dead_procs(server *srv, plugin_data *p, fcgi_extension_h /* the child should not terminate at all */ - switch(waitpid(proc->pid, &status, WNOHANG)) { - case 0: - /* child is still alive */ - break; - case -1: - break; - default: - if (WIFEXITED(status)) { + for ( ;; ) { + switch(waitpid(proc->pid, &status, WNOHANG)) { + case 0: + /* child is still alive */ + if (srv->cur_ts <= proc->disabled_until) break; + + proc->state = PROC_STATE_RUNNING; + host->active_procs++; + + log_error_write(srv, __FILE__, __LINE__, "sbdb", + "fcgi-server re-enabled:", + host->host, host->port, + host->unixsocket); + break; + case -1: + if (errno == EINTR) continue; + + log_error_write(srv, __FILE__, __LINE__, "sd", + "child died somehow, waitpid failed:", + errno); + proc->state = PROC_STATE_DIED; + break; + default: + if (WIFEXITED(status)) { #if 0 - log_error_write(srv, __FILE__, __LINE__, "sdsd", - "child exited, pid:", proc->pid, - "status:", WEXITSTATUS(status)); + log_error_write(srv, __FILE__, __LINE__, "sdsd", + "child exited, pid:", proc->pid, + "status:", WEXITSTATUS(status)); #endif - } else if (WIFSIGNALED(status)) { - log_error_write(srv, __FILE__, __LINE__, "sd", - "child signaled:", - WTERMSIG(status)); - } else { - log_error_write(srv, __FILE__, __LINE__, "sd", - "child died somehow:", - status); + } else if (WIFSIGNALED(status)) { + log_error_write(srv, __FILE__, __LINE__, "sd", + "child signaled:", + WTERMSIG(status)); + } else { + log_error_write(srv, __FILE__, __LINE__, "sd", + "child died somehow:", + status); + } + + proc->state = PROC_STATE_DIED; + break; } - - proc->state = PROC_STATE_DIED; break; } @@ -2797,7 +2841,7 @@ static handler_t fcgi_write_request(server *srv, handler_ctx *hctx) { hctx->proc->state = PROC_STATE_DIED; fastcgi_status_copy_procname(p->statuskey, hctx->host, hctx->proc); - buffer_append_string(p->statuskey, ".died"); + buffer_append_string_len(p->statuskey, CONST_STR_LEN(".died")); status_counter_inc(srv, CONST_BUF_LEN(p->statuskey)); @@ -2889,7 +2933,7 @@ static handler_t fcgi_write_request(server *srv, handler_ctx *hctx) { hctx->proc->state = PROC_STATE_OVERLOADED; fastcgi_status_copy_procname(p->statuskey, hctx->host, hctx->proc); - buffer_append_string(p->statuskey, ".overloaded"); + buffer_append_string_len(p->statuskey, CONST_STR_LEN(".overloaded")); status_counter_inc(srv, CONST_BUF_LEN(p->statuskey)); @@ -2915,7 +2959,7 @@ static handler_t fcgi_write_request(server *srv, handler_ctx *hctx) { "load:", host->load); fastcgi_status_copy_procname(p->statuskey, hctx->host, hctx->proc); - buffer_append_string(p->statuskey, ".died"); + buffer_append_string_len(p->statuskey, CONST_STR_LEN(".died")); status_counter_inc(srv, CONST_BUF_LEN(p->statuskey)); @@ -2941,19 +2985,19 @@ static handler_t fcgi_write_request(server *srv, handler_ctx *hctx) { status_counter_inc(srv, CONST_STR_LEN("fastcgi.active-requests")); fastcgi_status_copy_procname(p->statuskey, hctx->host, hctx->proc); - buffer_append_string(p->statuskey, ".connected"); + buffer_append_string_len(p->statuskey, CONST_STR_LEN(".connected")); status_counter_inc(srv, CONST_BUF_LEN(p->statuskey)); /* the proc-load */ fastcgi_status_copy_procname(p->statuskey, hctx->host, hctx->proc); - buffer_append_string(p->statuskey, ".load"); + buffer_append_string_len(p->statuskey, CONST_STR_LEN(".load")); status_counter_set(srv, CONST_BUF_LEN(p->statuskey), hctx->proc->load); /* the host-load */ fastcgi_status_copy_procname(p->statuskey, hctx->host, NULL); - buffer_append_string(p->statuskey, ".load"); + buffer_append_string_len(p->statuskey, CONST_STR_LEN(".load")); status_counter_set(srv, CONST_BUF_LEN(p->statuskey), hctx->host->load); @@ -3074,7 +3118,7 @@ SUBREQUEST_FUNC(mod_fastcgi_handle_subrequest) { /* check if the next server has no load. */ ndx = hctx->ext->last_used_ndx + 1; - if(ndx >= hctx->ext->used || ndx < 0) ndx = 0; + if(ndx >= (int) hctx->ext->used || ndx < 0) ndx = 0; host = hctx->ext->hosts[ndx]; if (host->load > 0) { /* get backend with the least load. */ @@ -3208,6 +3252,7 @@ static handler_t fcgi_handle_fdevent(void *s, void *ctx, int revents) { fcgi_connection_close(srv, hctx); con->mode = DIRECT; + con->http_status = 0; con->file_started = 1; /* fcgi_extension won't touch the request afterwards */ } else { /* we are done */ @@ -3418,6 +3463,8 @@ static handler_t fcgi_check_extension(server *srv, connection *con, void *p_d, i fcgi_extension *extension = NULL; fcgi_extension_host *host = NULL; + if (con->mode != DIRECT) return HANDLER_GO_ON; + /* Possibly, we processed already this request */ if (con->file_started == 1) return HANDLER_GO_ON; @@ -3480,13 +3527,12 @@ static handler_t fcgi_check_extension(server *srv, connection *con, void *p_d, i ct_len = extension->key->used - 1; - if (s_len < ct_len) continue; - - /* check extension in the form "/fcgi_pattern" */ - if (*(extension->key->ptr) == '/') { - if (strncmp(fn->ptr, extension->key->ptr, ct_len) == 0) + /* check _url_ in the form "/fcgi_pattern" */ + if (extension->key->ptr[0] == '/') { + if ((ct_len <= con->uri.path->used -1) && + (strncmp(con->uri.path->ptr, extension->key->ptr, ct_len) == 0)) break; - } else if (0 == strncmp(fn->ptr + s_len - ct_len, extension->key->ptr, ct_len)) { + } else if ((ct_len <= s_len) && (0 == strncmp(fn->ptr + s_len - ct_len, extension->key->ptr, ct_len))) { /* check extension in the form ".fcg" */ break; } @@ -3499,16 +3545,15 @@ static handler_t fcgi_check_extension(server *srv, connection *con, void *p_d, i /* check if we have at least one server for this extension up and running */ for (k = 0; k < extension->used; k++) { - host = extension->hosts[k]; + fcgi_extension_host *h = extension->hosts[k]; /* we should have at least one proc that can do something */ - if (host->active_procs == 0) { - host = NULL; - + if (h->active_procs == 0) { continue; } /* we found one host that is alive */ + host = h; break; } @@ -3564,36 +3609,50 @@ static handler_t fcgi_check_extension(server *srv, connection *con, void *p_d, i "handling it in mod_fastcgi"); } - /* the prefix is the SCRIPT_NAME, - * everything from start to the next slash - * this is important for check-local = "disable" - * - * if prefix = /admin.fcgi - * - * /admin.fcgi/foo/bar - * - * SCRIPT_NAME = /admin.fcgi - * PATH_INFO = /foo/bar - * - * if prefix = /fcgi-bin/ - * - * /fcgi-bin/foo/bar - * - * SCRIPT_NAME = /fcgi-bin/foo - * PATH_INFO = /bar - * - */ - - /* the rewrite is only done for /prefix/? matches */ - if (extension->key->ptr[0] == '/' && - con->uri.path->used > extension->key->used && - NULL != (pathinfo = strchr(con->uri.path->ptr + extension->key->used - 1, '/'))) { - /* rewrite uri.path and pathinfo */ - - buffer_copy_string(con->request.pathinfo, pathinfo); - - con->uri.path->used -= con->request.pathinfo->used - 1; - con->uri.path->ptr[con->uri.path->used - 1] = '\0'; + /* do not split path info for authorizer */ + if (host->mode != FCGI_AUTHORIZER) { + /* the prefix is the SCRIPT_NAME, + * everything from start to the next slash + * this is important for check-local = "disable" + * + * if prefix = /admin.fcgi + * + * /admin.fcgi/foo/bar + * + * SCRIPT_NAME = /admin.fcgi + * PATH_INFO = /foo/bar + * + * if prefix = /fcgi-bin/ + * + * /fcgi-bin/foo/bar + * + * SCRIPT_NAME = /fcgi-bin/foo + * PATH_INFO = /bar + * + * if prefix = /, and fix-root-path-name is enable + * + * /fcgi-bin/foo/bar + * + * SCRIPT_NAME = /fcgi-bin/foo + * PATH_INFO = /bar + * + */ + + /* the rewrite is only done for /prefix/? matches */ + if (extension->key->ptr[0] == '/' && + con->uri.path->used > extension->key->used && + NULL != (pathinfo = strchr(con->uri.path->ptr + extension->key->used - 1, '/'))) { + /* rewrite uri.path and pathinfo */ + + buffer_copy_string(con->request.pathinfo, pathinfo); + + con->uri.path->used -= con->request.pathinfo->used - 1; + con->uri.path->ptr[con->uri.path->used - 1] = '\0'; + } else if (host->fix_root_path_name && extension->key->ptr[0] == '/' && extension->key->ptr[1] == '\0') { + buffer_copy_string(con->request.pathinfo, con->uri.path->ptr); + con->uri.path->used = 1; + con->uri.path->ptr[con->uri.path->used - 1] = '\0'; + } } } } else { @@ -3738,7 +3797,7 @@ TRIGGER_FUNC(mod_fastcgi_handle_trigger) { proc->port = host->port + proc->id; } else { buffer_copy_string_buffer(proc->unixsocket, host->unixsocket); - buffer_append_string(proc->unixsocket, "-"); + buffer_append_string_len(proc->unixsocket, CONST_STR_LEN("-")); buffer_append_long(proc->unixsocket, proc->id); } diff --git a/src/mod_flv_streaming.c b/src/mod_flv_streaming.c index 32f2369..c0b1dd6 100644 --- a/src/mod_flv_streaming.c +++ b/src/mod_flv_streaming.c @@ -193,6 +193,8 @@ URIHANDLER_FUNC(mod_flv_streaming_path_handler) { UNUSED(srv); + if (con->mode != DIRECT) return HANDLER_GO_ON; + if (buffer_is_empty(con->physical.path)) return HANDLER_GO_ON; mod_flv_streaming_patch_connection(srv, con, p); @@ -245,7 +247,7 @@ URIHANDLER_FUNC(mod_flv_streaming_path_handler) { /* we are safe now, let's build a flv header */ b = chunkqueue_get_append_buffer(con->write_queue); - BUFFER_COPY_STRING_CONST(b, "FLV\x1\x1\0\0\0\x9\0\0\0\x9"); + buffer_copy_string_len(b, CONST_STR_LEN("FLV\x1\x1\0\0\0\x9\0\0\0\x9")); http_chunk_append_file(srv, con, con->physical.path, start, sce->st.st_size - start); diff --git a/src/mod_indexfile.c b/src/mod_indexfile.c index d167424..36b9e45 100644 --- a/src/mod_indexfile.c +++ b/src/mod_indexfile.c @@ -140,6 +140,8 @@ URIHANDLER_FUNC(mod_indexfile_subrequest) { size_t k; stat_cache_entry *sce = NULL; + if (con->mode != DIRECT) return HANDLER_GO_ON; + if (con->uri.path->used == 0) return HANDLER_GO_ON; if (con->uri.path->ptr[con->uri.path->used - 2] != '/') return HANDLER_GO_ON; diff --git a/src/mod_magnet.c b/src/mod_magnet.c index 4fd0795..02bcaed 100644 --- a/src/mod_magnet.c +++ b/src/mod_magnet.c @@ -414,10 +414,16 @@ static buffer *magnet_env_get_buffer(server *srv, connection *con, const char *k case MAGNET_ENV_URI_AUTHORITY: dest = con->uri.authority; break; case MAGNET_ENV_URI_QUERY: dest = con->uri.query; break; - case MAGNET_ENV_REQUEST_METHOD: break; + case MAGNET_ENV_REQUEST_METHOD: + buffer_copy_string(srv->tmp_buf, get_http_method_name(con->request.http_method)); + dest = srv->tmp_buf; + break; case MAGNET_ENV_REQUEST_URI: dest = con->request.uri; break; case MAGNET_ENV_REQUEST_ORIG_URI: dest = con->request.orig_uri; break; - case MAGNET_ENV_REQUEST_PROTOCOL: break; + case MAGNET_ENV_REQUEST_PROTOCOL: + buffer_copy_string(srv->tmp_buf, get_http_version_name(con->request.http_version)); + dest = srv->tmp_buf; + break; case MAGNET_ENV_UNSET: break; } @@ -647,6 +653,7 @@ static handler_t magnet_attract(server *srv, connection *con, plugin_data *p, bu assert(lua_gettop(L) == 0); /* only the function should be on the stack */ con->http_status = 500; + con->mode = DIRECT; return HANDLER_FINISHED; } @@ -744,6 +751,7 @@ static handler_t magnet_attract(server *srv, connection *con, plugin_data *p, bu assert(lua_gettop(L) == 1); /* only the function should be on the stack */ con->http_status = 500; + con->mode = DIRECT; return HANDLER_FINISHED; } @@ -766,9 +774,13 @@ static handler_t magnet_attract(server *srv, connection *con, plugin_data *p, bu /* try { ...*/ if (0 == setjmp(exceptionjmp)) { magnet_attach_content(srv, con, p, L); + if (!chunkqueue_is_empty(con->write_queue)) { + con->mode = p->id; + } } else { /* } catch () { */ con->http_status = 500; + con->mode = DIRECT; } assert(lua_gettop(L) == 1); /* only the function should be on the stack */ diff --git a/src/mod_mysql_vhost.c b/src/mod_mysql_vhost.c index fe2b67f..2824055 100644 --- a/src/mod_mysql_vhost.c +++ b/src/mod_mysql_vhost.c @@ -245,7 +245,6 @@ SERVER_FUNC(mod_mysql_vhost_set_defaults) { if (!(buffer_is_empty(s->myuser) || buffer_is_empty(s->mydb))) { my_bool reconnect = 1; - int fd; if (NULL == (s->mysql = mysql_init(NULL))) { log_error_write(srv, __FILE__, __LINE__, "s", "mysql_init() failed, exiting..."); @@ -267,19 +266,27 @@ SERVER_FUNC(mod_mysql_vhost_set_defaults) { return HANDLER_ERROR; } #undef FOO + +#if 0 /* set close_on_exec for mysql the hard way */ /* Note: this only works as it is done during startup, */ /* otherwise we cannot be sure that mysql is fd i-1 */ - if (-1 == (fd = open("/dev/null", 0))) { + { int fd; + if (-1 != (fd = open("/dev/null", 0))) { close(fd); +#ifdef FD_CLOEXEC fcntl(fd-1, F_SETFD, FD_CLOEXEC); - } +#endif + } } +#else +#ifdef FD_CLOEXEC + fcntl(s->mysql->net.fd, F_SETFD, FD_CLOEXEC); +#endif +#endif } } - - - return HANDLER_GO_ON; + return HANDLER_GO_ON; } #define PATCH(x) \ @@ -410,6 +417,7 @@ GO_ON: buffer_copy_string_buffer(con->server_name, c->server_name); ERR500: if (result) mysql_free_result(result); con->http_status = 500; /* Internal Error */ + con->mode = DIRECT; return HANDLER_FINISHED; } diff --git a/src/mod_proxy.c b/src/mod_proxy.c index 4d8ecdd..92549e2 100644 --- a/src/mod_proxy.c +++ b/src/mod_proxy.c @@ -432,10 +432,10 @@ static int proxy_create_env(server *srv, handler_ctx *hctx) { /* request line */ buffer_copy_string(b, get_http_method_name(con->request.http_method)); - BUFFER_APPEND_STRING_CONST(b, " "); + buffer_append_string_len(b, CONST_STR_LEN(" ")); buffer_append_string_buffer(b, con->request.uri); - BUFFER_APPEND_STRING_CONST(b, " HTTP/1.0\r\n"); + buffer_append_string_len(b, CONST_STR_LEN(" HTTP/1.0\r\n")); proxy_append_header(con, "X-Forwarded-For", (char *)inet_ntop_cache_get_ip(srv, &(con->dst_addr))); /* http_host is NOT is just a pointer to a buffer @@ -454,15 +454,16 @@ static int proxy_create_env(server *srv, handler_ctx *hctx) { if (ds->value->used && ds->key->used) { if (buffer_is_equal_string(ds->key, CONST_STR_LEN("Connection"))) continue; + if (buffer_is_equal_string(ds->key, CONST_STR_LEN("Proxy-Connection"))) continue; buffer_append_string_buffer(b, ds->key); - BUFFER_APPEND_STRING_CONST(b, ": "); + buffer_append_string_len(b, CONST_STR_LEN(": ")); buffer_append_string_buffer(b, ds->value); - BUFFER_APPEND_STRING_CONST(b, "\r\n"); + buffer_append_string_len(b, CONST_STR_LEN("\r\n")); } } - BUFFER_APPEND_STRING_CONST(b, "\r\n"); + buffer_append_string_len(b, CONST_STR_LEN("\r\n")); hctx->wb->bytes_in += b->used - 1; /* body */ @@ -652,7 +653,7 @@ static int proxy_demux_response(server *srv, handler_ctx *hctx) { buffer_prepare_append(hctx->response, b + 1); hctx->response->used = 1; } else { - buffer_prepare_append(hctx->response, hctx->response->used + b); + buffer_prepare_append(hctx->response, b); } if (-1 == (r = read(hctx->fd, hctx->response->ptr + hctx->response->used - 1, b))) { @@ -1060,6 +1061,8 @@ static handler_t mod_proxy_check_extension(server *srv, connection *con, void *p data_array *extension = NULL; size_t path_info_offset; + if (con->mode != DIRECT) return HANDLER_GO_ON; + /* Possibly, we processed already this request */ if (con->file_started == 1) return HANDLER_GO_ON; @@ -1118,7 +1121,13 @@ static handler_t mod_proxy_check_extension(server *srv, connection *con, void *p log_error_write(srv, __FILE__, __LINE__, "s", "proxy - ext found"); } - switch(p->conf.balance) { + if (extension->value->used == 1) { + if ( ((data_proxy *)extension->value->data[0])->is_disabled ) { + ndx = -1; + } else { + ndx = 0; + } + } else if (extension->value->used != 0) switch(p->conf.balance) { case PROXY_BALANCE_HASH: /* hash balancing */ @@ -1175,7 +1184,9 @@ static handler_t mod_proxy_check_extension(server *srv, connection *con, void *p } break; - case PROXY_BALANCE_RR: + case PROXY_BALANCE_RR: { + data_proxy *host; + /* round robin */ if (p->conf.debug) { log_error_write(srv, __FILE__, __LINE__, "s", @@ -1185,31 +1196,33 @@ static handler_t mod_proxy_check_extension(server *srv, connection *con, void *p /* just to be sure */ assert(extension->value->used < INT_MAX); - for (k = 0, ndx = -1, max_usage = INT_MAX; k < extension->value->used; k++) { - data_proxy *host = (data_proxy *)extension->value->data[k]; - - if (host->is_disabled) continue; + host = (data_proxy *)extension->value->data[0]; - /* first usable ndx */ - if (max_usage == INT_MAX) { - max_usage = k; - } + /* Use last_used_ndx from first host in list */ + k = host->last_used_ndx; + ndx = k + 1; /* use next host after the last one */ + if (ndx < 0) ndx = 0; - /* get next ndx */ - if ((int)k > host->last_used_ndx) { - ndx = k; - host->last_used_ndx = k; + /* Search first active host after last_used_ndx */ + while ( ndx < (int) extension->value->used + && (host = (data_proxy *)extension->value->data[ndx])->is_disabled ) ndx++; - break; + if (ndx >= (int) extension->value->used) { + /* didn't found a higher id, wrap to the start */ + for (ndx = 0; ndx < (int) k; ndx++) { + host = (data_proxy *)extension->value->data[ndx]; + if (!host->is_disabled) break; } - } - /* didn't found a higher id, wrap to the start */ - if (ndx == -1 && max_usage != INT_MAX) { - ndx = max_usage; + /* No active host found */ + if (host->is_disabled) ndx = -1; } + /* Save new index for next round */ + ((data_proxy *)extension->value->data[0])->last_used_ndx = ndx; + break; + } default: break; } diff --git a/src/mod_redirect.c b/src/mod_redirect.c index 24523ca..d5f7864 100644 --- a/src/mod_redirect.c +++ b/src/mod_redirect.c @@ -215,8 +215,7 @@ static handler_t mod_redirect_uri_handler(server *srv, connection *con, void *p_ start = 0; end = pattern_len; for (k = 0; k < pattern_len; k++) { - if ((pattern[k] == '$' || pattern[k] == '%') && - isdigit((unsigned char)pattern[k + 1])) { + if (pattern[k] == '$' || pattern[k] == '%') { /* got one */ size_t num = pattern[k + 1] - '0'; @@ -225,7 +224,10 @@ static handler_t mod_redirect_uri_handler(server *srv, connection *con, void *p_ buffer_append_string_len(p->location, pattern + start, end - start); - if (pattern[k] == '$') { + if (!isdigit((unsigned char)pattern[k + 1])) { + /* enable escape: "%%" => "%", "%a" => "%a", "$$" => "$" */ + buffer_append_string_len(p->location, pattern+k, pattern[k] == pattern[k+1] ? 1 : 2); + } else if (pattern[k] == '$') { /* n is always > 0 */ if (num < (size_t)n) { buffer_append_string(p->location, list[num]); @@ -251,6 +253,7 @@ static handler_t mod_redirect_uri_handler(server *srv, connection *con, void *p_ response_header_insert(srv, con, CONST_STR_LEN("Location"), CONST_BUF_LEN(p->location)); con->http_status = 301; + con->mode = DIRECT; con->file_finished = 1; return HANDLER_FINISHED; diff --git a/src/mod_rewrite.c b/src/mod_rewrite.c index b27361a..1b90afc 100644 --- a/src/mod_rewrite.c +++ b/src/mod_rewrite.c @@ -385,8 +385,7 @@ URIHANDLER_FUNC(mod_rewrite_uri_handler) { start = 0; end = pattern_len; for (k = 0; k < pattern_len; k++) { - if ((pattern[k] == '$' || pattern[k] == '%') && - isdigit((unsigned char)pattern[k + 1])) { + if (pattern[k] == '$' || pattern[k] == '%') { /* got one */ size_t num = pattern[k + 1] - '0'; @@ -395,7 +394,10 @@ URIHANDLER_FUNC(mod_rewrite_uri_handler) { buffer_append_string_len(con->request.uri, pattern + start, end - start); - if (pattern[k] == '$') { + if (!isdigit((unsigned char)pattern[k + 1])) { + /* enable escape: "%%" => "%", "%a" => "%a", "$$" => "$" */ + buffer_append_string_len(con->request.uri, pattern+k, pattern[k] == pattern[k+1] ? 1 : 2); + } else if (pattern[k] == '$') { /* n is always > 0 */ if (num < (size_t)n) { buffer_append_string(con->request.uri, list[num]); @@ -419,9 +421,12 @@ URIHANDLER_FUNC(mod_rewrite_uri_handler) { pcre_free(list); - hctx = handler_ctx_init(); - - con->plugin_ctx[p->id] = hctx; + if (con->plugin_ctx[p->id] == NULL) { + hctx = handler_ctx_init(); + con->plugin_ctx[p->id] = hctx; + } else { + hctx = con->plugin_ctx[p->id]; + } if (rule->once) hctx->state = REWRITE_STATE_FINISHED; diff --git a/src/mod_rrdtool.c b/src/mod_rrdtool.c index 28003c4..2cb4640 100644 --- a/src/mod_rrdtool.c +++ b/src/mod_rrdtool.c @@ -92,11 +92,11 @@ FREE_FUNC(mod_rrd_free) { } int mod_rrd_create_pipe(server *srv, plugin_data *p) { +#ifdef HAVE_FORK pid_t pid; int to_rrdtool_fds[2]; int from_rrdtool_fds[2]; -#ifdef HAVE_FORK if (pipe(to_rrdtool_fds)) { log_error_write(srv, __FILE__, __LINE__, "ss", "pipe failed: ", strerror(errno)); @@ -132,13 +132,6 @@ int mod_rrd_create_pipe(server *srv, plugin_data *p) { /* not needed */ close(to_rrdtool_fds[1]); - close(STDERR_FILENO); - - if (srv->errorlog_mode == ERRORLOG_FILE) { - dup2(srv->errorlog_fd, STDERR_FILENO); - close(srv->errorlog_fd); - } - /* set up args */ argc = 3; args = malloc(sizeof(*args) * argc); @@ -148,6 +141,8 @@ int mod_rrd_create_pipe(server *srv, plugin_data *p) { args[i++] = dash; args[i++] = NULL; + openDevNull(STDERR_FILENO); + /* we don't need the client socket */ for (i = 3; i < 256; i++) { close(i); @@ -156,7 +151,7 @@ int mod_rrd_create_pipe(server *srv, plugin_data *p) { /* exec the cgi */ execv(args[0], args); - log_error_write(srv, __FILE__, __LINE__, "sss", "spawing rrdtool failed: ", strerror(errno), args[0]); + /* log_error_write(srv, __FILE__, __LINE__, "sss", "spawing rrdtool failed: ", strerror(errno), args[0]); */ /* */ SEGFAULT(); @@ -177,6 +172,11 @@ int mod_rrd_create_pipe(server *srv, plugin_data *p) { p->read_fd = from_rrdtool_fds[0]; p->rrdtool_pid = pid; +#ifdef FD_CLOEXEC + fcntl(p->write_fd, F_SETFD, FD_CLOEXEC); + fcntl(p->read_fd, F_SETFD, FD_CLOEXEC); +#endif + break; } } @@ -187,6 +187,47 @@ int mod_rrd_create_pipe(server *srv, plugin_data *p) { #endif } +/* read/write wrappers to catch EINTR */ + +/* write to blocking socket; blocks until all data is sent, write returns 0 or an error (apart from EINTR) occurs. */ +static ssize_t safe_write(int fd, const void *buf, size_t count) { + ssize_t res, sum = 0; + + for (;;) { + res = write(fd, buf, count); + if (res >= 0) { + sum += res; + /* do not try again if res == 0 */ + if (res == 0 || (size_t) res == count) return sum; + count -= res; + buf = (const char*) buf + res; + continue; + } + switch (errno) { + case EINTR: + continue; + default: + return -1; + } + } +} + +/* this assumes we get enough data on a successful read */ +static ssize_t safe_read(int fd, void *buf, size_t count) { + ssize_t res; + + for (;;) { + res = read(fd, buf, count); + if (res >= 0) return res; + switch (errno) { + case EINTR: + continue; + default: + return -1; + } + } +} + static int mod_rrdtool_create_rrd(server *srv, plugin_data *p, plugin_config *s) { struct stat st; @@ -202,26 +243,27 @@ static int mod_rrdtool_create_rrd(server *srv, plugin_data *p, plugin_config *s) int r ; /* create a new one */ - BUFFER_COPY_STRING_CONST(p->cmd, "create "); + buffer_copy_string_len(p->cmd, CONST_STR_LEN("create ")); buffer_append_string_buffer(p->cmd, s->path_rrd); - buffer_append_string(p->cmd, " --step 60 "); - buffer_append_string(p->cmd, "DS:InOctets:ABSOLUTE:600:U:U "); - buffer_append_string(p->cmd, "DS:OutOctets:ABSOLUTE:600:U:U "); - buffer_append_string(p->cmd, "DS:Requests:ABSOLUTE:600:U:U "); - buffer_append_string(p->cmd, "RRA:AVERAGE:0.5:1:600 "); - buffer_append_string(p->cmd, "RRA:AVERAGE:0.5:6:700 "); - buffer_append_string(p->cmd, "RRA:AVERAGE:0.5:24:775 "); - buffer_append_string(p->cmd, "RRA:AVERAGE:0.5:288:797 "); - buffer_append_string(p->cmd, "RRA:MAX:0.5:1:600 "); - buffer_append_string(p->cmd, "RRA:MAX:0.5:6:700 "); - buffer_append_string(p->cmd, "RRA:MAX:0.5:24:775 "); - buffer_append_string(p->cmd, "RRA:MAX:0.5:288:797 "); - buffer_append_string(p->cmd, "RRA:MIN:0.5:1:600 "); - buffer_append_string(p->cmd, "RRA:MIN:0.5:6:700 "); - buffer_append_string(p->cmd, "RRA:MIN:0.5:24:775 "); - buffer_append_string(p->cmd, "RRA:MIN:0.5:288:797\n"); - - if (-1 == (r = write(p->write_fd, p->cmd->ptr, p->cmd->used - 1))) { + buffer_append_string_len(p->cmd, CONST_STR_LEN( + " --step 60 " + "DS:InOctets:ABSOLUTE:600:U:U " + "DS:OutOctets:ABSOLUTE:600:U:U " + "DS:Requests:ABSOLUTE:600:U:U " + "RRA:AVERAGE:0.5:1:600 " + "RRA:AVERAGE:0.5:6:700 " + "RRA:AVERAGE:0.5:24:775 " + "RRA:AVERAGE:0.5:288:797 " + "RRA:MAX:0.5:1:600 " + "RRA:MAX:0.5:6:700 " + "RRA:MAX:0.5:24:775 " + "RRA:MAX:0.5:288:797 " + "RRA:MIN:0.5:1:600 " + "RRA:MIN:0.5:6:700 " + "RRA:MIN:0.5:24:775 " + "RRA:MIN:0.5:288:797\n")); + + if (-1 == (r = safe_write(p->write_fd, p->cmd->ptr, p->cmd->used - 1))) { log_error_write(srv, __FILE__, __LINE__, "ss", "rrdtool-write: failed", strerror(errno)); @@ -229,7 +271,7 @@ static int mod_rrdtool_create_rrd(server *srv, plugin_data *p, plugin_config *s) } buffer_prepare_copy(p->resp, 4096); - if (-1 == (r = read(p->read_fd, p->resp->ptr, p->resp->size))) { + if (-1 == (r = safe_read(p->read_fd, p->resp->ptr, p->resp->size))) { log_error_write(srv, __FILE__, __LINE__, "ss", "rrdtool-read: failed", strerror(errno)); @@ -372,17 +414,17 @@ TRIGGER_FUNC(mod_rrd_trigger) { if (HANDLER_GO_ON != mod_rrdtool_create_rrd(srv, p, s)) return HANDLER_ERROR; - BUFFER_COPY_STRING_CONST(p->cmd, "update "); + buffer_copy_string_len(p->cmd, CONST_STR_LEN("update ")); buffer_append_string_buffer(p->cmd, s->path_rrd); - BUFFER_APPEND_STRING_CONST(p->cmd, " N:"); + buffer_append_string_len(p->cmd, CONST_STR_LEN(" N:")); buffer_append_off_t(p->cmd, s->bytes_read); - BUFFER_APPEND_STRING_CONST(p->cmd, ":"); + buffer_append_string_len(p->cmd, CONST_STR_LEN(":")); buffer_append_off_t(p->cmd, s->bytes_written); - BUFFER_APPEND_STRING_CONST(p->cmd, ":"); + buffer_append_string_len(p->cmd, CONST_STR_LEN(":")); buffer_append_long(p->cmd, s->requests); - BUFFER_APPEND_STRING_CONST(p->cmd, "\n"); + buffer_append_string_len(p->cmd, CONST_STR_LEN("\n")); - if (-1 == (r = write(p->write_fd, p->cmd->ptr, p->cmd->used - 1))) { + if (-1 == (r = safe_write(p->write_fd, p->cmd->ptr, p->cmd->used - 1))) { p->rrdtool_running = 0; log_error_write(srv, __FILE__, __LINE__, "ss", @@ -392,7 +434,7 @@ TRIGGER_FUNC(mod_rrd_trigger) { } buffer_prepare_copy(p->resp, 4096); - if (-1 == (r = read(p->read_fd, p->resp->ptr, p->resp->size))) { + if (-1 == (r = safe_read(p->read_fd, p->resp->ptr, p->resp->size))) { p->rrdtool_running = 0; log_error_write(srv, __FILE__, __LINE__, "ss", @@ -405,12 +447,15 @@ TRIGGER_FUNC(mod_rrd_trigger) { if (p->resp->ptr[0] != 'O' || p->resp->ptr[1] != 'K') { - p->rrdtool_running = 0; + /* don't fail on this error if we just started (graceful restart, the old one might have just updated too) */ + if (!(strstr(p->resp->ptr, "(minimum one second step)") && (srv->cur_ts - srv->startup_ts < 3))) { + p->rrdtool_running = 0; - log_error_write(srv, __FILE__, __LINE__, "sbb", + log_error_write(srv, __FILE__, __LINE__, "sbb", "rrdtool-response:", p->cmd, p->resp); - return HANDLER_ERROR; + return HANDLER_ERROR; + } } s->requests = 0; s->bytes_written = 0; diff --git a/src/mod_scgi.c b/src/mod_scgi.c index b7287ba..0d19a88 100644 --- a/src/mod_scgi.c +++ b/src/mod_scgi.c @@ -202,6 +202,15 @@ typedef struct { * */ + /* + * workaround for program when prefix="/" + * + * rule to build PATH_INFO is hardcoded for when check_local is disabled + * enable this option to use the workaround + * + */ + + unsigned short fix_root_path_name; ssize_t load; /* replace by host->load */ size_t max_id; /* corresponds most of the time to @@ -233,6 +242,7 @@ typedef struct { typedef struct { buffer *key; /* like .php */ + int note_is_sent; scgi_extension_host **hosts; size_t used; @@ -583,6 +593,7 @@ FREE_FUNC(mod_scgi_free) { static int env_add(char_array *env, const char *key, size_t key_len, const char *val, size_t val_len) { char *dst; + size_t i; if (!key || !val) return -1; @@ -592,6 +603,15 @@ static int env_add(char_array *env, const char *key, size_t key_len, const char /* add the \0 from the value */ memcpy(dst + key_len + 1, val, val_len + 1); + for (i = 0; i < env->used; i++) { + if (0 == strncmp(dst, env->ptr[i], key_len + 1)) { + /* don't care about free as we are in a forked child which is going to exec(...) */ + /* free(env->ptr[i]); */ + env->ptr[i] = dst; + return 0; + } + } + if (env->size == 0) { env->size = 16; env->ptr = malloc(env->size * sizeof(*env->ptr)); @@ -749,11 +769,20 @@ static int scgi_spawn_connection(server *srv, env.size = 0; env.used = 0; + if (scgi_fd != 0) { + close(0); + dup2(scgi_fd, 0); + close(scgi_fd); + scgi_fd = 0; + } + /* we don't need the client socket */ for (fd = 3; fd < 256; fd++) { - if (fd != 2 && fd != scgi_fd) close(fd); + close(fd); } + openDevNull(STDERR_FILENO); + /* build clean environment */ if (host->bin_env_copy->used) { for (i = 0; i < host->bin_env_copy->used; i++) { @@ -794,7 +823,7 @@ static int scgi_spawn_connection(server *srv, env.ptr[env.used] = NULL; b = buffer_init(); - buffer_copy_string(b, "exec "); + buffer_copy_string_len(b, CONST_STR_LEN("exec ")); buffer_append_string_buffer(b, host->bin_path); /* exec the cgi */ @@ -968,6 +997,7 @@ SETDEFAULTS_FUNC(mod_scgi_set_defaults) { { "bin-environment", NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_CONNECTION }, /* 11 */ { "bin-copy-environment", NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_CONNECTION }, /* 12 */ + { "fix-root-scriptname", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 13 */ { NULL, NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET } @@ -990,6 +1020,7 @@ SETDEFAULTS_FUNC(mod_scgi_set_defaults) { df->max_load_per_proc = 1; df->idle_timeout = 60; df->disable_time = 60; + df->fix_root_path_name = 0; fcv[0].destination = df->host; fcv[1].destination = df->docroot; @@ -1006,6 +1037,7 @@ SETDEFAULTS_FUNC(mod_scgi_set_defaults) { fcv[11].destination = df->bin_env; fcv[12].destination = df->bin_env_copy; + fcv[13].destination = &(df->fix_root_path_name); if (0 != config_insert_values_internal(srv, da_host->value, fcv)) { @@ -1084,7 +1116,7 @@ SETDEFAULTS_FUNC(mod_scgi_set_defaults) { proc->port = df->port + pno; } else { buffer_copy_string_buffer(proc->socket, df->unixsocket); - buffer_append_string(proc->socket, "-"); + buffer_append_string_len(proc->socket, CONST_STR_LEN("-")); buffer_append_long(proc->socket, pno); } @@ -1155,11 +1187,6 @@ void scgi_connection_cleanup(server *srv, handler_ctx *hctx) { p = hctx->plugin_data; con = hctx->remote_conn; - if (con->mode != p->id) { - WP(); - return; - } - if (hctx->fd != -1) { fdevent_event_del(srv->ev, &(hctx->fde_ndx), hctx->fd); fdevent_unregister(srv->ev, hctx->fd); @@ -1366,7 +1393,7 @@ static int scgi_env_add_request_headers(server *srv, connection *con, plugin_dat buffer_reset(srv->tmp_buf); if (0 != strcasecmp(ds->key->ptr, "CONTENT-TYPE")) { - BUFFER_COPY_STRING_CONST(srv->tmp_buf, "HTTP_"); + buffer_copy_string_len(srv->tmp_buf, CONST_STR_LEN("HTTP_")); srv->tmp_buf->used--; } @@ -1394,7 +1421,7 @@ static int scgi_env_add_request_headers(server *srv, connection *con, plugin_dat buffer_prepare_append(srv->tmp_buf, ds->key->used + 2); for (j = 0; j < ds->key->used - 1; j++) { srv->tmp_buf->ptr[srv->tmp_buf->used++] = - isalpha((unsigned char)ds->key->ptr[j]) ? + light_isalnum((unsigned char)ds->key->ptr[j]) ? toupper((unsigned char)ds->key->ptr[j]) : '_'; } srv->tmp_buf->ptr[srv->tmp_buf->used++] = '\0'; @@ -1673,9 +1700,8 @@ static int scgi_response_parse(server *srv, connection *con, plugin_data *p, buf status = strtol(s+9, NULL, 10); - if (con->http_status >= 100 && - con->http_status < 1000) { - /* we expected 3 digits and didn't got them */ + if (status >= 100 && status < 1000) { + /* we expected 3 digits got them */ con->parsed_response |= HTTP_STATUS; con->http_status = status; } @@ -1788,6 +1814,7 @@ static int scgi_demux_response(server *srv, handler_ctx *hctx) { int header_end = 0; int cp, eol = EOL_UNSET; size_t used = 0; + size_t hlen = 0; buffer_append_string_buffer(hctx->response_header, hctx->response); @@ -1810,6 +1837,7 @@ static int scgi_demux_response(server *srv, handler_ctx *hctx) { if (*(c+1) == '\n') { header_end = 1; + hlen = cp + 2; break; } @@ -1828,6 +1856,7 @@ static int scgi_demux_response(server *srv, handler_ctx *hctx) { *(c+2) == '\r' && *(c+3) == '\n') { header_end = 1; + hlen = cp + 4; break; } @@ -1849,12 +1878,11 @@ static int scgi_demux_response(server *srv, handler_ctx *hctx) { http_chunk_append_mem(srv, con, hctx->response_header->ptr, hctx->response_header->used); joblist_append(srv, con); } else { - size_t hlen = c - hctx->response_header->ptr + (eol == EOL_RN ? 4 : 2); size_t blen = hctx->response_header->used - hlen - 1; /* a small hack: terminate after at the second \r */ - hctx->response_header->used = hlen + 1 - (eol == EOL_RN ? 2 : 1); - hctx->response_header->ptr[hlen - (eol == EOL_RN ? 2 : 1)] = '\0'; + hctx->response_header->used = hlen; + hctx->response_header->ptr[hlen - 1] = '\0'; /* parse the response header */ scgi_response_parse(srv, con, p, hctx->response_header, eol); @@ -1866,7 +1894,7 @@ static int scgi_demux_response(server *srv, handler_ctx *hctx) { } if ((hctx->response->used != hlen) && blen > 0) { - http_chunk_append_mem(srv, con, c + (eol == EOL_RN ? 4: 2), blen + 1); + http_chunk_append_mem(srv, con, hctx->response_header->ptr + hlen, blen + 1); joblist_append(srv, con); } } @@ -2438,15 +2466,11 @@ static handler_t scgi_connection_close(server *srv, handler_ctx *hctx) { p = hctx->plugin_data; con = hctx->remote_conn; - if (con->mode != p->id) return HANDLER_GO_ON; - log_error_write(srv, __FILE__, __LINE__, "ssdsd", "emergency exit: scgi:", "connection-fd:", con->fd, "fcgi-fd:", hctx->fd); - - scgi_connection_cleanup(srv, hctx); return HANDLER_FINISHED; @@ -2548,13 +2572,13 @@ static handler_t scgi_handle_fdevent(void *s, void *ctx, int revents) { con->mode = DIRECT; } else { /* response might have been already started, kill the connection */ - scgi_connection_cleanup(srv, hctx); - log_error_write(srv, __FILE__, __LINE__, "ssdsd", "response already sent out, termination connection", "connection-fd:", con->fd, "fcgi-fd:", hctx->fd); + scgi_connection_cleanup(srv, hctx); + connection_set_state(srv, con, CON_STATE_ERROR); } @@ -2668,10 +2692,12 @@ static handler_t scgi_check_extension(server *srv, connection *con, void *p_d, i plugin_data *p = p_d; size_t s_len; int used = -1; - int ndx; size_t k; buffer *fn; scgi_extension *extension = NULL; + scgi_extension_host *host = NULL; + + if (con->mode != DIRECT) return HANDLER_GO_ON; /* Possibly, we processed already this request */ if (con->file_started == 1) return HANDLER_GO_ON; @@ -2712,95 +2738,59 @@ static handler_t scgi_check_extension(server *srv, connection *con, void *p_d, i } /* get best server */ - for (k = 0, ndx = -1; k < extension->used; k++) { - scgi_extension_host *host = extension->hosts[k]; + for (k = 0; k < extension->used; k++) { + scgi_extension_host *h = extension->hosts[k]; - /* we should have at least one proc that can do somthing */ - if (host->active_procs == 0) continue; + /* we should have at least one proc that can do something */ + if (h->active_procs == 0) { + continue; + } - if (used == -1 || host->load < used) { - used = host->load; + if (used == -1 || h->load < used) { + used = h->load; - ndx = k; + host = h; } } - /* found a server */ - if (ndx != -1) { - scgi_extension_host *host = extension->hosts[ndx]; - - /* - * if check-local is disabled, use the uri.path handler - * - */ - - /* init handler-context */ - if (uri_path_handler) { - if (host->check_local == 0) { - handler_ctx *hctx; - char *pathinfo; - - hctx = handler_ctx_init(); - - hctx->remote_conn = con; - hctx->plugin_data = p; - hctx->host = host; - hctx->proc = NULL; - - hctx->conf.exts = p->conf.exts; - hctx->conf.debug = p->conf.debug; - - con->plugin_ctx[p->id] = hctx; - - host->load++; + if (!host) { + /* sorry, we don't have a server alive for this ext */ + buffer_reset(con->physical.path); + con->http_status = 500; - con->mode = p->id; + /* only send the 'no handler' once */ + if (!extension->note_is_sent) { + extension->note_is_sent = 1; - if (con->conf.log_request_handling) { - log_error_write(srv, __FILE__, __LINE__, "s", "handling it in mod_scgi"); - } + log_error_write(srv, __FILE__, __LINE__, "sbsbs", + "all handlers for ", con->uri.path, + "on", extension->key, + "are down."); + } - /* the prefix is the SCRIPT_NAME, - * everthing from start to the next slash - * this is important for check-local = "disable" - * - * if prefix = /admin.fcgi - * - * /admin.fcgi/foo/bar - * - * SCRIPT_NAME = /admin.fcgi - * PATH_INFO = /foo/bar - * - * if prefix = /fcgi-bin/ - * - * /fcgi-bin/foo/bar - * - * SCRIPT_NAME = /fcgi-bin/foo - * PATH_INFO = /bar - * - */ + return HANDLER_FINISHED; + } - /* the rewrite is only done for /prefix/? matches */ - if (extension->key->ptr[0] == '/' && - con->uri.path->used > extension->key->used && - NULL != (pathinfo = strchr(con->uri.path->ptr + extension->key->used - 1, '/'))) { - /* rewrite uri.path and pathinfo */ + /* a note about no handler is not sent yet */ + extension->note_is_sent = 0; - buffer_copy_string(con->request.pathinfo, pathinfo); + /* + * if check-local is disabled, use the uri.path handler + * + */ - con->uri.path->used -= con->request.pathinfo->used - 1; - con->uri.path->ptr[con->uri.path->used - 1] = '\0'; - } - } - return HANDLER_GO_ON; - } else { + /* init handler-context */ + if (uri_path_handler) { + if (host->check_local == 0) { handler_ctx *hctx; + char *pathinfo; + hctx = handler_ctx_init(); hctx->remote_conn = con; hctx->plugin_data = p; hctx->host = host; - hctx->proc = NULL; + hctx->proc = NULL; hctx->conf.exts = p->conf.exts; hctx->conf.debug = p->conf.debug; @@ -2812,22 +2802,69 @@ static handler_t scgi_check_extension(server *srv, connection *con, void *p_d, i con->mode = p->id; if (con->conf.log_request_handling) { - log_error_write(srv, __FILE__, __LINE__, "s", "handling it in mod_fastcgi"); + log_error_write(srv, __FILE__, __LINE__, "s", + "handling it in mod_fastcgi"); } - return HANDLER_GO_ON; + /* the prefix is the SCRIPT_NAME, + * everything from start to the next slash + * this is important for check-local = "disable" + * + * if prefix = /admin.fcgi + * + * /admin.fcgi/foo/bar + * + * SCRIPT_NAME = /admin.fcgi + * PATH_INFO = /foo/bar + * + * if prefix = /fcgi-bin/ + * + * /fcgi-bin/foo/bar + * + * SCRIPT_NAME = /fcgi-bin/foo + * PATH_INFO = /bar + * + */ + + /* the rewrite is only done for /prefix/? matches */ + if (extension->key->ptr[0] == '/' && + con->uri.path->used > extension->key->used && + NULL != (pathinfo = strchr(con->uri.path->ptr + extension->key->used - 1, '/'))) { + /* rewrite uri.path and pathinfo */ + + buffer_copy_string(con->request.pathinfo, pathinfo); + + con->uri.path->used -= con->request.pathinfo->used - 1; + con->uri.path->ptr[con->uri.path->used - 1] = '\0'; + } else if (host->fix_root_path_name && extension->key->ptr[0] == '/' && extension->key->ptr[1] == '\0') { + buffer_copy_string(con->request.pathinfo, con->uri.path->ptr); + con->uri.path->used = 1; + con->uri.path->ptr[con->uri.path->used - 1] = '\0'; + } } } else { - /* no handler found */ - buffer_reset(con->physical.path); - con->http_status = 500; + handler_ctx *hctx; + hctx = handler_ctx_init(); - log_error_write(srv, __FILE__, __LINE__, "sb", - "no fcgi-handler found for:", - fn); + hctx->remote_conn = con; + hctx->plugin_data = p; + hctx->host = host; + hctx->proc = NULL; - return HANDLER_FINISHED; + hctx->conf.exts = p->conf.exts; + hctx->conf.debug = p->conf.debug; + + con->plugin_ctx[p->id] = hctx; + + host->load++; + + con->mode = p->id; + + if (con->conf.log_request_handling) { + log_error_write(srv, __FILE__, __LINE__, "s", "handling it in mod_fastcgi"); + } } + return HANDLER_GO_ON; } @@ -2949,7 +2986,7 @@ TRIGGER_FUNC(mod_scgi_handle_trigger) { fp->port = host->port + fp->id; } else { buffer_copy_string_buffer(fp->socket, host->unixsocket); - buffer_append_string(fp->socket, "-"); + buffer_append_string_len(fp->socket, CONST_STR_LEN("-")); buffer_append_long(fp->socket, fp->id); } diff --git a/src/mod_secure_download.c b/src/mod_secure_download.c index 57e407f..0ff0102 100644 --- a/src/mod_secure_download.c +++ b/src/mod_secure_download.c @@ -204,6 +204,8 @@ URIHANDLER_FUNC(mod_secdownload_uri_handler) { time_t ts = 0; size_t i; + if (con->mode != DIRECT) return HANDLER_GO_ON; + if (con->uri.path->used == 0) return HANDLER_GO_ON; mod_secdownload_patch_connection(srv, con, p); @@ -243,8 +245,8 @@ URIHANDLER_FUNC(mod_secdownload_uri_handler) { } /* timed-out */ - if (srv->cur_ts - ts > p->conf.timeout || - srv->cur_ts - ts < -p->conf.timeout) { + if ( (srv->cur_ts > ts && srv->cur_ts - ts > p->conf.timeout) || + (srv->cur_ts < ts && ts - srv->cur_ts > p->conf.timeout) ) { /* "Gone" as the url will never be valid again instead of "408 - Timeout" where the request may be repeated */ con->http_status = 410; @@ -268,7 +270,7 @@ URIHANDLER_FUNC(mod_secdownload_uri_handler) { buffer_copy_string_hex(p->md5, (char *)HA1, 16); - if (0 != strncmp(md5_str, p->md5->ptr, 32)) { + if (0 != strncasecmp(md5_str, p->md5->ptr, 32)) { con->http_status = 403; log_error_write(srv, __FILE__, __LINE__, "sss", diff --git a/src/mod_simple_vhost.c b/src/mod_simple_vhost.c index d55cfed..1a8c13a 100644 --- a/src/mod_simple_vhost.c +++ b/src/mod_simple_vhost.c @@ -249,6 +249,10 @@ static handler_t mod_simple_vhost_docroot(server *srv, connection *con, void *p_ return HANDLER_GO_ON; } else { buffer_copy_string_buffer(con->server_name, p->conf.default_host); + buffer_copy_string_buffer(con->physical.doc_root, p->doc_root); + + /* do not cache default host */ + return HANDLER_GO_ON; } } else { buffer_copy_string_buffer(con->server_name, con->uri.authority); diff --git a/src/mod_skeleton.c b/src/mod_skeleton.c index 9cea92c..0ce833f 100644 --- a/src/mod_skeleton.c +++ b/src/mod_skeleton.c @@ -169,6 +169,8 @@ URIHANDLER_FUNC(mod_skeleton_uri_handler) { UNUSED(srv); + if (con->mode != DIRECT) return HANDLER_GO_ON; + if (con->uri.path->used == 0) return HANDLER_GO_ON; mod_skeleton_patch_connection(srv, con, p); diff --git a/src/mod_ssi.c b/src/mod_ssi.c index d02d998..8323c8e 100644 --- a/src/mod_ssi.c +++ b/src/mod_ssi.c @@ -177,7 +177,7 @@ static int ssi_env_add_request_headers(server *srv, connection *con, plugin_data } if (0 != strcasecmp(ds->key->ptr, "CONTENT-TYPE")) { - buffer_copy_string(srv->tmp_buf, "HTTP_"); + buffer_copy_string_len(srv->tmp_buf, CONST_STR_LEN("HTTP_")); srv->tmp_buf->used--; } @@ -419,7 +419,7 @@ static int process_ssi_stmt(server *srv, connection *con, plugin_data *p, b = chunkqueue_get_append_buffer(con->write_queue); if (0 == strftime(buf, sizeof(buf), p->timefmt->ptr, localtime(&t))) { - buffer_copy_string(b, "(none)"); + buffer_copy_string_len(b, CONST_STR_LEN("(none)")); } else { buffer_copy_string(b, buf); } @@ -430,7 +430,7 @@ static int process_ssi_stmt(server *srv, connection *con, plugin_data *p, b = chunkqueue_get_append_buffer(con->write_queue); if (0 == strftime(buf, sizeof(buf), p->timefmt->ptr, localtime(&t))) { - buffer_copy_string(b, "(none)"); + buffer_copy_string_len(b, CONST_STR_LEN("(none)")); } else { buffer_copy_string(b, buf); } @@ -441,7 +441,7 @@ static int process_ssi_stmt(server *srv, connection *con, plugin_data *p, b = chunkqueue_get_append_buffer(con->write_queue); if (0 == strftime(buf, sizeof(buf), p->timefmt->ptr, gmtime(&t))) { - buffer_copy_string(b, "(none)"); + buffer_copy_string_len(b, CONST_STR_LEN("(none)")); } else { buffer_copy_string(b, buf); } @@ -472,7 +472,7 @@ static int process_ssi_stmt(server *srv, connection *con, plugin_data *p, if (NULL != (ds = (data_string *)array_get_element(p->ssi_cgi_env, var_val))) { buffer_copy_string_buffer(b, ds->value); } else { - buffer_copy_string(b, "(none)"); + buffer_copy_string_len(b, CONST_STR_LEN("(none)")); } break; @@ -519,7 +519,7 @@ static int process_ssi_stmt(server *srv, connection *con, plugin_data *p, if (file_path) { /* current doc-root */ if (NULL == (sl = strrchr(con->physical.path->ptr, '/'))) { - buffer_copy_string(p->stat_fn, "/"); + buffer_copy_string_len(p->stat_fn, CONST_STR_LEN("/")); } else { buffer_copy_string_len(p->stat_fn, con->physical.path->ptr, sl - con->physical.path->ptr + 1); } @@ -573,7 +573,7 @@ static int process_ssi_stmt(server *srv, connection *con, plugin_data *p, case SSI_FLASTMOD: b = chunkqueue_get_append_buffer(con->write_queue); if (0 == strftime(buf, sizeof(buf), p->timefmt->ptr, localtime(&t))) { - buffer_copy_string(b, "(none)"); + buffer_copy_string_len(b, CONST_STR_LEN("(none)")); } else { buffer_copy_string(b, buf); } @@ -656,17 +656,17 @@ static int process_ssi_stmt(server *srv, connection *con, plugin_data *p, if (p->if_is_false) break; b = chunkqueue_get_append_buffer(con->write_queue); - buffer_copy_string(b, "<pre>"); + buffer_copy_string_len(b, CONST_STR_LEN("<pre>")); for (i = 0; i < p->ssi_vars->used; i++) { data_string *ds = (data_string *)p->ssi_vars->data[p->ssi_vars->sorted[i]]; buffer_append_string_buffer(b, ds->key); - buffer_append_string(b, ": "); + buffer_append_string_len(b, CONST_STR_LEN(": ")); buffer_append_string_buffer(b, ds->value); - buffer_append_string(b, "<br />"); + buffer_append_string_len(b, CONST_STR_LEN("<br />")); } - buffer_append_string(b, "</pre>"); + buffer_append_string_len(b, CONST_STR_LEN("</pre>")); break; case SSI_EXEC: { @@ -924,7 +924,7 @@ static int mod_ssi_handle_request(server *srv, connection *con, plugin_data *p) array_reset(p->ssi_vars); array_reset(p->ssi_cgi_env); - buffer_copy_string(p->timefmt, "%a, %d %b %Y %H:%M:%S %Z"); + buffer_copy_string_len(p->timefmt, CONST_STR_LEN("%a, %d %b %Y %H:%M:%S %Z")); p->sizefmt = 0; build_ssi_cgi_vars(srv, con, p); p->if_is_false = 0; @@ -1027,6 +1027,7 @@ static int mod_ssi_handle_request(server *srv, connection *con, plugin_data *p) con->file_started = 1; con->file_finished = 1; + con->mode = p->id; response_header_overwrite(srv, con, CONST_STR_LEN("Content-Type"), CONST_STR_LEN("text/html")); @@ -1094,6 +1095,8 @@ URIHANDLER_FUNC(mod_ssi_physical_path) { plugin_data *p = p_d; size_t k; + if (con->mode != DIRECT) return HANDLER_GO_ON; + if (con->physical.path->used == 0) return HANDLER_GO_ON; mod_ssi_patch_connection(srv, con, p); @@ -1109,6 +1112,7 @@ URIHANDLER_FUNC(mod_ssi_physical_path) { if (mod_ssi_handle_request(srv, con, p)) { /* on error */ con->http_status = 500; + con->mode = DIRECT; } return HANDLER_FINISHED; diff --git a/src/mod_ssi_expr.c b/src/mod_ssi_expr.c index fc6e4cb..b560f79 100644 --- a/src/mod_ssi_expr.c +++ b/src/mod_ssi_expr.c @@ -59,7 +59,7 @@ static int ssi_expr_tokenizer(server *srv, connection *con, plugin_data *p, t->offset++; t->line_pos++; - buffer_copy_string(token, "(=)"); + buffer_copy_string_len(token, CONST_STR_LEN("(=)")); break; case '>': @@ -69,14 +69,14 @@ static int ssi_expr_tokenizer(server *srv, connection *con, plugin_data *p, tid = TK_GE; - buffer_copy_string(token, "(>=)"); + buffer_copy_string_len(token, CONST_STR_LEN("(>=)")); } else { t->offset += 1; t->line_pos += 1; tid = TK_GT; - buffer_copy_string(token, "(>)"); + buffer_copy_string_len(token, CONST_STR_LEN("(>)")); } break; @@ -87,14 +87,14 @@ static int ssi_expr_tokenizer(server *srv, connection *con, plugin_data *p, tid = TK_LE; - buffer_copy_string(token, "(<=)"); + buffer_copy_string_len(token, CONST_STR_LEN("(<=)")); } else { t->offset += 1; t->line_pos += 1; tid = TK_LT; - buffer_copy_string(token, "(<)"); + buffer_copy_string_len(token, CONST_STR_LEN("(<)")); } break; @@ -106,14 +106,14 @@ static int ssi_expr_tokenizer(server *srv, connection *con, plugin_data *p, tid = TK_NE; - buffer_copy_string(token, "(!=)"); + buffer_copy_string_len(token, CONST_STR_LEN("(!=)")); } else { t->offset += 1; t->line_pos += 1; tid = TK_NOT; - buffer_copy_string(token, "(!)"); + buffer_copy_string_len(token, CONST_STR_LEN("(!)")); } break; @@ -124,7 +124,7 @@ static int ssi_expr_tokenizer(server *srv, connection *con, plugin_data *p, tid = TK_AND; - buffer_copy_string(token, "(&&)"); + buffer_copy_string_len(token, CONST_STR_LEN("(&&)")); } else { log_error_write(srv, __FILE__, __LINE__, "sds", "pos:", t->line_pos, @@ -140,7 +140,7 @@ static int ssi_expr_tokenizer(server *srv, connection *con, plugin_data *p, tid = TK_OR; - buffer_copy_string(token, "(||)"); + buffer_copy_string_len(token, CONST_STR_LEN("(||)")); } else { log_error_write(srv, __FILE__, __LINE__, "sds", "pos:", t->line_pos, @@ -183,7 +183,7 @@ static int ssi_expr_tokenizer(server *srv, connection *con, plugin_data *p, tid = TK_LPARAN; - buffer_copy_string(token, "("); + buffer_copy_string_len(token, CONST_STR_LEN("(")); break; case ')': t->offset++; @@ -191,7 +191,7 @@ static int ssi_expr_tokenizer(server *srv, connection *con, plugin_data *p, tid = TK_RPARAN; - buffer_copy_string(token, ")"); + buffer_copy_string_len(token, CONST_STR_LEN(")")); break; case '$': if (t->input[t->offset + 1] == '{') { @@ -219,7 +219,7 @@ static int ssi_expr_tokenizer(server *srv, connection *con, plugin_data *p, } else if (NULL != (ds = (data_string *)array_get_element(p->ssi_vars, token->ptr))) { buffer_copy_string_buffer(token, ds->value); } else { - buffer_copy_string(token, ""); + buffer_copy_string_len(token, CONST_STR_LEN("")); } t->offset += i; diff --git a/src/mod_ssi_exprparser.c b/src/mod_ssi_exprparser.c index d049e9a..676c274 100644 --- a/src/mod_ssi_exprparser.c +++ b/src/mod_ssi_exprparser.c @@ -4,7 +4,7 @@ /* First off, code is include which follows the "include" declaration ** in the input file. */ #include <stdio.h> -#line 6 "./mod_ssi_exprparser.y" +#line 6 "../../src/mod_ssi_exprparser.y" #include <assert.h> #include <string.h> @@ -236,12 +236,14 @@ static char *yyTracePrompt = 0; ** Outputs: ** None. */ +#if 0 void ssiexprparserTrace(FILE *TraceFILE, char *zTracePrompt){ yyTraceFILE = TraceFILE; yyTracePrompt = zTracePrompt; if( yyTraceFILE==0 ) yyTracePrompt = 0; else if( yyTracePrompt==0 ) yyTraceFILE = 0; } +#endif #endif /* NDEBUG */ #ifndef NDEBUG @@ -283,9 +285,10 @@ static const char *yyRuleName[] = { ** This function returns the symbolic name associated with a token ** value. */ +#if 0 const char *ssiexprparserTokenName(int tokenType){ #ifndef NDEBUG - if( tokenType>0 && tokenType<(sizeof(yyTokenName)/sizeof(yyTokenName[0])) ){ + if( tokenType>0 && (size_t)tokenType<(sizeof(yyTokenName)/sizeof(yyTokenName[0])) ){ return yyTokenName[tokenType]; }else{ return "Unknown"; @@ -294,6 +297,7 @@ const char *ssiexprparserTokenName(int tokenType){ return ""; #endif } +#endif /* ** This function allocates a new parser. @@ -345,9 +349,9 @@ static void yy_destructor(YYCODETYPE yymajor, YYMINORTYPE *yypminor){ case 10: case 11: case 12: -#line 24 "./mod_ssi_exprparser.y" +#line 24 "../../src/mod_ssi_exprparser.y" { buffer_free((yypminor->yy0)); } -#line 350 "mod_ssi_exprparser.c" +#line 354 "mod_ssi_exprparser.c" break; default: break; /* If no destructor action specified: do nothing */ } @@ -425,7 +429,7 @@ static int yy_find_shift_action( return YY_NO_ACTION; } i += iLookAhead; - if( i<0 || i>=YY_SZ_ACTTAB || yy_lookahead[i]!=iLookAhead ){ + if( i<0 || (size_t)i>=YY_SZ_ACTTAB || yy_lookahead[i]!=iLookAhead ){ #ifdef YYFALLBACK int iFallback; /* Fallback token */ if( iLookAhead<sizeof(yyFallback)/sizeof(yyFallback[0]) @@ -468,7 +472,7 @@ static int yy_find_reduce_action( return YY_NO_ACTION; } i += iLookAhead; - if( i<0 || i>=YY_SZ_ACTTAB || yy_lookahead[i]!=iLookAhead ){ + if( i<0 || (size_t)i>=YY_SZ_ACTTAB || yy_lookahead[i]!=iLookAhead ){ return yy_default[stateno]; }else{ return yy_action[i]; @@ -560,7 +564,7 @@ static void yy_reduce( yymsp = &yypParser->yystack[yypParser->yyidx]; #ifndef NDEBUG if( yyTraceFILE && yyruleno>=0 - && yyruleno<sizeof(yyRuleName)/sizeof(yyRuleName[0]) ){ + && (size_t)yyruleno<sizeof(yyRuleName)/sizeof(yyRuleName[0]) ){ fprintf(yyTraceFILE, "%sReduce [%s].\n", yyTracePrompt, yyRuleName[yyruleno]); } @@ -576,17 +580,17 @@ static void yy_reduce( ** break; */ case 0: -#line 31 "./mod_ssi_exprparser.y" +#line 31 "../../src/mod_ssi_exprparser.y" { ctx->val.bo = ssi_val_tobool(yymsp[0].minor.yy29); ctx->val.type = SSI_TYPE_BOOL; ssi_val_free(yymsp[0].minor.yy29); } -#line 586 "mod_ssi_exprparser.c" +#line 590 "mod_ssi_exprparser.c" break; case 1: -#line 38 "./mod_ssi_exprparser.y" +#line 38 "../../src/mod_ssi_exprparser.y" { int cmp; @@ -612,17 +616,17 @@ static void yy_reduce( ssi_val_free(yymsp[0].minor.yy29); } -#line 615 "mod_ssi_exprparser.c" +#line 619 "mod_ssi_exprparser.c" break; case 2: -#line 63 "./mod_ssi_exprparser.y" +#line 63 "../../src/mod_ssi_exprparser.y" { yygotominor.yy29 = yymsp[0].minor.yy29; } -#line 622 "mod_ssi_exprparser.c" +#line 626 "mod_ssi_exprparser.c" break; case 3: -#line 66 "./mod_ssi_exprparser.y" +#line 66 "../../src/mod_ssi_exprparser.y" { int e; @@ -633,11 +637,11 @@ static void yy_reduce( yygotominor.yy29->type = SSI_TYPE_BOOL; ssi_val_free(yymsp[0].minor.yy29); } -#line 636 "mod_ssi_exprparser.c" +#line 640 "mod_ssi_exprparser.c" yy_destructor(1,&yymsp[-1].minor); break; case 4: -#line 77 "./mod_ssi_exprparser.y" +#line 77 "../../src/mod_ssi_exprparser.y" { int e; @@ -648,11 +652,11 @@ static void yy_reduce( yygotominor.yy29->type = SSI_TYPE_BOOL; ssi_val_free(yymsp[0].minor.yy29); } -#line 651 "mod_ssi_exprparser.c" +#line 655 "mod_ssi_exprparser.c" yy_destructor(2,&yymsp[-1].minor); break; case 5: -#line 88 "./mod_ssi_exprparser.y" +#line 88 "../../src/mod_ssi_exprparser.y" { int e; @@ -662,76 +666,77 @@ static void yy_reduce( yygotominor.yy29->bo = e; yygotominor.yy29->type = SSI_TYPE_BOOL; } -#line 665 "mod_ssi_exprparser.c" +#line 669 "mod_ssi_exprparser.c" yy_destructor(9,&yymsp[-1].minor); break; case 6: -#line 97 "./mod_ssi_exprparser.y" +#line 97 "../../src/mod_ssi_exprparser.y" { yygotominor.yy29 = yymsp[-1].minor.yy29; } -#line 673 "mod_ssi_exprparser.c" +#line 677 "mod_ssi_exprparser.c" yy_destructor(10,&yymsp[-2].minor); yy_destructor(11,&yymsp[0].minor); break; case 7: -#line 101 "./mod_ssi_exprparser.y" +#line 101 "../../src/mod_ssi_exprparser.y" { yygotominor.yy29 = ssi_val_init(); yygotominor.yy29->str = yymsp[0].minor.yy19; yygotominor.yy29->type = SSI_TYPE_STRING; } -#line 684 "mod_ssi_exprparser.c" +#line 688 "mod_ssi_exprparser.c" break; case 8: -#line 107 "./mod_ssi_exprparser.y" +#line 107 "../../src/mod_ssi_exprparser.y" { - yygotominor.yy19 = buffer_init_string(yymsp[0].minor.yy0->ptr); + yygotominor.yy19 = yymsp[0].minor.yy0; } -#line 691 "mod_ssi_exprparser.c" +#line 695 "mod_ssi_exprparser.c" break; case 9: -#line 111 "./mod_ssi_exprparser.y" +#line 111 "../../src/mod_ssi_exprparser.y" { yygotominor.yy19 = yymsp[-1].minor.yy19; buffer_append_string_buffer(yygotominor.yy19, yymsp[0].minor.yy0); + buffer_free(yymsp[0].minor.yy0); } -#line 699 "mod_ssi_exprparser.c" +#line 704 "mod_ssi_exprparser.c" break; case 10: -#line 116 "./mod_ssi_exprparser.y" +#line 117 "../../src/mod_ssi_exprparser.y" { yygotominor.yy8 = SSI_COND_EQ; } -#line 704 "mod_ssi_exprparser.c" +#line 709 "mod_ssi_exprparser.c" yy_destructor(3,&yymsp[0].minor); break; case 11: -#line 117 "./mod_ssi_exprparser.y" +#line 118 "../../src/mod_ssi_exprparser.y" { yygotominor.yy8 = SSI_COND_NE; } -#line 710 "mod_ssi_exprparser.c" +#line 715 "mod_ssi_exprparser.c" yy_destructor(4,&yymsp[0].minor); break; case 12: -#line 118 "./mod_ssi_exprparser.y" +#line 119 "../../src/mod_ssi_exprparser.y" { yygotominor.yy8 = SSI_COND_LE; } -#line 716 "mod_ssi_exprparser.c" +#line 721 "mod_ssi_exprparser.c" yy_destructor(8,&yymsp[0].minor); break; case 13: -#line 119 "./mod_ssi_exprparser.y" +#line 120 "../../src/mod_ssi_exprparser.y" { yygotominor.yy8 = SSI_COND_GE; } -#line 722 "mod_ssi_exprparser.c" +#line 727 "mod_ssi_exprparser.c" yy_destructor(6,&yymsp[0].minor); break; case 14: -#line 120 "./mod_ssi_exprparser.y" +#line 121 "../../src/mod_ssi_exprparser.y" { yygotominor.yy8 = SSI_COND_LT; } -#line 728 "mod_ssi_exprparser.c" +#line 733 "mod_ssi_exprparser.c" yy_destructor(7,&yymsp[0].minor); break; case 15: -#line 121 "./mod_ssi_exprparser.y" +#line 122 "../../src/mod_ssi_exprparser.y" { yygotominor.yy8 = SSI_COND_GT; } -#line 734 "mod_ssi_exprparser.c" +#line 739 "mod_ssi_exprparser.c" yy_destructor(5,&yymsp[0].minor); break; }; @@ -761,11 +766,11 @@ static void yy_parse_failed( while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser); /* Here code is inserted which will be executed whenever the ** parser fails */ -#line 16 "./mod_ssi_exprparser.y" +#line 16 "../../src/mod_ssi_exprparser.y" ctx->ok = 0; -#line 768 "mod_ssi_exprparser.c" +#line 773 "mod_ssi_exprparser.c" ssiexprparserARG_STORE; /* Suppress warning about unused %extra_argument variable */ } @@ -778,6 +783,8 @@ static void yy_syntax_error( YYMINORTYPE yyminor /* The minor type of the error token */ ){ ssiexprparserARG_FETCH; + UNUSED(yymajor); + UNUSED(yyminor); #define TOKEN (yyminor.yy0) ssiexprparserARG_STORE; /* Suppress warning about unused %extra_argument variable */ } diff --git a/src/mod_ssi_exprparser.y b/src/mod_ssi_exprparser.y index ac993d7..f3d4a57 100644 --- a/src/mod_ssi_exprparser.y +++ b/src/mod_ssi_exprparser.y @@ -105,12 +105,13 @@ expr(A) ::= value(B). { } value(A) ::= VALUE(B). { - A = buffer_init_string(B->ptr); + A = B; } value(A) ::= value(B) VALUE(C). { A = B; buffer_append_string_buffer(A, C); + buffer_free(C); } cond(A) ::= EQ. { A = SSI_COND_EQ; } diff --git a/src/mod_staticfile.c b/src/mod_staticfile.c index 0ffa901..37f1b26 100644 --- a/src/mod_staticfile.c +++ b/src/mod_staticfile.c @@ -282,22 +282,22 @@ static int http_response_parse_range(server *srv, connection *con, plugin_data * b = chunkqueue_get_append_buffer(con->write_queue); - buffer_copy_string(b, "\r\n--"); + buffer_copy_string_len(b, CONST_STR_LEN("\r\n--")); buffer_append_string(b, boundary); /* write Content-Range */ - buffer_append_string(b, "\r\nContent-Range: bytes "); + buffer_append_string_len(b, CONST_STR_LEN("\r\nContent-Range: bytes ")); buffer_append_off_t(b, start); - buffer_append_string(b, "-"); + buffer_append_string_len(b, CONST_STR_LEN("-")); buffer_append_off_t(b, end); - buffer_append_string(b, "/"); + buffer_append_string_len(b, CONST_STR_LEN("/")); buffer_append_off_t(b, sce->st.st_size); - buffer_append_string(b, "\r\nContent-Type: "); + buffer_append_string_len(b, CONST_STR_LEN("\r\nContent-Type: ")); buffer_append_string_buffer(b, content_type); /* write END-OF-HEADER */ - buffer_append_string(b, "\r\n\r\n"); + buffer_append_string_len(b, CONST_STR_LEN("\r\n\r\n")); con->response.content_length += b->used - 1; @@ -325,7 +325,7 @@ static int http_response_parse_range(server *srv, connection *con, plugin_data * /* set header-fields */ - buffer_copy_string(p->range_buf, "multipart/byteranges; boundary="); + buffer_copy_string_len(p->range_buf, CONST_STR_LEN("multipart/byteranges; boundary=")); buffer_append_string(p->range_buf, boundary); /* overwrite content-type */ @@ -333,11 +333,11 @@ static int http_response_parse_range(server *srv, connection *con, plugin_data * } else { /* add Content-Range-header */ - buffer_copy_string(p->range_buf, "bytes "); + buffer_copy_string_len(p->range_buf, CONST_STR_LEN("bytes ")); buffer_append_off_t(p->range_buf, start); - buffer_append_string(p->range_buf, "-"); + buffer_append_string_len(p->range_buf, CONST_STR_LEN("-")); buffer_append_off_t(p->range_buf, end); - buffer_append_string(p->range_buf, "/"); + buffer_append_string_len(p->range_buf, CONST_STR_LEN("/")); buffer_append_off_t(p->range_buf, sce->st.st_size); response_header_insert(srv, con, CONST_STR_LEN("Content-Range"), CONST_BUF_LEN(p->range_buf)); diff --git a/src/mod_status.c b/src/mod_status.c index 028cbc7..3f8b120 100644 --- a/src/mod_status.c +++ b/src/mod_status.c @@ -143,24 +143,24 @@ SETDEFAULTS_FUNC(mod_status_set_defaults) { static int mod_status_row_append(buffer *b, const char *key, const char *value) { - BUFFER_APPEND_STRING_CONST(b, " <tr>\n"); - BUFFER_APPEND_STRING_CONST(b, " <td><b>"); + buffer_append_string_len(b, CONST_STR_LEN(" <tr>\n")); + buffer_append_string_len(b, CONST_STR_LEN(" <td><b>")); buffer_append_string(b, key); - BUFFER_APPEND_STRING_CONST(b, "</b></td>\n"); - BUFFER_APPEND_STRING_CONST(b, " <td>"); + buffer_append_string_len(b, CONST_STR_LEN("</b></td>\n")); + buffer_append_string_len(b, CONST_STR_LEN(" <td>")); buffer_append_string(b, value); - BUFFER_APPEND_STRING_CONST(b, "</td>\n"); - BUFFER_APPEND_STRING_CONST(b, " </tr>\n"); + buffer_append_string_len(b, CONST_STR_LEN("</td>\n")); + buffer_append_string_len(b, CONST_STR_LEN(" </tr>\n")); return 0; } static int mod_status_header_append(buffer *b, const char *key) { - BUFFER_APPEND_STRING_CONST(b, " <tr>\n"); - BUFFER_APPEND_STRING_CONST(b, " <th colspan=\"2\">"); + buffer_append_string_len(b, CONST_STR_LEN(" <tr>\n")); + buffer_append_string_len(b, CONST_STR_LEN(" <th colspan=\"2\">")); buffer_append_string(b, key); - BUFFER_APPEND_STRING_CONST(b, "</th>\n"); - BUFFER_APPEND_STRING_CONST(b, " </tr>\n"); + buffer_append_string_len(b, CONST_STR_LEN("</th>\n")); + buffer_append_string_len(b, CONST_STR_LEN(" </tr>\n")); return 0; } @@ -169,13 +169,13 @@ static int mod_status_header_append_sort(buffer *b, void *p_d, const char* key) plugin_data *p = p_d; if (p->conf.sort) { - BUFFER_APPEND_STRING_CONST(b, "<th class=\"status\"><a href=\"#\" class=\"sortheader\" onclick=\"resort(this);return false;\">"); + buffer_append_string_len(b, CONST_STR_LEN("<th class=\"status\"><a href=\"#\" class=\"sortheader\" onclick=\"resort(this);return false;\">")); buffer_append_string(b, key); - BUFFER_APPEND_STRING_CONST(b, "<span class=\"sortarrow\">:</span></a></th>\n"); + buffer_append_string_len(b, CONST_STR_LEN("<span class=\"sortarrow\">:</span></a></th>\n")); } else { - BUFFER_APPEND_STRING_CONST(b, "<th class=\"status\">"); + buffer_append_string_len(b, CONST_STR_LEN("<th class=\"status\">")); buffer_append_string(b, key); - BUFFER_APPEND_STRING_CONST(b, "</th>\n"); + buffer_append_string_len(b, CONST_STR_LEN("</th>\n")); } return 0; @@ -209,15 +209,14 @@ static handler_t mod_status_handle_server_status_html(server *srv, connection *c b = chunkqueue_get_append_buffer(con->write_queue); - BUFFER_COPY_STRING_CONST(b, + buffer_copy_string_len(b, CONST_STR_LEN( "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\n" "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n" " \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n" "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\">\n" " <head>\n" - " <title>Status</title>\n"); + " <title>Status</title>\n" - BUFFER_APPEND_STRING_CONST(b, " <style type=\"text/css\">\n" " table.status { border: black solid thin; }\n" " td { white-space: nowrap; }\n" @@ -226,16 +225,15 @@ static handler_t mod_status_handle_server_status_html(server *srv, connection *c " th.status { background-color: black; color: white; font-weight: bold; }\n" " a.sortheader { background-color: black; color: white; font-weight: bold; text-decoration: none; display: block; }\n" " span.sortarrow { color: white; text-decoration: none; }\n" - " </style>\n"); + " </style>\n")); if (p->conf.sort) { - BUFFER_APPEND_STRING_CONST(b, + buffer_append_string_len(b, CONST_STR_LEN( "<script type=\"text/javascript\">\n" "// <!--\n" "var sort_column;\n" - "var prev_span = null;\n"); + "var prev_span = null;\n" - BUFFER_APPEND_STRING_CONST(b, "function get_inner_text(el) {\n" " if((typeof el == 'string')||(typeof el == 'undefined'))\n" " return el;\n" @@ -251,9 +249,8 @@ static handler_t mod_status_handle_server_status_html(server *srv, connection *c " }\n" " }\n" " return str;\n" - "}\n"); + "}\n" - BUFFER_APPEND_STRING_CONST(b, "function sortfn(a,b) {\n" " var at = get_inner_text(a.cells[sort_column]);\n" " var bt = get_inner_text(b.cells[sort_column]);\n" @@ -266,9 +263,8 @@ static handler_t mod_status_handle_server_status_html(server *srv, connection *c " else if (aa<bb) return -1;\n" " else return 1;\n" " }\n" - "}\n"); + "}\n" - BUFFER_APPEND_STRING_CONST(b, "function resort(lnk) {\n" " var span = lnk.childNodes[1];\n" " var table = lnk.parentNode.parentNode.parentNode.parentNode;\n" @@ -276,9 +272,8 @@ static handler_t mod_status_handle_server_status_html(server *srv, connection *c " for (j=1;j<table.rows.length;j++)\n" " rows[j-1] = table.rows[j];\n" " sort_column = lnk.parentNode.cellIndex;\n" - " rows.sort(sortfn);\n"); + " rows.sort(sortfn);\n" - BUFFER_APPEND_STRING_CONST(b, " if (prev_span != null) prev_span.innerHTML = '';\n" " if (span.getAttribute('sortdir')=='down') {\n" " span.innerHTML = '↑';\n" @@ -293,25 +288,25 @@ static handler_t mod_status_handle_server_status_html(server *srv, connection *c " prev_span = span;\n" "}\n" "// -->\n" - "</script>\n"); + "</script>\n")); } - BUFFER_APPEND_STRING_CONST(b, + buffer_append_string_len(b, CONST_STR_LEN( " </head>\n" - " <body>\n"); + " <body>\n")); /* connection listing */ - BUFFER_APPEND_STRING_CONST(b, "<h1>Server-Status</h1>"); + buffer_append_string_len(b, CONST_STR_LEN("<h1>Server-Status</h1>")); - BUFFER_APPEND_STRING_CONST(b, "<table summary=\"status\" class=\"status\">"); - BUFFER_APPEND_STRING_CONST(b, "<tr><td>Hostname</td><td class=\"string\">"); + buffer_append_string_len(b, CONST_STR_LEN("<table summary=\"status\" class=\"status\">")); + buffer_append_string_len(b, CONST_STR_LEN("<tr><td>Hostname</td><td class=\"string\">")); buffer_append_string_buffer(b, con->uri.authority); - BUFFER_APPEND_STRING_CONST(b, " ("); + buffer_append_string_len(b, CONST_STR_LEN(" (")); buffer_append_string_buffer(b, con->server_name); - BUFFER_APPEND_STRING_CONST(b, ")</td></tr>\n"); - BUFFER_APPEND_STRING_CONST(b, "<tr><td>Uptime</td><td class=\"string\">"); + buffer_append_string_len(b, CONST_STR_LEN(")</td></tr>\n")); + buffer_append_string_len(b, CONST_STR_LEN("<tr><td>Uptime</td><td class=\"string\">")); ts = srv->cur_ts - srv->startup_ts; @@ -328,98 +323,98 @@ static handler_t mod_status_handle_server_status_html(server *srv, connection *c if (days) { buffer_append_long(b, days); - BUFFER_APPEND_STRING_CONST(b, " days "); + buffer_append_string_len(b, CONST_STR_LEN(" days ")); } if (hours) { buffer_append_long(b, hours); - BUFFER_APPEND_STRING_CONST(b, " hours "); + buffer_append_string_len(b, CONST_STR_LEN(" hours ")); } if (mins) { buffer_append_long(b, mins); - BUFFER_APPEND_STRING_CONST(b, " min "); + buffer_append_string_len(b, CONST_STR_LEN(" min ")); } buffer_append_long(b, seconds); - BUFFER_APPEND_STRING_CONST(b, " s"); + buffer_append_string_len(b, CONST_STR_LEN(" s")); - BUFFER_APPEND_STRING_CONST(b, "</td></tr>\n"); - BUFFER_APPEND_STRING_CONST(b, "<tr><td>Started at</td><td class=\"string\">"); + buffer_append_string_len(b, CONST_STR_LEN("</td></tr>\n")); + buffer_append_string_len(b, CONST_STR_LEN("<tr><td>Started at</td><td class=\"string\">")); ts = srv->startup_ts; strftime(buf, sizeof(buf) - 1, "%Y-%m-%d %H:%M:%S", localtime(&ts)); buffer_append_string(b, buf); - BUFFER_APPEND_STRING_CONST(b, "</td></tr>\n"); + buffer_append_string_len(b, CONST_STR_LEN("</td></tr>\n")); - BUFFER_APPEND_STRING_CONST(b, "<tr><th colspan=\"2\">absolute (since start)</th></tr>\n"); + buffer_append_string_len(b, CONST_STR_LEN("<tr><th colspan=\"2\">absolute (since start)</th></tr>\n")); - BUFFER_APPEND_STRING_CONST(b, "<tr><td>Requests</td><td class=\"string\">"); + buffer_append_string_len(b, CONST_STR_LEN("<tr><td>Requests</td><td class=\"string\">")); avg = p->abs_requests; mod_status_get_multiplier(&avg, &multiplier, 1000); buffer_append_long(b, avg); - BUFFER_APPEND_STRING_CONST(b, " "); + buffer_append_string_len(b, CONST_STR_LEN(" ")); if (multiplier) buffer_append_string_len(b, &multiplier, 1); - BUFFER_APPEND_STRING_CONST(b, "req</td></tr>\n"); + buffer_append_string_len(b, CONST_STR_LEN("req</td></tr>\n")); - BUFFER_APPEND_STRING_CONST(b, "<tr><td>Traffic</td><td class=\"string\">"); + buffer_append_string_len(b, CONST_STR_LEN("<tr><td>Traffic</td><td class=\"string\">")); avg = p->abs_traffic_out; mod_status_get_multiplier(&avg, &multiplier, 1024); sprintf(buf, "%.2f", avg); buffer_append_string(b, buf); - BUFFER_APPEND_STRING_CONST(b, " "); + buffer_append_string_len(b, CONST_STR_LEN(" ")); if (multiplier) buffer_append_string_len(b, &multiplier, 1); - BUFFER_APPEND_STRING_CONST(b, "byte</td></tr>\n"); + buffer_append_string_len(b, CONST_STR_LEN("byte</td></tr>\n")); - BUFFER_APPEND_STRING_CONST(b, "<tr><th colspan=\"2\">average (since start)</th></tr>\n"); + buffer_append_string_len(b, CONST_STR_LEN("<tr><th colspan=\"2\">average (since start)</th></tr>\n")); - BUFFER_APPEND_STRING_CONST(b, "<tr><td>Requests</td><td class=\"string\">"); + buffer_append_string_len(b, CONST_STR_LEN("<tr><td>Requests</td><td class=\"string\">")); avg = p->abs_requests / (srv->cur_ts - srv->startup_ts); mod_status_get_multiplier(&avg, &multiplier, 1000); buffer_append_long(b, avg); - BUFFER_APPEND_STRING_CONST(b, " "); + buffer_append_string_len(b, CONST_STR_LEN(" ")); if (multiplier) buffer_append_string_len(b, &multiplier, 1); - BUFFER_APPEND_STRING_CONST(b, "req/s</td></tr>\n"); + buffer_append_string_len(b, CONST_STR_LEN("req/s</td></tr>\n")); - BUFFER_APPEND_STRING_CONST(b, "<tr><td>Traffic</td><td class=\"string\">"); + buffer_append_string_len(b, CONST_STR_LEN("<tr><td>Traffic</td><td class=\"string\">")); avg = p->abs_traffic_out / (srv->cur_ts - srv->startup_ts); mod_status_get_multiplier(&avg, &multiplier, 1024); sprintf(buf, "%.2f", avg); buffer_append_string(b, buf); - BUFFER_APPEND_STRING_CONST(b, " "); + buffer_append_string_len(b, CONST_STR_LEN(" ")); if (multiplier) buffer_append_string_len(b, &multiplier, 1); - BUFFER_APPEND_STRING_CONST(b, "byte/s</td></tr>\n"); + buffer_append_string_len(b, CONST_STR_LEN("byte/s</td></tr>\n")); - BUFFER_APPEND_STRING_CONST(b, "<tr><th colspan=\"2\">average (5s sliding average)</th></tr>\n"); + buffer_append_string_len(b, CONST_STR_LEN("<tr><th colspan=\"2\">average (5s sliding average)</th></tr>\n")); for (j = 0, avg = 0; j < 5; j++) { avg += p->mod_5s_requests[j]; } avg /= 5; - BUFFER_APPEND_STRING_CONST(b, "<tr><td>Requests</td><td class=\"string\">"); + buffer_append_string_len(b, CONST_STR_LEN("<tr><td>Requests</td><td class=\"string\">")); mod_status_get_multiplier(&avg, &multiplier, 1000); buffer_append_long(b, avg); - BUFFER_APPEND_STRING_CONST(b, " "); + buffer_append_string_len(b, CONST_STR_LEN(" ")); if (multiplier) buffer_append_string_len(b, &multiplier, 1); - BUFFER_APPEND_STRING_CONST(b, "req/s</td></tr>\n"); + buffer_append_string_len(b, CONST_STR_LEN("req/s</td></tr>\n")); for (j = 0, avg = 0; j < 5; j++) { avg += p->mod_5s_traffic_out[j]; @@ -427,28 +422,29 @@ static handler_t mod_status_handle_server_status_html(server *srv, connection *c avg /= 5; - BUFFER_APPEND_STRING_CONST(b, "<tr><td>Traffic</td><td class=\"string\">"); + buffer_append_string_len(b, CONST_STR_LEN("<tr><td>Traffic</td><td class=\"string\">")); mod_status_get_multiplier(&avg, &multiplier, 1024); sprintf(buf, "%.2f", avg); buffer_append_string(b, buf); - BUFFER_APPEND_STRING_CONST(b, " "); + buffer_append_string_len(b, CONST_STR_LEN(" ")); if (multiplier) buffer_append_string_len(b, &multiplier, 1); - BUFFER_APPEND_STRING_CONST(b, "byte/s</td></tr>\n"); + buffer_append_string_len(b, CONST_STR_LEN("byte/s</td></tr>\n")); - BUFFER_APPEND_STRING_CONST(b, "</table>\n"); + buffer_append_string_len(b, CONST_STR_LEN("</table>\n")); - BUFFER_APPEND_STRING_CONST(b, "<hr />\n<pre><b>legend</b>\n"); - BUFFER_APPEND_STRING_CONST(b, ". = connect, C = close, E = hard error\n"); - BUFFER_APPEND_STRING_CONST(b, "r = read, R = read-POST, W = write, h = handle-request\n"); - BUFFER_APPEND_STRING_CONST(b, "q = request-start, Q = request-end\n"); - BUFFER_APPEND_STRING_CONST(b, "s = response-start, S = response-end\n"); + buffer_append_string_len(b, CONST_STR_LEN( + "<hr />\n<pre><b>legend</b>\n" + ". = connect, C = close, E = hard error\n" + "r = read, R = read-POST, W = write, h = handle-request\n" + "q = request-start, Q = request-end\n" + "s = response-start, S = response-end\n")); - BUFFER_APPEND_STRING_CONST(b, "<b>"); + buffer_append_string_len(b, CONST_STR_LEN("<b>")); buffer_append_long(b, srv->conns->used); - BUFFER_APPEND_STRING_CONST(b, " connections</b>\n"); + buffer_append_string_len(b, CONST_STR_LEN(" connections</b>\n")); for (j = 0; j < srv->conns->used; j++) { connection *c = srv->conns->ptr[j]; @@ -457,14 +453,14 @@ static handler_t mod_status_handle_server_status_html(server *srv, connection *c buffer_append_string_len(b, state, 1); if (((j + 1) % 50) == 0) { - BUFFER_APPEND_STRING_CONST(b, "\n"); + buffer_append_string_len(b, CONST_STR_LEN("\n")); } } - BUFFER_APPEND_STRING_CONST(b, "\n</pre><hr />\n<h2>Connections</h2>\n"); + buffer_append_string_len(b, CONST_STR_LEN("\n</pre><hr />\n<h2>Connections</h2>\n")); - BUFFER_APPEND_STRING_CONST(b, "<table summary=\"status\" class=\"status\">\n"); - BUFFER_APPEND_STRING_CONST(b, "<tr>"); + buffer_append_string_len(b, CONST_STR_LEN("<table summary=\"status\" class=\"status\">\n")); + buffer_append_string_len(b, CONST_STR_LEN("<tr>")); mod_status_header_append_sort(b, p_d, "Client IP"); mod_status_header_append_sort(b, p_d, "Read"); mod_status_header_append_sort(b, p_d, "Written"); @@ -473,40 +469,40 @@ static handler_t mod_status_handle_server_status_html(server *srv, connection *c mod_status_header_append_sort(b, p_d, "Host"); mod_status_header_append_sort(b, p_d, "URI"); mod_status_header_append_sort(b, p_d, "File"); - BUFFER_APPEND_STRING_CONST(b, "</tr>\n"); + buffer_append_string_len(b, CONST_STR_LEN("</tr>\n")); for (j = 0; j < srv->conns->used; j++) { connection *c = srv->conns->ptr[j]; - BUFFER_APPEND_STRING_CONST(b, "<tr><td class=\"string\">"); + buffer_append_string_len(b, CONST_STR_LEN("<tr><td class=\"string\">")); buffer_append_string(b, inet_ntop_cache_get_ip(srv, &(c->dst_addr))); - BUFFER_APPEND_STRING_CONST(b, "</td><td class=\"int\">"); + buffer_append_string_len(b, CONST_STR_LEN("</td><td class=\"int\">")); if (con->request.content_length) { buffer_append_long(b, c->request_content_queue->bytes_in); - BUFFER_APPEND_STRING_CONST(b, "/"); + buffer_append_string_len(b, CONST_STR_LEN("/")); buffer_append_long(b, c->request.content_length); } else { - BUFFER_APPEND_STRING_CONST(b, "0/0"); + buffer_append_string_len(b, CONST_STR_LEN("0/0")); } - BUFFER_APPEND_STRING_CONST(b, "</td><td class=\"int\">"); + buffer_append_string_len(b, CONST_STR_LEN("</td><td class=\"int\">")); buffer_append_off_t(b, chunkqueue_written(c->write_queue)); - BUFFER_APPEND_STRING_CONST(b, "/"); + buffer_append_string_len(b, CONST_STR_LEN("/")); buffer_append_off_t(b, chunkqueue_length(c->write_queue)); - BUFFER_APPEND_STRING_CONST(b, "</td><td class=\"string\">"); + buffer_append_string_len(b, CONST_STR_LEN("</td><td class=\"string\">")); buffer_append_string(b, connection_get_state(c->state)); - BUFFER_APPEND_STRING_CONST(b, "</td><td class=\"int\">"); + buffer_append_string_len(b, CONST_STR_LEN("</td><td class=\"int\">")); buffer_append_long(b, srv->cur_ts - c->request_start); - BUFFER_APPEND_STRING_CONST(b, "</td><td class=\"string\">"); + buffer_append_string_len(b, CONST_STR_LEN("</td><td class=\"string\">")); if (buffer_is_empty(c->server_name)) { buffer_append_string_buffer(b, c->uri.authority); @@ -515,38 +511,38 @@ static handler_t mod_status_handle_server_status_html(server *srv, connection *c buffer_append_string_buffer(b, c->server_name); } - BUFFER_APPEND_STRING_CONST(b, "</td><td class=\"string\">"); + buffer_append_string_len(b, CONST_STR_LEN("</td><td class=\"string\">")); if (!buffer_is_empty(c->uri.path)) { buffer_append_string_encoded(b, CONST_BUF_LEN(c->uri.path), ENCODING_HTML); } if (!buffer_is_empty(c->uri.query)) { - BUFFER_APPEND_STRING_CONST(b, "?"); + buffer_append_string_len(b, CONST_STR_LEN("?")); buffer_append_string_encoded(b, CONST_BUF_LEN(c->uri.query), ENCODING_HTML); } if (!buffer_is_empty(c->request.orig_uri)) { - BUFFER_APPEND_STRING_CONST(b, " ("); + buffer_append_string_len(b, CONST_STR_LEN(" (")); buffer_append_string_encoded(b, CONST_BUF_LEN(c->request.orig_uri), ENCODING_HTML); - BUFFER_APPEND_STRING_CONST(b, ")"); + buffer_append_string_len(b, CONST_STR_LEN(")")); } - BUFFER_APPEND_STRING_CONST(b, "</td><td class=\"string\">"); + buffer_append_string_len(b, CONST_STR_LEN("</td><td class=\"string\">")); buffer_append_string_buffer(b, c->physical.path); - BUFFER_APPEND_STRING_CONST(b, "</td></tr>\n"); + buffer_append_string_len(b, CONST_STR_LEN("</td></tr>\n")); } - BUFFER_APPEND_STRING_CONST(b, - "</table>\n"); + buffer_append_string_len(b, CONST_STR_LEN( + "</table>\n")); - BUFFER_APPEND_STRING_CONST(b, + buffer_append_string_len(b, CONST_STR_LEN( " </body>\n" "</html>\n" - ); + )); response_header_overwrite(srv, con, CONST_STR_LEN("Content-Type"), CONST_STR_LEN("text/html")); @@ -566,45 +562,45 @@ static handler_t mod_status_handle_server_status_text(server *srv, connection *c b = chunkqueue_get_append_buffer(con->write_queue); /* output total number of requests */ - BUFFER_APPEND_STRING_CONST(b, "Total Accesses: "); + buffer_append_string_len(b, CONST_STR_LEN("Total Accesses: ")); avg = p->abs_requests; snprintf(buf, sizeof(buf) - 1, "%.0f", avg); buffer_append_string(b, buf); - BUFFER_APPEND_STRING_CONST(b, "\n"); + buffer_append_string_len(b, CONST_STR_LEN("\n")); /* output total traffic out in kbytes */ - BUFFER_APPEND_STRING_CONST(b, "Total kBytes: "); + buffer_append_string_len(b, CONST_STR_LEN("Total kBytes: ")); avg = p->abs_traffic_out / 1024; snprintf(buf, sizeof(buf) - 1, "%.0f", avg); buffer_append_string(b, buf); - BUFFER_APPEND_STRING_CONST(b, "\n"); + buffer_append_string_len(b, CONST_STR_LEN("\n")); /* output uptime */ - BUFFER_APPEND_STRING_CONST(b, "Uptime: "); + buffer_append_string_len(b, CONST_STR_LEN("Uptime: ")); ts = srv->cur_ts - srv->startup_ts; buffer_append_long(b, ts); - BUFFER_APPEND_STRING_CONST(b, "\n"); + buffer_append_string_len(b, CONST_STR_LEN("\n")); /* output busy servers */ - BUFFER_APPEND_STRING_CONST(b, "BusyServers: "); + buffer_append_string_len(b, CONST_STR_LEN("BusyServers: ")); buffer_append_long(b, srv->conns->used); - BUFFER_APPEND_STRING_CONST(b, "\n"); + buffer_append_string_len(b, CONST_STR_LEN("\n")); - BUFFER_APPEND_STRING_CONST(b, "IdleServers: "); + buffer_append_string_len(b, CONST_STR_LEN("IdleServers: ")); buffer_append_long(b, srv->conns->size - srv->conns->used); - BUFFER_APPEND_STRING_CONST(b, "\n"); + buffer_append_string_len(b, CONST_STR_LEN("\n")); /* output scoreboard */ - BUFFER_APPEND_STRING_CONST(b, "Scoreboard: "); + buffer_append_string_len(b, CONST_STR_LEN("Scoreboard: ")); for (k = 0; k < srv->conns->used; k++) { connection *c = srv->conns->ptr[k]; const char *state = connection_get_short_state(c->state); buffer_append_string_len(b, state, 1); } for (l = 0; l < srv->conns->size - srv->conns->used; l++) { - BUFFER_APPEND_STRING_CONST(b, "_"); + buffer_append_string_len(b, CONST_STR_LEN("_")); } - BUFFER_APPEND_STRING_CONST(b, "\n"); + buffer_append_string_len(b, CONST_STR_LEN("\n")); /* set text/plain output */ @@ -633,9 +629,9 @@ static handler_t mod_status_handle_server_statistics(server *srv, connection *co size_t ndx = st->sorted[i]; buffer_append_string_buffer(b, st->data[ndx]->key); - buffer_append_string(b, ": "); + buffer_append_string_len(b, CONST_STR_LEN(": ")); buffer_append_long(b, ((data_integer *)(st->data[ndx]))->value); - buffer_append_string(b, "\n"); + buffer_append_string_len(b, CONST_STR_LEN("\n")); } response_header_overwrite(srv, con, CONST_STR_LEN("Content-Type"), CONST_STR_LEN("text/plain")); @@ -696,7 +692,7 @@ static handler_t mod_status_handle_server_config(server *srv, connection *con, v b = chunkqueue_get_append_buffer(con->write_queue); - BUFFER_COPY_STRING_CONST(b, + buffer_copy_string_len(b, CONST_STR_LEN( "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\n" "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n" " \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n" @@ -706,7 +702,7 @@ static handler_t mod_status_handle_server_config(server *srv, connection *con, v " </head>\n" " <body>\n" " <h1>" PACKAGE_NAME " " PACKAGE_VERSION "</h1>\n" - " <table summary=\"status\" border=\"1\">\n"); + " <table summary=\"status\" border=\"1\">\n")); mod_status_header_append(b, "Server-Features"); #ifdef HAVE_PCRE_H @@ -733,19 +729,19 @@ static handler_t mod_status_handle_server_config(server *srv, connection *con, v if (i == 0) { buffer_copy_string_buffer(m, pl->name); } else { - BUFFER_APPEND_STRING_CONST(m, "<br />"); + buffer_append_string_len(m, CONST_STR_LEN("<br />")); buffer_append_string_buffer(m, pl->name); } } mod_status_row_append(b, "Loaded Modules", m->ptr); - BUFFER_APPEND_STRING_CONST(b, " </table>\n"); + buffer_append_string_len(b, CONST_STR_LEN(" </table>\n")); - BUFFER_APPEND_STRING_CONST(b, + buffer_append_string_len(b, CONST_STR_LEN( " </body>\n" "</html>\n" - ); + )); response_header_overwrite(srv, con, CONST_STR_LEN("Content-Type"), CONST_STR_LEN("text/html")); @@ -796,6 +792,8 @@ static int mod_status_patch_connection(server *srv, connection *con, plugin_data static handler_t mod_status_handler(server *srv, connection *con, void *p_d) { plugin_data *p = p_d; + if (con->mode != DIRECT) return HANDLER_GO_ON; + mod_status_patch_connection(srv, con, p); if (!buffer_is_empty(p->conf.status_url) && diff --git a/src/mod_trigger_b4_dl.c b/src/mod_trigger_b4_dl.c index bc49b1e..11fc2ae 100644 --- a/src/mod_trigger_b4_dl.c +++ b/src/mod_trigger_b4_dl.c @@ -1,5 +1,6 @@ #include <ctype.h> #include <stdlib.h> +#include <fcntl.h> #include <string.h> #include "base.h" @@ -180,6 +181,9 @@ SETDEFAULTS_FUNC(mod_trigger_b4_dl_set_defaults) { "gdbm-open failed"); return HANDLER_ERROR; } +#ifdef FD_CLOEXEC + fcntl(gdbm_fdesc(s->db), F_SETFD, FD_CLOEXEC); +#endif } #endif #if defined(HAVE_PCRE_H) @@ -316,6 +320,8 @@ URIHANDLER_FUNC(mod_trigger_b4_dl_uri_handler) { # define N 10 int ovec[N * 3]; + if (con->mode != DIRECT) return HANDLER_GO_ON; + if (con->uri.path->used == 0) return HANDLER_GO_ON; mod_trigger_b4_dl_patch_connection(srv, con, p); @@ -425,8 +431,8 @@ URIHANDLER_FUNC(mod_trigger_b4_dl_uri_handler) { /* not found, redirect */ response_header_insert(srv, con, CONST_STR_LEN("Location"), CONST_BUF_LEN(p->conf.deny_url)); - con->http_status = 307; + con->file_finished = 1; return HANDLER_FINISHED; } @@ -440,6 +446,7 @@ URIHANDLER_FUNC(mod_trigger_b4_dl_uri_handler) { response_header_insert(srv, con, CONST_STR_LEN("Location"), CONST_BUF_LEN(p->conf.deny_url)); con->http_status = 307; + con->file_finished = 1; if (p->conf.db) { if (0 != gdbm_delete(p->conf.db, key)) { @@ -490,6 +497,7 @@ URIHANDLER_FUNC(mod_trigger_b4_dl_uri_handler) { response_header_insert(srv, con, CONST_STR_LEN("Location"), CONST_BUF_LEN(p->conf.deny_url)); con->http_status = 307; + con->file_finished = 1; return HANDLER_FINISHED; } diff --git a/src/mod_userdir.c b/src/mod_userdir.c index e664bf2..7ac5cc1 100644 --- a/src/mod_userdir.c +++ b/src/mod_userdir.c @@ -262,6 +262,9 @@ URIHANDLER_FUNC(mod_userdir_docroot_handler) { return HANDLER_GO_ON; } } + if (con->conf.force_lowercase_filenames) { + buffer_to_lower(p->username); + } buffer_copy_string_buffer(p->temp_path, p->conf.basepath); BUFFER_APPEND_SLASH(p->temp_path); @@ -284,8 +287,24 @@ URIHANDLER_FUNC(mod_userdir_docroot_handler) { } } + /* the physical rel_path is basically the same as uri.path; + * but it is converted to lowercase in case of force_lowercase_filenames and some special handling + * for trailing '.', ' ' and '/' on windows + * we assume that no docroot/physical handler changed this + * (docroot should only set the docroot/server name, phyiscal should only change the phyiscal.path; + * the exception mod_secure_download doesn't work with userdir anyway) + */ BUFFER_APPEND_SLASH(p->temp_path); - buffer_append_string(p->temp_path, rel_url + 1); /* skip the / */ + /* if no second '/' is found, we assume that it was stripped from the uri.path for the special handling + * on windows. + * we do not care about the trailing slash here on windows, as we already ensured it is a directory + * + * TODO: what to do with trailing dots in usernames on windows? they may result in the same directory + * as a username without them. + */ + if (NULL != (rel_url = strchr(con->physical.rel_path->ptr + 2, '/'))) { + buffer_append_string(p->temp_path, rel_url + 1); /* skip the / */ + } buffer_copy_string_buffer(con->physical.path, p->temp_path); buffer_reset(p->temp_path); diff --git a/src/mod_usertrack.c b/src/mod_usertrack.c index 6c228b3..c85f36c 100644 --- a/src/mod_usertrack.c +++ b/src/mod_usertrack.c @@ -103,7 +103,7 @@ SETDEFAULTS_FUNC(mod_usertrack_set_defaults) { } if (buffer_is_empty(s->cookie_name)) { - buffer_copy_string(s->cookie_name, "TRACKID"); + buffer_copy_string_len(s->cookie_name, CONST_STR_LEN("TRACKID")); } else { size_t j; for (j = 0; j < s->cookie_name->used - 1; j++) { @@ -214,9 +214,9 @@ URIHANDLER_FUNC(mod_usertrack_uri_handler) { if (NULL == (ds = (data_string *)array_get_unused_element(con->response.headers, TYPE_STRING))) { ds = data_response_init(); } - buffer_copy_string(ds->key, "Set-Cookie"); + buffer_copy_string_len(ds->key, CONST_STR_LEN("Set-Cookie")); buffer_copy_string_buffer(ds->value, p->conf.cookie_name); - buffer_append_string(ds->value, "="); + buffer_append_string_len(ds->value, CONST_STR_LEN("=")); /* taken from mod_auth.c */ @@ -235,16 +235,16 @@ URIHANDLER_FUNC(mod_usertrack_uri_handler) { MD5_Final(h, &Md5Ctx); buffer_append_string_encoded(ds->value, (char *)h, 16, ENCODING_HEX); - buffer_append_string(ds->value, "; Path=/"); - buffer_append_string(ds->value, "; Version=1"); + buffer_append_string_len(ds->value, CONST_STR_LEN("; Path=/")); + buffer_append_string_len(ds->value, CONST_STR_LEN("; Version=1")); if (!buffer_is_empty(p->conf.cookie_domain)) { - buffer_append_string(ds->value, "; Domain="); + buffer_append_string_len(ds->value, CONST_STR_LEN("; Domain=")); buffer_append_string_encoded(ds->value, CONST_BUF_LEN(p->conf.cookie_domain), ENCODING_REL_URI); } if (p->conf.cookie_max_age) { - buffer_append_string(ds->value, "; max-age="); + buffer_append_string_len(ds->value, CONST_STR_LEN("; max-age=")); buffer_append_long(ds->value, p->conf.cookie_max_age); } diff --git a/src/mod_webdav.c b/src/mod_webdav.c index 1432618..a2376c0 100644 --- a/src/mod_webdav.c +++ b/src/mod_webdav.c @@ -485,23 +485,23 @@ static int webdav_gen_prop_tag(server *srv, connection *con, UNUSED(con); if (value) { - buffer_append_string(b,"<"); + buffer_append_string_len(b,CONST_STR_LEN("<")); buffer_append_string(b, prop_name); - buffer_append_string(b, " xmlns=\""); + buffer_append_string_len(b, CONST_STR_LEN(" xmlns=\"")); buffer_append_string(b, prop_ns); - buffer_append_string(b, "\">"); + buffer_append_string_len(b, CONST_STR_LEN("\">")); buffer_append_string(b, value); - buffer_append_string(b,"</"); + buffer_append_string_len(b,CONST_STR_LEN("</")); buffer_append_string(b, prop_name); - buffer_append_string(b, ">"); + buffer_append_string_len(b, CONST_STR_LEN(">")); } else { - buffer_append_string(b,"<"); + buffer_append_string_len(b,CONST_STR_LEN("<")); buffer_append_string(b, prop_name); - buffer_append_string(b, " xmlns=\""); + buffer_append_string_len(b, CONST_STR_LEN(" xmlns=\"")); buffer_append_string(b, prop_ns); - buffer_append_string(b, "\"/>"); + buffer_append_string_len(b, CONST_STR_LEN("\"/>")); } return 0; @@ -511,24 +511,24 @@ static int webdav_gen_prop_tag(server *srv, connection *con, static int webdav_gen_response_status_tag(server *srv, connection *con, physical *dst, int status, buffer *b) { UNUSED(srv); - buffer_append_string(b,"<D:response xmlns:ns0=\"urn:uuid:c2f41010-65b3-11d1-a29f-00aa00c14882/\">\n"); + buffer_append_string_len(b,CONST_STR_LEN("<D:response xmlns:ns0=\"urn:uuid:c2f41010-65b3-11d1-a29f-00aa00c14882/\">\n")); - buffer_append_string(b,"<D:href>\n"); + buffer_append_string_len(b,CONST_STR_LEN("<D:href>\n")); buffer_append_string_buffer(b, dst->rel_path); - buffer_append_string(b,"</D:href>\n"); - buffer_append_string(b,"<D:status>\n"); + buffer_append_string_len(b,CONST_STR_LEN("</D:href>\n")); + buffer_append_string_len(b,CONST_STR_LEN("<D:status>\n")); if (con->request.http_version == HTTP_VERSION_1_1) { - BUFFER_COPY_STRING_CONST(b, "HTTP/1.1 "); + buffer_copy_string_len(b, CONST_STR_LEN("HTTP/1.1 ")); } else { - BUFFER_COPY_STRING_CONST(b, "HTTP/1.0 "); + buffer_copy_string_len(b, CONST_STR_LEN("HTTP/1.0 ")); } buffer_append_long(b, status); - BUFFER_APPEND_STRING_CONST(b, " "); + buffer_append_string_len(b, CONST_STR_LEN(" ")); buffer_append_string(b, get_http_status_name(status)); - buffer_append_string(b,"</D:status>\n"); - buffer_append_string(b,"</D:response>\n"); + buffer_append_string_len(b,CONST_STR_LEN("</D:status>\n")); + buffer_append_string_len(b,CONST_STR_LEN("</D:response>\n")); return 0; } @@ -570,6 +570,8 @@ static int webdav_delete_file(server *srv, connection *con, plugin_data *p, phys /* */ } } +#else + UNUSED(p); #endif } @@ -730,6 +732,8 @@ static int webdav_copy_file(server *srv, connection *con, plugin_data *p, physic } } } +#else + UNUSED(p); #endif return status; } @@ -840,12 +844,12 @@ static int webdav_get_live_property(server *srv, connection *con, plugin_data *p if (0 == strcmp(prop_name, "resourcetype")) { if (S_ISDIR(sce->st.st_mode)) { - buffer_append_string(b, "<D:resourcetype><D:collection/></D:resourcetype>"); + buffer_append_string_len(b, CONST_STR_LEN("<D:resourcetype><D:collection/></D:resourcetype>")); found = 1; } } else if (0 == strcmp(prop_name, "getcontenttype")) { if (S_ISDIR(sce->st.st_mode)) { - buffer_append_string(b, "<D:getcontenttype>httpd/unix-directory</D:getcontenttype>"); + buffer_append_string_len(b, CONST_STR_LEN("<D:getcontenttype>httpd/unix-directory</D:getcontenttype>")); found = 1; } else if(S_ISREG(sce->st.st_mode)) { for (k = 0; k < con->conf.mimetypes->used; k++) { @@ -854,9 +858,9 @@ static int webdav_get_live_property(server *srv, connection *con, plugin_data *p if (ds->key->used == 0) continue; if (buffer_is_equal_right_len(dst->path, ds->key, ds->key->used - 1)) { - buffer_append_string(b,"<D:getcontenttype>"); + buffer_append_string_len(b,CONST_STR_LEN("<D:getcontenttype>")); buffer_append_string_buffer(b, ds->value); - buffer_append_string(b, "</D:getcontenttype>"); + buffer_append_string_len(b, CONST_STR_LEN("</D:getcontenttype>")); found = 1; break; @@ -864,26 +868,26 @@ static int webdav_get_live_property(server *srv, connection *con, plugin_data *p } } } else if (0 == strcmp(prop_name, "creationdate")) { - buffer_append_string(b, "<D:creationdate ns0:dt=\"dateTime.tz\">"); + buffer_append_string_len(b, CONST_STR_LEN("<D:creationdate ns0:dt=\"dateTime.tz\">")); strftime(ctime_buf, sizeof(ctime_buf), "%Y-%m-%dT%H:%M:%SZ", gmtime(&(sce->st.st_ctime))); buffer_append_string(b, ctime_buf); - buffer_append_string(b, "</D:creationdate>"); + buffer_append_string_len(b, CONST_STR_LEN("</D:creationdate>")); found = 1; } else if (0 == strcmp(prop_name, "getlastmodified")) { - buffer_append_string(b,"<D:getlastmodified ns0:dt=\"dateTime.rfc1123\">"); + buffer_append_string_len(b,CONST_STR_LEN("<D:getlastmodified ns0:dt=\"dateTime.rfc1123\">")); strftime(mtime_buf, sizeof(mtime_buf), "%a, %d %b %Y %H:%M:%S GMT", gmtime(&(sce->st.st_mtime))); buffer_append_string(b, mtime_buf); - buffer_append_string(b, "</D:getlastmodified>"); + buffer_append_string_len(b, CONST_STR_LEN("</D:getlastmodified>")); found = 1; } else if (0 == strcmp(prop_name, "getcontentlength")) { - buffer_append_string(b,"<D:getcontentlength>"); + buffer_append_string_len(b,CONST_STR_LEN("<D:getcontentlength>")); buffer_append_off_t(b, sce->st.st_size); - buffer_append_string(b, "</D:getcontentlength>"); + buffer_append_string_len(b, CONST_STR_LEN("</D:getcontentlength>")); found = 1; } else if (0 == strcmp(prop_name, "getcontentlanguage")) { - buffer_append_string(b,"<D:getcontentlanguage>"); - buffer_append_string(b, "en"); - buffer_append_string(b, "</D:getcontentlanguage>"); + buffer_append_string_len(b,CONST_STR_LEN("<D:getcontentlanguage>")); + buffer_append_string_len(b, CONST_STR_LEN("en")); + buffer_append_string_len(b, CONST_STR_LEN("</D:getcontentlanguage>")); found = 1; } } @@ -1022,6 +1026,8 @@ static int webdav_parse_chunkqueue(server *srv, connection *con, plugin_data *p, if (MAP_FAILED == (c->file.mmap.start = mmap(0, c->file.length, PROT_READ, MAP_SHARED, c->file.fd, 0))) { log_error_write(srv, __FILE__, __LINE__, "ssbd", "mmap failed: ", strerror(errno), c->file.name, c->file.fd); + close(c->file.fd); + c->file.fd = -1; return -1; } @@ -1103,44 +1109,44 @@ int webdav_lockdiscovery(server *srv, connection *con, b = chunkqueue_get_append_buffer(con->write_queue); - buffer_copy_string(b, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"); + buffer_copy_string_len(b, CONST_STR_LEN("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n")); - buffer_append_string(b,"<D:prop xmlns:D=\"DAV:\" xmlns:ns0=\"urn:uuid:c2f41010-65b3-11d1-a29f-00aa00c14882/\">\n"); - buffer_append_string(b,"<D:lockdiscovery>\n"); - buffer_append_string(b,"<D:activelock>\n"); + buffer_append_string_len(b,CONST_STR_LEN("<D:prop xmlns:D=\"DAV:\" xmlns:ns0=\"urn:uuid:c2f41010-65b3-11d1-a29f-00aa00c14882/\">\n")); + buffer_append_string_len(b,CONST_STR_LEN("<D:lockdiscovery>\n")); + buffer_append_string_len(b,CONST_STR_LEN("<D:activelock>\n")); - buffer_append_string(b,"<D:lockscope>"); - buffer_append_string(b,"<D:"); + buffer_append_string_len(b,CONST_STR_LEN("<D:lockscope>")); + buffer_append_string_len(b,CONST_STR_LEN("<D:")); buffer_append_string(b, lockscope); - buffer_append_string(b, "/>"); - buffer_append_string(b,"</D:lockscope>\n"); + buffer_append_string_len(b, CONST_STR_LEN("/>")); + buffer_append_string_len(b,CONST_STR_LEN("</D:lockscope>\n")); - buffer_append_string(b,"<D:locktype>"); - buffer_append_string(b,"<D:"); + buffer_append_string_len(b,CONST_STR_LEN("<D:locktype>")); + buffer_append_string_len(b,CONST_STR_LEN("<D:")); buffer_append_string(b, locktype); - buffer_append_string(b, "/>"); - buffer_append_string(b,"</D:locktype>\n"); + buffer_append_string_len(b, CONST_STR_LEN("/>")); + buffer_append_string_len(b,CONST_STR_LEN("</D:locktype>\n")); - buffer_append_string(b,"<D:depth>"); + buffer_append_string_len(b,CONST_STR_LEN("<D:depth>")); buffer_append_string(b, depth == 0 ? "0" : "infinity"); - buffer_append_string(b,"</D:depth>\n"); + buffer_append_string_len(b,CONST_STR_LEN("</D:depth>\n")); - buffer_append_string(b,"<D:timeout>"); - buffer_append_string(b, "Second-600"); - buffer_append_string(b,"</D:timeout>\n"); + buffer_append_string_len(b,CONST_STR_LEN("<D:timeout>")); + buffer_append_string_len(b, CONST_STR_LEN("Second-600")); + buffer_append_string_len(b,CONST_STR_LEN("</D:timeout>\n")); - buffer_append_string(b,"<D:owner>"); - buffer_append_string(b,"</D:owner>\n"); + buffer_append_string_len(b,CONST_STR_LEN("<D:owner>")); + buffer_append_string_len(b,CONST_STR_LEN("</D:owner>\n")); - buffer_append_string(b,"<D:locktoken>"); - buffer_append_string(b, "<D:href>"); + buffer_append_string_len(b,CONST_STR_LEN("<D:locktoken>")); + buffer_append_string_len(b, CONST_STR_LEN("<D:href>")); buffer_append_string_buffer(b, locktoken); - buffer_append_string(b, "</D:href>"); - buffer_append_string(b,"</D:locktoken>\n"); + buffer_append_string_len(b, CONST_STR_LEN("</D:href>")); + buffer_append_string_len(b,CONST_STR_LEN("</D:locktoken>\n")); - buffer_append_string(b,"</D:activelock>\n"); - buffer_append_string(b,"</D:lockdiscovery>\n"); - buffer_append_string(b,"</D:prop>\n"); + buffer_append_string_len(b,CONST_STR_LEN("</D:activelock>\n")); + buffer_append_string_len(b,CONST_STR_LEN("</D:lockdiscovery>\n")); + buffer_append_string_len(b,CONST_STR_LEN("</D:prop>\n")); return 0; } @@ -1155,6 +1161,7 @@ int webdav_has_lock(server *srv, connection *con, plugin_data *p, buffer *uri) { #ifdef USE_LOCKS data_string *ds; + UNUSED(srv); /** * This implementation is more fake than real @@ -1192,6 +1199,11 @@ int webdav_has_lock(server *srv, connection *con, plugin_data *p, buffer *uri) { has_lock = 0; } } +#else + UNUSED(srv); + UNUSED(con); + UNUSED(p); + UNUSED(uri); #endif return has_lock; @@ -1334,9 +1346,9 @@ URIHANDLER_FUNC(mod_webdav_subrequest_handler) { b = chunkqueue_get_append_buffer(con->write_queue); - buffer_copy_string(b, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"); + buffer_copy_string_len(b, CONST_STR_LEN("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n")); - buffer_append_string(b,"<D:multistatus xmlns:D=\"DAV:\" xmlns:ns0=\"urn:uuid:c2f41010-65b3-11d1-a29f-00aa00c14882/\">\n"); + buffer_append_string_len(b,CONST_STR_LEN("<D:multistatus xmlns:D=\"DAV:\" xmlns:ns0=\"urn:uuid:c2f41010-65b3-11d1-a29f-00aa00c14882/\">\n")); /* allprop */ @@ -1348,40 +1360,40 @@ URIHANDLER_FUNC(mod_webdav_subrequest_handler) { /* Depth: 0 */ webdav_get_props(srv, con, p, &(con->physical), req_props, prop_200, prop_404); - buffer_append_string(b,"<D:response>\n"); - buffer_append_string(b,"<D:href>"); + buffer_append_string_len(b,CONST_STR_LEN("<D:response>\n")); + buffer_append_string_len(b,CONST_STR_LEN("<D:href>")); buffer_append_string_buffer(b, con->uri.scheme); - buffer_append_string(b,"://"); + buffer_append_string_len(b,CONST_STR_LEN("://")); buffer_append_string_buffer(b, con->uri.authority); buffer_append_string_encoded(b, CONST_BUF_LEN(con->uri.path), ENCODING_REL_URI); - buffer_append_string(b,"</D:href>\n"); + buffer_append_string_len(b,CONST_STR_LEN("</D:href>\n")); if (!buffer_is_empty(prop_200)) { - buffer_append_string(b,"<D:propstat>\n"); - buffer_append_string(b,"<D:prop>\n"); + buffer_append_string_len(b,CONST_STR_LEN("<D:propstat>\n")); + buffer_append_string_len(b,CONST_STR_LEN("<D:prop>\n")); buffer_append_string_buffer(b, prop_200); - buffer_append_string(b,"</D:prop>\n"); + buffer_append_string_len(b,CONST_STR_LEN("</D:prop>\n")); - buffer_append_string(b,"<D:status>HTTP/1.1 200 OK</D:status>\n"); + buffer_append_string_len(b,CONST_STR_LEN("<D:status>HTTP/1.1 200 OK</D:status>\n")); - buffer_append_string(b,"</D:propstat>\n"); + buffer_append_string_len(b,CONST_STR_LEN("</D:propstat>\n")); } if (!buffer_is_empty(prop_404)) { - buffer_append_string(b,"<D:propstat>\n"); - buffer_append_string(b,"<D:prop>\n"); + buffer_append_string_len(b,CONST_STR_LEN("<D:propstat>\n")); + buffer_append_string_len(b,CONST_STR_LEN("<D:prop>\n")); buffer_append_string_buffer(b, prop_404); - buffer_append_string(b,"</D:prop>\n"); + buffer_append_string_len(b,CONST_STR_LEN("</D:prop>\n")); - buffer_append_string(b,"<D:status>HTTP/1.1 404 Not Found</D:status>\n"); + buffer_append_string_len(b,CONST_STR_LEN("<D:status>HTTP/1.1 404 Not Found</D:status>\n")); - buffer_append_string(b,"</D:propstat>\n"); + buffer_append_string_len(b,CONST_STR_LEN("</D:propstat>\n")); } - buffer_append_string(b,"</D:response>\n"); + buffer_append_string_len(b,CONST_STR_LEN("</D:response>\n")); break; case 1: @@ -1417,40 +1429,40 @@ URIHANDLER_FUNC(mod_webdav_subrequest_handler) { webdav_get_props(srv, con, p, &d, req_props, prop_200, prop_404); - buffer_append_string(b,"<D:response>\n"); - buffer_append_string(b,"<D:href>"); + buffer_append_string_len(b,CONST_STR_LEN("<D:response>\n")); + buffer_append_string_len(b,CONST_STR_LEN("<D:href>")); buffer_append_string_buffer(b, con->uri.scheme); - buffer_append_string(b,"://"); + buffer_append_string_len(b,CONST_STR_LEN("://")); buffer_append_string_buffer(b, con->uri.authority); buffer_append_string_encoded(b, CONST_BUF_LEN(d.rel_path), ENCODING_REL_URI); - buffer_append_string(b,"</D:href>\n"); + buffer_append_string_len(b,CONST_STR_LEN("</D:href>\n")); if (!buffer_is_empty(prop_200)) { - buffer_append_string(b,"<D:propstat>\n"); - buffer_append_string(b,"<D:prop>\n"); + buffer_append_string_len(b,CONST_STR_LEN("<D:propstat>\n")); + buffer_append_string_len(b,CONST_STR_LEN("<D:prop>\n")); buffer_append_string_buffer(b, prop_200); - buffer_append_string(b,"</D:prop>\n"); + buffer_append_string_len(b,CONST_STR_LEN("</D:prop>\n")); - buffer_append_string(b,"<D:status>HTTP/1.1 200 OK</D:status>\n"); + buffer_append_string_len(b,CONST_STR_LEN("<D:status>HTTP/1.1 200 OK</D:status>\n")); - buffer_append_string(b,"</D:propstat>\n"); + buffer_append_string_len(b,CONST_STR_LEN("</D:propstat>\n")); } if (!buffer_is_empty(prop_404)) { - buffer_append_string(b,"<D:propstat>\n"); - buffer_append_string(b,"<D:prop>\n"); + buffer_append_string_len(b,CONST_STR_LEN("<D:propstat>\n")); + buffer_append_string_len(b,CONST_STR_LEN("<D:prop>\n")); buffer_append_string_buffer(b, prop_404); - buffer_append_string(b,"</D:prop>\n"); + buffer_append_string_len(b,CONST_STR_LEN("</D:prop>\n")); - buffer_append_string(b,"<D:status>HTTP/1.1 404 Not Found</D:status>\n"); + buffer_append_string_len(b,CONST_STR_LEN("<D:status>HTTP/1.1 404 Not Found</D:status>\n")); - buffer_append_string(b,"</D:propstat>\n"); + buffer_append_string_len(b,CONST_STR_LEN("</D:propstat>\n")); } - buffer_append_string(b,"</D:response>\n"); + buffer_append_string_len(b,CONST_STR_LEN("</D:response>\n")); } closedir(dir); buffer_free(d.path); @@ -1473,7 +1485,7 @@ URIHANDLER_FUNC(mod_webdav_subrequest_handler) { buffer_free(prop_200); buffer_free(prop_404); - buffer_append_string(b,"</D:multistatus>\n"); + buffer_append_string_len(b,CONST_STR_LEN("</D:multistatus>\n")); if (p->conf.log_xml) { log_error_write(srv, __FILE__, __LINE__, "sb", "XML-response-body:", b); @@ -1548,13 +1560,13 @@ URIHANDLER_FUNC(mod_webdav_subrequest_handler) { b = chunkqueue_get_append_buffer(con->write_queue); - buffer_copy_string(b, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"); + buffer_copy_string_len(b, CONST_STR_LEN("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n")); - buffer_append_string(b,"<D:multistatus xmlns:D=\"DAV:\">\n"); + buffer_append_string_len(b,CONST_STR_LEN("<D:multistatus xmlns:D=\"DAV:\">\n")); buffer_append_string_buffer(b, multi_status_resp); - buffer_append_string(b,"</D:multistatus>\n"); + buffer_append_string_len(b,CONST_STR_LEN("</D:multistatus>\n")); if (p->conf.log_xml) { log_error_write(srv, __FILE__, __LINE__, "sb", "XML-response-body:", b); @@ -1713,6 +1725,8 @@ URIHANDLER_FUNC(mod_webdav_subrequest_handler) { if (MAP_FAILED == (c->file.mmap.start = mmap(0, c->file.length, PROT_READ, MAP_SHARED, c->file.fd, 0))) { log_error_write(srv, __FILE__, __LINE__, "ssbd", "mmap failed: ", strerror(errno), c->file.name, c->file.fd); + close(c->file.fd); + c->file.fd = -1; return HANDLER_ERROR; } @@ -2286,7 +2300,7 @@ propmatch_cleanup: uuid_generate(id); uuid_unparse(id, uuid); - buffer_copy_string(p->tmp_buf, "opaquelocktoken:"); + buffer_copy_string_len(p->tmp_buf, CONST_STR_LEN("opaquelocktoken:")); buffer_append_string(p->tmp_buf, uuid); /* "CREATE TABLE locks (" diff --git a/src/network.c b/src/network.c index ba024aa..0534bee 100644 --- a/src/network.c +++ b/src/network.c @@ -494,7 +494,7 @@ int network_init(server *srv) { b = buffer_init(); buffer_copy_string_buffer(b, srv->srvconf.bindhost); - buffer_append_string(b, ":"); + buffer_append_string_len(b, CONST_STR_LEN(":")); buffer_append_long(b, srv->srvconf.port); if (0 != network_server_init(srv, b, srv->config_storage[0])) { diff --git a/src/network_freebsd_sendfile.c b/src/network_freebsd_sendfile.c index 6150834..9bdd2a9 100644 --- a/src/network_freebsd_sendfile.c +++ b/src/network_freebsd_sendfile.c @@ -166,17 +166,17 @@ int network_write_chunkqueue_freebsdsendfile(server *srv, connection *con, int f if (-1 == sendfile(c->file.fd, fd, offset, toSend, NULL, &r, 0)) { switch(errno) { case EAGAIN: - break; + case EINTR: + /* for EAGAIN/EINTR r still contains the sent bytes */ + break; /* try again later */ + case EPIPE: case ENOTCONN: return -2; default: log_error_write(srv, __FILE__, __LINE__, "ssd", "sendfile: ", strerror(errno), errno); return -1; } - } - - if (r == 0) { - int oerrno = errno; + } else if (r == 0) { /* We got an event to write but we wrote nothing * * - the file shrinked -> error @@ -189,12 +189,9 @@ int network_write_chunkqueue_freebsdsendfile(server *srv, connection *con, int f if (offset >= sce->st.st_size) { /* file shrinked, close the connection */ - errno = oerrno; - return -1; } - errno = oerrno; return -2; } diff --git a/src/network_openssl.c b/src/network_openssl.c index ff9fb97..756ce19 100644 --- a/src/network_openssl.c +++ b/src/network_openssl.c @@ -85,6 +85,7 @@ int network_write_chunkqueue_openssl(server *srv, connection *con, SSL *ssl, chu * */ + ERR_clear_error(); if ((r = SSL_write(ssl, offset, toSend)) <= 0) { unsigned long err; @@ -187,6 +188,7 @@ int network_write_chunkqueue_openssl(server *srv, connection *con, SSL *ssl, chu close(ifd); + ERR_clear_error(); if ((r = SSL_write(ssl, s, toSend)) <= 0) { unsigned long err; diff --git a/src/plugin.c b/src/plugin.c index faf5520..68eab65 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -131,12 +131,12 @@ int plugins_load(server *srv) { buffer_copy_string_buffer(srv->tmp_buf, srv->srvconf.modules_dir); - buffer_append_string(srv->tmp_buf, "/"); + buffer_append_string_len(srv->tmp_buf, CONST_STR_LEN("/")); buffer_append_string(srv->tmp_buf, modules); #if defined(__WIN32) || defined(__CYGWIN__) - buffer_append_string(srv->tmp_buf, ".dll"); + buffer_append_string_len(srv->tmp_buf, CONST_STR_LEN(".dll")); #else - buffer_append_string(srv->tmp_buf, ".so"); + buffer_append_string_len(srv->tmp_buf, CONST_STR_LEN(".so")); #endif p = plugin_init(); @@ -173,7 +173,7 @@ int plugins_load(server *srv) { #endif buffer_reset(srv->tmp_buf); buffer_copy_string(srv->tmp_buf, modules); - buffer_append_string(srv->tmp_buf, "_plugin_init"); + buffer_append_string_len(srv->tmp_buf, CONST_STR_LEN("_plugin_init")); #ifdef __WIN32 init = GetProcAddress(p->lib, srv->tmp_buf->ptr); @@ -197,7 +197,7 @@ int plugins_load(server *srv) { #else #if 1 - init = (int (*)(plugin *))dlsym(p->lib, srv->tmp_buf->ptr); + init = (int (*)(plugin *))(intptr_t)dlsym(p->lib, srv->tmp_buf->ptr); #else *(void **)(&init) = dlsym(p->lib, srv->tmp_buf->ptr); #endif diff --git a/src/proc_open.c b/src/proc_open.c index 1f55b61..79f62c6 100644 --- a/src/proc_open.c +++ b/src/proc_open.c @@ -184,7 +184,7 @@ int proc_open(proc_handler_t *proc, const char *command) { buffer_append_string(cmdline, shell); } else { buffer_append_string(cmdline, windir); - buffer_append_string(cmdline, "\\system32\\cmd.exe"); + buffer_append_string_len(cmdline, CONST_STR_LEN("\\system32\\cmd.exe")); } buffer_append_string_len(cmdline, CONST_STR_LEN(" /c ")); buffer_append_string(cmdline, command); @@ -287,31 +287,32 @@ static void proc_read_fd_to_buffer(int fd, buffer *b) { } /* }}} */ /* {{{ proc_open_buffer */ -int proc_open_buffer(proc_handler_t *proc, const char *command, buffer *in, buffer *out, buffer *err) { - - UNUSED(err); +int proc_open_buffer(const char *command, buffer *in, buffer *out, buffer *err) { + proc_handler_t proc; - if (proc_open(proc, command) != 0) { + if (proc_open(&proc, command) != 0) { return -1; } if (in) { - if (write(proc->in.fd, (void *)in->ptr, in->used) < 0) { + if (write(proc.in.fd, (void *)in->ptr, in->used) < 0) { perror("error writing pipe"); return -1; } } - pipe_close(&proc->in); + pipe_close(&proc.in); if (out) { - proc_read_fd_to_buffer(proc->out.fd, out); + proc_read_fd_to_buffer(proc.out.fd, out); } - pipe_close(&proc->out); + pipe_close(&proc.out); if (err) { - proc_read_fd_to_buffer(proc->err.fd, err); + proc_read_fd_to_buffer(proc.err.fd, err); } - pipe_close(&proc->err); + pipe_close(&proc.err); + + proc_close(&proc); return 0; } @@ -366,7 +367,7 @@ int main() { RESET(); fprintf(stdout, "test: echo 321 with read\n"); fflush(stdout); - if (proc_open_buffer(&proc, "echo 321", NULL, out, err) != 0) { + if (proc_open_buffer("echo 321", NULL, out, err) != 0) { ERROR_OUT(); } fprintf(stdout, "result: ->%s<-\n\n", out->ptr); fflush(stdout); @@ -374,7 +375,7 @@ int main() { fprintf(stdout, "test: echo 123 | " CMD_CAT "\n"); fflush(stdout); buffer_copy_string_len(in, CONST_STR_LEN("123\n")); - if (proc_open_buffer(&proc, CMD_CAT, in, out, err) != 0) { + if (proc_open_buffer(CMD_CAT, in, out, err) != 0) { ERROR_OUT(); } fprintf(stdout, "result: ->%s<-\n\n", out->ptr); fflush(stdout); diff --git a/src/proc_open.h b/src/proc_open.h index e07421a..af70738 100644 --- a/src/proc_open.h +++ b/src/proc_open.h @@ -22,4 +22,4 @@ typedef struct { int proc_close(proc_handler_t *ht); int proc_open(proc_handler_t *ht, const char *command); -int proc_open_buffer(proc_handler_t *ht, const char *command, buffer *in, buffer *out, buffer *err); +int proc_open_buffer(const char *command, buffer *in, buffer *out, buffer *err); diff --git a/src/request.c b/src/request.c index 4298873..b586c06 100644 --- a/src/request.c +++ b/src/request.c @@ -825,6 +825,7 @@ int http_request_parse(server *srv, connection *con) { "request-header:\n", con->request.request); } + array_insert_unique(con->request.headers, (data_unset *)ds); return 0; } @@ -874,6 +875,7 @@ int http_request_parse(server *srv, connection *con) { "request-header:\n", con->request.request); } + array_insert_unique(con->request.headers, (data_unset *)ds); return 0; } } else if (cmp > 0 && 0 == (cmp = buffer_caseless_compare(CONST_BUF_LEN(ds->key), CONST_STR_LEN("Expect")))) { @@ -892,11 +894,12 @@ int http_request_parse(server *srv, connection *con) { * */ - con->http_status = 417; - con->keep_alive = 0; - - array_insert_unique(con->request.headers, (data_unset *)ds); - return 0; + if (srv->srvconf.reject_expect_100_with_417 && 0 == buffer_caseless_compare(CONST_BUF_LEN(ds->value), CONST_STR_LEN("100-continue"))) { + con->http_status = 417; + con->keep_alive = 0; + array_insert_unique(con->request.headers, (data_unset *)ds); + return 0; + } } else if (cmp > 0 && 0 == (cmp = buffer_caseless_compare(CONST_BUF_LEN(ds->key), CONST_STR_LEN("Host")))) { if (!con->request.http_host) { con->request.http_host = ds->value; @@ -911,6 +914,7 @@ int http_request_parse(server *srv, connection *con) { "request-header:\n", con->request.request); } + array_insert_unique(con->request.headers, (data_unset *)ds); return 0; } } else if (cmp > 0 && 0 == (cmp = buffer_caseless_compare(CONST_BUF_LEN(ds->key), CONST_STR_LEN("If-Modified-Since")))) { @@ -936,6 +940,7 @@ int http_request_parse(server *srv, connection *con) { "request-header:\n", con->request.request); } + array_insert_unique(con->request.headers, (data_unset *)ds); return 0; } } else if (cmp > 0 && 0 == (cmp = buffer_caseless_compare(CONST_BUF_LEN(ds->key), CONST_STR_LEN("If-None-Match")))) { @@ -953,6 +958,7 @@ int http_request_parse(server *srv, connection *con) { "request-header:\n", con->request.request); } + array_insert_unique(con->request.headers, (data_unset *)ds); return 0; } } else if (cmp > 0 && 0 == (cmp = buffer_caseless_compare(CONST_BUF_LEN(ds->key), CONST_STR_LEN("Range")))) { @@ -976,6 +982,7 @@ int http_request_parse(server *srv, connection *con) { "request-header:\n", con->request.request); } + array_insert_unique(con->request.headers, (data_unset *)ds); return 0; } } @@ -1014,7 +1021,7 @@ int http_request_parse(server *srv, connection *con) { /* strip leading WS */ if (value == cur) value = cur+1; default: - if (*cur >= 0 && *cur < 32) { + if (*cur >= 0 && *cur < 32 && *cur != '\t') { if (srv->srvconf.log_request_header_on_error) { log_error_write(srv, __FILE__, __LINE__, "sds", "invalid char in header", (int)*cur, "-> 400"); @@ -1129,8 +1136,8 @@ int http_request_parse(server *srv, connection *con) { con->http_status = 413; con->keep_alive = 0; - log_error_write(srv, __FILE__, __LINE__, "sds", - "request-size too long:", con->request.content_length, "-> 413"); + log_error_write(srv, __FILE__, __LINE__, "sos", + "request-size too long:", (off_t) con->request.content_length, "-> 413"); return 0; } @@ -1144,8 +1151,8 @@ int http_request_parse(server *srv, connection *con) { con->http_status = 413; con->keep_alive = 0; - log_error_write(srv, __FILE__, __LINE__, "sds", - "request-size too long:", con->request.content_length, "-> 413"); + log_error_write(srv, __FILE__, __LINE__, "sos", + "request-size too long:", (off_t) con->request.content_length, "-> 413"); return 0; } diff --git a/src/response.c b/src/response.c index bc2bdd1..785e442 100644 --- a/src/response.c +++ b/src/response.c @@ -35,21 +35,24 @@ int http_response_write_header(server *srv, connection *con) { b = chunkqueue_get_prepend_buffer(con->write_queue); if (con->request.http_version == HTTP_VERSION_1_1) { - BUFFER_COPY_STRING_CONST(b, "HTTP/1.1 "); + buffer_copy_string_len(b, CONST_STR_LEN("HTTP/1.1 ")); } else { - BUFFER_COPY_STRING_CONST(b, "HTTP/1.0 "); + buffer_copy_string_len(b, CONST_STR_LEN("HTTP/1.0 ")); } buffer_append_long(b, con->http_status); - BUFFER_APPEND_STRING_CONST(b, " "); + buffer_append_string_len(b, CONST_STR_LEN(" ")); buffer_append_string(b, get_http_status_name(con->http_status)); if (con->request.http_version != HTTP_VERSION_1_1 || con->keep_alive == 0) { - BUFFER_APPEND_STRING_CONST(b, "\r\nConnection: "); - buffer_append_string(b, con->keep_alive ? "keep-alive" : "close"); + if (con->keep_alive) { + response_header_overwrite(srv, con, CONST_STR_LEN("Connection"), CONST_STR_LEN("keep-alive")); + } else { + response_header_overwrite(srv, con, CONST_STR_LEN("Connection"), CONST_STR_LEN("close")); + } } if (con->response.transfer_encoding & HTTP_TRANSFER_ENCODING_CHUNKED) { - BUFFER_APPEND_STRING_CONST(b, "\r\nTransfer-Encoding: chunked"); + response_header_overwrite(srv, con, CONST_STR_LEN("Transfer-Encoding"), CONST_STR_LEN("chunked")); } @@ -60,14 +63,15 @@ int http_response_write_header(server *srv, connection *con) { ds = (data_string *)con->response.headers->data[i]; if (ds->value->used && ds->key->used && - 0 != strncmp(ds->key->ptr, "X-LIGHTTPD-", sizeof("X-LIGHTTPD-") - 1) && - 0 != strncmp(ds->key->ptr, "X-Sendfile", sizeof("X-Sendfile") - 1)) { - if (buffer_is_equal_string(ds->key, CONST_STR_LEN("Date"))) have_date = 1; - if (buffer_is_equal_string(ds->key, CONST_STR_LEN("Server"))) have_server = 1; + 0 != strncasecmp(ds->key->ptr, CONST_STR_LEN("X-LIGHTTPD-")) && + 0 != strcasecmp(ds->key->ptr, "X-Sendfile")) { + if (0 == strcasecmp(ds->key->ptr, "Date")) have_date = 1; + if (0 == strcasecmp(ds->key->ptr, "Server")) have_server = 1; + if (0 == strcasecmp(ds->key->ptr, "Content-Encoding") && 304 == con->http_status) continue; - BUFFER_APPEND_STRING_CONST(b, "\r\n"); + buffer_append_string_len(b, CONST_STR_LEN("\r\n")); buffer_append_string_buffer(b, ds->key); - BUFFER_APPEND_STRING_CONST(b, ": "); + buffer_append_string_len(b, CONST_STR_LEN(": ")); #if 0 /** * the value might contain newlines, encode them with at least one white-space @@ -81,7 +85,7 @@ int http_response_write_header(server *srv, connection *con) { if (!have_date) { /* HTTP/1.1 requires a Date: header */ - BUFFER_APPEND_STRING_CONST(b, "\r\nDate: "); + buffer_append_string_len(b, CONST_STR_LEN("\r\nDate: ")); /* cache the generated timestamp */ if (srv->cur_ts != srv->last_generated_date_ts) { @@ -100,14 +104,14 @@ int http_response_write_header(server *srv, connection *con) { if (!have_server) { if (buffer_is_empty(con->conf.server_tag)) { - BUFFER_APPEND_STRING_CONST(b, "\r\nServer: " PACKAGE_NAME "/" PACKAGE_VERSION); - } else { - BUFFER_APPEND_STRING_CONST(b, "\r\nServer: "); + buffer_append_string_len(b, CONST_STR_LEN("\r\nServer: " PACKAGE_NAME "/" PACKAGE_VERSION)); + } else if (con->conf.server_tag->used > 1) { + buffer_append_string_len(b, CONST_STR_LEN("\r\nServer: ")); buffer_append_string_encoded(b, CONST_BUF_LEN(con->conf.server_tag), ENCODING_HTTP_HEADER); } } - BUFFER_APPEND_STRING_CONST(b, "\r\n\r\n"); + buffer_append_string_len(b, CONST_STR_LEN("\r\n\r\n")); con->bytes_header = b->used - 1; @@ -152,7 +156,7 @@ handler_t http_response_prepare(server *srv, connection *con) { * */ config_cond_cache_reset(srv, con); - config_setup_connection(srv, con); // Perhaps this could be removed at other places. + config_setup_connection(srv, con); /* Perhaps this could be removed at other places. */ if (con->conf.log_condition_handling) { log_error_write(srv, __FILE__, __LINE__, "s", "run condition"); @@ -181,7 +185,11 @@ handler_t http_response_prepare(server *srv, connection *con) { * */ - buffer_copy_string(con->uri.scheme, con->conf.is_ssl ? "https" : "http"); + if (con->conf.is_ssl) { + buffer_copy_string_len(con->uri.scheme, CONST_STR_LEN("https")); + } else { + buffer_copy_string_len(con->uri.scheme, CONST_STR_LEN("http")); + } buffer_copy_string_buffer(con->uri.authority, con->request.http_host); buffer_to_lower(con->uri.authority); @@ -190,6 +198,7 @@ handler_t http_response_prepare(server *srv, connection *con) { config_patch_connection(srv, con, COMP_HTTP_REMOTE_IP); /* Client-IP */ config_patch_connection(srv, con, COMP_HTTP_REFERER); /* Referer: */ config_patch_connection(srv, con, COMP_HTTP_USER_AGENT);/* User-Agent: */ + config_patch_connection(srv, con, COMP_HTTP_LANGUAGE); /* Accept-Language: */ config_patch_connection(srv, con, COMP_HTTP_COOKIE); /* Cookie: */ config_patch_connection(srv, con, COMP_HTTP_REQUEST_METHOD); /* REQUEST_METHOD */ diff --git a/src/server.c b/src/server.c index 585a973..ee56b66 100644 --- a/src/server.c +++ b/src/server.c @@ -75,12 +75,15 @@ static volatile siginfo_t last_sigterm_info; static volatile siginfo_t last_sighup_info; static void sigaction_handler(int sig, siginfo_t *si, void *context) { + static siginfo_t empty_siginfo; UNUSED(context); + if (!si) si = &empty_siginfo; + switch (sig) { case SIGTERM: srv_shutdown = 1; - memcpy(&last_sigterm_info, si, sizeof(*si)); + last_sigterm_info = *si; break; case SIGINT: if (graceful_shutdown) { @@ -88,7 +91,7 @@ static void sigaction_handler(int sig, siginfo_t *si, void *context) { } else { graceful_shutdown = 1; } - memcpy(&last_sigterm_info, si, sizeof(*si)); + last_sigterm_info = *si; break; case SIGALRM: @@ -104,7 +107,7 @@ static void sigaction_handler(int sig, siginfo_t *si, void *context) { */ if (!forwarded_sig_hup) { handle_sig_hup = 1; - memcpy(&last_sighup_info, si, sizeof(*si)); + last_sighup_info = *si; } else { forwarded_sig_hup = 0; } @@ -210,6 +213,7 @@ static server *server_init(void) { srv->srvconf.modules_dir = buffer_init_string(LIBRARY_DIR); srv->srvconf.network_backend = buffer_init(); srv->srvconf.upload_tempdirs = array_init(); + srv->srvconf.reject_expect_100_with_417 = 1; /* use syslog */ srv->errorlog_fd = -1; @@ -573,19 +577,8 @@ int main (int argc, char **argv) { } /* close stdin and stdout, as they are not needed */ - /* move stdin to /dev/null */ - if (-1 != (fd = open("/dev/null", O_RDONLY))) { - close(STDIN_FILENO); - dup2(fd, STDIN_FILENO); - close(fd); - } - - /* move stdout to /dev/null */ - if (-1 != (fd = open("/dev/null", O_WRONLY))) { - close(STDOUT_FILENO); - dup2(fd, STDOUT_FILENO); - close(fd); - } + openDevNull(STDIN_FILENO); + openDevNull(STDOUT_FILENO); if (0 != config_set_defaults(srv)) { log_error_write(srv, __FILE__, __LINE__, "s", @@ -855,15 +848,16 @@ int main (int argc, char **argv) { } /* set max-conns */ - if (srv->srvconf.max_conns > srv->max_fds) { - /* we can't have more connections than max-fds */ - srv->max_conns = srv->max_fds; + if (srv->srvconf.max_conns > srv->max_fds/2) { + /* we can't have more connections than max-fds/2 */ + log_error_write(srv, __FILE__, __LINE__, "sdd", "can't have more connections than fds/2: ", srv->srvconf.max_conns, srv->max_fds); + srv->max_conns = srv->max_fds/2; } else if (srv->srvconf.max_conns) { /* otherwise respect the wishes of the user */ srv->max_conns = srv->srvconf.max_conns; } else { - /* or use the default */ - srv->max_conns = srv->max_fds; + /* or use the default: we really don't want to hit max-fds */ + srv->max_conns = srv->max_fds/3; } if (HANDLER_GO_ON != plugins_call_init(srv)) { @@ -887,14 +881,14 @@ int main (int argc, char **argv) { /* write pid file */ if (pid_fd != -1) { buffer_copy_long(srv->tmp_buf, getpid()); - buffer_append_string(srv->tmp_buf, "\n"); + buffer_append_string_len(srv->tmp_buf, CONST_STR_LEN("\n")); write(pid_fd, srv->tmp_buf->ptr, srv->tmp_buf->used - 1); close(pid_fd); pid_fd = -1; } - // Close stderr ASAP in the child process to make sure that nothing - // is being written to that fd which may not be valid anymore. + /* Close stderr ASAP in the child process to make sure that nothing + * is being written to that fd which may not be valid anymore. */ if (-1 == log_error_open(srv)) { log_error_write(srv, __FILE__, __LINE__, "s", "Opening errorlog failed. Going down."); @@ -1254,8 +1248,8 @@ int main (int argc, char **argv) { if (srv->cur_ts - con->write_request_ts > con->conf.max_write_idle) { /* time - out */ -#if 1 - log_error_write(srv, __FILE__, __LINE__, "sbsosds", + if (con->conf.log_timeouts) { + log_error_write(srv, __FILE__, __LINE__, "sbsosds", "NOTE: a request for", con->request.uri, "timed out after writing", @@ -1263,7 +1257,7 @@ int main (int argc, char **argv) { "bytes. We waited", (int)con->conf.max_write_idle, "seconds. If this a problem increase server.max-write-idle"); -#endif + } connection_set_state(srv, con, CON_STATE_ERROR); changed = 1; } @@ -1306,8 +1300,8 @@ int main (int argc, char **argv) { if (srv->sockets_disabled) { /* our server sockets are disabled, why ? */ - if ((srv->cur_fds + srv->want_fds < srv->max_fds * 0.8) && /* we have enough unused fds */ - (srv->conns->used < srv->max_conns * 0.9) && + if ((srv->cur_fds + srv->want_fds < srv->max_fds * 8 / 10) && /* we have enough unused fds */ + (srv->conns->used <= srv->max_conns * 9 / 10) && (0 == graceful_shutdown)) { for (i = 0; i < srv->srv_sockets.used; i++) { server_socket *srv_socket = srv->srv_sockets.ptr[i]; @@ -1319,8 +1313,8 @@ int main (int argc, char **argv) { srv->sockets_disabled = 0; } } else { - if ((srv->cur_fds + srv->want_fds > srv->max_fds * 0.9) || /* out of fds */ - (srv->conns->used > srv->max_conns) || /* out of connections */ + if ((srv->cur_fds + srv->want_fds > srv->max_fds * 9 / 10) || /* out of fds */ + (srv->conns->used >= srv->max_conns) || /* out of connections */ (graceful_shutdown)) { /* graceful_shutdown */ /* disable server-fds */ @@ -1359,7 +1353,7 @@ int main (int argc, char **argv) { if (graceful_shutdown) { log_error_write(srv, __FILE__, __LINE__, "s", "[note] graceful shutdown started"); - } else if (srv->conns->used > srv->max_conns) { + } else if (srv->conns->used >= srv->max_conns) { log_error_write(srv, __FILE__, __LINE__, "s", "[note] sockets disabled, connection limit reached"); } else { log_error_write(srv, __FILE__, __LINE__, "s", "[note] sockets disabled, out-of-fds"); diff --git a/src/spawn-fcgi.c b/src/spawn-fcgi.c index 60e02bd..a570e16 100644 --- a/src/spawn-fcgi.c +++ b/src/spawn-fcgi.c @@ -37,9 +37,9 @@ typedef int socklen_t; #endif #ifdef HAVE_SYS_UN_H -int fcgi_spawn_connection(char *appPath, char **appArgv, char *addr, unsigned short port, const char *unixsocket, int child_count, int pid_fd, int nofork) { +int fcgi_spawn_connection(char *appPath, char **appArgv, char *addr, unsigned short port, const char *unixsocket, int fork_count, int child_count, int pid_fd, int nofork) { int fcgi_fd; - int socket_type, status; + int socket_type, status, rc = 0; struct timeval tv = { 0, 100 * 1000 }; struct sockaddr_un fcgi_addr_un; @@ -48,9 +48,6 @@ int fcgi_spawn_connection(char *appPath, char **appArgv, char *addr, unsigned sh socklen_t servlen; - pid_t child; - int val; - if (child_count < 2) { child_count = 5; } @@ -61,7 +58,7 @@ int fcgi_spawn_connection(char *appPath, char **appArgv, char *addr, unsigned sh if (unixsocket) { - memset(&fcgi_addr, 0, sizeof(fcgi_addr)); + memset(&fcgi_addr_un, 0, sizeof(fcgi_addr_un)); fcgi_addr_un.sun_family = AF_UNIX; strcpy(fcgi_addr_un.sun_path, unixsocket); @@ -74,32 +71,14 @@ int fcgi_spawn_connection(char *appPath, char **appArgv, char *addr, unsigned sh #endif socket_type = AF_UNIX; fcgi_addr = (struct sockaddr *) &fcgi_addr_un; - - /* check if some backend is listening on the socket - * as if we delete the socket-file and rebind there will be no "socket already in use" error - */ - if (-1 == (fcgi_fd = socket(socket_type, SOCK_STREAM, 0))) { - fprintf(stderr, "%s.%d\n", - __FILE__, __LINE__); - return -1; - } - - if (-1 != connect(fcgi_fd, fcgi_addr, servlen)) { - fprintf(stderr, "%s.%d: socket is already used, can't spawn\n", - __FILE__, __LINE__); - return -1; - } - - /* cleanup previous socket if it exists */ - unlink(unixsocket); - close(fcgi_fd); } else { + memset(&fcgi_addr_in, 0, sizeof(fcgi_addr_in)); fcgi_addr_in.sin_family = AF_INET; - if (addr != NULL) { - fcgi_addr_in.sin_addr.s_addr = inet_addr(addr); - } else { - fcgi_addr_in.sin_addr.s_addr = htonl(INADDR_ANY); - } + if (addr != NULL) { + fcgi_addr_in.sin_addr.s_addr = inet_addr(addr); + } else { + fcgi_addr_in.sin_addr.s_addr = htonl(INADDR_ANY); + } fcgi_addr_in.sin_port = htons(port); servlen = sizeof(fcgi_addr_in); @@ -107,133 +86,176 @@ int fcgi_spawn_connection(char *appPath, char **appArgv, char *addr, unsigned sh fcgi_addr = (struct sockaddr *) &fcgi_addr_in; } - /* open socket */ if (-1 == (fcgi_fd = socket(socket_type, SOCK_STREAM, 0))) { fprintf(stderr, "%s.%d\n", __FILE__, __LINE__); return -1; } - val = 1; - if (setsockopt(fcgi_fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)) < 0) { - fprintf(stderr, "%s.%d\n", - __FILE__, __LINE__); - return -1; - } + if (-1 == connect(fcgi_fd, fcgi_addr, servlen)) { + /* server is not up, spawn in */ + pid_t child; + int val; - /* create socket */ - if (-1 == bind(fcgi_fd, fcgi_addr, servlen)) { - fprintf(stderr, "%s.%d: bind failed: %s\n", - __FILE__, __LINE__, - strerror(errno)); - return -1; - } + if (unixsocket) unlink(unixsocket); - if (-1 == listen(fcgi_fd, 1024)) { - fprintf(stderr, "%s.%d: fd = -1\n", - __FILE__, __LINE__); - return -1; - } - - if (!nofork) { - child = fork(); - } else { - child = 0; - } - - switch (child) { - case 0: { - char cgi_childs[64]; + close(fcgi_fd); - int i = 0; + /* reopen socket */ + if (-1 == (fcgi_fd = socket(socket_type, SOCK_STREAM, 0))) { + fprintf(stderr, "%s.%d\n", + __FILE__, __LINE__); + return -1; + } - /* is safe as we limit to 256 childs */ - sprintf(cgi_childs, "PHP_FCGI_CHILDREN=%d", child_count); + val = 1; + if (setsockopt(fcgi_fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)) < 0) { + fprintf(stderr, "%s.%d\n", + __FILE__, __LINE__); + return -1; + } - if(fcgi_fd != FCGI_LISTENSOCK_FILENO) { - close(FCGI_LISTENSOCK_FILENO); - dup2(fcgi_fd, FCGI_LISTENSOCK_FILENO); - close(fcgi_fd); + /* create socket */ + if (-1 == bind(fcgi_fd, fcgi_addr, servlen)) { + fprintf(stderr, "%s.%d: bind failed: %s\n", + __FILE__, __LINE__, + strerror(errno)); + return -1; } - /* we don't need the client socket */ - for (i = 3; i < 256; i++) { - close(i); + if (-1 == listen(fcgi_fd, 1024)) { + fprintf(stderr, "%s.%d: fd = -1\n", + __FILE__, __LINE__); + return -1; } - /* create environment */ + while (fork_count-- > 0) { - putenv(cgi_childs); + if (!nofork) { + child = fork(); + } else { + child = 0; + } - /* fork and replace shell */ - if (appArgv) { - execv(appArgv[0], appArgv); + switch (child) { + case 0: { + char cgi_childs[64]; + int max_fd = 0; - } else { - char *b = malloc(strlen("exec ") + strlen(appPath) + 1); - strcpy(b, "exec "); - strcat(b, appPath); + int i = 0; - /* exec the cgi */ - execl("/bin/sh", "sh", "-c", b, (char *)NULL); - } + /* loose control terminal */ + setsid(); - exit(errno); + /* is safe as we limit to 256 childs */ + sprintf(cgi_childs, "PHP_FCGI_CHILDREN=%d", child_count); - break; - } - case -1: - /* error */ - break; - default: - /* father */ - - /* wait */ - select(0, NULL, NULL, NULL, &tv); - - switch (waitpid(child, &status, WNOHANG)) { - case 0: - fprintf(stderr, "%s.%d: child spawned successfully: PID: %d\n", - __FILE__, __LINE__, - child); + if(fcgi_fd != FCGI_LISTENSOCK_FILENO) { + close(FCGI_LISTENSOCK_FILENO); + dup2(fcgi_fd, FCGI_LISTENSOCK_FILENO); + close(fcgi_fd); + } - /* write pid file */ - if (pid_fd != -1) { - /* assume a 32bit pid_t */ - char pidbuf[12]; + max_fd = open("/dev/null", O_RDWR); + close(STDERR_FILENO); + dup2(max_fd, STDERR_FILENO); + close(max_fd); - snprintf(pidbuf, sizeof(pidbuf) - 1, "%d", child); + max_fd = open("/dev/null", O_RDWR); + close(STDOUT_FILENO); + dup2(max_fd, STDOUT_FILENO); + close(max_fd); - write(pid_fd, pidbuf, strlen(pidbuf)); - close(pid_fd); - pid_fd = -1; - } + /* we don't need the client socket */ + for (i = 3; i < max_fd; i++) { + if (i != FCGI_LISTENSOCK_FILENO) close(i); + } - break; - case -1: - break; - default: - if (WIFEXITED(status)) { - fprintf(stderr, "%s.%d: child exited with: %d, %s\n", - __FILE__, __LINE__, - WEXITSTATUS(status), strerror(WEXITSTATUS(status))); - } else if (WIFSIGNALED(status)) { - fprintf(stderr, "%s.%d: child signaled: %d\n", - __FILE__, __LINE__, - WTERMSIG(status)); - } else { - fprintf(stderr, "%s.%d: child died somehow: %d\n", - __FILE__, __LINE__, - status); + /* create environment */ + + putenv(cgi_childs); + + /* fork and replace shell */ + if (appArgv) { + execv(appArgv[0], appArgv); + + } else { + char *b = malloc(strlen("exec ") + strlen(appPath) + 1); + strcpy(b, "exec "); + strcat(b, appPath); + + /* exec the cgi */ + execl("/bin/sh", "sh", "-c", b, (char *)NULL); + } + + exit(errno); + + break; + } + case -1: + /* error */ + break; + default: + /* father */ + + /* wait */ + select(0, NULL, NULL, NULL, &tv); + + switch (waitpid(child, &status, WNOHANG)) { + case 0: + fprintf(stdout, "%s.%d: child spawned successfully: PID: %d\n", + __FILE__, __LINE__, + child); + + /* write pid file */ + if (pid_fd != -1) { + /* assume a 32bit pid_t */ + char pidbuf[12]; + + snprintf(pidbuf, sizeof(pidbuf) - 1, "%d", child); + + write(pid_fd, pidbuf, strlen(pidbuf)); + /* avoid eol for the last one */ + if (fork_count != 0) { + write(pid_fd, "\n", 1); + } + } + + break; + case -1: + break; + default: + if (WIFEXITED(status)) { + fprintf(stderr, "%s.%d: child exited with: %d\n", + __FILE__, __LINE__, WEXITSTATUS(status)); + rc = WEXITSTATUS(status); + } else if (WIFSIGNALED(status)) { + fprintf(stderr, "%s.%d: child signaled: %d\n", + __FILE__, __LINE__, + WTERMSIG(status)); + rc = 1; + } else { + fprintf(stderr, "%s.%d: child died somehow: %d\n", + __FILE__, __LINE__, + status); + rc = status; + } + } + + break; } } - - break; + close(pid_fd); + pid_fd = -1; + } else { + fprintf(stderr, "%s.%d: socket is already used, can't spawn\n", + __FILE__, __LINE__); + return -1; } close(fcgi_fd); - return 0; + return rc; } @@ -256,6 +278,7 @@ void show_help () { " -p <port> bind to tcp-port\n" \ " -s <path> bind to unix-domain socket\n" \ " -C <childs> (PHP only) numbers of childs to spawn (default 5)\n" \ +" -F <childs> numbers of childs to fork (default 1)\n" \ " -P <path> name of PID-file for spawed process\n" \ " -n no fork (for daemontools)\n" \ " -v show version\n" \ @@ -276,20 +299,21 @@ int main(int argc, char **argv) { char **fcgi_app_argv = { NULL }; unsigned short port = 0; int child_count = 5; + int fork_count = 1; int i_am_root, o; int pid_fd = -1; int nofork = 0; struct sockaddr_un un; - const size_t sun_path_len = sizeof(un.sun_path); i_am_root = (getuid() == 0); - while(-1 != (o = getopt(argc, argv, "c:f:g:hna:p:u:vC:s:P:"))) { + while (-1 != (o = getopt(argc, argv, "c:f:g:hna:p:u:vC:F:s:P:"))) { switch(o) { case 'f': fcgi_app = optarg; break; case 'a': addr = optarg;/* ip addr */ break; case 'p': port = strtol(optarg, NULL, 10);/* port */ break; case 'C': child_count = strtol(optarg, NULL, 10);/* */ break; + case 'F': fork_count = strtol(optarg, NULL, 10);/* */ break; case 's': unixsocket = optarg; /* unix-domain socket */ break; case 'c': if (i_am_root) { changeroot = optarg; }/* chroot() */ break; case 'u': if (i_am_root) { username = optarg; } /* set user */ break; @@ -321,7 +345,7 @@ int main(int argc, char **argv) { return -1; } - if (unixsocket && strlen(unixsocket) > sun_path_len - 1) { + if (unixsocket && strlen(unixsocket) > sizeof(un.sun_path) - 1) { fprintf(stderr, "%s.%d: %s\n", __FILE__, __LINE__, "path of the unix socket is too long\n"); @@ -416,18 +440,15 @@ int main(int argc, char **argv) { "I will not set gid to 0\n"); return -1; } - } - /* - * Change group before chroot, when we have access - * to /etc/group - */ - if (groupname) { + /* do the change before we do the chroot() */ setgid(grp->gr_gid); - setgroups(0, NULL); + setgroups(0, NULL); + if (username) { initgroups(username, grp->gr_gid); } + } if (changeroot) { @@ -451,7 +472,7 @@ int main(int argc, char **argv) { } } - return fcgi_spawn_connection(fcgi_app, fcgi_app_argv, addr, port, unixsocket, child_count, pid_fd, nofork); + return fcgi_spawn_connection(fcgi_app, fcgi_app_argv, addr, port, unixsocket, fork_count, child_count, pid_fd, nofork); } #else int main() { diff --git a/src/stat_cache.c b/src/stat_cache.c index 9325693..fa94eed 100644 --- a/src/stat_cache.c +++ b/src/stat_cache.c @@ -445,7 +445,9 @@ handler_t stat_cache_get_entry(server *srv, connection *con, buffer *name, stat_ /* dir-check */ if (srv->srvconf.stat_cache_engine == STAT_CACHE_ENGINE_FAM) { if (0 != buffer_copy_dirname(sc->dir_name, name)) { - SEGFAULT(); + log_error_write(srv, __FILE__, __LINE__, "sb", + "no '/' found in filename:", name); + return HANDLER_ERROR; } buffer_copy_string_buffer(sc->hash_key, sc->dir_name); |