From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2B47515808B for ; Sun, 27 Feb 2022 02:52:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 377232BC00D; Sun, 27 Feb 2022 02:52:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1143F2BC00C for ; Sun, 27 Feb 2022 02:52:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7B3823431CB for ; Sun, 27 Feb 2022 02:52:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9D5872FD for ; Sun, 27 Feb 2022 02:52:33 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1645927997.300f017b1807980f57f1578f8ac1ffdf49a4285e.perfinion@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/admin/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/admin/puppet.fc policy/modules/admin/puppet.te X-VCS-Directories: policy/modules/admin/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 300f017b1807980f57f1578f8ac1ffdf49a4285e X-VCS-Branch: master Date: Sun, 27 Feb 2022 02:52:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4006dd36-4260-4d72-8c16-37f4312a0745 X-Archives-Hash: 964e258a45f3747e0e4e85c800879787 commit: 300f017b1807980f57f1578f8ac1ffdf49a4285e Author: Chris PeBenito ieee org> AuthorDate: Fri Feb 18 18:25:04 2022 +0000 Commit: Jason Zaman gentoo org> CommitDate: Sun Feb 27 02:13:17 2022 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=300f017b puppet: Style fixes. Signed-off-by: Chris PeBenito ieee.org> Signed-off-by: Jason Zaman gentoo.org> policy/modules/admin/puppet.fc | 1 + policy/modules/admin/puppet.te | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/policy/modules/admin/puppet.fc b/policy/modules/admin/puppet.fc index 001f21fe..42f3b7b2 100644 --- a/policy/modules/admin/puppet.fc +++ b/policy/modules/admin/puppet.fc @@ -12,6 +12,7 @@ /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 7ef5ab83..9e312a17 100644 --- a/policy/modules/admin/puppet.te +++ b/policy/modules/admin/puppet.te @@ -20,6 +20,9 @@ type puppet_t; type puppet_exec_t; init_daemon_domain(puppet_t, puppet_exec_t) +type puppet_cache_t; +files_type(puppet_cache_t) + type puppet_etc_t; files_config_file(puppet_etc_t) @@ -36,9 +39,6 @@ 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) @@ -73,10 +73,6 @@ allow puppet_t puppet_etc_t:dir list_dir_perms; allow puppet_t puppet_etc_t:file read_file_perms; allow puppet_t puppet_etc_t:lnk_file read_lnk_file_perms; -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) @@ -84,6 +80,10 @@ 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 }) +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) + allow puppet_t puppet_log_t:dir { create_dir_perms setattr_dir_perms }; append_files_pattern(puppet_t, puppet_log_t, puppet_log_t) create_files_pattern(puppet_t, puppet_log_t, puppet_log_t)