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 979F0138010 for ; Fri, 28 Sep 2012 17:52:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 322F4E0730; Fri, 28 Sep 2012 17:50:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E9F83E0730 for ; Fri, 28 Sep 2012 17:50:40 +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 0CC3133D2A8 for ; Fri, 28 Sep 2012 17:50:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4F8F9E544A for ; Fri, 28 Sep 2012 17:50:37 +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: <1348854476.a7aab0b2275f1883f1908bb036520a7a6616a94f.SwifT@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/dkim.fc policy/modules/contrib/dkim.if policy/modules/contrib/dkim.te X-VCS-Directories: policy/modules/contrib/ X-VCS-Committer: SwifT X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: a7aab0b2275f1883f1908bb036520a7a6616a94f X-VCS-Branch: master Date: Fri, 28 Sep 2012 17:50:37 +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: 18fd0615-e97b-4d60-a596-6243df704254 X-Archives-Hash: 496d2dd79777c6d55a6ae0d2153661c3 commit: a7aab0b2275f1883f1908bb036520a7a6616a94f Author: Dominick Grift gmail com> AuthorDate: Fri Sep 28 10:49:33 2012 +0000 Commit: Sven Vermeulen siphos be> CommitDate: Fri Sep 28 17:47:56 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=a7aab0b2 Changes to the dkim policy module Add init script file Add dkim_admin() Module clean up Signed-off-by: Dominick Grift gmail.com> --- policy/modules/contrib/dkim.fc | 19 +++++++++++-------- policy/modules/contrib/dkim.if | 38 ++++++++++++++++++++++++++++++++++++++ policy/modules/contrib/dkim.te | 6 ++++-- 3 files changed, 53 insertions(+), 10 deletions(-) diff --git a/policy/modules/contrib/dkim.fc b/policy/modules/contrib/dkim.fc index bf4321a..eebcf5d 100644 --- a/policy/modules/contrib/dkim.fc +++ b/policy/modules/contrib/dkim.fc @@ -1,14 +1,17 @@ /etc/mail/dkim-milter/keys(/.*)? gen_context(system_u:object_r:dkim_milter_private_key_t,s0) -/etc/opendkim/keys(/.*)? gen_context(system_u:object_r:dkim_milter_private_key_t,s0) +/etc/opendkim/keys(/.*)? gen_context(system_u:object_r:dkim_milter_private_key_t,s0) -/usr/sbin/dkim-filter -- gen_context(system_u:object_r:dkim_milter_exec_t,s0) -/usr/sbin/opendkim -- gen_context(system_u:object_r:dkim_milter_exec_t,s0) +/etc/rc\.d/init\.d/((opendkim)|(dkim-milter)) -- gen_context(system_u:object_r:dkim_milter_initrc_exec_t,s0) -/var/db/dkim(/.*)? gen_context(system_u:object_r:dkim_milter_private_key_t,s0) +/usr/sbin/dkim-filter -- gen_context(system_u:object_r:dkim_milter_exec_t,s0) +/usr/sbin/opendkim -- gen_context(system_u:object_r:dkim_milter_exec_t,s0) -/var/run/dkim-filter(/.*)? gen_context(system_u:object_r:dkim_milter_data_t,s0) -/var/run/dkim-milter(/.*)? gen_context(system_u:object_r:dkim_milter_data_t,s0) +/var/db/dkim(/.*)? gen_context(system_u:object_r:dkim_milter_private_key_t,s0) + +/var/run/dkim-filter(/.*)? gen_context(system_u:object_r:dkim_milter_data_t,s0) +/var/run/dkim-milter(/.*)? gen_context(system_u:object_r:dkim_milter_data_t,s0) /var/run/dkim-milter\.pid -- gen_context(system_u:object_r:dkim_milter_data_t,s0) -/var/run/opendkim(/.*)? gen_context(system_u:object_r:dkim_milter_data_t,s0) -/var/spool/opendkim(/.*)? gen_context(system_u:object_r:dkim_milter_data_t,s0) +/var/run/opendkim(/.*)? gen_context(system_u:object_r:dkim_milter_data_t,s0) + +/var/spool/opendkim(/.*)? gen_context(system_u:object_r:dkim_milter_data_t,s0) diff --git a/policy/modules/contrib/dkim.if b/policy/modules/contrib/dkim.if index 32d108a..386e494 100644 --- a/policy/modules/contrib/dkim.if +++ b/policy/modules/contrib/dkim.if @@ -1 +1,39 @@ ## DomainKeys Identified Mail milter. + +######################################## +## +## All of the rules required to +## administrate an dkim environment. +## +## +## +## Domain allowed access. +## +## +## +## +## Role allowed access. +## +## +## +# +interface(`dkim_admin',` + gen_require(` + type dkim_milter_t, dkim_milter_initrc_exec_t, dkim_milter_private_key_t; + type dkim_milter_data_t; + ') + + allow $1 dkim_milter_t:process { ptrace signal_perms }; + ps_process_pattern($1, dkim_milter_t) + + init_labeled_script_domtrans($1, dkim_milter_initrc_exec_t) + domain_system_change_exemption($1) + role_transition $2 dkim_milter_initrc_exec_t system_r; + allow $2 system_r; + + files_search_etc($1) + admin_pattern($1, dkim_milter_private_key_t) + + files_search_pids($1) + admin_pattern($1, dkim_milter_data_t) +') diff --git a/policy/modules/contrib/dkim.te b/policy/modules/contrib/dkim.te index cc1199e..30f4578 100644 --- a/policy/modules/contrib/dkim.te +++ b/policy/modules/contrib/dkim.te @@ -1,4 +1,4 @@ -policy_module(dkim, 1.1.0) +policy_module(dkim, 1.1.1) ######################################## # @@ -7,7 +7,9 @@ policy_module(dkim, 1.1.0) milter_template(dkim) -# Type for the private key of dkim-filter +type dkim_milter_initrc_exec_t; +init_script_file(dkim_milter_initrc_exec_t) + type dkim_milter_private_key_t; files_type(dkim_milter_private_key_t)