You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by st...@apache.org on 2014/10/10 21:01:00 UTC
[21/50] [abbrv] git commit: HADOOP-11117 UGI HadoopLoginModule
doesn't catch & wrap all kerberos-related exceptions (stevel)
HADOOP-11117 UGI HadoopLoginModule doesn't catch & wrap all kerberos-related exceptions (stevel)
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4040cbf7
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4040cbf7
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4040cbf7
Branch: refs/heads/champlain
Commit: 4040cbf783a74e6f89c65b4e7d5be74d0b7d93a4
Parents: a3605e8
Author: Steve Loughran <st...@apache.org>
Authored: Tue Sep 30 17:28:56 2014 -0700
Committer: Jitendra Pandey <Ji...@Jitendra-Pandeys-MacBook-Pro-4.local>
Committed: Wed Oct 8 23:32:56 2014 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 5 +++++
.../java/org/apache/hadoop/security/User.java | 3 ++-
.../hadoop/security/UserGroupInformation.java | 18 ++++++++++++++++--
.../hadoop/security/TestUserGroupInformation.java | 3 ++-
4 files changed, 25 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4040cbf7/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index d415d03..ce33214 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -589,6 +589,11 @@ Release 2.6.0 - UNRELEASED
HADOOP-11154. Update BUILDING.txt to state that CMake 3.0 or newer is
required on Mac. (cnauroth)
+ HADOOP-11145. TestFairCallQueue fails. (Akira AJISAKA via cnauroth)
+
+ HADOOP-11117 UGI HadoopLoginModule doesn't catch & wrap all
+ kerberos-related exceptions (stevel)
+
Release 2.5.1 - 2014-09-05
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4040cbf7/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/User.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/User.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/User.java
index 8d9b28b..236e962 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/User.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/User.java
@@ -47,7 +47,8 @@ class User implements Principal {
try {
shortName = new HadoopKerberosName(name).getShortName();
} catch (IOException ioe) {
- throw new IllegalArgumentException("Illegal principal name " + name, ioe);
+ throw new IllegalArgumentException("Illegal principal name " + name
+ +": " + ioe.toString(), ioe);
}
fullName = name;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4040cbf7/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
index 4f117fd..fbefdb1 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
@@ -176,7 +176,21 @@ public class UserGroupInformation {
}
// if we found the user, add our principal
if (user != null) {
- subject.getPrincipals().add(new User(user.getName()));
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Using user: \"" + user + "\" with name " + user.getName());
+ }
+
+ User userEntry = null;
+ try {
+ userEntry = new User(user.getName());
+ } catch (Exception e) {
+ throw (LoginException)(new LoginException(e.toString()).initCause(e));
+ }
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("User entry: \"" + userEntry.toString() + "\"" );
+ }
+
+ subject.getPrincipals().add(userEntry);
return true;
}
LOG.error("Can't find user in " + subject);
@@ -919,7 +933,7 @@ public class UserGroupInformation {
metrics.loginFailure.add(Time.now() - start);
}
throw new IOException("Login failure for " + user + " from keytab " +
- path, le);
+ path+ ": " + le, le);
}
LOG.info("Login successful for user " + keytabPrincipal
+ " using keytab file " + keytabFile);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4040cbf7/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java
index 23e89d8..f1fba03 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java
@@ -339,7 +339,8 @@ public class TestUserGroupInformation {
} catch (IllegalArgumentException e) {
String expect = (userName == null || userName.isEmpty())
? "Null user" : "Illegal principal name "+userName;
- assertEquals(expect, e.getMessage());
+ assertTrue("Did not find "+ expect + " in " + e,
+ e.toString().contains(expect));
}
}