commit: 975c23d83a8f52c93dffdfd7899bfb561769e711
Author: Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Sun Oct 9 05:08:41 2016 +0000
Commit: Sven Vermeulen <swift <AT> gentoo <DOT> org>
CommitDate: Mon Oct 24 16:02:52 2016 +0000
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=975c23d8
DO NOT MERGE. sync user_cert_t cert_home_t with upstream
Need to upstream userdom_user_home_dir_filetrans_user_cert interface
policy/modules/system/miscfiles.fc | 2 --
policy/modules/system/miscfiles.if | 46 ++++---------------------------------
policy/modules/system/miscfiles.te | 7 ------
policy/modules/system/userdomain.if | 33 +++++++++++++++++++++++---
policy/modules/system/userdomain.te | 2 +-
5 files changed, 36 insertions(+), 54 deletions(-)
diff --git a/policy/modules/system/miscfiles.fc
b/policy/modules/system/miscfiles.fc
index be0b6a1..42ac30b 100644
--- a/policy/modules/system/miscfiles.fc
+++ b/policy/modules/system/miscfiles.fc
@@ -103,8 +103,6 @@ ifdef(`distro_redhat',`
/var/spool/postfix/etc/localtime -- gen_context(system_u:object_r:locale_t,s0)
')
-HOME_DIR/.pki(/.*)? gen_context(system_u:object_r:cert_home_t,s0)
-
ifdef(`distro_gentoo',`
/etc/fonts(/.*)? gen_context(system_u:object_r:fonts_t,s0)
')
diff --git a/policy/modules/system/miscfiles.if
b/policy/modules/system/miscfiles.if
index 63ed47f..d89c7c0 100644
--- a/policy/modules/system/miscfiles.if
+++ b/policy/modules/system/miscfiles.if
@@ -97,15 +97,8 @@ interface(`miscfiles_read_generic_certs',`
## </param>
#
interface(`miscfiles_manage_user_certs',`
- gen_require(`
- type cert_home_t;
- ')
-
- manage_dirs_pattern($1, cert_home_t, cert_home_t)
- manage_files_pattern($1, cert_home_t, cert_home_t)
- manage_lnk_files_pattern($1, cert_home_t, cert_home_t)
-
- userdom_search_user_home_dirs($1)
+ userdom_manage_user_certs($1)
+ refpolicywarn(`$0() has been deprecated, please use
userdom_manage_user_certs() instead.')
')
########################################
@@ -213,35 +206,6 @@ interface(`miscfiles_manage_cert_files',`
########################################
## <summary>
-## Automatically use the cert_home_t label for selected resources created
-## in a users home directory
-## </summary>
-## <param name="domain">
-## <summary>
-## Domain allowed access
-## </summary>
-## </param>
-## <param name="class">
-## <summary>
-## Resource type(s) for which the label should be used
-## </summary>
-## </param>
-## <param name="filename" optional="true">
-## <summary>
-## Name of the resource that is being created
-## </summary>
-## </param>
-#
-interface(`miscfiles_user_home_dir_filetrans_cert_home',`
- gen_require(`
- type cert_home_t;
- ')
-
- userdom_user_home_dir_filetrans($1, cert_home_t, $2, $3)
-')
-
-########################################
-## <summary>
## Read fonts.
## </summary>
## <param name="domain">
@@ -823,8 +787,7 @@ interface(`miscfiles_read_test_files',`
########################################
## <summary>
-## Create files in etc directories
-## with localization file type.
+## Execute test files.
## </summary>
## <param name="domain">
## <summary>
@@ -843,7 +806,8 @@ interface(`miscfiles_exec_test_files',`
########################################
## <summary>
-## Execute test files.
+## Create files in etc directories
+## with localization file type.
## </summary>
## <param name="domain">
## <summary>
diff --git a/policy/modules/system/miscfiles.te
b/policy/modules/system/miscfiles.te
index 246ac6a..85a29e3 100644
--- a/policy/modules/system/miscfiles.te
+++ b/policy/modules/system/miscfiles.te
@@ -14,13 +14,6 @@ type cert_t;
miscfiles_cert_type(cert_t)
#
-# cert_home_t is the type of files in the users' home directories.
-#
-type cert_home_t;
-miscfiles_cert_type(cert_home_t)
-userdom_user_home_content(cert_home_t)
-
-#
# fonts_t is the type of various font
# files in /usr
#
diff --git a/policy/modules/system/userdomain.if
b/policy/modules/system/userdomain.if
index 1572b51..d2b1df0 100644
--- a/policy/modules/system/userdomain.if
+++ b/policy/modules/system/userdomain.if
@@ -272,9 +272,6 @@ interface(`userdom_manage_home_role',`
')
ifdef(`distro_gentoo',`
- miscfiles_manage_user_certs($2)
- miscfiles_relabel_user_certs($2)
-
optional_policy(`
flash_manage_home($2)
flash_relabel_home($2)
@@ -2467,6 +2464,36 @@ interface(`userdom_manage_user_certs',`
########################################
## <summary>
+## Automatically use the user_cert_t label for
+## selected resources created in a users home
+## directory
+## </summary>
+## <param name="domain">
+## <summary>
+## Domain allowed access
+## </summary>
+## </param>
+## <param name="class">
+## <summary>
+## Resource type(s) for which the label should be used
+## </summary>
+## </param>
+## <param name="filename" optional="true">
+## <summary>
+## Name of the resource that is being created
+## </summary>
+## </param>
+#
+interface(`userdom_user_home_dir_filetrans_user_cert',`
+ gen_require(`
+ type user_cert_t;
+ ')
+
+ userdom_user_home_dir_filetrans($1, user_cert_t, $2, $3)
+')
+
+########################################
+## <summary>
## Write to user temporary named sockets.
## </summary>
## <param name="domain">
diff --git a/policy/modules/system/userdomain.te
b/policy/modules/system/userdomain.te
index 0b0eb60..b590d64 100644
--- a/policy/modules/system/userdomain.te
+++ b/policy/modules/system/userdomain.te
@@ -93,7 +93,7 @@ files_associate_tmp(user_home_t)
files_poly_parent(user_home_t)
files_mountpoint(user_home_t)
-type user_cert_t;
+type user_cert_t alias cert_home_t;
userdom_user_home_content(user_cert_t)
type user_devpts_t alias { staff_devpts_t sysadm_devpts_t secadm_devpts_t
auditadm_devpts_t unconfined_devpts_t };
