From patchwork Sat Apr 23 06:04:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Zaman X-Patchwork-Id: 8916991 Return-Path: X-Original-To: patchwork-selinux@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8DC849F1C1 for ; Sat, 23 Apr 2016 06:10:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D1C8A20254 for ; Sat, 23 Apr 2016 06:10:33 +0000 (UTC) Received: from emvm-gh1-uea09.nsa.gov (smtp.nsa.gov [8.44.101.9]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E1A3920225 for ; Sat, 23 Apr 2016 06:10:32 +0000 (UTC) X-TM-IMSS-Message-ID: Received: from tarius.tycho.ncsc.mil ([144.51.242.1]) by nsa.gov ([10.208.42.194]) with ESMTP (TREND IMSS SMTP Service 7.1) id b0b0064700006457 ; Sat, 23 Apr 2016 02:07:47 -0400 Received: from prometheus.infosec.tycho.ncsc.mil (prometheus [192.168.25.40]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id u3N68DWL008001; Sat, 23 Apr 2016 02:08:14 -0400 Received: from tarius.tycho.ncsc.mil (tarius.infosec.tycho.ncsc.mil [144.51.242.1]) by prometheus.infosec.tycho.ncsc.mil (8.15.2/8.15.2) with ESMTP id u3N65jmt117841 for ; Sat, 23 Apr 2016 02:05:45 -0400 Received: from goalie.tycho.ncsc.mil (goalie [144.51.242.250]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id u3N65jAj007380 for ; Sat, 23 Apr 2016 02:05:45 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0CtBACSDxtX/yUp0ApcAoMNgXu3doJqgR4KF4V3AoFuAQEBAQEBZieEQgEBAQMSLgEBNwEPORg0AQUBHBkiiAgBoHeBMT4xik+FKAEEjEkBAQEBAQEEAgEXBgqEDYtcBAeBdQtAgkOOS4lJjhZjiEaFZY1xMIEOYoF4ggBfAYdFgTUBAQE X-IPAS-Result: A0CtBACSDxtX/yUp0ApcAoMNgXu3doJqgR4KF4V3AoFuAQEBAQEBZieEQgEBAQMSLgEBNwEPORg0AQUBHBkiiAgBoHeBMT4xik+FKAEEjEkBAQEBAQEEAgEXBgqEDYtcBAeBdQtAgkOOS4lJjhZjiEaFZY1xMIEOYoF4ggBfAYdFgTUBAQE X-IronPort-AV: E=Sophos;i="5.24,520,1454994000"; d="scan'208";a="5403917" Received: from emsm-gh1-uea11.corp.nsa.gov (HELO emsm-gh1-uea11.nsa.gov) ([10.208.41.37]) by goalie.tycho.ncsc.mil with ESMTP; 23 Apr 2016 02:05:44 -0400 IronPort-PHdr: =?us-ascii?q?9a23=3AiKXiDBaoWQNbhcG/ybSOvjH/LSx+4OfEezUN459i?= =?us-ascii?q?sYplN5qZpc+ybnLW6fgltlLVR4KTs6sC0LqG9f+5Ej1Qqb+681k8M7V0Hycfjs?= =?us-ascii?q?sXmwFySOWkMmbcaMDQUiohAc5ZX0Vk9XzoeWJcGcL5ekGA6ibqtW1aJBzzOEJP?= =?us-ascii?q?K/jvHcaK1oLsh7D0pMSYMlUArQH+SI0xBS3+lR/WuMgSjNkqAYcK4TyNnEF1ff?= =?us-ascii?q?9Lz3hjP1OZkkW0zM6x+Jl+73YY4Kp5pIYTGZn9Kr81Sb1eESQOL3E+5MqtswLK?= =?us-ascii?q?CwSI+CgySGITxzhBGA/DpCPzW573+n/4v/F63gGCMNf4TLY1XjLk5KBuHky7wB?= =?us-ascii?q?wbPiI0pTmEwvd7i7hW9Uqs?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A1EQAQA2DxtXiEHcVdFcAoMNgXu3doJqg?= =?us-ascii?q?R4KF4F2hAECgW4BAQEBAQECAg8BAQEICwsJH4JefVs9AQEBAxIuAQE3AQ85GDQ?= =?us-ascii?q?BBQEcGSKICAGgd4ExPjGKT4UoAQSMSQEBAQEBAQQCARcGCoQNi1wEB4F1C0CCQ?= =?us-ascii?q?45LiUmOFmOIRoVljXEwgQ6CWh6BYl8Bh0WBNQEBAQ?= X-IPAS-Result: =?us-ascii?q?A1EQAQA2DxtXiEHcVdFcAoMNgXu3doJqgR4KF4F2hAECgW4?= =?us-ascii?q?BAQEBAQECAg8BAQEICwsJH4JefVs9AQEBAxIuAQE3AQ85GDQBBQEcGSKICAGgd?= =?us-ascii?q?4ExPjGKT4UoAQSMSQEBAQEBAQQCARcGCoQNi1wEB4F1C0CCQ45LiUmOFmOIRoV?= =?us-ascii?q?ljXEwgQ6CWh6BYl8Bh0WBNQEBAQ?= X-IronPort-AV: E=Sophos;i="5.24,520,1454976000"; d="scan'208";a="15548864" Received: from emvm-gh1-uea09.nsa.gov ([10.208.42.194]) by emsm-gh1-uea11.nsa.gov with ESMTP/TLS/DHE-RSA-AES256-SHA; 23 Apr 2016 06:05:44 +0000 X-TM-IMSS-Message-ID: Received: from mail-pa0-f65.google.com (mail-pa0-f65.google.com [209.85.220.65]) by nsa.gov ([10.208.42.194]) with ESMTP (TREND IMSS SMTP Service 7.1; TLSv1/SSLv3 AES128-SHA (128/128)) id b0adb86600006431 ; Sat, 23 Apr 2016 02:05:16 -0400 Received: by mail-pa0-f65.google.com with SMTP id vv3so11735595pab.0 for ; Fri, 22 Apr 2016 23:05:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=perfinion-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VgE/+LrZItKMjSQlh7Ni4fsANeZB8waIz2qCOwU49no=; b=Qxo/O2sxPXT3fIwcNSWLepIRtMbV5EOs1eBh6oO7ORvUCIqbtzyGKIQBOXuh+S7vUO yz8o3X8e0TjMgMI8v/+YYMt2NA+X6XROIXggtYxsQaPZLVjb5tH9jKZ2iCfPx+rhQDdn B/kRLqsxcRNAO5MDQUSBINDpm0YJ64jzA9DOepejW+ju0Bj+OZq54wPcLzTQm63uKvNq jInnLyFsLcJdGKELnLJDBE9LdOSH2BjMtUB0FtmRSwjPQUJ0ir2Iif0yFlttnSKcEZ+b 26/H++pXas2UmRuiPqNDNP0BSt+lnFYaLH1ITrw4mu82Zmmjck1iiHrbqELDtDdbhOCd sueQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=VgE/+LrZItKMjSQlh7Ni4fsANeZB8waIz2qCOwU49no=; b=NWNeZ6nhtIaEqPZDJuGTlOYxLDxnfmqvpd1oJT58RK1PUrXajGLHJ6ygkHekNJeHNq hRh0F/a8TdtWU3FToKedZSL3qs4YtATXh+mzAvNWhNygtyjXu680slkr6a0AawWCeM41 nqyjHQ7UIHqQ1IILynwjnyTU45fuqANpSq2YaFSisZqM6y9/IWjydXeOZOT+RFgeZ+1r zppjldE1NmU2Iteh0ULGLGXilCVALjntIYQM0684LnZSs72eBtKN2iDEg6XmUAXM56T2 +fQvchbOYvcGeJPyvxR4qfH8qdRLgtuTe4j3XbJmyRJxoVOjXeyRPG5LadcqZHkKq2kS rrcw== X-Gm-Message-State: AOPr4FWq0RuAlQQrDLJZ7ELErpZnXLvlDVotAHOmTv1V/L+GCrWbQMI9u/YVU0zKQToFbw== X-Received: by 10.66.249.166 with SMTP id yv6mr33315157pac.91.1461391542830; Fri, 22 Apr 2016 23:05:42 -0700 (PDT) Received: from localhost ([2404:e800:e600:38b:b52d:863:7600:b418]) by smtp.gmail.com with ESMTPSA id 16sm12331972pfk.28.2016.04.22.23.05.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Apr 2016 23:05:42 -0700 (PDT) From: Jason Zaman To: selinux@tycho.nsa.gov Subject: [PATCH v2 6/8] genhomedircon: make USERID, USERNAME context lists Date: Sat, 23 Apr 2016 14:04:57 +0800 Message-Id: <1461391499-20593-7-git-send-email-jason@perfinion.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1461391499-20593-1-git-send-email-jason@perfinion.com> References: <1460131535-15688-1-git-send-email-jason@perfinion.com> <1461391499-20593-1-git-send-email-jason@perfinion.com> X-TM-AS-MML: disable X-BeenThere: selinux@tycho.nsa.gov X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Security-Enhanced Linux \(SELinux\) mailing list" List-Post: List-Help: MIME-Version: 1.0 Errors-To: selinux-bounces@tycho.nsa.gov Sender: "Selinux" X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Jason Zaman --- libsemanage/src/genhomedircon.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/libsemanage/src/genhomedircon.c b/libsemanage/src/genhomedircon.c index 56c58e0..e69b311 100644 --- a/libsemanage/src/genhomedircon.c +++ b/libsemanage/src/genhomedircon.c @@ -73,8 +73,13 @@ which are searched for and replaced */ #define TEMPLATE_HOME_ROOT "HOME_ROOT" #define TEMPLATE_HOME_DIR "HOME_DIR" +/* these are legacy */ #define TEMPLATE_USER "USER" #define TEMPLATE_ROLE "ROLE" +/* new names */ +#define TEMPLATE_USERNAME "%{USERNAME}" +#define TEMPLATE_USERID "%{USERID}" + #define TEMPLATE_SEUSER "system_u" #define TEMPLATE_LEVEL "s0" @@ -463,8 +468,21 @@ static int HOME_DIR_PRED(const char *string) return semanage_is_prefix(string, TEMPLATE_HOME_DIR); } +/* new names */ +static int USERNAME_CONTEXT_PRED(const char *string) +{ + return (int)( + (strstr(string, TEMPLATE_USERNAME) != NULL) || + (strstr(string, TEMPLATE_USERID) != NULL) + ); +} + +/* This will never match USER if USERNAME or USERID are found. */ static int USER_CONTEXT_PRED(const char *string) { + if (USERNAME_CONTEXT_PRED(string)) + return 0; + return (int)(strstr(string, TEMPLATE_USER) != NULL); } @@ -944,16 +962,21 @@ static int write_context_file(genhomedircon_settings_t * s, FILE * out) { semanage_list_t *homedirs = NULL; semanage_list_t *h = NULL; - semanage_list_t *user_context_tpl = NULL; semanage_list_t *homedir_context_tpl = NULL; semanage_list_t *homeroot_context_tpl = NULL; + semanage_list_t *username_context_tpl = NULL; + semanage_list_t *user_context_tpl = NULL; int retval = STATUS_SUCCESS; homedir_context_tpl = make_template(s, &HOME_DIR_PRED); homeroot_context_tpl = make_template(s, &HOME_ROOT_PRED); + username_context_tpl = make_template(s, &USERNAME_CONTEXT_PRED); user_context_tpl = make_template(s, &USER_CONTEXT_PRED); - if (!homedir_context_tpl && !homeroot_context_tpl && !user_context_tpl) + if (!homedir_context_tpl + && !homeroot_context_tpl + && !username_context_tpl + && !user_context_tpl) goto done; if (write_file_context_header(out) != STATUS_SUCCESS) { @@ -1022,6 +1045,7 @@ static int write_context_file(genhomedircon_settings_t * s, FILE * out) done: /* Cleanup */ semanage_list_destroy(&homedirs); + semanage_list_destroy(&username_context_tpl); semanage_list_destroy(&user_context_tpl); semanage_list_destroy(&homedir_context_tpl); semanage_list_destroy(&homeroot_context_tpl);