From common-commits-return-83460-archive-asf-public=cust-asf.ponee.io@hadoop.apache.org Wed May 30 23:01:43 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 8A32B180771 for ; Wed, 30 May 2018 23:01:42 +0200 (CEST) Received: (qmail 86301 invoked by uid 500); 30 May 2018 21:01:30 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 85161 invoked by uid 99); 30 May 2018 21:01:30 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 May 2018 21:01:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4DB1BE117F; Wed, 30 May 2018 21:01:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hanishakoneru@apache.org To: common-commits@hadoop.apache.org Date: Wed, 30 May 2018 21:02:04 -0000 Message-Id: <48a7903644724ba696896d57b1adf1e3@git.apache.org> In-Reply-To: <8e883cb562e44350b39c61eec0211dd7@git.apache.org> References: <8e883cb562e44350b39c61eec0211dd7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [37/50] [abbrv] hadoop git commit: HDFS-13626. Fix incorrect username when deny the setOwner operation. Contributed by Zsolt Venczel. HDFS-13626. Fix incorrect username when deny the setOwner operation. Contributed by Zsolt Venczel. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a25d95bc Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a25d95bc Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a25d95bc Branch: refs/heads/HDDS-48 Commit: a25d95bc6591637932542f1ba02da504488841c5 Parents: 6d8597b Author: Yiqun Lin Authored: Wed May 30 16:52:21 2018 +0800 Committer: Hanisha Koneru Committed: Wed May 30 14:00:26 2018 -0700 ---------------------------------------------------------------------- .../hadoop/hdfs/server/namenode/FSDirAttrOp.java | 4 ++-- .../org/apache/hadoop/security/TestPermission.java | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a25d95bc/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAttrOp.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAttrOp.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAttrOp.java index 406fe80..1dbee96 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAttrOp.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAttrOp.java @@ -82,12 +82,12 @@ public class FSDirAttrOp { fsd.checkOwner(pc, iip); if (!pc.isSuperUser()) { if (username != null && !pc.getUser().equals(username)) { - throw new AccessControlException("User " + username + throw new AccessControlException("User " + pc.getUser() + " is not a super user (non-super user cannot change owner)."); } if (group != null && !pc.isMemberOfGroup(group)) { throw new AccessControlException( - "User " + username + " does not belong to " + group); + "User " + pc.getUser() + " does not belong to " + group); } } unprotectedSetOwner(fsd, iip, username, group); http://git-wip-us.apache.org/repos/asf/hadoop/blob/a25d95bc/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/security/TestPermission.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/security/TestPermission.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/security/TestPermission.java index 813ac5a..388e7f2 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/security/TestPermission.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/security/TestPermission.java @@ -337,7 +337,8 @@ public class TestPermission { fail("Expect ACE when a non-super user tries to change a file to a " + "group where the user does not belong."); } catch (AccessControlException e) { - assertThat(e.getMessage(), startsWith("User null does not belong to")); + assertThat(e.getMessage(), startsWith("User " + + userfs.getFileStatus(file).getOwner() + " does not belong to")); } } @@ -371,8 +372,9 @@ public class TestPermission { userfs.setOwner(file, NOUSER, null); fail("Expect ACE when a non-super user tries to change owner"); } catch (AccessControlException e) { - assertThat(e.getMessage(), startsWith("User " + NOUSER - + " is not a super user (non-super user cannot change owner)")); + assertThat(e.getMessage(), startsWith("User " + + userfs.getFileStatus(file).getOwner() + + " is not a super user (non-super user cannot change owner)")); } } @@ -397,8 +399,9 @@ public class TestPermission { fail("Expect ACE or FNFE when a non-super user tries to change owner " + "for a non-existent file"); } catch (AccessControlException e) { - assertThat(e.getMessage(), startsWith("User " + NOUSER - + " is not a super user (non-super user cannot change owner)")); + assertThat(e.getMessage(), startsWith("User " + + userfs.getFileStatus(file).getOwner() + + " is not a super user (non-super user cannot change owner)")); } catch (FileNotFoundException e) { } } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org