From patchwork Sun Dec 13 22:40:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Bigonville X-Patchwork-Id: 7839931 Return-Path: X-Original-To: patchwork-selinux@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2B9B4BEEE1 for ; Sun, 13 Dec 2015 22:46:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7DD302045E for ; Sun, 13 Dec 2015 22:46:58 +0000 (UTC) Received: from emvm-gh1-uea08.nsa.gov (emvm-gh1-uea08.nsa.gov [63.239.67.9]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5AE032045B for ; Sun, 13 Dec 2015 22:46:56 +0000 (UTC) X-TM-IMSS-Message-ID: <056c0d55000042f4@nsa.gov> Received: from tarius.tycho.ncsc.mil ([144.51.242.1]) by nsa.gov ([10.208.42.193]) with ESMTP (TREND IMSS SMTP Service 7.1) id 056c0d55000042f4 ; Sun, 13 Dec 2015 17:45:19 -0500 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 tBDMfWOA003251; Sun, 13 Dec 2015 17:41:45 -0500 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 tBDMfRAB058354 for ; Sun, 13 Dec 2015 17:41:27 -0500 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 tBDMfRoU003246 for ; Sun, 13 Dec 2015 17:41:27 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A1AQBQDI821W/2OteVteGQEBAg8BAQKCX4FGJqlxCwaRC4Qch2MBAQEBAQGBC4R7AQE4L200iDADAalMhVQBBY0DBoYOiW1/hBmNOYlCjUSOdI4eAmOBVm6BQXGDNoFLAQEB X-IPAS-Result: A1AQBQDI821W/2OteVteGQEBAg8BAQKCX4FGJqlxCwaRC4Qch2MBAQEBAQGBC4R7AQE4L200iDADAalMhVQBBY0DBoYOiW1/hBmNOYlCjUSOdI4eAmOBVm6BQXGDNoFLAQEB X-IronPort-AV: E=Sophos;i="5.20,424,1444708800"; d="scan'208";a="5024380" Received: from emvm-gh1-uea08.nsa.gov ([10.208.42.193]) by goalie.tycho.ncsc.mil with ESMTP; 13 Dec 2015 17:40:47 -0500 X-TM-IMSS-Message-ID: <05684259000042d8@nsa.gov> Received: from anor.bigon.be (anor.bigon.be [91.121.173.99]) by nsa.gov ([10.208.42.193]) with ESMTP (TREND IMSS SMTP Service 7.1; TLSv1/SSLv3 ADH-AES256-SHA (256/256)) id 05684259000042d8 ; Sun, 13 Dec 2015 17:41:10 -0500 Received: from anor.bigon.be (localhost.localdomain [127.0.0.1]) by anor.bigon.be (Postfix) with ESMTP id 603181A1D8 for ; Sun, 13 Dec 2015 23:40:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=bigon.be; h= x-mailer:message-id:date:date:subject:subject:from:from:received :received:received; s=key1; t=1450046442; x=1451860843; bh=MbYUV uX4uqRg2mo/QnLUu8IXfGgAXLMzP+RK53PoqlU=; b=mv7aNcAW4RBmIMeB1rpal tb9H5/XYuW9x12WXFgd70NVPkak+8JPkVIEFcHymU+A2AhlOZory/m65Z49YLgoa 5LDOhAAhetQqJ4WTJq3Io5lqAgd+ICcP900RVIVmE3EjcHkW8fQNEcGZLtaCxDXs EoDoWbZk7TFTUcTZ42fMVs= X-Virus-Scanned: Debian amavisd-new at bigon.be Received: from anor.bigon.be ([127.0.0.1]) by anor.bigon.be (anor.bigon.be [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id I9Pz1DVKmwLp for ; Sun, 13 Dec 2015 23:40:42 +0100 (CET) Received: from fornost.bigon.be (unknown [IPv6:2a02:578:85fc:1::6b5]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) (Authenticated sender: bigon) by anor.bigon.be (Postfix) with ESMTPSA id CD9901A070 for ; Sun, 13 Dec 2015 23:40:41 +0100 (CET) Received: from bigon (uid 1000) (envelope-from bigon@bigon.be) id 40fc8 by fornost.bigon.be (DragonFly Mail Agent v0.9); Sun, 13 Dec 2015 23:40:40 +0100 From: Laurent Bigonville To: selinux@tycho.nsa.gov Subject: [PATCH] policycoreutils/chcat: Add a fallback in case os.getlogin() returns nothing Date: Sun, 13 Dec 2015 23:40:40 +0100 Message-Id: <1450046440-25449-1-git-send-email-bigon@bigon.be> X-Mailer: git-send-email 2.6.4 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=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,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 From: Laurent Bigonville Some teminal emulators (like the latest version of gnome-terminal) are not setting entries in the utmp file, this leads getlogin() to return an empty string. Fallback to the name of the user running the chcat process. --- policycoreutils/scripts/chcat | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/policycoreutils/scripts/chcat b/policycoreutils/scripts/chcat index ec527e5..472785c 100755 --- a/policycoreutils/scripts/chcat +++ b/policycoreutils/scripts/chcat @@ -372,7 +372,10 @@ def listcats(): def listusercats(users): if len(users) == 0: - users.append(os.getlogin()) + try: + users.append(os.getlogin()) + except: + users.append(pwd.getpwuid(os.getuid()).pw_name) verify_users(users) for u in users: