From patchwork Sun Dec 9 14:23:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Iooss X-Patchwork-Id: 10720059 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DC01F1731 for ; Sun, 9 Dec 2018 14:23:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C060F2909F for ; Sun, 9 Dec 2018 14:23:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B0AEF296DB; Sun, 9 Dec 2018 14:23:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2D9332909F for ; Sun, 9 Dec 2018 14:23:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726237AbeLIOXr (ORCPT ); Sun, 9 Dec 2018 09:23:47 -0500 Received: from mx1.polytechnique.org ([129.104.30.34]:38832 "EHLO mx1.polytechnique.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726212AbeLIOXr (ORCPT ); Sun, 9 Dec 2018 09:23:47 -0500 Received: from localhost.localdomain (89-156-252-9.rev.numericable.fr [89.156.252.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ssl.polytechnique.org (Postfix) with ESMTPSA id 09944564607 for ; Sun, 9 Dec 2018 15:23:44 +0100 (CET) From: Nicolas Iooss To: selinux@vger.kernel.org Subject: [PATCH 1/2] python/chcat: improve the code readability Date: Sun, 9 Dec 2018 15:23:22 +0100 Message-Id: <20181209142323.21149-1-nicolas.iooss@m4x.org> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-AV-Checked: ClamAV using ClamSMTP at svoboda.polytechnique.org (Sun Dec 9 15:23:44 2018 +0100 (CET)) X-Org-Mail: nicolas.iooss.2010@polytechnique.org Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP flake8 reports many warnings for chcat: chcat:7:1: E265 block comment should start with '# ' chcat:29:1: F401 'string' imported but unused chcat:44:1: E722 do not use bare 'except' chcat:104:9: F841 local variable 'e' is assigned to but never used chcat:144:9: F841 local variable 'e' is assigned to but never used chcat:186:9: F841 local variable 'e' is assigned to but never used chcat:234:9: F841 local variable 'e' is assigned to but never used chcat:262:9: F841 local variable 'e' is assigned to but never used chcat:281:5: F841 local variable 'e' is assigned to but never used chcat:385:9: E722 do not use bare 'except' chcat:402:1: E305 expected 2 blank lines after class or function definition, found 1 chcat:436:5: F841 local variable 'e' is assigned to but never used Fix all of them. Signed-off-by: Nicolas Iooss Acked-by: Petr Lautrbach --- This patch needs to be applied after "python/chcat: use check_call instead of getstatusoutput", https://lore.kernel.org/selinux/CAJfZ7=k+dNFE7AOO_FJhSMZP7WdvkJf3zbfqeY6kSkabOm+Uag@mail.gmail.com/T/#e720d3de77d336300faf6cc3d8a2940b70c9a169a python/chcat/chcat | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/python/chcat/chcat b/python/chcat/chcat index 1de92306e963..73f757258807 100755 --- a/python/chcat/chcat +++ b/python/chcat/chcat @@ -4,7 +4,7 @@ # # chcat is a script that allows you modify the Security label on a file # -#` Author: Daniel Walsh +# Author: Daniel Walsh # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -26,7 +26,6 @@ import subprocess import sys import os import pwd -import string import getopt import selinux import seobject @@ -41,7 +40,7 @@ try: localedir="/usr/share/locale", codeset='utf-8', **kwargs) -except: +except ImportError: try: import builtins builtins.__dict__['_'] = str @@ -101,7 +100,7 @@ def chcat_user_add(newcat, users): cmd = ["semanage", "login", "-m", "-r", new_serange, "-s", user[0], u] try: subprocess.check_call(cmd, stderr=subprocess.STDOUT, shell=False) - except subprocess.CalledProcessError as e: + except subprocess.CalledProcessError: errors += 1 return errors @@ -141,7 +140,7 @@ def chcat_add(orig, newcat, objects, login_ind): cmd = ["chcon", "-l", "%s:%s" % (sensitivity, cat_string), f] try: subprocess.check_call(cmd, stderr=subprocess.STDOUT, shell=False) - except subprocess.CalledProcessError as e: + except subprocess.CalledProcessError: errors += 1 return errors @@ -183,7 +182,7 @@ def chcat_user_remove(newcat, users): try: subprocess.check_call(cmd, stderr=subprocess.STDOUT, shell=False) - except subprocess.CalledProcessError as e: + except subprocess.CalledProcessError: errors += 1 return errors @@ -231,7 +230,7 @@ def chcat_remove(orig, newcat, objects, login_ind): cmd = ["chcon", "-l", new_serange, f] try: subprocess.check_call(cmd, stderr=subprocess.STDOUT, shell=False) - except subprocess.CalledProcessError as e: + except subprocess.CalledProcessError: errors += 1 return errors @@ -259,7 +258,7 @@ def chcat_user_replace(newcat, users): cmd = ["semanage", "login", "-m", "-r", new_serange, "-s", user[0], u] try: subprocess.check_call(cmd, stderr=subprocess.STDOUT, shell=False) - except subprocess.CalledProcessError as e: + except subprocess.CalledProcessError: errors += 1 return errors @@ -268,6 +267,7 @@ def chcat_replace(newcat, objects, login_ind): if login_ind == 1: return chcat_user_replace(newcat, objects) errors = 0 + # newcat[0] is the sensitivity level, newcat[1:] are the categories if len(newcat) == 1: new_serange = newcat[0] else: @@ -278,7 +278,7 @@ def chcat_replace(newcat, objects, login_ind): cmd = ["chcon", "-l", new_serange] + objects try: subprocess.check_call(cmd, stderr=subprocess.STDOUT, shell=False) - except subprocess.CalledProcessError as e: + except subprocess.CalledProcessError: errors += 1 return errors @@ -382,7 +382,7 @@ def listusercats(users): if len(users) == 0: try: users.append(os.getlogin()) - except: + except OSError: users.append(pwd.getpwuid(os.getuid()).pw_name) verify_users(users) @@ -399,6 +399,7 @@ def error(msg): print("%s: %s" % (sys.argv[0], msg)) sys.exit(1) + if __name__ == '__main__': if selinux.is_selinux_mls_enabled() != 1: error("Requires a mls enabled system") @@ -433,7 +434,7 @@ if __name__ == '__main__': except getopt.error as error: errorExit(_("Options Error %s ") % error.msg) - except ValueError as e: + except ValueError: usage() if delete_ind: From patchwork Sun Dec 9 14:23:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Iooss X-Patchwork-Id: 10720061 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 592DC18A7 for ; Sun, 9 Dec 2018 14:23:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B7472909F for ; Sun, 9 Dec 2018 14:23:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3F4B6296DB; Sun, 9 Dec 2018 14:23:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D623B294B4 for ; Sun, 9 Dec 2018 14:23:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726212AbeLIOXs (ORCPT ); Sun, 9 Dec 2018 09:23:48 -0500 Received: from mx1.polytechnique.org ([129.104.30.34]:48140 "EHLO mx1.polytechnique.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726227AbeLIOXs (ORCPT ); Sun, 9 Dec 2018 09:23:48 -0500 Received: from localhost.localdomain (89-156-252-9.rev.numericable.fr [89.156.252.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ssl.polytechnique.org (Postfix) with ESMTPSA id 98A77564670 for ; Sun, 9 Dec 2018 15:23:45 +0100 (CET) From: Nicolas Iooss To: selinux@vger.kernel.org Subject: [PATCH 2/2] python/chcat: fix removing categories on users with Fedora default setup Date: Sun, 9 Dec 2018 15:23:23 +0100 Message-Id: <20181209142323.21149-2-nicolas.iooss@m4x.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181209142323.21149-1-nicolas.iooss@m4x.org> References: <20181209142323.21149-1-nicolas.iooss@m4x.org> MIME-Version: 1.0 X-AV-Checked: ClamAV using ClamSMTP at svoboda.polytechnique.org (Sun Dec 9 15:23:45 2018 +0100 (CET)) X-Org-Mail: nicolas.iooss.2010@polytechnique.org Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Using Vagrant with fedora/28-cloud-base image, SELinux logins are configured this way: # semanage login -l Login Name SELinux User MLS/MCS Range Service __default__ unconfined_u s0-s0:c0.c1023 * root unconfined_u s0-s0:c0.c1023 * vagrant unconfined_u s0-s0:c0.c1023 * Using "chcat -l +c42 vagrant" successfully adds the category to user vagrant, but "chcat -l -- -c42 vagrant" fails to remove it. semanage login -l returns: vagrant unconfined_u s0-s0:c0.c1023,c42 * This issue is caused by expandCats(), which refuses to return a list of more than 25 categories. This causes chcat_user_remove() to work with cats=['c0.c1023,c42'] instead of cats=['c0.c102','c42'], which leads to it not been able to remove 'c42' from the list. Fix this issue by splitting the list of categories before calling expandCats(). Signed-off-by: Nicolas Iooss Acked-by: Petr Lautrbach --- python/chcat/chcat | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/python/chcat/chcat b/python/chcat/chcat index 73f757258807..5bef0073b7a4 100755 --- a/python/chcat/chcat +++ b/python/chcat/chcat @@ -82,8 +82,7 @@ def chcat_user_add(newcat, users): if len(serange) > 1: top = serange[1].split(":") if len(top) > 1: - cats.append(top[1]) - cats = expandCats(cats) + cats = expandCats(top[1].split(',')) for i in newcat[1:]: if i not in cats: @@ -163,8 +162,7 @@ def chcat_user_remove(newcat, users): if len(serange) > 1: top = serange[1].split(":") if len(top) > 1: - cats.append(top[1]) - cats = expandCats(cats) + cats = expandCats(top[1].split(',')) for i in newcat[1:]: if i in cats: