[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/contrib/

[Sven Vermeulen]

commit:     e8d04403970e4e7b8461e588b413b8769031e618
Author:     Dominick Grift <dominick.grift <AT> gmail <DOT> com>
AuthorDate: Fri Sep 28 10:09:59 2012 +0000
Commit:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
CommitDate: Fri Sep 28 17:42:46 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=e8d04403

Changes to the discc policy module

Add init script file type
Add distcc_admin()
Add missing file contexts
Module clean up

Signed-off-by: Dominick Grift <dominick.grift <AT> gmail.com>

---
 policy/modules/contrib/distcc.fc |    5 ++++
 policy/modules/contrib/distcc.if |   43 +++++++++++++++++++++++++++++++++++++-
 policy/modules/contrib/distcc.te |   31 +++++++++++---------------
 3 files changed, 60 insertions(+), 19 deletions(-)

diff --git a/policy/modules/contrib/distcc.fc b/policy/modules/contrib/distcc.fc
index 6ce6b00..7b9fb3f 100644
--- a/policy/modules/contrib/distcc.fc
+++ b/policy/modules/contrib/distcc.fc
@@ -1,2 +1,7 @@
+/etc/rc\.d/init\.d/distccd	--	gen_context(system_u:object_r:distccd_initrc_exec_t,s0)
 
 /usr/bin/distccd	--	gen_context(system_u:object_r:distccd_exec_t,s0)
+
+/var/log/distccd.*	--	gen_context(system_u:object_r:distccd_log_t,s0)
+
+/var/run/distccd\.pid	--	gen_context(system_u:object_r:distccd_var_run_t,s0)

diff --git a/policy/modules/contrib/distcc.if b/policy/modules/contrib/distcc.if
index 926e959..24d8c74 100644
--- a/policy/modules/contrib/distcc.if
+++ b/policy/modules/contrib/distcc.if
@@ -1 +1,42 @@
-## <summary>Distributed compiler daemon</summary>
+## <summary>Distributed compiler daemon.</summary>
+
+########################################
+## <summary>
+##	All of the rules required to
+##	administrate an distcc environment.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <param name="role">
+##	<summary>
+##	Role allowed access.
+##	</summary>
+## </param>
+## <rolecap/>
+#
+interface(`distcc_admin',`
+	gen_require(`
+		type distccd_t, distccd_t, distccd_log_t;
+		type disccd_var_run_t, distccd_tmp_t, distccd_initrc_exec_t;
+	')
+
+	allow $1 distccd_t:process { ptrace signal_perms };
+	ps_process_pattern($1, distccd_t)
+
+	init_labeled_script_domtrans($1, distccd_initrc_exec_t)
+	domain_system_change_exemption($1)
+	role_transition $2 distccd_initrc_exec_t system_r;
+	allow $2 system_r;
+
+	logging_search_logs($1)
+	admin_pattern($1, distccd_log_t)
+
+	files_search_tmp($1)
+	admin_pattern($1, distccd_tmp_t)
+
+	files_search_pids($1)
+	admin_pattern($1, distccd_var_run_t)
+')

diff --git a/policy/modules/contrib/distcc.te b/policy/modules/contrib/distcc.te
index 54d93e8..b441a4d 100644
--- a/policy/modules/contrib/distcc.te
+++ b/policy/modules/contrib/distcc.te
@@ -1,4 +1,4 @@
-policy_module(distcc, 1.8.0)
+policy_module(distcc, 1.8.2)
 
 ########################################
 #
@@ -9,6 +9,9 @@ type distccd_t;
 type distccd_exec_t;
 init_daemon_domain(distccd_t, distccd_exec_t)
 
+type distccd_initrc_exec_t;
+init_script_file(distccd_initrc_exec_t)
+
 type distccd_log_t;
 logging_log_file(distccd_log_t)
 
@@ -27,11 +30,11 @@ allow distccd_t self:capability { setgid setuid };
 dontaudit distccd_t self:capability sys_tty_config;
 allow distccd_t self:process { signal_perms setsched };
 allow distccd_t self:fifo_file rw_fifo_file_perms;
-allow distccd_t self:netlink_route_socket r_netlink_socket_perms;
-allow distccd_t self:tcp_socket create_stream_socket_perms;
-allow distccd_t self:udp_socket create_socket_perms;
+allow distccd_t self:tcp_socket { accept listen };
 
-allow distccd_t distccd_log_t:file manage_file_perms;
+allow distccd_t distccd_log_t:file append_file_perms;
+allow distccd_t distccd_log_t:file create_file_perms;
+allow distccd_t distccd_log_t:file setattr_file_perms;
 logging_log_filetrans(distccd_t, distccd_log_t, file)
 
 manage_dirs_pattern(distccd_t, distccd_tmp_t, distccd_tmp_t)
@@ -47,14 +50,12 @@ kernel_read_kernel_sysctls(distccd_t)
 corenet_all_recvfrom_unlabeled(distccd_t)
 corenet_all_recvfrom_netlabel(distccd_t)
 corenet_tcp_sendrecv_generic_if(distccd_t)
-corenet_udp_sendrecv_generic_if(distccd_t)
 corenet_tcp_sendrecv_generic_node(distccd_t)
-corenet_udp_sendrecv_generic_node(distccd_t)
-corenet_tcp_sendrecv_all_ports(distccd_t)
-corenet_udp_sendrecv_all_ports(distccd_t)
 corenet_tcp_bind_generic_node(distccd_t)
-corenet_tcp_bind_distccd_port(distccd_t)
+
 corenet_sendrecv_distccd_server_packets(distccd_t)
+corenet_tcp_bind_distccd_port(distccd_t)
+corenet_tcp_sendrecv_distccd_port(distccd_t)
 
 dev_read_sysfs(distccd_t)
 
@@ -62,29 +63,23 @@ fs_getattr_all_fs(distccd_t)
 fs_search_auto_mountpoints(distccd_t)
 
 corecmd_exec_bin(distccd_t)
-corecmd_read_bin_symlinks(distccd_t)
 
 domain_use_interactive_fds(distccd_t)
 
-files_read_etc_files(distccd_t)
 files_read_etc_runtime_files(distccd_t)
 
+auth_use_nsswitch(distccd_t)
+
 libs_exec_lib_files(distccd_t)
 
 logging_send_syslog_msg(distccd_t)
 
 miscfiles_read_localization(distccd_t)
 
-sysnet_read_config(distccd_t)
-
 userdom_dontaudit_use_unpriv_user_fds(distccd_t)
 userdom_dontaudit_search_user_home_dirs(distccd_t)
 
 optional_policy(`
-	nis_use_ypbind(distccd_t)
-')
-
-optional_policy(`
 	seutil_sigchld_newrole(distccd_t)
 ')