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

[Sven Vermeulen]

commit:     42314e38a4ebeca9d1fa617e33e26f2b8257bcff
Author:     Dominick Grift <dominick.grift <AT> gmail <DOT> com>
AuthorDate: Sat Sep 29 11:19:26 2012 +0000
Commit:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
CommitDate: Tue Oct  2 18:04:31 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=42314e38

Changes to the exim policy module and relevant dependencies

Ported from Fedora with changes

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

---
 policy/modules/contrib/dovecot.if |   20 ++++++++
 policy/modules/contrib/dovecot.te |    2 +-
 policy/modules/contrib/exim.fc    |   14 ++++--
 policy/modules/contrib/exim.if    |   65 +++++++++++++++++++++----
 policy/modules/contrib/exim.te    |   94 ++++++++++++++++++++++++-------------
 5 files changed, 148 insertions(+), 47 deletions(-)

diff --git a/policy/modules/contrib/dovecot.if b/policy/modules/contrib/dovecot.if
index cf53f3d..34733ad 100644
--- a/policy/modules/contrib/dovecot.if
+++ b/policy/modules/contrib/dovecot.if
@@ -1,5 +1,25 @@
 ## <summary>POP and IMAP mail server.</summary>
 
+#######################################
+## <summary>
+##	Connect to dovecot using a unix
+##	domain stream socket.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`dovecot_stream_connect',`
+	gen_require(`
+		type dovecot_t, dovecot_var_run_t;
+	')
+
+	files_search_pids($1)
+	stream_connect_pattern($1, dovecot_var_run_t, dovecot_var_run_t, dovecot_t)
+')
+
 ########################################
 ## <summary>
 ##	Connect to dovecot using a unix

diff --git a/policy/modules/contrib/dovecot.te b/policy/modules/contrib/dovecot.te
index da39b02..f5f0b6f 100644
--- a/policy/modules/contrib/dovecot.te
+++ b/policy/modules/contrib/dovecot.te
@@ -1,4 +1,4 @@
-policy_module(dovecot, 1.14.4)
+policy_module(dovecot, 1.14.5)
 
 ########################################
 #

diff --git a/policy/modules/contrib/exim.fc b/policy/modules/contrib/exim.fc
index 298f066..fd99946 100644
--- a/policy/modules/contrib/exim.fc
+++ b/policy/modules/contrib/exim.fc
@@ -1,8 +1,14 @@
-/usr/sbin/exim[0-9]?		--	gen_context(system_u:object_r:exim_exec_t,s0)
-/var/log/exim[0-9]?(/.*)?		gen_context(system_u:object_r:exim_log_t,s0)
+/etc/rc\.d/init\.d/exim	--	gen_context(system_u:object_r:exim_initrc_exec_t,s0)
+
+/usr/sbin/exim[0-9]?	--	gen_context(system_u:object_r:exim_exec_t,s0)
+/usr/sbin/exim_tidydb	--	gen_context(system_u:object_r:exim_exec_t,s0)
+
+/var/log/exim[0-9]?(/.*)?	gen_context(system_u:object_r:exim_log_t,s0)
+
 /var/run/exim[0-9]?\.pid	--	gen_context(system_u:object_r:exim_var_run_t,s0)
-/var/spool/exim[0-9]?(/.*)?		gen_context(system_u:object_r:exim_spool_t,s0)
+
+/var/spool/exim[0-9]?(/.*)?	gen_context(system_u:object_r:exim_spool_t,s0)
 
 ifdef(`distro_debian',`
-/var/run/exim[0-9]?(/.*)?		gen_context(system_u:object_r:exim_var_run_t,s0)
+/var/run/exim[0-9]?(/.*)?	gen_context(system_u:object_r:exim_var_run_t,s0)
 ')

diff --git a/policy/modules/contrib/exim.if b/policy/modules/contrib/exim.if
index 6bef7f8..ae630d5 100644
--- a/policy/modules/contrib/exim.if
+++ b/policy/modules/contrib/exim.if
@@ -1,4 +1,4 @@
-## <summary>Exim mail transfer agent</summary>
+## <summary>Mail transfer agent.</summary>
 
 ########################################
 ## <summary>
@@ -15,13 +15,14 @@ interface(`exim_domtrans',`
 		type exim_t, exim_exec_t;
 	')
 
+	corecmd_search_bin($1)
 	domtrans_pattern($1, exim_exec_t, exim_t)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to read, 
-##	exim tmp files
+##	Do not audit attempts to read exim
+##	temporary tmp files.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -39,7 +40,7 @@ interface(`exim_dontaudit_read_tmp_files',`
 
 ########################################
 ## <summary>
-##	Allow domain to read, exim tmp files
+##	Read exim temporary files.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58,7 +59,7 @@ interface(`exim_read_tmp_files',`
 
 ########################################
 ## <summary>
-##	Read exim PID files.
+##	Read exim pid files.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77,7 +78,7 @@ interface(`exim_read_pid_files',`
 
 ########################################
 ## <summary>
-##	Allow the specified domain to read exim's log files.
+##	Read exim log files.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -97,8 +98,7 @@ interface(`exim_read_log',`
 
 ########################################
 ## <summary>
-##	Allow the specified domain to append
-##	exim log files.
+##	Append exim log files.
 ## </summary>
 ## <param name="domain">
 ## 	<summary>
@@ -117,7 +117,8 @@ interface(`exim_append_log',`
 
 ########################################
 ## <summary>
-##	Allow the specified domain to manage exim's log files.
+##	Create, read, write, and delete
+##	exim log files.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -138,7 +139,7 @@ interface(`exim_manage_log',`
 ########################################
 ## <summary>
 ##	Create, read, write, and delete
-##	exim spool dirs.
+##	exim spool directories.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -194,3 +195,47 @@ interface(`exim_manage_spool_files',`
 	manage_files_pattern($1, exim_spool_t, exim_spool_t)
 	files_search_spool($1)
 ')
+
+########################################
+## <summary>
+##	All of the rules required to
+##	administrate an exim environment.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <param name="role">
+##	<summary>
+##	Role allowed access.
+##	</summary>
+## </param>
+## <rolecap/>
+#
+interface(`exim_admin',`
+	gen_require(`
+		type exim_t, exim_spool_t, exim_log_t;
+		type exim_var_run_t, exim_initrc_exec_t, exim_tmp_t;
+	')
+
+	allow $1 exim_t:process { ptrace signal_perms };
+	ps_process_pattern($1, exim_t)
+
+	init_labeled_script_domtrans($1, exim_initrc_exec_t)
+	domain_system_change_exemption($1)
+	role_transition $2 exim_initrc_exec_t system_r;
+	allow $2 system_r;
+
+	files_search_spool($1)
+	admin_pattern($1, exim_spool_t)
+
+	logging_search_logs($1)
+	admin_pattern($1, exim_log_t)
+
+	files_search_pids($1)
+	admin_pattern($1, exim_var_run_t)
+
+	files_search_tmp($1)
+	admin_pattern($1, exim_tmp_t)
+')

diff --git a/policy/modules/contrib/exim.te b/policy/modules/contrib/exim.te
index f28f64b..f50794d 100644
--- a/policy/modules/contrib/exim.te
+++ b/policy/modules/contrib/exim.te
@@ -1,4 +1,4 @@
-policy_module(exim, 1.5.0)
+policy_module(exim, 1.5.1)
 
 ########################################
 #
@@ -6,23 +6,26 @@ policy_module(exim, 1.5.0)
 #
 
 ## <desc>
-## <p>
-## Allow exim to connect to databases (postgres, mysql)
-## </p>
+##	<p>
+##	Determine whether exim can connect to
+##	databases.
+##	</p>
 ## </desc>
 gen_tunable(exim_can_connect_db, false)
 
 ## <desc>
-## <p>
-## Allow exim to read unprivileged user files.
-## </p>
+##	<p>
+##	Determine whether exim can read generic
+##	user content files.
+##	</p>
 ## </desc>
 gen_tunable(exim_read_user_files, false)
 
 ## <desc>
-## <p>
-## Allow exim to create, read, write, and delete
-## unprivileged user files.
+##	<p>
+##	Determine whether exim can create,
+##	read, write, and delete generic user
+##	content files.
 ## </p>
 ## </desc>
 gen_tunable(exim_manage_user_files, false)
@@ -35,6 +38,9 @@ mta_mailserver_user_agent(exim_t)
 application_executable_file(exim_exec_t)
 mta_agent_executable(exim_exec_t)
 
+type exim_initrc_exec_t;
+init_script_file(exim_initrc_exec_t)
+
 type exim_log_t;
 logging_log_file(exim_log_t)
 
@@ -49,33 +55,34 @@ files_pid_file(exim_var_run_t)
 
 ########################################
 #
-# exim local policy
+# Local policy
 #
 
 allow exim_t self:capability { chown dac_override dac_read_search fowner setuid setgid sys_resource };
 allow exim_t self:process { setrlimit setpgid };
 allow exim_t self:fifo_file rw_fifo_file_perms;
-allow exim_t self:unix_stream_socket create_stream_socket_perms;
-allow exim_t self:tcp_socket create_stream_socket_perms;
-allow exim_t self:udp_socket create_socket_perms;
-
-can_exec(exim_t, exim_exec_t)
+allow exim_t self:unix_stream_socket { accept listen };
+allow exim_t self:tcp_socket { accept listen };
 
-manage_files_pattern(exim_t, exim_log_t, exim_log_t)
-logging_log_filetrans(exim_t, exim_log_t, { file dir })
+append_files_pattern(exim_t, exim_log_t, exim_log_t)
+create_files_pattern(exim_t, exim_log_t, exim_log_t)
+setattr_files_pattern(exim_t, exim_log_t, exim_log_t)
+logging_log_filetrans(exim_t, exim_log_t, file)
 
 manage_dirs_pattern(exim_t, exim_spool_t, exim_spool_t)
 manage_files_pattern(exim_t, exim_spool_t, exim_spool_t)
 manage_sock_files_pattern(exim_t, exim_spool_t, exim_spool_t)
-files_spool_filetrans(exim_t, exim_spool_t, { file dir sock_file })
+files_spool_filetrans(exim_t, exim_spool_t, { dir file sock_file })
 
 manage_dirs_pattern(exim_t, exim_tmp_t, exim_tmp_t)
 manage_files_pattern(exim_t, exim_tmp_t, exim_tmp_t)
-files_tmp_filetrans(exim_t, exim_tmp_t, { file dir })
+files_tmp_filetrans(exim_t, exim_tmp_t, { dir file })
 
 manage_dirs_pattern(exim_t, exim_var_run_t, exim_var_run_t)
 manage_files_pattern(exim_t, exim_var_run_t, exim_var_run_t)
-files_pid_filetrans(exim_t, exim_var_run_t, { file dir })
+files_pid_filetrans(exim_t, exim_var_run_t, { dir file })
+
+can_exec(exim_t, exim_exec_t)
 
 kernel_read_kernel_sysctls(exim_t)
 kernel_read_network_state(exim_t)
@@ -91,24 +98,32 @@ corenet_tcp_sendrecv_generic_node(exim_t)
 corenet_udp_sendrecv_generic_node(exim_t)
 corenet_tcp_sendrecv_all_ports(exim_t)
 corenet_tcp_bind_generic_node(exim_t)
+
+corenet_sendrecv_smtp_server_packets(exim_t)
 corenet_tcp_bind_smtp_port(exim_t)
+
+corenet_sendrecv_amavisd_send_server_packets(exim_t)
 corenet_tcp_bind_amavisd_send_port(exim_t)
+
+corenet_sendrecv_auth_client_packets(exim_t)
 corenet_tcp_connect_auth_port(exim_t)
+
+corenet_sendrecv_smtp_client_packets(exim_t)
 corenet_tcp_connect_smtp_port(exim_t)
-corenet_tcp_connect_ldap_port(exim_t)
+
+corenet_sendrecv_inetd_child_client_packets(exim_t)
 corenet_tcp_connect_inetd_child_port(exim_t)
-# connect to spamassassin
+
+corenet_sendrecv_spamd_client_packets(exim_t)
 corenet_tcp_connect_spamd_port(exim_t)
 
 dev_read_rand(exim_t)
 dev_read_urand(exim_t)
 
-# Init script handling
 domain_use_interactive_fds(exim_t)
 
 files_search_usr(exim_t)
 files_search_var(exim_t)
-files_read_etc_files(exim_t)
 files_read_etc_runtime_files(exim_t)
 files_getattr_all_mountpoints(exim_t)
 
@@ -130,10 +145,15 @@ mta_manage_spool(exim_t)
 mta_mailserver_delivery(exim_t)
 
 tunable_policy(`exim_can_connect_db',`
-	corenet_tcp_connect_mysqld_port(exim_t)
-	corenet_sendrecv_mysqld_client_packets(exim_t)
-	corenet_tcp_connect_postgresql_port(exim_t)
-	corenet_sendrecv_postgresql_client_packets(exim_t)
+	corenet_sendrecv_gds_db_client_packets(exim_t)
+	corenet_tcp_connect_gds_db_port(exim_t)
+	corenet_tcp_sendrecv_gds_db_port(exim_t)
+	corenet_sendrecv_mssql_client_packets(exim_t)
+	corenet_tcp_connect_mssql_port(exim_t)
+	corenet_tcp_sendrecv_mssql_port(exim_t)
+	corenet_sendrecv_oracledb_client_packets(exim_t)
+	corenet_tcp_connect_oracledb_port(exim_t)
+	corenet_tcp_sendrecv_oracledb_port(exim_t)
 ')
 
 tunable_policy(`exim_read_user_files',`
@@ -162,6 +182,10 @@ optional_policy(`
 ')
 
 optional_policy(`
+	dovecot_stream_connect(exim_t)
+')
+
+optional_policy(`
 	kerberos_keytab_template(exim, exim_t)
 ')
 
@@ -171,14 +195,23 @@ optional_policy(`
 ')
 
 optional_policy(`
+	nagios_search_spool(exim_t)
+')
+
+optional_policy(`
 	tunable_policy(`exim_can_connect_db',`
+		mysql_rw_db_sockets(exim_t)
 		mysql_stream_connect(exim_t)
+		mysql_tcp_connect(exim_t)
 	')
 ')
 
 optional_policy(`
+	postgresql_unpriv_client(exim_t)
+
 	tunable_policy(`exim_can_connect_db',`
 		postgresql_stream_connect(exim_t)
+		postgresql_tcp_connect(exim_t)
 	')
 ')
 
@@ -191,9 +224,6 @@ optional_policy(`
 ')
 
 optional_policy(`
-	# https://bugzilla.redhat.com/show_bug.cgi?id=512710
-	# uses sendmail for outgoing mail and exim
-	# for incoming mail
 	sendmail_manage_tmp_files(exim_t)
 ')