[refpolicy] [PATCH 05/13] Move use of httpd_t from mojomojo.te to apache.te

[jwcart2@tycho.nsa.gov (James Carter)]

The type httpd_t is actually declared in apache.te.

Created apache.if:apache_rw_stream_sockets() which allows
reading and writing unix domain stream sockets labeled httpd_t.

Modified mojomojo.te to use the new interface instead of
This is needed by the module mojomojo which had been referring to
httpd_t directly.

Signed-off-by: James Carter <jwcart2@tycho.nsa.gov>
---
 apache.if   | 19 +++++++++++++++++++
 mojomojo.te |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/apache.if b/apache.if
index 135e2f5..94878d6 100644
--- a/apache.if
+++ b/apache.if
@@ -373,6 +373,25 @@ interface(`apache_dontaudit_rw_stream_sockets',`
 
 ########################################
 ## <summary>
+##	Read and write httpd unix domain
+##      stream sockets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`apache_rw_stream_sockets',`
+	gen_require(`
+		type httpd_t;
+	')
+
+	allow $1 httpd_t:unix_stream_socket rw_stream_socket_perms;
+')
+
+########################################
+## <summary>
 ##	Do not audit attempts to read and
 ##	write httpd TCP sockets.
 ## </summary>
diff --git a/mojomojo.te b/mojomojo.te
index 8f4d477..ea853ce 100644
--- a/mojomojo.te
+++ b/mojomojo.te
@@ -12,7 +12,7 @@ apache_content_template(mojomojo)
 # Local policy
 #
 
-allow httpd_mojomojo_script_t httpd_t:unix_stream_socket rw_stream_socket_perms;
+apache_rw_stream_sockets(httpd_mojomojo_script_t)
 
 corenet_sendrecv_smtp_client_packets(httpd_mojomojo_script_t)
 corenet_tcp_connect_smtp_port(httpd_mojomojo_script_t)
-- 
2.13.6