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

[Sven Vermeulen]

commit:     862050dcd2025c7b7331c89601beca3bf44b1422
Author:     Dominick Grift <dominick.grift <AT> gmail <DOT> com>
AuthorDate: Sun Oct 28 17:04:28 2012 +0000
Commit:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
CommitDate: Sun Oct 28 17:59:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=862050dc

Changes to the spamassassin policy module and relevant dependendies

Ported from Fedora with changes

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

---
 policy/modules/contrib/razor.if        |   41 ++++
 policy/modules/contrib/razor.te        |    2 +-
 policy/modules/contrib/spamassassin.fc |   17 ++-
 policy/modules/contrib/spamassassin.if |  107 +++++++---
 policy/modules/contrib/spamassassin.te |  350 ++++++++++++++++++++------------
 5 files changed, 352 insertions(+), 165 deletions(-)

diff --git a/policy/modules/contrib/razor.if b/policy/modules/contrib/razor.if
index 9ea7d52..1e4b523 100644
--- a/policy/modules/contrib/razor.if
+++ b/policy/modules/contrib/razor.if
@@ -87,3 +87,44 @@ interface(`razor_domtrans',`
 	corecmd_search_bin($1)
 	domtrans_pattern($1, razor_exec_t, system_razor_t)
 ')
+
+########################################
+## <summary>
+##	Create, read, write, and delete
+##	razor home content.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`razor_manage_home_content',`
+	gen_require(`
+		type razor_home_t;
+	')
+
+	userdom_search_user_home_dirs($1)
+	allow $1 razor_home_t:dir manage_dir_perms;
+	allow $1 razor_home_t:file manage_file_perms;
+	allow $1 razor_home_t:lnk_file manage_lnk_file_perms;
+')
+
+########################################
+## <summary>
+##	Read razor lib files.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`razor_read_lib_files',`
+	gen_require(`
+		type razor_var_lib_t;
+	')
+
+	files_search_var_lib($1)
+	read_files_pattern($1, razor_var_lib_t, razor_var_lib_t)
+')

diff --git a/policy/modules/contrib/razor.te b/policy/modules/contrib/razor.te
index b92caa1..5ddedbc 100644
--- a/policy/modules/contrib/razor.te
+++ b/policy/modules/contrib/razor.te
@@ -1,4 +1,4 @@
-policy_module(razor, 2.3.1)
+policy_module(razor, 2.3.2)
 
 ########################################
 #

diff --git a/policy/modules/contrib/spamassassin.fc b/policy/modules/contrib/spamassassin.fc
index 06e1313..e9bd097 100644
--- a/policy/modules/contrib/spamassassin.fc
+++ b/policy/modules/contrib/spamassassin.fc
@@ -1,16 +1,31 @@
 HOME_DIR/\.spamassassin(/.*)?	gen_context(system_u:object_r:spamassassin_home_t,s0)
 HOME_DIR/\.spamd(/.*)?	gen_context(system_u:object_r:spamd_home_t,s0)
 
+/etc/rc\.d/init\.d/spamd	--	gen_context(system_u:object_r:spamd_initrc_exec_t,s0)
+/etc/rc\.d/init\.d/spampd	--	gen_context(system_u:object_r:spamd_initrc_exec_t,s0)
+/etc/rc\.d/init\.d/mimedefang.*	--	gen_context(system_u:object_r:spamd_initrc_exec_t,s0)
+
 /usr/bin/sa-learn	--	gen_context(system_u:object_r:spamc_exec_t,s0)
-/usr/bin/spamassassin	--	gen_context(system_u:object_r:spamassassin_exec_t,s0)
+/usr/bin/spamassassin	--	gen_context(system_u:object_r:spamc_exec_t,s0)
 /usr/bin/spamc	--	gen_context(system_u:object_r:spamc_exec_t,s0)
 /usr/bin/spamd	--	gen_context(system_u:object_r:spamd_exec_t,s0)
+/usr/bin/sa-update	--	gen_context(system_u:object_r:spamd_update_exec_t,s0)
 
 /usr/sbin/spamd	--	gen_context(system_u:object_r:spamd_exec_t,s0)
+/usr/sbin/spampd	--	gen_context(system_u:object_r:spamd_exec_t,s0)
+/usr/bin/mimedefang	--	gen_context(system_u:object_r:spamd_exec_t,s0)
+/usr/bin/mimedefang-multiplexor	--	gen_context(system_u:object_r:spamd_exec_t,s0)
 
 /var/lib/spamassassin(/.*)?	gen_context(system_u:object_r:spamd_var_lib_t,s0)
+/var/lib/spamassassin/compiled(/.*)?	gen_context(system_u:object_r:spamd_compiled_t,s0)
+
+/var/log/spamd\.log.*	--	gen_context(system_u:object_r:spamd_log_t,s0)
+/var/log/mimedefang.*	--	gen_context(system_u:object_r:spamd_log_t,s0)
 
 /var/run/spamassassin(/.*)?	gen_context(system_u:object_r:spamd_var_run_t,s0)
 
 /var/spool/spamassassin(/.*)?	gen_context(system_u:object_r:spamd_spool_t,s0)
 /var/spool/spamd(/.*)?	gen_context(system_u:object_r:spamd_spool_t,s0)
+/var/spool/spampd(/.*)?	gen_context(system_u:object_r:spamd_spool_t,s0)
+/var/spool/MD-Quarantine(/.*)?	gen_context(system_u:object_r:spamd_var_run_t,s0)
+/var/spool/MIMEDefang(/.*)?	gen_context(system_u:object_r:spamd_var_run_t,s0)

diff --git a/policy/modules/contrib/spamassassin.if b/policy/modules/contrib/spamassassin.if
index f2d1fa0..b180439 100644
--- a/policy/modules/contrib/spamassassin.if
+++ b/policy/modules/contrib/spamassassin.if
@@ -2,41 +2,39 @@
 
 ########################################
 ## <summary>
-##	Role access for spamassassin
+##	Role access for spamassassin.
 ## </summary>
 ## <param name="role">
 ##	<summary>
-##	Role allowed access
+##	Role allowed access.
 ##	</summary>
 ## </param>
 ## <param name="domain">
 ##	<summary>
-##	User domain for the role
+##	User domain for the role.
 ##	</summary>
 ## </param>
 #
 interface(`spamassassin_role',`
 	gen_require(`
 		type spamc_t, spamc_exec_t, spamc_tmp_t;
-		type spamassassin_t, spamassassin_exec_t;
+		type spamassassin_t, spamassassin_exec_t, spamd_home_t;
 		type spamassassin_home_t, spamassassin_tmp_t;
 	')
 
 	role $1 types { spamc_t spamassassin_t };
 
 	domtrans_pattern($2, spamassassin_exec_t, spamassassin_t)
-	ps_process_pattern($2, spamassassin_t)
-
 	domtrans_pattern($2, spamc_exec_t, spamc_t)
-	ps_process_pattern($2, spamc_t)
-
-	manage_dirs_pattern($2, spamassassin_home_t, spamassassin_home_t)
-	manage_files_pattern($2, spamassassin_home_t, spamassassin_home_t)
-	manage_lnk_files_pattern($2, spamassassin_home_t, spamassassin_home_t)
-	relabel_dirs_pattern($2, spamassassin_home_t, spamassassin_home_t)
-	relabel_files_pattern($2, spamassassin_home_t, spamassassin_home_t)
-	relabel_lnk_files_pattern($2, spamassassin_home_t, spamassassin_home_t)
+
+	allow $2 { spamc_t spamassassin_t}:process { ptrace signal_perms };
+	ps_process_pattern($2, { spamc_t spamassassin_t })
+
+	allow $2 { spamc_tmp_t spamd_home_t spamassassin_home_t spamassassin_tmp_t }:dir { manage_dir_perms relabel_dir_perms };
+	allow $2 { spamc_tmp_t spamd_home_t spamassassin_home_t spamassassin_tmp_t }:file { manage_file_perms relabel_file_perms };
+	allow $2 { spamc_tmp_t spamd_home_t spamassassin_home_t spamassassin_tmp_t }:lnk_file { manage_lnk_file_perms relabel_lnk_file_perms };
 	userdom_user_home_dir_filetrans($2, spamassassin_home_t, dir, ".spamassassin")
+	userdom_user_home_dir_filetrans($2, spamassassin_home_t, dir, ".spamd")
 ')
 
 ########################################
@@ -55,13 +53,13 @@ interface(`spamassassin_exec',`
 		type spamassassin_exec_t;
 	')
 
+	corecmd_search_bin($1)
 	can_exec($1, spamassassin_exec_t)
-
 ')
 
 ########################################
 ## <summary>
-##	Singnal the spam assassin daemon
+##	Send generic signals to spamd.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79,8 +77,7 @@ interface(`spamassassin_signal_spamd',`
 
 ########################################
 ## <summary>
-##	Execute the spamassassin daemon
-##	program in the caller directory.
+##	Execute spamd in the caller domain.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -93,12 +90,13 @@ interface(`spamassassin_exec_spamd',`
 		type spamd_exec_t;
 	')
 
+	corecmd_search_bin($1)
 	can_exec($1, spamd_exec_t)
 ')
 
 ########################################
 ## <summary>
-##	Execute spamassassin client in the spamassassin client domain.
+##	Execute spamc in the spamc domain.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -111,13 +109,13 @@ interface(`spamassassin_domtrans_client',`
 		type spamc_t, spamc_exec_t;
 	')
 
+	corecmd_search_bin($1)
 	domtrans_pattern($1, spamc_exec_t, spamc_t)
 ')
 
 ########################################
 ## <summary>
-##	Execute the spamassassin client
-##	program in the caller directory.
+##	Execute spamc in the caller domain.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -130,12 +128,13 @@ interface(`spamassassin_exec_client',`
 		type spamc_exec_t;
 	')
 
+	corecmd_search_bin($1)
 	can_exec($1, spamc_exec_t)
 ')
 
 ########################################
 ## <summary>
-##	Send kill signals to spamassassin client.
+##	Send kill signals to spamc.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -153,7 +152,8 @@ interface(`spamassassin_kill_client',`
 
 ########################################
 ## <summary>
-##	Execute spamassassin standalone client in the user spamassassin domain.
+##	Execute spamassassin standalone client
+##	in the user spamassassin domain.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -166,6 +166,7 @@ interface(`spamassassin_domtrans_local_client',`
 		type spamassassin_t, spamassassin_exec_t;
 	')
 
+	corecmd_search_bin($1)
 	domtrans_pattern($1, spamassassin_exec_t, spamassassin_t)
 ')
 
@@ -243,7 +244,7 @@ interface(`spamassassin_home_filetrans_spamd_home',`
 
 ########################################
 ## <summary>
-##	read spamd lib files.
+##	Read spamd lib files.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -301,7 +302,7 @@ interface(`spamassassin_read_spamd_pid_files',`
 
 ########################################
 ## <summary>
-##	Read temporary spamd file.
+##	Read temporary spamd files.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -319,8 +320,8 @@ interface(`spamassassin_read_spamd_tmp_files',`
 
 ########################################
 ## <summary>
-##	Do not audit attempts to get attributes of temporary
-##	spamd sockets/
+##	Do not audit attempts to get
+##	attributes of temporary spamd sockets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -338,7 +339,7 @@ interface(`spamassassin_dontaudit_getattr_spamd_tmp_sockets',`
 
 ########################################
 ## <summary>
-##	Connect to run spamd with a unix
+##	Connect to spamd with a unix
 ##	domain stream socket.
 ## </summary>
 ## <param name="domain">
@@ -355,3 +356,53 @@ interface(`spamassassin_stream_connect_spamd',`
 	files_search_pids($1)
 	stream_connect_pattern($1, spamd_var_run_t, spamd_var_run_t, spamd_t)
 ')
+
+########################################
+## <summary>
+##	All of the rules required to
+##	administrate an spamassassin environment.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <param name="role">
+##	<summary>
+##	Role allowed access.
+##	</summary>
+## </param>
+## <rolecap/>
+#
+interface(`spamassassin_admin',`
+	gen_require(`
+		type spamd_t, spamd_tmp_t, spamd_log_t;
+		type spamd_spool_t, spamd_var_lib_t, spamd_var_run_t;
+		type spamd_initrc_exec_t;
+	')
+
+	allow $1 spamd_t:process { ptrace signal_perms };
+	ps_process_pattern($1, spamd_t)
+
+	init_labeled_script_domtrans($1, spamd_initrc_exec_t)
+	domain_system_change_exemption($1)
+	role_transition $2 spamd_initrc_exec_t system_r;
+	allow $2 system_r;
+
+	files_list_tmp($1)
+	admin_pattern($1, spamd_tmp_t)
+
+	logging_list_logs($1)
+	admin_pattern($1, spamd_log_t)
+
+	files_list_spool($1)
+	admin_pattern($1, spamd_spool_t)
+
+	files_list_var_lib($1)
+	admin_pattern($1, spamd_var_lib_t)
+
+	files_list_pids($1)
+	admin_pattern($1, spamd_var_run_t)
+
+	spamassassin_role($2, $1)
+')

diff --git a/policy/modules/contrib/spamassassin.te b/policy/modules/contrib/spamassassin.te
index e141309..01e5555 100644
--- a/policy/modules/contrib/spamassassin.te
+++ b/policy/modules/contrib/spamassassin.te
@@ -1,4 +1,4 @@
-policy_module(spamassassin, 2.5.5)
+policy_module(spamassassin, 2.5.6)
 
 ########################################
 #
@@ -6,19 +6,25 @@ policy_module(spamassassin, 2.5.5)
 #
 
 ## <desc>
-## <p>
-## Allow user spamassassin clients to use the network.
-## </p>
+##	<p>
+##	Determine whether spamassassin
+##	clients can use the network.
+##	</p>
 ## </desc>
 gen_tunable(spamassassin_can_network, false)
 
 ## <desc>
-## <p>
-## Allow spamd to read/write user home directories.
-## </p>
+##	<p>
+##	Determine whether spamd can manage
+##	generic user home content.
+##	</p>
 ## </desc>
 gen_tunable(spamd_enable_home_dirs, false)
 
+type spamd_update_t;
+type spamd_update_exec_t;
+init_system_domain(spamd_update_t, spamd_update_exec_t)
+
 type spamassassin_t;
 type spamassassin_exec_t;
 typealias spamassassin_t alias { user_spamassassin_t staff_spamassassin_t sysadm_spamassassin_t };
@@ -50,39 +56,43 @@ type spamd_t;
 type spamd_exec_t;
 init_daemon_domain(spamd_t, spamd_exec_t)
 
+type spamd_compiled_t;
+files_type(spamd_compiled_t)
+
+type spamd_etc_t;
+files_config_file(spamd_etc_t)
+
 type spamd_home_t;
 userdom_user_home_content(spamd_home_t)
 
+type spamd_initrc_exec_t;
+init_script_file(spamd_initrc_exec_t)
+
+type spamd_log_t;
+logging_log_file(spamd_log_t)
+
 type spamd_spool_t;
 files_type(spamd_spool_t)
 
 type spamd_tmp_t;
 files_tmp_file(spamd_tmp_t)
 
-# var/lib files
 type spamd_var_lib_t;
 files_type(spamd_var_lib_t)
 
 type spamd_var_run_t;
 files_pid_file(spamd_var_run_t)
 
-##############################
+########################################
 #
-# Standalone program local policy
+# Standalone local policy
 #
 
 allow spamassassin_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
 allow spamassassin_t self:fd use;
 allow spamassassin_t self:fifo_file rw_fifo_file_perms;
-allow spamassassin_t self:sock_file read_sock_file_perms;
-allow spamassassin_t self:unix_dgram_socket create_socket_perms;
-allow spamassassin_t self:unix_stream_socket create_stream_socket_perms;
 allow spamassassin_t self:unix_dgram_socket sendto;
-allow spamassassin_t self:unix_stream_socket connectto;
-allow spamassassin_t self:shm create_shm_perms;
-allow spamassassin_t self:sem create_sem_perms;
-allow spamassassin_t self:msgq create_msgq_perms;
-allow spamassassin_t self:msg { send receive };
+allow spamassassin_t self:unix_stream_socket { accept connectto listen };
 
 manage_dirs_pattern(spamassassin_t, spamassassin_home_t, spamassassin_home_t)
 manage_files_pattern(spamassassin_t, spamassassin_home_t, spamassassin_home_t)
@@ -95,26 +105,13 @@ manage_dirs_pattern(spamassassin_t, spamassassin_tmp_t, spamassassin_tmp_t)
 manage_files_pattern(spamassassin_t, spamassassin_tmp_t, spamassassin_tmp_t)
 files_tmp_filetrans(spamassassin_t, spamassassin_tmp_t, { file dir })
 
-manage_dirs_pattern(spamd_t, spamassassin_home_t, spamassassin_home_t)
-manage_files_pattern(spamd_t, spamassassin_home_t, spamassassin_home_t)
-manage_lnk_files_pattern(spamd_t, spamassassin_home_t, spamassassin_home_t)
-manage_fifo_files_pattern(spamd_t, spamassassin_home_t, spamassassin_home_t)
-manage_sock_files_pattern(spamd_t, spamassassin_home_t, spamassassin_home_t)
-userdom_user_home_dir_filetrans(spamd_t, spamassassin_home_t, { dir file lnk_file sock_file fifo_file })
-
 kernel_read_kernel_sysctls(spamassassin_t)
 
 dev_read_urand(spamassassin_t)
 
+fs_getattr_all_fs(spamassassin_t)
 fs_search_auto_mountpoints(spamassassin_t)
 
-# this should probably be removed
-corecmd_list_bin(spamassassin_t)
-corecmd_read_bin_symlinks(spamassassin_t)
-corecmd_read_bin_files(spamassassin_t)
-corecmd_read_bin_pipes(spamassassin_t)
-corecmd_read_bin_sockets(spamassassin_t)
-
 domain_use_interactive_fds(spamassassin_t)
 
 files_read_etc_files(spamassassin_t)
@@ -127,34 +124,19 @@ logging_send_syslog_msg(spamassassin_t)
 
 miscfiles_read_localization(spamassassin_t)
 
-# cjp: this could probably be removed
-seutil_read_config(spamassassin_t)
-
 sysnet_dns_name_resolve(spamassassin_t)
 
-# set tunable if you have spamassassin do DNS lookups
 tunable_policy(`spamassassin_can_network',`
-	allow spamassassin_t self:tcp_socket create_stream_socket_perms;
-	allow spamassassin_t self:udp_socket create_socket_perms;
+	allow spamassassin_t self:tcp_socket { accept listen };
 
 	corenet_all_recvfrom_unlabeled(spamassassin_t)
 	corenet_all_recvfrom_netlabel(spamassassin_t)
 	corenet_tcp_sendrecv_generic_if(spamassassin_t)
-	corenet_udp_sendrecv_generic_if(spamassassin_t)
 	corenet_tcp_sendrecv_generic_node(spamassassin_t)
-	corenet_udp_sendrecv_generic_node(spamassassin_t)
 	corenet_tcp_sendrecv_all_ports(spamassassin_t)
-	corenet_udp_sendrecv_all_ports(spamassassin_t)
+
 	corenet_tcp_connect_all_ports(spamassassin_t)
 	corenet_sendrecv_all_client_packets(spamassassin_t)
-
-	sysnet_read_config(spamassassin_t)
-')
-
-tunable_policy(`spamd_enable_home_dirs',`
-	userdom_manage_user_home_content_dirs(spamd_t)
-	userdom_manage_user_home_content_files(spamd_t)
-	userdom_manage_user_home_content_symlinks(spamd_t)
 ')
 
 tunable_policy(`use_nfs_home_dirs',`
@@ -170,11 +152,6 @@ tunable_policy(`use_samba_home_dirs',`
 ')
 
 optional_policy(`
-	# Write pid file and socket in ~/.evolution/cache/tmp
-	evolution_home_filetrans(spamd_t, spamd_tmp_t, { file sock_file })
-')
-
-optional_policy(`
 	tunable_policy(`spamassassin_can_network && allow_ypbind',`
 		nis_use_ypbind_uncond(spamassassin_t)
 	')
@@ -190,139 +167,157 @@ optional_policy(`
 # Client local policy
 #
 
+allow spamc_t self:capability dac_override;
 allow spamc_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
 allow spamc_t self:fd use;
 allow spamc_t self:fifo_file rw_fifo_file_perms;
-allow spamc_t self:sock_file read_sock_file_perms;
-allow spamc_t self:shm create_shm_perms;
-allow spamc_t self:sem create_sem_perms;
-allow spamc_t self:msgq create_msgq_perms;
-allow spamc_t self:msg { send receive };
-allow spamc_t self:unix_dgram_socket create_socket_perms;
-allow spamc_t self:unix_stream_socket create_stream_socket_perms;
 allow spamc_t self:unix_dgram_socket sendto;
-allow spamc_t self:unix_stream_socket connectto;
-allow spamc_t self:tcp_socket create_stream_socket_perms;
-allow spamc_t self:udp_socket create_socket_perms;
+allow spamc_t self:unix_stream_socket { accept connectto listen };
+allow spamc_t self:tcp_socket { accept listen };
 
 manage_dirs_pattern(spamc_t, spamc_tmp_t, spamc_tmp_t)
 manage_files_pattern(spamc_t, spamc_tmp_t, spamc_tmp_t)
 files_tmp_filetrans(spamc_t, spamc_tmp_t, { file dir })
 
-# Allow connecting to a local spamd
-allow spamc_t spamd_t:unix_stream_socket connectto;
-allow spamc_t spamd_tmp_t:sock_file rw_sock_file_perms;
+manage_dirs_pattern(spamc_t, spamassassin_home_t, spamassassin_home_t)
+manage_files_pattern(spamc_t, spamassassin_home_t, spamassassin_home_t)
+manage_lnk_files_pattern(spamc_t, spamassassin_home_t, spamassassin_home_t)
+manage_fifo_files_pattern(spamc_t, spamassassin_home_t, spamassassin_home_t)
+manage_sock_files_pattern(spamc_t, spamassassin_home_t, spamassassin_home_t)
+userdom_user_home_dir_filetrans(spamc_t, spamassassin_home_t, dir, ".spamassassin")
+
+list_dirs_pattern(spamc_t, spamd_var_lib_t, spamd_var_lib_t)
+read_files_pattern(spamc_t, spamd_var_lib_t, spamd_var_lib_t)
+
+stream_connect_pattern(spamc_t, { spamd_var_run_t spamd_tmp_t }, { spamd_var_run_t spamd_tmp_t }, spamd_t)
 
 kernel_read_kernel_sysctls(spamc_t)
+kernel_read_system_state(spamc_t)
 
 corenet_all_recvfrom_unlabeled(spamc_t)
 corenet_all_recvfrom_netlabel(spamc_t)
 corenet_tcp_sendrecv_generic_if(spamc_t)
-corenet_udp_sendrecv_generic_if(spamc_t)
 corenet_tcp_sendrecv_generic_node(spamc_t)
-corenet_udp_sendrecv_generic_node(spamc_t)
 corenet_tcp_sendrecv_all_ports(spamc_t)
-corenet_udp_sendrecv_all_ports(spamc_t)
-corenet_tcp_connect_all_ports(spamc_t)
-corenet_sendrecv_all_client_packets(spamc_t)
 
-fs_search_auto_mountpoints(spamc_t)
+corenet_sendrecv_all_client_packets(spamc_t)
+corenet_tcp_connect_all_ports(spamc_t)
 
-# cjp: these should probably be removed:
-corecmd_list_bin(spamc_t)
-corecmd_read_bin_symlinks(spamc_t)
-corecmd_read_bin_files(spamc_t)
-corecmd_read_bin_pipes(spamc_t)
-corecmd_read_bin_sockets(spamc_t)
+corecmd_exec_bin(spamc_t)
 
 domain_use_interactive_fds(spamc_t)
 
-files_read_etc_files(spamc_t)
+fs_getattr_all_fs(spamc_t)
+fs_search_auto_mountpoints(spamc_t)
+
 files_read_etc_runtime_files(spamc_t)
 files_read_usr_files(spamc_t)
 files_dontaudit_search_var(spamc_t)
-# cjp: this may be removable:
 files_list_home(spamc_t)
+files_list_var_lib(spamc_t)
+
+auth_use_nsswitch(spamc_t)
 
 logging_send_syslog_msg(spamc_t)
 
 miscfiles_read_localization(spamc_t)
 
-# cjp: this should probably be removed:
-seutil_read_config(spamc_t)
+tunable_policy(`use_nfs_home_dirs',`
+	fs_manage_nfs_dirs(spamc_t)
+	fs_manage_nfs_files(spamc_t)
+	fs_manage_nfs_symlinks(spamc_t)
+')
 
-sysnet_read_config(spamc_t)
+tunable_policy(`use_samba_home_dirs',`
+	fs_manage_cifs_dirs(spamc_t)
+	fs_manage_cifs_files(spamc_t)
+	fs_manage_cifs_symlinks(spamc_t)
+')
 
 optional_policy(`
-	# Allow connection to spamd socket above
-	evolution_stream_connect(spamc_t)
+	abrt_stream_connect(spamc_t)
 ')
 
 optional_policy(`
-	# Needed for pyzor/razor called from spamd
-	milter_manage_spamass_state(spamc_t)
+	amavis_manage_spool_files(spamc_t)
 ')
 
 optional_policy(`
-	nis_use_ypbind(spamc_t)
+	evolution_stream_connect(spamc_t)
 ')
 
 optional_policy(`
-	nscd_socket_use(spamc_t)
+	milter_manage_spamass_state(spamc_t)
 ')
 
 optional_policy(`
+	mta_send_mail(spamc_t)
 	mta_read_config(spamc_t)
+	mta_read_queue(spamc_t)
+	sendmail_rw_pipes(spamc_t)
 	sendmail_stub(spamc_t)
 ')
 
+optional_policy(`
+	postfix_domtrans_postdrop(spamc_t)
+	postfix_search_spool(spamc_t)
+	postfix_rw_local_pipes(spamc_t)
+	postfix_rw_master_pipes(spamc_t)
+')
+
 ########################################
 #
-# Server local policy
+# Daemon local policy
 #
 
-# Spamassassin, when run as root and using per-user config files,
-# setuids to the user running spamc.  Comment this if you are not
-# using this ability.
-
-allow spamd_t self:capability { setuid setgid dac_override sys_tty_config };
+allow spamd_t self:capability { kill setuid setgid dac_override sys_tty_config };
 dontaudit spamd_t self:capability sys_tty_config;
 allow spamd_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
 allow spamd_t self:fd use;
 allow spamd_t self:fifo_file rw_fifo_file_perms;
-allow spamd_t self:sock_file read_sock_file_perms;
-allow spamd_t self:shm create_shm_perms;
-allow spamd_t self:sem create_sem_perms;
-allow spamd_t self:msgq create_msgq_perms;
-allow spamd_t self:msg { send receive };
-allow spamd_t self:unix_dgram_socket create_socket_perms;
-allow spamd_t self:unix_stream_socket create_stream_socket_perms;
 allow spamd_t self:unix_dgram_socket sendto;
-allow spamd_t self:unix_stream_socket connectto;
-allow spamd_t self:tcp_socket create_stream_socket_perms;
-allow spamd_t self:udp_socket create_socket_perms;
-allow spamd_t self:netlink_route_socket r_netlink_socket_perms;
+allow spamd_t self:unix_stream_socket { accept connectto listen };
+allow spamd_t self:tcp_socket { accept listen };
 
 manage_dirs_pattern(spamd_t, spamd_home_t, spamd_home_t)
 manage_files_pattern(spamd_t, spamd_home_t, spamd_home_t)
 manage_lnk_files_pattern(spamd_t, spamd_home_t, spamd_home_t)
+manage_fifo_files_pattern(spamd_t, spamd_home_t, spamd_home_t)
+manage_sock_files_pattern(spamd_t, spamd_home_t, spamd_home_t)
 userdom_user_home_dir_filetrans(spamd_t, spamd_home_t, dir, ".spamd")
 
+manage_dirs_pattern(spamd_t, spamassassin_home_t, spamassassin_home_t)
+manage_files_pattern(spamd_t, spamassassin_home_t, spamassassin_home_t)
+manage_lnk_files_pattern(spamd_t, spamassassin_home_t, spamassassin_home_t)
+manage_fifo_files_pattern(spamd_t, spamassassin_home_t, spamassassin_home_t)
+manage_sock_files_pattern(spamd_t, spamassassin_home_t, spamassassin_home_t)
+userdom_user_home_dir_filetrans(spamd_t, spamassassin_home_t, dir, ".spamassassin")
+
+manage_dirs_pattern(spamd_t, spamd_compiled_t, spamd_compiled_t)
+manage_files_pattern(spamd_t, spamd_compiled_t, spamd_compiled_t)
+
+allow spamd_t spamd_log_t:file { append_file_perms create_file_perms setattr_file_perms };
+logging_log_filetrans(spamd_t, spamd_log_t, file)
+
 manage_dirs_pattern(spamd_t, spamd_spool_t, spamd_spool_t)
 manage_files_pattern(spamd_t, spamd_spool_t, spamd_spool_t)
+manage_sock_files_pattern(spamd_t, spamd_spool_t, spamd_spool_t)
 files_spool_filetrans(spamd_t, spamd_spool_t, { file dir })
 
 manage_dirs_pattern(spamd_t, spamd_tmp_t, spamd_tmp_t)
 manage_files_pattern(spamd_t, spamd_tmp_t, spamd_tmp_t)
 files_tmp_filetrans(spamd_t, spamd_tmp_t, { file dir })
 
-# var/lib files for spamd
 allow spamd_t spamd_var_lib_t:dir list_dir_perms;
-read_files_pattern(spamd_t, spamd_var_lib_t, spamd_var_lib_t)
+manage_files_pattern(spamd_t, spamd_var_lib_t, spamd_var_lib_t)
+manage_lnk_files_pattern(spamd_t, spamd_var_lib_t, spamd_var_lib_t)
 
 manage_dirs_pattern(spamd_t, spamd_var_run_t, spamd_var_run_t)
 manage_files_pattern(spamd_t, spamd_var_run_t, spamd_var_run_t)
-files_pid_filetrans(spamd_t, spamd_var_run_t, { dir file })
+manage_sock_files_pattern(spamd_t, spamd_var_run_t, spamd_var_run_t)
+files_pid_filetrans(spamd_t, spamd_var_run_t, { file dir })
+
+can_exec(spamd_t, { spamd_exec_t spamd_compiled_t })
 
 kernel_read_all_sysctls(spamd_t)
 kernel_read_system_state(spamd_t)
@@ -336,58 +331,70 @@ corenet_udp_sendrecv_generic_node(spamd_t)
 corenet_tcp_sendrecv_all_ports(spamd_t)
 corenet_udp_sendrecv_all_ports(spamd_t)
 corenet_tcp_bind_generic_node(spamd_t)
+corenet_udp_bind_generic_node(spamd_t)
+
+corenet_sendrecv_spamd_server_packets(spamd_t)
 corenet_tcp_bind_spamd_port(spamd_t)
+
+corenet_sendrecv_razor_client_packets(spamd_t)
 corenet_tcp_connect_razor_port(spamd_t)
+
+corenet_sendrecv_smtp_client_packets(spamd_t)
 corenet_tcp_connect_smtp_port(spamd_t)
-corenet_sendrecv_razor_client_packets(spamd_t)
-corenet_sendrecv_spamd_server_packets(spamd_t)
-# spamassassin 3.1 needs this for its
-# DnsResolver.pm module which binds to
-# random ports >= 1024.
-corenet_udp_bind_generic_node(spamd_t)
+
+corenet_sendrecv_generic_server_packets(spamd_t)
 corenet_udp_bind_generic_port(spamd_t)
+
+corenet_sendrecv_imaze_server_packets(spamd_t)
 corenet_udp_bind_imaze_port(spamd_t)
+
 corenet_dontaudit_udp_bind_all_ports(spamd_t)
-corenet_sendrecv_imaze_server_packets(spamd_t)
-corenet_sendrecv_generic_server_packets(spamd_t)
+
+corecmd_exec_bin(spamd_t)
 
 dev_read_sysfs(spamd_t)
 dev_read_urand(spamd_t)
 
-fs_getattr_all_fs(spamd_t)
-fs_search_auto_mountpoints(spamd_t)
-
-auth_dontaudit_read_shadow(spamd_t)
-
-corecmd_exec_bin(spamd_t)
-
 domain_use_interactive_fds(spamd_t)
 
 files_read_usr_files(spamd_t)
-files_read_etc_files(spamd_t)
 files_read_etc_runtime_files(spamd_t)
-# /var/lib/spamassin
-files_read_var_lib_files(spamd_t)
+
+fs_getattr_all_fs(spamd_t)
+fs_search_auto_mountpoints(spamd_t)
+
+auth_use_nsswitch(spamd_t)
+auth_dontaudit_read_shadow(spamd_t)
 
 init_dontaudit_rw_utmp(spamd_t)
 
+libs_use_ld_so(spamd_t)
+libs_use_shared_libs(spamd_t)
+
 logging_send_syslog_msg(spamd_t)
 
 miscfiles_read_localization(spamd_t)
 
-sysnet_read_config(spamd_t)
 sysnet_use_ldap(spamd_t)
-sysnet_dns_name_resolve(spamd_t)
 
 userdom_use_unpriv_users_fds(spamd_t)
-userdom_search_user_home_dirs(spamd_t)
+
+tunable_policy(`spamd_enable_home_dirs',`
+	userdom_manage_user_home_content_dirs(spamd_t)
+	userdom_manage_user_home_content_files(spamd_t)
+	userdom_manage_user_home_content_symlinks(spamd_t)
+')
 
 tunable_policy(`use_nfs_home_dirs',`
+	fs_manage_nfs_dirs(spamd_t)
 	fs_manage_nfs_files(spamd_t)
+	fs_manage_nfs_symlinks(spamd_t)
 ')
 
 tunable_policy(`use_samba_home_dirs',`
+	fs_manage_cifs_dirs(spamd_t)
 	fs_manage_cifs_files(spamd_t)
+	fs_manage_cifs_symlinks(spamd_t)
 ')
 
 optional_policy(`
@@ -395,6 +402,10 @@ optional_policy(`
 ')
 
 optional_policy(`
+	clamav_stream_connect(spamd_t)
+')
+
+optional_policy(`
 	cron_system_entry(spamd_t, spamd_exec_t)
 ')
 
@@ -403,21 +414,28 @@ optional_policy(`
 ')
 
 optional_policy(`
+	dcc_domtrans_cdcc(spamd_t)
 	dcc_domtrans_client(spamd_t)
+	dcc_signal_client(spamd_t)
 	dcc_stream_connect_dccifd(spamd_t)
 ')
 
 optional_policy(`
-	milter_manage_spamass_state(spamd_t)
+	evolution_home_filetrans(spamd_t, spamd_tmp_t, { file sock_file })
 ')
 
 optional_policy(`
-	mysql_stream_connect(spamd_t)
-	mysql_tcp_connect(spamd_t)
+	exim_manage_spool_dirs(spamd_t)
+	exim_manage_spool_files(spamd_t)
+')
+
+optional_policy(`
+	milter_manage_spamass_state(spamd_t)
 ')
 
 optional_policy(`
-	nis_use_ypbind(spamd_t)
+	mysql_stream_connect(spamd_t)
+	mysql_tcp_connect(spamd_t)
 ')
 
 optional_policy(`
@@ -436,6 +454,8 @@ optional_policy(`
 
 optional_policy(`
 	razor_domtrans(spamd_t)
+	razor_read_lib_files(spamd_t)
+	razor_manage_home_content(spamd_t)
 ')
 
 optional_policy(`
@@ -445,8 +465,68 @@ optional_policy(`
 optional_policy(`
 	sendmail_stub(spamd_t)
 	mta_read_config(spamd_t)
+	mta_send_mail(spamd_t)
 ')
 
 optional_policy(`
 	udev_read_db(spamd_t)
 ')
+
+########################################
+#
+# Update local policy
+#
+
+dontaudit spamd_update_t self:capability dac_override;
+allow spamd_update_t self:fifo_file manage_fifo_file_perms;
+allow spamd_update_t self:unix_stream_socket create_stream_socket_perms;
+
+manage_dirs_pattern(spamd_update_t, spamd_tmp_t, spamd_tmp_t)
+manage_files_pattern(spamd_update_t, spamd_tmp_t, spamd_tmp_t)
+files_tmp_filetrans(spamd_update_t, spamd_tmp_t, { file dir })
+
+allow spamd_update_t spamd_var_lib_t:dir list_dir_perms;
+manage_files_pattern(spamd_update_t, spamd_var_lib_t, spamd_var_lib_t)
+manage_lnk_files_pattern(spamd_update_t, spamd_var_lib_t, spamd_var_lib_t)
+
+kernel_read_system_state(spamd_update_t)
+
+corenet_all_recvfrom_unlabeled(spamd_update_t)
+corenet_all_recvfrom_netlabel(spamd_update_t)
+corenet_tcp_sendrecv_generic_if(spamd_update_t)
+corenet_tcp_sendrecv_generic_node(spamd_update_t)
+corenet_tcp_sendrecv_all_ports(spamd_update_t)
+
+corenet_sendrecv_http_client_packets(spamd_update_t)
+corenet_tcp_connect_http_port(spamd_update_t)
+corenet_tcp_sendrecv_http_port(spamd_update_t)
+
+corecmd_exec_bin(spamd_update_t)
+corecmd_exec_shell(spamd_update_t)
+
+dev_read_urand(spamd_update_t)
+
+domain_use_interactive_fds(spamd_update_t)
+
+files_read_usr_files(spamd_update_t)
+
+auth_use_nsswitch(spamd_update_t)
+auth_dontaudit_read_shadow(spamd_update_t)
+
+miscfiles_read_localization(spamd_update_t)
+
+userdom_use_user_terminals(spamd_update_t)
+
+optional_policy(`
+	cron_system_entry(spamd_update_t, spamd_update_exec_t)
+')
+
+# probably want a solution same as httpd_use_gpg since this will
+# give spamd_update a path to users gpg keys
+# optional_policy(`
+#	gpg_domtrans(spamd_update_t)
+# ')
+
+optional_policy(`
+	mta_read_config(spamd_update_t)
+')