From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-907948-garchives=archives.gentoo.org@lists.gentoo.org> 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 7C9C2138CD6 for <garchives@archives.gentoo.org>; Mon, 24 Oct 2016 16:57:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4EC41E0B0D; Mon, 24 Oct 2016 16:56:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 3806BE0B0D for <gentoo-commits@lists.gentoo.org>; Mon, 24 Oct 2016 16:56:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5E48F34166C for <gentoo-commits@lists.gentoo.org>; Mon, 24 Oct 2016 16:56:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A7ABE24A4 for <gentoo-commits@lists.gentoo.org>; Mon, 24 Oct 2016 16:56:34 +0000 (UTC) From: "Sven Vermeulen" <swift@gentoo.org> 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" <swift@gentoo.org> Message-ID: <1477328107.d95d8f98194fb82bcd0afba3ce09893911a3f146.swift@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/system/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/system/miscfiles.if policy/modules/system/userdomain.if X-VCS-Directories: policy/modules/system/ X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: d95d8f98194fb82bcd0afba3ce09893911a3f146 X-VCS-Branch: master Date: Mon, 24 Oct 2016 16:56:34 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3a4fdaf4-9c49-44f2-92c3-7c503db7fb47 X-Archives-Hash: 74cd631b7bd35ce83678d27baab3adb2 commit: d95d8f98194fb82bcd0afba3ce09893911a3f146 Author: Sven Vermeulen <swift <AT> gentoo <DOT> org> AuthorDate: Mon Oct 24 16:55:07 2016 +0000 Commit: Sven Vermeulen <swift <AT> gentoo <DOT> org> CommitDate: Mon Oct 24 16:55:07 2016 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=d95d8f98 Move miscfiles_relabel_user_certs to userdom_relabel_user_certs policy/modules/system/miscfiles.if | 11 +++-------- policy/modules/system/userdomain.if | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/policy/modules/system/miscfiles.if b/policy/modules/system/miscfiles.if index d89c7c0..5b9a810 100644 --- a/policy/modules/system/miscfiles.if +++ b/policy/modules/system/miscfiles.if @@ -103,7 +103,7 @@ interface(`miscfiles_manage_user_certs',` ######################################## ## <summary> -## Relabel from/to cert_home_t (user-managed SSL certificates) +## Relabel from/to user_cert_t (user-managed SSL certificates) ## </summary> ## <param name="domain"> ## <summary> @@ -112,13 +112,8 @@ interface(`miscfiles_manage_user_certs',` ## </param> # interface(`miscfiles_relabel_user_certs',` - gen_require(` - type cert_home_t; - ') - - relabel_dirs_pattern($1, cert_home_t, cert_home_t) - relabel_files_pattern($1, cert_home_t, cert_home_t) - relabel_lnk_files_pattern($1, cert_home_t, cert_home_t) + userdom_relabel_user_certs($1) + refpolicywarn(`$0() has been deprecated, please use userdom_relabel_user_certs() instead.') ') ######################################## diff --git a/policy/modules/system/userdomain.if b/policy/modules/system/userdomain.if index 666292e..c4bef2b 100644 --- a/policy/modules/system/userdomain.if +++ b/policy/modules/system/userdomain.if @@ -4053,3 +4053,26 @@ interface(`userdom_user_home_dir_filetrans_user_cert',` userdom_user_home_dir_filetrans($1, user_cert_t, $2, $3) ') + +######################################## +## <summary> +## Allow relabeling resources to user_cert_t +## </summary> +## <param name="domain"> +## <summary> +## Domain allowed access +## </summary> +## </param> +# + +interface(`userdom_relabel_user_certs',` + gen_require(` + type user_cert_t; + ') + + relabel_dirs_pattern($1, user_cert_t, user_cert_t) + relabel_files_pattern($1, user_cert_t, user_cert_t) + relabel_lnk_files_pattern($1, user_cert_t, user_cert_t) + relabel_sock_files_pattern($1, user_cert_t, user_cert_t) + relabel_fifo_files_pattern($1, user_cert_t, user_cert_t) +') From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-907956-garchives=archives.gentoo.org@lists.gentoo.org> 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 3D859138D1A for <garchives@archives.gentoo.org>; Mon, 24 Oct 2016 17:14:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E6BE6E0962; Mon, 24 Oct 2016 17:14:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 CFC8AE0962 for <gentoo-commits@lists.gentoo.org>; Mon, 24 Oct 2016 17:14:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0CFD23414C1 for <gentoo-commits@lists.gentoo.org>; Mon, 24 Oct 2016 17:14:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EBC9F24A7 for <gentoo-commits@lists.gentoo.org>; Mon, 24 Oct 2016 17:13:59 +0000 (UTC) From: "Sven Vermeulen" <swift@gentoo.org> 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" <swift@gentoo.org> Message-ID: <1477328107.d95d8f98194fb82bcd0afba3ce09893911a3f146.swift@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:next commit in: policy/modules/system/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/system/miscfiles.if policy/modules/system/userdomain.if X-VCS-Directories: policy/modules/system/ X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: d95d8f98194fb82bcd0afba3ce09893911a3f146 X-VCS-Branch: next Date: Mon, 24 Oct 2016 17:13:59 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1ac92be4-8582-4df9-b630-ebf80e08e8a9 X-Archives-Hash: bc2c328567bb9444a1597c4a163f0a60 Message-ID: <20161024171359.n6OEX7WMBCJY0D_8eB-tQq4vGJfMQK6YlOFEqozux-E@z> commit: d95d8f98194fb82bcd0afba3ce09893911a3f146 Author: Sven Vermeulen <swift <AT> gentoo <DOT> org> AuthorDate: Mon Oct 24 16:55:07 2016 +0000 Commit: Sven Vermeulen <swift <AT> gentoo <DOT> org> CommitDate: Mon Oct 24 16:55:07 2016 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=d95d8f98 Move miscfiles_relabel_user_certs to userdom_relabel_user_certs policy/modules/system/miscfiles.if | 11 +++-------- policy/modules/system/userdomain.if | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/policy/modules/system/miscfiles.if b/policy/modules/system/miscfiles.if index d89c7c0..5b9a810 100644 --- a/policy/modules/system/miscfiles.if +++ b/policy/modules/system/miscfiles.if @@ -103,7 +103,7 @@ interface(`miscfiles_manage_user_certs',` ######################################## ## <summary> -## Relabel from/to cert_home_t (user-managed SSL certificates) +## Relabel from/to user_cert_t (user-managed SSL certificates) ## </summary> ## <param name="domain"> ## <summary> @@ -112,13 +112,8 @@ interface(`miscfiles_manage_user_certs',` ## </param> # interface(`miscfiles_relabel_user_certs',` - gen_require(` - type cert_home_t; - ') - - relabel_dirs_pattern($1, cert_home_t, cert_home_t) - relabel_files_pattern($1, cert_home_t, cert_home_t) - relabel_lnk_files_pattern($1, cert_home_t, cert_home_t) + userdom_relabel_user_certs($1) + refpolicywarn(`$0() has been deprecated, please use userdom_relabel_user_certs() instead.') ') ######################################## diff --git a/policy/modules/system/userdomain.if b/policy/modules/system/userdomain.if index 666292e..c4bef2b 100644 --- a/policy/modules/system/userdomain.if +++ b/policy/modules/system/userdomain.if @@ -4053,3 +4053,26 @@ interface(`userdom_user_home_dir_filetrans_user_cert',` userdom_user_home_dir_filetrans($1, user_cert_t, $2, $3) ') + +######################################## +## <summary> +## Allow relabeling resources to user_cert_t +## </summary> +## <param name="domain"> +## <summary> +## Domain allowed access +## </summary> +## </param> +# + +interface(`userdom_relabel_user_certs',` + gen_require(` + type user_cert_t; + ') + + relabel_dirs_pattern($1, user_cert_t, user_cert_t) + relabel_files_pattern($1, user_cert_t, user_cert_t) + relabel_lnk_files_pattern($1, user_cert_t, user_cert_t) + relabel_sock_files_pattern($1, user_cert_t, user_cert_t) + relabel_fifo_files_pattern($1, user_cert_t, user_cert_t) +') From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-907941-garchives=archives.gentoo.org@lists.gentoo.org> 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 2F287138CD5 for <garchives@archives.gentoo.org>; Mon, 24 Oct 2016 16:56:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 83575E08E1; Mon, 24 Oct 2016 16:56:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 6B629E08E1 for <gentoo-commits@lists.gentoo.org>; Mon, 24 Oct 2016 16:56:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 842B23415A2 for <gentoo-commits@lists.gentoo.org>; Mon, 24 Oct 2016 16:56:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 159582413 for <gentoo-commits@lists.gentoo.org>; Mon, 24 Oct 2016 16:56:16 +0000 (UTC) From: "Sven Vermeulen" <swift@gentoo.org> 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" <swift@gentoo.org> Message-ID: <1477328107.d95d8f98194fb82bcd0afba3ce09893911a3f146.swift@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:swift commit in: policy/modules/system/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/system/miscfiles.if policy/modules/system/userdomain.if X-VCS-Directories: policy/modules/system/ X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: d95d8f98194fb82bcd0afba3ce09893911a3f146 X-VCS-Branch: swift Date: Mon, 24 Oct 2016 16:56:16 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4cd191aa-d66c-456c-a78a-619820cfca06 X-Archives-Hash: c962b34929ca67aaf6fcca11b2a21d48 Message-ID: <20161024165616.jB690nGj_73BIvZg2YGU5rGBKAY12lJ7YfbEGu_k6fg@z> commit: d95d8f98194fb82bcd0afba3ce09893911a3f146 Author: Sven Vermeulen <swift <AT> gentoo <DOT> org> AuthorDate: Mon Oct 24 16:55:07 2016 +0000 Commit: Sven Vermeulen <swift <AT> gentoo <DOT> org> CommitDate: Mon Oct 24 16:55:07 2016 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=d95d8f98 Move miscfiles_relabel_user_certs to userdom_relabel_user_certs policy/modules/system/miscfiles.if | 11 +++-------- policy/modules/system/userdomain.if | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/policy/modules/system/miscfiles.if b/policy/modules/system/miscfiles.if index d89c7c0..5b9a810 100644 --- a/policy/modules/system/miscfiles.if +++ b/policy/modules/system/miscfiles.if @@ -103,7 +103,7 @@ interface(`miscfiles_manage_user_certs',` ######################################## ## <summary> -## Relabel from/to cert_home_t (user-managed SSL certificates) +## Relabel from/to user_cert_t (user-managed SSL certificates) ## </summary> ## <param name="domain"> ## <summary> @@ -112,13 +112,8 @@ interface(`miscfiles_manage_user_certs',` ## </param> # interface(`miscfiles_relabel_user_certs',` - gen_require(` - type cert_home_t; - ') - - relabel_dirs_pattern($1, cert_home_t, cert_home_t) - relabel_files_pattern($1, cert_home_t, cert_home_t) - relabel_lnk_files_pattern($1, cert_home_t, cert_home_t) + userdom_relabel_user_certs($1) + refpolicywarn(`$0() has been deprecated, please use userdom_relabel_user_certs() instead.') ') ######################################## diff --git a/policy/modules/system/userdomain.if b/policy/modules/system/userdomain.if index 666292e..c4bef2b 100644 --- a/policy/modules/system/userdomain.if +++ b/policy/modules/system/userdomain.if @@ -4053,3 +4053,26 @@ interface(`userdom_user_home_dir_filetrans_user_cert',` userdom_user_home_dir_filetrans($1, user_cert_t, $2, $3) ') + +######################################## +## <summary> +## Allow relabeling resources to user_cert_t +## </summary> +## <param name="domain"> +## <summary> +## Domain allowed access +## </summary> +## </param> +# + +interface(`userdom_relabel_user_certs',` + gen_require(` + type user_cert_t; + ') + + relabel_dirs_pattern($1, user_cert_t, user_cert_t) + relabel_files_pattern($1, user_cert_t, user_cert_t) + relabel_lnk_files_pattern($1, user_cert_t, user_cert_t) + relabel_sock_files_pattern($1, user_cert_t, user_cert_t) + relabel_fifo_files_pattern($1, user_cert_t, user_cert_t) +')