httpd/httpd-2.4.54-selinux.patch

61 lines
1.6 KiB
Diff
Raw Normal View History

2020-03-31 14:30:12 +00:00
diff --git a/configure.in b/configure.in
2022-06-09 22:05:19 +00:00
index 74015ca..8c0ee10 100644
2020-03-31 14:30:12 +00:00
--- a/configure.in
+++ b/configure.in
2022-06-09 22:05:19 +00:00
@@ -508,6 +508,11 @@ getloadavg
dnl confirm that a void pointer is large enough to store a long integer
APACHE_CHECK_VOID_PTR_LEN
+AC_CHECK_LIB(selinux, is_selinux_enabled, [
+ AC_DEFINE(HAVE_SELINUX, 1, [Defined if SELinux is supported])
+ APR_ADDTO(HTTPD_LIBS, [-lselinux])
+])
+
AC_CACHE_CHECK([for gettid()], ac_cv_gettid,
[AC_TRY_RUN(#define _GNU_SOURCE
#include <unistd.h>
2020-03-31 14:30:12 +00:00
diff --git a/server/core.c b/server/core.c
2022-06-09 22:05:19 +00:00
index a6fa2fb..cf4cba4 100644
2020-03-31 14:30:12 +00:00
--- a/server/core.c
+++ b/server/core.c
2022-06-09 22:05:19 +00:00
@@ -65,6 +65,10 @@
#include <unistd.h>
#endif
+#ifdef HAVE_SELINUX
+#include <selinux/selinux.h>
+#endif
+
/* LimitRequestBody handling */
#define AP_LIMIT_REQ_BODY_UNSET ((apr_off_t) -1)
2022-06-09 22:05:19 +00:00
#define AP_DEFAULT_LIMIT_REQ_BODY ((apr_off_t) 1<<30) /* 1GB */
@@ -5150,6 +5154,28 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte
}
#endif
+#ifdef HAVE_SELINUX
+ {
+ static int already_warned = 0;
+ int is_enabled = is_selinux_enabled() > 0;
+
2005-12-02 10:43:00 +00:00
+ if (is_enabled && !already_warned) {
+ security_context_t con;
+
+ if (getcon(&con) == 0) {
+
+ ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, NULL,
+ "SELinux policy enabled; "
+ "httpd running as context %s", con);
+
+ already_warned = 1;
+
+ freecon(con);
+ }
+ }
+ }
+#endif
+
return OK;
}