Commit 40bb4ca3 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1341905, r1342065, r1341930, r1345147, r1344712, r1814465 from trunk: 

suexec: Add support for logging to syslog as an alternative to a
logfile.

* support/suexec.c (err_output) [AP_LOG_SYSLOG]: Log to syslog.
  (main): Close syslog fd if open, before execv.  Add -V output
  for AP_LOG_SYSLOG.

* configure.in: Add --with-suexec-syslog argument; allow
  --without-suexec-logfile to omit definition of AP_LOG_EXEC.


suexec: Support use of setgid/setuid capability bits on Linux, a
weaker set of privileges than the full setuid/setgid root binary.

* configure.in: Add --enable-suexec-capabilites flag.

* Makefile.in: If configured, use setcap instead of chmod 7555 on
  installed suexec binary.

* modules/arch/unix/mod_unixd.c (unixd_pre_config): Drop test for
  setuid bit if capability bits are used.

* docs/manual/: Add docs.


* docs/manual/suexec.html.en: Update for syslog logging.


* configure.in: Correct handling of --with-suexec-logfile in r1341905,
  thanks to rpluem.


* support/suexec.c: Define AP_LOG_FACILITY.
  (err_output): Use AP_LOG_FACILITY for syslog facility.

Suggested by: kbrand


* configure.in: Fix help text for --with-suexec-syslog.

Submitted by: jorton
Reviewed by: jorton, ylavic, jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1832565 13f79535-47bb-0310-9956-ffa450edef68
parent 49907943

CHANGES

+8 −0
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.4.34



  *) suexec: Add --enable-suexec-capabilites support on Linux, to use

     setuid/setgid capability bits rather than a setuid root binary.

     [Joe Orton]



  *) suexec: Add support for logging to syslog as an alternative to

     logging to a file; use --without-suexec-logfile --with-suexec-syslog.

     [Joe Orton]



  *) mod_ssl: Restore 2.4.29 behaviour in SSL vhost merging/enabling

     which broke some rare but previously-working configs.  [Joe Orton]

Makefile.in

+13 −2
Original line number Diff line number Diff line
@@ -269,13 +269,24 @@ install-man: 
	  cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \

	fi



install-suexec:

install-suexec: install-suexec-binary install-suexec-$(INSTALL_SUEXEC)



install-suexec-binary:

	@if test -f $(builddir)/support/suexec; then \

            test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir); \

            $(INSTALL_PROGRAM) $(top_builddir)/support/suexec $(DESTDIR)$(sbindir); \

	fi



install-suexec-setuid:

	@if test -f $(builddir)/support/suexec; then \

	    chmod 4755 $(DESTDIR)$(sbindir)/suexec; \

	fi



install-suexec-caps:

	@if test -f $(builddir)/support/suexec; then \

            setcap 'cap_setuid,cap_setgid+pe' $(DESTDIR)$(sbindir)/suexec; \

	fi



suexec:

	cd support && $(MAKE) suexec

STATUS

+0 −11
Original line number Diff line number Diff line
@@ -135,17 +135,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) suexec: Support logging to syslog and Linux capabilities.

     trunk patch: http://svn.apache.org/r1341905

                  http://svn.apache.org/r1341930

                  http://svn.apache.org/r1342065

                  http://svn.apache.org/r1345147

                  http://svn.apache.org/r1344712

                  http://svn.apache.org/r1814465

     2.4.x patch: http://people.apache.org/~jorton/ap_suexec_jumbo.patch

         or svn merge -c 1341905,1342065,1341930,1345147,1344712,1814465 ^/httpd/httpd/trunk .

     +1: jorton, ylavic, jim



  *) mod_http2: Restore keepalive timing of v1.10.16, see https://github.com/icing/mod_h2/issues/160.

     trunk patch: http://svn.apache.org/1830562

     2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/h2_keepalive_restore.patch

configure.in

+29 −1
Original line number Diff line number Diff line
@@ -744,7 +744,26 @@ APACHE_HELP_STRING(--with-suexec-gidmin,Minimal allowed GID),[ 


AC_ARG_WITH(suexec-logfile,

APACHE_HELP_STRING(--with-suexec-logfile,Set the logfile),[

  AC_DEFINE_UNQUOTED(AP_LOG_EXEC, "$withval", [SuExec log file] ) ] )

  if test "x$withval" = "xyes"; then

    AC_MSG_ERROR([log filename required for --with-suexec-logfile option])

  elif test "x$withval" != "xno"; then

    AC_DEFINE_UNQUOTED(AP_LOG_EXEC, "$withval", [SuExec log file])

  fi

])



