|
 |
b9e347 |
From 58c3343a67a3922dcc84d3d4b1deca515c48a6f8 Mon Sep 17 00:00:00 2001
|
|
|
b9e347 |
From: =?UTF-8?q?Fran=C3=A7ois=20Cami?= <fcami@redhat.com>
|
|
|
b9e347 |
Date: Wed, 23 Sep 2020 09:17:53 +0200
|
|
|
b9e347 |
Subject: [PATCH] SELinux: do not double-define node_t and pki_tomcat_cert_t
|
|
|
b9e347 |
MIME-Version: 1.0
|
|
|
b9e347 |
Content-Type: text/plain; charset=UTF-8
|
|
|
b9e347 |
Content-Transfer-Encoding: 8bit
|
|
|
b9e347 |
|
|
|
b9e347 |
node_t and pki_tomcat_cert_t are defined in other modules.
|
|
|
b9e347 |
Do not double-define them.
|
|
|
b9e347 |
|
|
|
b9e347 |
Fixes: https://pagure.io/freeipa/issue/8513
|
|
|
b9e347 |
Signed-off-by: François Cami <fcami@redhat.com>
|
|
|
b9e347 |
Reviewed-By: Christian Heimes <cheimes@redhat.com>
|
|
|
b9e347 |
---
|
|
|
b9e347 |
selinux/ipa.te | 25 ++++++++++++++++---------
|
|
|
b9e347 |
1 file changed, 16 insertions(+), 9 deletions(-)
|
|
|
b9e347 |
|
|
|
b9e347 |
diff --git a/selinux/ipa.te b/selinux/ipa.te
|
|
|
b9e347 |
index fa577191c..d80e64a0b 100644
|
|
|
b9e347 |
--- a/selinux/ipa.te
|
|
|
b9e347 |
+++ b/selinux/ipa.te
|
|
|
b9e347 |
@@ -74,9 +74,6 @@ logging_log_file(ipa_custodia_log_t)
|
|
|
b9e347 |
type ipa_custodia_tmp_t;
|
|
|
b9e347 |
files_tmp_file(ipa_custodia_tmp_t)
|
|
|
b9e347 |
|
|
|
b9e347 |
-type pki_tomcat_cert_t;
|
|
|
b9e347 |
-type node_t;
|
|
|
b9e347 |
-
|
|
|
b9e347 |
type ipa_pki_retrieve_key_exec_t;
|
|
|
b9e347 |
type ipa_pki_retrieve_key_t;
|
|
|
b9e347 |
domain_type(ipa_pki_retrieve_key_t)
|
|
|
b9e347 |
@@ -339,12 +336,6 @@ allow ipa_custodia_t self:unix_dgram_socket create_socket_perms;
|
|
|
b9e347 |
allow ipa_custodia_t self:tcp_socket { bind create };
|
|
|
b9e347 |
allow ipa_custodia_t self:udp_socket create_socket_perms;
|
|
|
b9e347 |
|
|
|
b9e347 |
-allow ipa_custodia_t node_t:tcp_socket node_bind;
|
|
|
b9e347 |
-
|
|
|
b9e347 |
-allow ipa_custodia_t pki_tomcat_cert_t:dir remove_name;
|
|
|
b9e347 |
-allow ipa_custodia_t pki_tomcat_cert_t:file create;
|
|
|
b9e347 |
-allow ipa_custodia_t pki_tomcat_cert_t:file unlink;
|
|
|
b9e347 |
-
|
|
|
b9e347 |
manage_dirs_pattern(ipa_custodia_t,ipa_custodia_log_t,ipa_custodia_log_t)
|
|
|
b9e347 |
manage_files_pattern(ipa_custodia_t, ipa_custodia_log_t, ipa_custodia_log_t)
|
|
|
b9e347 |
logging_log_filetrans(ipa_custodia_t, ipa_custodia_log_t, { dir file })
|
|
|
b9e347 |
@@ -456,3 +447,19 @@ optional_policy(`
|
|
|
b9e347 |
kerberos_read_config(tomcat_t)
|
|
|
b9e347 |
kerberos_read_keytab(tomcat_t)
|
|
|
b9e347 |
')
|
|
|
b9e347 |
+
|
|
|
b9e347 |
+optional_policy(`
|
|
|
b9e347 |
+ gen_require(`
|
|
|
b9e347 |
+ type node_t;
|
|
|
b9e347 |
+ ')
|
|
|
b9e347 |
+ allow ipa_custodia_t node_t:tcp_socket node_bind;
|
|
|
b9e347 |
+')
|
|
|
b9e347 |
+
|
|
|
b9e347 |
+optional_policy(`
|
|
|
b9e347 |
+ gen_require(`
|
|
|
b9e347 |
+ type pki_tomcat_cert_t;
|
|
|
b9e347 |
+ ')
|
|
|
b9e347 |
+ allow ipa_custodia_t pki_tomcat_cert_t:dir remove_name;
|
|
|
b9e347 |
+ allow ipa_custodia_t pki_tomcat_cert_t:file create;
|
|
|
b9e347 |
+ allow ipa_custodia_t pki_tomcat_cert_t:file unlink;
|
|
|
b9e347 |
+')
|
|
|
b9e347 |
--
|
|
|
b9e347 |
2.26.2
|
|
|
b9e347 |
|