| 1 |
commit: 4b1f697b6a9ee59734e0cdf1067cc6d57a3b0799 |
| 2 |
Author: Russell Coker <russell <AT> coker <DOT> com <DOT> au> |
| 3 |
AuthorDate: Thu Feb 17 14:45:38 2022 +0000 |
| 4 |
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 27 02:13:17 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=4b1f697b |
| 7 |
|
| 8 |
puppet V3 |
| 9 |
|
| 10 |
Removed the entrypoint stuff that was controversial, the rest should be fine. |
| 11 |
|
| 12 |
I think it's ready to merge. |
| 13 |
|
| 14 |
Signed-off-by: Russell Coker <russell <AT> coker.com.au> |
| 15 |
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org> |
| 16 |
|
| 17 |
policy/modules/admin/puppet.fc | 1 + |
| 18 |
policy/modules/admin/puppet.te | 9 +++++++-- |
| 19 |
2 files changed, 8 insertions(+), 2 deletions(-) |
| 20 |
|
| 21 |
diff --git a/policy/modules/admin/puppet.fc b/policy/modules/admin/puppet.fc |
| 22 |
index f45bdc6a..001f21fe 100644 |
| 23 |
--- a/policy/modules/admin/puppet.fc |
| 24 |
+++ b/policy/modules/admin/puppet.fc |
| 25 |
@@ -11,6 +11,7 @@ |
| 26 |
/usr/sbin/puppetd -- gen_context(system_u:object_r:puppet_exec_t,s0) |
| 27 |
/usr/sbin/puppetmasterd -- gen_context(system_u:object_r:puppetmaster_exec_t,s0) |
| 28 |
|
| 29 |
+/var/cache/puppet(/.*)? gen_context(system_u:object_r:puppet_cache_t,s0) |
| 30 |
/var/lib/puppet(/.*)? gen_context(system_u:object_r:puppet_var_lib_t,s0) |
| 31 |
|
| 32 |
/var/log/puppet(/.*)? gen_context(system_u:object_r:puppet_log_t,s0) |
| 33 |
|
| 34 |
diff --git a/policy/modules/admin/puppet.te b/policy/modules/admin/puppet.te |
| 35 |
index 3d5a832b..7ef5ab83 100644 |
| 36 |
--- a/policy/modules/admin/puppet.te |
| 37 |
+++ b/policy/modules/admin/puppet.te |
| 38 |
@@ -36,6 +36,9 @@ init_daemon_runtime_file(puppet_runtime_t, dir, "puppet") |
| 39 |
type puppet_tmp_t; |
| 40 |
files_tmp_file(puppet_tmp_t) |
| 41 |
|
| 42 |
+type puppet_cache_t; |
| 43 |
+files_type(puppet_cache_t) |
| 44 |
+ |
| 45 |
type puppet_var_lib_t; |
| 46 |
files_type(puppet_var_lib_t) |
| 47 |
|
| 48 |
@@ -74,6 +77,9 @@ manage_dirs_pattern(puppet_t, puppet_var_lib_t, puppet_var_lib_t) |
| 49 |
manage_files_pattern(puppet_t, puppet_var_lib_t, puppet_var_lib_t) |
| 50 |
can_exec(puppet_t, puppet_var_lib_t) |
| 51 |
|
| 52 |
+manage_dirs_pattern(puppet_t, puppet_cache_t, puppet_cache_t) |
| 53 |
+manage_files_pattern(puppet_t, puppet_cache_t, puppet_cache_t) |
| 54 |
+ |
| 55 |
setattr_dirs_pattern(puppet_t, puppet_runtime_t, puppet_runtime_t) |
| 56 |
manage_files_pattern(puppet_t, puppet_runtime_t, puppet_runtime_t) |
| 57 |
files_runtime_filetrans(puppet_t, puppet_runtime_t, { file dir }) |
| 58 |
@@ -182,8 +188,6 @@ optional_policy(` |
| 59 |
') |
| 60 |
|
| 61 |
optional_policy(` |
| 62 |
- files_rw_var_files(puppet_t) |
| 63 |
- |
| 64 |
rpm_domtrans(puppet_t) |
| 65 |
rpm_manage_db(puppet_t) |
| 66 |
rpm_manage_log(puppet_t) |
| 67 |
@@ -267,6 +271,7 @@ allow puppetmaster_t puppet_etc_t:lnk_file read_lnk_file_perms; |
| 68 |
allow puppetmaster_t puppet_log_t:dir setattr_dir_perms; |
| 69 |
append_files_pattern(puppetmaster_t, puppet_log_t, puppet_log_t) |
| 70 |
create_files_pattern(puppetmaster_t, puppet_log_t, puppet_log_t) |
| 71 |
+read_files_pattern(puppetmaster_t, puppet_log_t, puppet_log_t) |
| 72 |
setattr_files_pattern(puppetmaster_t, puppet_log_t, puppet_log_t) |
| 73 |
logging_log_filetrans(puppetmaster_t, puppet_log_t, { file dir }) |
Archives