AC_ARG_WITH(suexec-syslog,

APACHE_HELP_STRING(--with-suexec-syslog,Use syslog for suexec logging),[

  if test $withval = "yes"; then

    if test "x${with_suexec_logfile}" != "xno"; then

      AC_MSG_NOTICE([hint: use "--without-suexec-logfile --with-suexec-syslog"])

      AC_MSG_ERROR([suexec does not support both logging to file and syslog])

    fi

    AC_CHECK_FUNCS([vsyslog], [], [

       AC_MSG_ERROR([cannot support syslog from suexec without vsyslog()])])

    AC_DEFINE(AP_LOG_SYSLOG, 1, [SuExec log to syslog])

  fi    

])





AC_ARG_WITH(suexec-safepath,

APACHE_HELP_STRING(--with-suexec-safepath,Set the safepath),[
@@ -754,6 +773,15 @@ AC_ARG_WITH(suexec-umask, 
APACHE_HELP_STRING(--with-suexec-umask,umask for suexec'd process),[

  AC_DEFINE_UNQUOTED(AP_SUEXEC_UMASK, 0$withval, [umask for suexec'd process] ) ] )



INSTALL_SUEXEC=setuid

AC_ARG_ENABLE([suexec-capabilities], 

APACHE_HELP_STRING(--enable-suexec-capabilities,Use Linux capability bits not setuid root suexec), [

INSTALL_SUEXEC=caps

AC_DEFINE(AP_SUEXEC_CAPABILITIES, 1, 

          [Enable if suexec is installed with Linux capabilities, not setuid])

])

APACHE_SUBST(INSTALL_SUEXEC)



dnl APR should go after the other libs, so the right symbols can be picked up

if test x${apu_found} != xobsolete; then

  AP_LIBS="$AP_LIBS `$apu_config --avoid-ldap --link-libtool --libs`"

docs/manual/suexec.html.en

+28 −4
Original line number Diff line number Diff line
@@ -374,6 +374,21 @@ 
      together with the <code>--enable-suexec</code> option to let

      APACI accept your request for using the suEXEC feature.</dd>



      <dt><code>--enable-suexec-capabilities</code></dt>



      <dd><strong>Linux specific:</strong> Normally,

      the <code>suexec</code> binary is installed "setuid/setgid

      root", which allows it to run with the full privileges of the

      root user.  If this option is used, the <code>suexec</code>

      binary will instead be installed with only the setuid/setgid

      "capability" bits set, which is the subset of full root

      priviliges required for suexec operation.  Note that

      the <code>suexec</code> binary may not be able to write to a log

      file in this mode; it is recommended that the

      <code>--with-suexec-syslog --without-suexec-logfile</code>

      options are used in conjunction with this mode, so that syslog

      logging is used instead.</dd>



      <dt><code>--with-suexec-bin=<em>PATH</em></code></dt>



      <dd>The path to the <code>suexec</code> binary must be hard-coded
@@ -435,6 +450,12 @@ 
      "<code>suexec_log</code>" and located in your standard logfile

      directory (<code>--logfiledir</code>).</dd>



      <dt><code>--with-suexec-syslog</code></dt>



      <dd>If defined, suexec will log notices and errors to syslog

      instead of a logfile.  This option must be combined

      with <code>--without-suexec-logfile</code>.</dd>



      <dt><code>--with-suexec-safepath=<em>PATH</em></code></dt>



      <dd>Define a safe PATH environment to pass to CGI
@@ -550,9 +571,12 @@ Group webgroup</pre> 


    <p>The suEXEC wrapper will write log information

    to the file defined with the <code>--with-suexec-logfile</code>

    option as indicated above. If you feel you have configured and

    installed the wrapper properly, have a look at this log and the

    error_log for the server to see where you may have gone astray.</p>

    option as indicated above, or to syslog if <code>--with-suexec-syslog</code>

    is used. If you feel you have configured and

    installed the wrapper properly, have a look at the log and the

    error_log for the server to see where you may have gone astray. 

    The output of <code>"suexec -V"</code> will show the options

    used to compile suexec, if using a binary distribution.</p>



</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>

<div class="section">