diff options
| author |   Russell Coker <russell@coker.com.au> | 2022-02-18 01:45:38 +1100 |
|---|---|---|
| committer |   Jason Zaman <perfinion@gentoo.org> | 2022-02-26 18:13:17 -0800 |
| commit | 4b1f697b6a9ee59734e0cdf1067cc6d57a3b0799 (patch) | |
| tree | 638869374e1b43c55cd7c0e0c55ac444810b19ba | |
| parent | cron, dbus, policykit, postfix: Minor style fixes. (diff) | |
| download | hardened-refpolicy-4b1f697b.tar.gz hardened-refpolicy-4b1f697b.tar.bz2 hardened-refpolicy-4b1f697b.zip | |
puppet V3
Removed the entrypoint stuff that was controversial, the rest should be fine.
I think it's ready to merge.
Signed-off-by: Russell Coker <russell@coker.com.au>
Signed-off-by: Jason Zaman <perfinion@gentoo.org>
| -rw-r--r-- | policy/modules/admin/puppet.fc | 1 | ||||
| -rw-r--r-- | policy/modules/admin/puppet.te | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/policy/modules/admin/puppet.fc b/policy/modules/admin/puppet.fc index f45bdc6a8..001f21fe9 100644 --- a/policy/modules/admin/puppet.fc +++ b/policy/modules/admin/puppet.fc @@ -11,6 +11,7 @@ /usr/sbin/puppetd -- gen_context(system_u:object_r:puppet_exec_t,s0) /usr/sbin/puppetmasterd -- gen_context(system_u:object_r:puppetmaster_exec_t,s0) +/var/cache/puppet(/.*)? gen_context(system_u:object_r:puppet_cache_t,s0) /var/lib/puppet(/.*)? gen_context(system_u:object_r:puppet_var_lib_t,s0) /var/log/puppet(/.*)? gen_context(system_u:object_r:puppet_log_t,s0) diff --git a/policy/modules/admin/puppet.te b/policy/modules/admin/puppet.te index 3d5a832b9..7ef5ab836 100644 --- a/policy/modules/admin/puppet.te +++ b/policy/modules/admin/puppet.te @@ -36,6 +36,9 @@ init_daemon_runtime_file(puppet_runtime_t, dir, "puppet") type puppet_tmp_t; files_tmp_file(puppet_tmp_t) +type puppet_cache_t; +files_type(puppet_cache_t) + type puppet_var_lib_t; files_type(puppet_var_lib_t) @@ -74,6 +77,9 @@ manage_dirs_pattern(puppet_t, puppet_var_lib_t, puppet_var_lib_t) manage_files_pattern(puppet_t, puppet_var_lib_t, puppet_var_lib_t) can_exec(puppet_t, puppet_var_lib_t) +manage_dirs_pattern(puppet_t, puppet_cache_t, puppet_cache_t) +manage_files_pattern(puppet_t, puppet_cache_t, puppet_cache_t) + setattr_dirs_pattern(puppet_t, puppet_runtime_t, puppet_runtime_t) manage_files_pattern(puppet_t, puppet_runtime_t, puppet_runtime_t) files_runtime_filetrans(puppet_t, puppet_runtime_t, { file dir }) @@ -182,8 +188,6 @@ optional_policy(` ') optional_policy(` - files_rw_var_files(puppet_t) - rpm_domtrans(puppet_t) rpm_manage_db(puppet_t) rpm_manage_log(puppet_t) @@ -267,6 +271,7 @@ allow puppetmaster_t puppet_etc_t:lnk_file read_lnk_file_perms; allow puppetmaster_t puppet_log_t:dir setattr_dir_perms; append_files_pattern(puppetmaster_t, puppet_log_t, puppet_log_t) create_files_pattern(puppetmaster_t, puppet_log_t, puppet_log_t) +read_files_pattern(puppetmaster_t, puppet_log_t, puppet_log_t) setattr_files_pattern(puppetmaster_t, puppet_log_t, puppet_log_t) logging_log_filetrans(puppetmaster_t, puppet_log_t, { file dir }) |