From fdea6ee0d188d5be83ab7c7efdfdc7fa7b0b55c8 Mon Sep 17 00:00:00 2001 From: Jason Lowe Date: Wed, 8 Jun 2016 14:11:25 +0000 Subject: [PATCH] YARN-5206. RegistrySecurity includes id:pass in exception text if considered invalid. Contributed by Steve Loughran (cherry picked from commit 8c8a377cac10b086a7ff37ee366b79e6b04d2738) --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../hadoop/registry/client/impl/zk/RegistrySecurity.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 5ed23204404..374848f52b5 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -145,6 +145,9 @@ Release 2.7.3 - UNRELEASED YARN-4459. container-executor should only kill process groups (Jun Gong via jlowe) + YARN-5206. RegistrySecurity includes id:pass in exception text if + considered invalid (Steve Loughran via jlowe) + Release 2.7.2 - 2016-01-25 INCOMPATIBLE CHANGES diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java index 1c75e43987e..1761b0e521f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java @@ -443,7 +443,7 @@ public class RegistrySecurity extends AbstractService { */ public String digest(String idPasswordPair) throws IOException { if (StringUtils.isEmpty(idPasswordPair) || !isValid(idPasswordPair)) { - throw new IOException("Invalid id:password: " + idPasswordPair); + throw new IOException("Invalid id:password"); } try { return DigestAuthenticationProvider.generateDigest(idPasswordPair);