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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 60D60139694 for ; Sun, 30 Apr 2017 14:20:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 256DE21C0E7; Sun, 30 Apr 2017 14:20:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EAC1421C0E7 for ; Sun, 30 Apr 2017 14:20:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9AD113416B9 for ; Sun, 30 Apr 2017 14:20:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C82D97453 for ; Sun, 30 Apr 2017 14:20:00 +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: <1493561864.7b0509b4ca611c1723179a84d751ada6345b7a13.perfinion@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/contrib/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/contrib/apache.te X-VCS-Directories: policy/modules/contrib/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 7b0509b4ca611c1723179a84d751ada6345b7a13 X-VCS-Branch: master Date: Sun, 30 Apr 2017 14:20:00 +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-Archives-Salt: 2e8d19b3-5754-4037-a75b-a8882bfc92c9 X-Archives-Hash: c7330c5d621cdb1087571c71523dc021 commit: 7b0509b4ca611c1723179a84d751ada6345b7a13 Author: Chris PeBenito ieee org> AuthorDate: Fri Apr 21 00:19:13 2017 +0000 Commit: Jason Zaman gentoo org> CommitDate: Sun Apr 30 14:17:44 2017 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=7b0509b4 apache: Move blocks. No rule changes. policy/modules/contrib/apache.te | 58 +++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/policy/modules/contrib/apache.te b/policy/modules/contrib/apache.te index ce6479e8..9593175b 100644 --- a/policy/modules/contrib/apache.te +++ b/policy/modules/contrib/apache.te @@ -745,14 +745,6 @@ tunable_policy(`httpd_use_fusefs && httpd_builtin_scripting',` fs_exec_fusefs_files(httpd_t) ') -optional_policy(` - tunable_policy(`httpd_use_nfs',` - fs_list_auto_mountpoints(httpd_t) - rpc_manage_nfs_rw_content(httpd_t) - rpc_read_nfs_content(httpd_t) - ') -') - tunable_policy(`httpd_use_nfs && httpd_builtin_scripting',` fs_exec_nfs_files(httpd_t) ') @@ -877,6 +869,12 @@ optional_policy(` optional_policy(` rpc_search_nfs_state_data(httpd_t) + + tunable_policy(`httpd_use_nfs',` + fs_list_auto_mountpoints(httpd_t) + rpc_manage_nfs_rw_content(httpd_t) + rpc_read_nfs_content(httpd_t) + ') ') optional_policy(` @@ -1016,6 +1014,10 @@ tunable_policy(`httpd_enable_cgi && httpd_unified',` domtrans_pattern(httpd_suexec_t, httpdcontent, httpd_sys_script_t) ') +tunable_policy(`httpd_enable_homedirs',` + userdom_search_user_home_dirs(httpd_suexec_t) +') + tunable_policy(`httpd_enable_homedirs && use_samba_home_dirs',` fs_list_auto_mountpoints(httpd_suexec_t) fs_read_cifs_files(httpd_suexec_t) @@ -1040,6 +1042,10 @@ tunable_policy(`httpd_execmem',` allow httpd_suexec_t self:process { execmem execstack }; ') +tunable_policy(`httpd_read_user_content',` + userdom_read_user_home_content_files(httpd_suexec_t) +') + tunable_policy(`httpd_tmp_exec',` can_exec(httpd_suexec_t, httpd_suexec_tmp_t) ') @@ -1072,14 +1078,6 @@ tunable_policy(`httpd_use_fusefs && httpd_builtin_scripting',` fs_exec_fusefs_files(httpd_suexec_t) ') -optional_policy(` - tunable_policy(`httpd_use_nfs',` - fs_list_auto_mountpoints(httpd_suexec_t) - rpc_manage_nfs_rw_content(httpd_t) - rpc_read_nfs_content(httpd_t) - ') -') - tunable_policy(`httpd_use_nfs && httpd_builtin_scripting',` fs_exec_nfs_files(httpd_suexec_t) ') @@ -1106,12 +1104,12 @@ optional_policy(` ') ') -tunable_policy(`httpd_read_user_content',` - userdom_read_user_home_content_files(httpd_suexec_t) -') - -tunable_policy(`httpd_enable_homedirs',` - userdom_search_user_home_dirs(httpd_suexec_t) +optional_policy(` + tunable_policy(`httpd_use_nfs',` + fs_list_auto_mountpoints(httpd_suexec_t) + rpc_manage_nfs_rw_content(httpd_t) + rpc_read_nfs_content(httpd_t) + ') ') ######################################## @@ -1311,14 +1309,6 @@ tunable_policy(`httpd_use_fusefs && httpd_builtin_scripting',` fs_exec_fusefs_files(httpd_sys_script_t) ') -optional_policy(` - tunable_policy(`httpd_use_nfs',` - fs_list_auto_mountpoints(httpd_sys_script_t) - rpc_manage_nfs_rw_content(httpd_t) - rpc_read_nfs_content(httpd_t) - ') -') - tunable_policy(`httpd_use_nfs && httpd_builtin_scripting',` fs_exec_nfs_files(httpd_sys_script_t) ') @@ -1331,6 +1321,14 @@ optional_policy(` postgresql_unpriv_client(httpd_sys_script_t) ') +optional_policy(` + tunable_policy(`httpd_use_nfs',` + fs_list_auto_mountpoints(httpd_sys_script_t) + rpc_manage_nfs_rw_content(httpd_t) + rpc_read_nfs_content(httpd_t) + ') +') + ######################################## # # Rotatelogs local policy