From patchwork Wed Feb 6 19:43:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Lautrbach X-Patchwork-Id: 10799987 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 8E9031390 for ; Wed, 6 Feb 2019 19:43:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7FB3F2C2A6 for ; Wed, 6 Feb 2019 19:43:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7446E2C423; Wed, 6 Feb 2019 19:43:31 +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 EFC5B2C2A6 for ; Wed, 6 Feb 2019 19:43:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726448AbfBFTna (ORCPT ); Wed, 6 Feb 2019 14:43:30 -0500 Received: from mx1.redhat.com ([209.132.183.28]:26815 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726442AbfBFTna (ORCPT ); Wed, 6 Feb 2019 14:43:30 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8C95F8B101 for ; Wed, 6 Feb 2019 19:43:29 +0000 (UTC) Received: from workstation.redhat.com (ovpn-204-32.brq.redhat.com [10.40.204.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE90A272BF; Wed, 6 Feb 2019 19:43:28 +0000 (UTC) From: Petr Lautrbach To: selinux@vger.kernel.org Cc: Petr Lautrbach Subject: [PATCH 1/2] python/semanage module: Fix handling of -a/-e/-d/-r options Date: Wed, 6 Feb 2019 20:43:24 +0100 Message-Id: <20190206194325.24875-1-plautrba@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 06 Feb 2019 19:43:29 +0000 (UTC) Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Previous code traceback-ed when one of the mentioned option was used without any argument as this state was not handled by the argument parser. action='store' stores arguments as a list while the original action='store_const' used str therefore the particular interfaces in moduleRecords are changed to be compatible with both. Fixes: ^_^ semanage module -a Traceback (most recent call last): File "/usr/sbin/semanage", line 963, in do_parser() File "/usr/sbin/semanage", line 942, in do_parser args.func(args) File "/usr/sbin/semanage", line 608, in handleModule OBJECT.add(args.module_name, args.priority) File "/usr/lib/python3.7/site-packages/seobject.py", line 402, in add if not os.path.exists(file): File "/usr/lib64/python3.7/genericpath.py", line 19, in exists os.stat(path) TypeError: stat: path should be string, bytes, os.PathLike or integer, not NoneType Signed-off-by: Petr Lautrbach --- python/semanage/semanage | 25 ++++++++++++------------- python/semanage/seobject.py | 10 ++++++++-- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/python/semanage/semanage b/python/semanage/semanage index 6afeac14..9b737fa8 100644 --- a/python/semanage/semanage +++ b/python/semanage/semanage @@ -609,14 +609,14 @@ def setupInterfaceParser(subparsers): def handleModule(args): OBJECT = seobject.moduleRecords(args) - if args.action == "add": - OBJECT.add(args.module_name, args.priority) - if args.action == "enable": - OBJECT.set_enabled(args.module_name, True) - if args.action == "disable": - OBJECT.set_enabled(args.module_name, False) - if args.action == "remove": - OBJECT.delete(args.module_name, args.priority) + if args.action_add: + OBJECT.add(args.action_add, args.priority) + if args.action_enable: + OBJECT.set_enabled(args.action_enable, True) + if args.action_disable: + OBJECT.set_enabled(args.action_disable, False) + if args.action_remove: + OBJECT.delete(args.action_remove, args.priority) if args.action == "deleteall": OBJECT.deleteall() if args.action == "list": @@ -635,14 +635,13 @@ def setupModuleParser(subparsers): parser_add_priority(moduleParser, "module") mgroup = moduleParser.add_mutually_exclusive_group(required=True) - parser_add_add(mgroup, "module") parser_add_list(mgroup, "module") parser_add_extract(mgroup, "module") parser_add_deleteall(mgroup, "module") - mgroup.add_argument('-r', '--remove', dest='action', action='store_const', const='remove', help=_("Remove a module")) - mgroup.add_argument('-d', '--disable', dest='action', action='store_const', const='disable', help=_("Disable a module")) - mgroup.add_argument('-e', '--enable', dest='action', action='store_const', const='enable', help=_("Enable a module")) - moduleParser.add_argument('module_name', nargs='?', default=None, help=_('Name of the module to act on')) + mgroup.add_argument('-a', '--add', dest='action_add', action='store', nargs=1, metavar='module_name', help=_("Add a module")) + mgroup.add_argument('-r', '--remove', dest='action_remove', action='store', nargs='+', metavar='module_name', help=_("Remove a module")) + mgroup.add_argument('-d', '--disable', dest='action_disable', action='store', nargs='+', metavar='module_name', help=_("Disable a module")) + mgroup.add_argument('-e', '--enable', dest='action_enable', action='store', nargs='+', metavar='module_name', help=_("Enable a module")) moduleParser.set_defaults(func=handleModule) diff --git a/python/semanage/seobject.py b/python/semanage/seobject.py index 556d3ba5..cd2d3457 100644 --- a/python/semanage/seobject.py +++ b/python/semanage/seobject.py @@ -401,6 +401,8 @@ class moduleRecords(semanageRecords): print("%-25s %-9s %-5s %s" % (t[0], t[2], t[3], disabled)) def add(self, file, priority): + if type(file) == list: + file = file[0] if not os.path.exists(file): raise ValueError(_("Module does not exist: %s ") % file) @@ -413,7 +415,9 @@ class moduleRecords(semanageRecords): self.commit() def set_enabled(self, module, enable): - for m in module.split(): + if type(module) == str: + module = module.split() + for m in module: rc, key = semanage_module_key_create(self.sh) if rc < 0: raise ValueError(_("Could not create module key")) @@ -435,7 +439,9 @@ class moduleRecords(semanageRecords): if rc < 0: raise ValueError(_("Invalid priority %d (needs to be between 1 and 999)") % priority) - for m in module.split(): + if type(module) == str: + module = module.split() + for m in module: rc = semanage_module_remove(self.sh, m) if rc < 0 and rc != -2: raise ValueError(_("Could not remove module %s (remove failed)") % m)