From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id BA7F61381F3 for ; Mon, 23 Sep 2013 06:29:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 009FCE09DE; Mon, 23 Sep 2013 06:29:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DBF20E09B3 for ; Mon, 23 Sep 2013 06:29:29 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DA8F033ED37 for ; Mon, 23 Sep 2013 06:29:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4C12CE546A for ; Mon, 23 Sep 2013 06:29:26 +0000 (UTC) From: "Sven Vermeulen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Vermeulen" Message-ID: <1379917648.5562e1cd22a89358906eb674325fb40a10cf9ae2.SwifT@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:merge commit in: policy/modules/contrib/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/contrib/condor.fc policy/modules/contrib/condor.if policy/modules/contrib/condor.te X-VCS-Directories: policy/modules/contrib/ X-VCS-Committer: SwifT X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: 5562e1cd22a89358906eb674325fb40a10cf9ae2 X-VCS-Branch: merge Date: Mon, 23 Sep 2013 06:29:26 +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: 9397d86a-2d3b-4efd-9f50-76f41b5fc1fe X-Archives-Hash: 75cbd8ac12d08fd565b525af6744f2fe Message-ID: <20130923062926.AZcopFRgimBD2LnKYAWVyL3RqbtON-rOEvVLUiv4Mow@z> commit: 5562e1cd22a89358906eb674325fb40a10cf9ae2 Author: Dominick Grift gmail com> AuthorDate: Thu Sep 19 17:54:51 2013 +0000 Commit: Sven Vermeulen siphos be> CommitDate: Mon Sep 23 06:27:28 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=5562e1cd Change type from etc_rw to conf for readability admin access to condor_conf_t Signed-off-by: Dominick Grift gmail.com> --- policy/modules/contrib/condor.fc | 2 +- policy/modules/contrib/condor.if | 5 ++++- policy/modules/contrib/condor.te | 6 +++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/policy/modules/contrib/condor.fc b/policy/modules/contrib/condor.fc index 543321b..ad2b696 100644 --- a/policy/modules/contrib/condor.fc +++ b/policy/modules/contrib/condor.fc @@ -1,4 +1,4 @@ -/etc/condor(/.*)? gen_context(system_u:object_r:condor_etc_rw_t,s0) +/etc/condor(/.*)? gen_context(system_u:object_r:condor_conf_t,s0) /etc/rc\.d/init\.d/condor -- gen_context(system_u:object_r:condor_initrc_exec_t,s0) diff --git a/policy/modules/contrib/condor.if b/policy/modules/contrib/condor.if index 3fe3cb8..881d92f 100644 --- a/policy/modules/contrib/condor.if +++ b/policy/modules/contrib/condor.if @@ -60,7 +60,7 @@ interface(`condor_admin',` attribute condor_domain; type condor_initrc_exec_config_t, condor_log_t; type condor_var_lib_t, condor_var_lock_t, condor_schedd_tmp_t; - type condor_var_run_t, condor_startd_tmp_t; + type condor_var_run_t, condor_startd_tmp_t, condor_conf_t; ') allow $1 condor_domain:process { ptrace signal_perms }; @@ -71,6 +71,9 @@ interface(`condor_admin',` role_transition $2 condor_initrc_exec_t system_r; allow $2 system_r; + files_search_etc($1) + admin_pattern($1, condor_conf_t) + logging_search_logs($1) admin_pattern($1, condor_log_t) diff --git a/policy/modules/contrib/condor.te b/policy/modules/contrib/condor.te index 7666be4..5fd1388 100644 --- a/policy/modules/contrib/condor.te +++ b/policy/modules/contrib/condor.te @@ -34,8 +34,8 @@ files_tmp_file(condor_startd_tmp_t) type condor_startd_tmpfs_t; files_tmpfs_file(condor_startd_tmpfs_t) -type condor_etc_rw_t; -files_config_file(condor_etc_rw_t) +type condor_conf_t; +files_config_file(condor_conf_t) type condor_log_t; logging_log_file(condor_log_t) @@ -65,7 +65,7 @@ allow condor_domain self:fifo_file rw_fifo_file_perms; allow condor_domain self:tcp_socket { accept listen }; allow condor_domain self:unix_stream_socket { accept listen }; -rw_files_pattern(condor_domain, condor_etc_rw_t, condor_etc_rw_t) +rw_files_pattern(condor_domain, condor_conf_t, condor_conf_t) manage_dirs_pattern(condor_domain, condor_log_t, condor_log_t) append_files_pattern(condor_domain, condor_log_t, condor_log_t)