Re: [PATCH] puppet V3

On 2/17/22 09:45, Russell Coker wrote:
> Removed the entrypoint stuff that was controversial, the rest should be fine.
> 
> I think it's ready to merge.
> 
> Signed-off-by: Russell Coker <[email protected]>
> 
> Index: refpolicy-2.20220106/policy/modules/admin/puppet.fc
> ===================================================================
> --- refpolicy-2.20220106.orig/policy/modules/admin/puppet.fc
> +++ refpolicy-2.20220106/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)
> Index: refpolicy-2.20220106/policy/modules/admin/puppet.te
> ===================================================================
> --- refpolicy-2.20220106.orig/policy/modules/admin/puppet.te
> +++ refpolicy-2.20220106/policy/modules/admin/puppet.te
> @@ -36,6 +36,9 @@ init_daemon_runtime_file(puppet_runtime_
>   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
>   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 +189,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 +272,7 @@ allow puppetmaster_t puppet_etc_t:lnk_fi
>   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 })

Merged.

-- 
Chris PeBenito