HADOOP-15959. Revert "HADOOP-12751. While using kerberos Hadoop incorrectly assumes names with '@' to be non-simple"
This reverts commit 829a2e4d271f05afb209ddc834cd4a0e85492eda. (cherry picked from commit d0edd37269bb40290b409d583bcf3b70897c13e0) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1a448565 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1a448565 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1a448565 Branch: refs/heads/branch-3.2 Commit: 1a448565a85e13572795696ed5e5c6643de62431 Parents: 183ec39 Author: Steve Loughran <ste...@apache.org> Authored: Thu Nov 29 17:53:23 2018 +0000 Committer: Steve Loughran <ste...@apache.org> Committed: Thu Nov 29 17:53:23 2018 +0000 ---------------------------------------------------------------------- .../authentication/util/KerberosName.java | 9 ++-- .../TestKerberosAuthenticationHandler.java | 7 ++- .../authentication/util/TestKerberosName.java | 17 ++++++-- .../java/org/apache/hadoop/security/KDiag.java | 46 +------------------- .../src/site/markdown/SecureMode.md | 6 --- .../org/apache/hadoop/security/TestKDiag.java | 16 ------- .../security/TestUserGroupInformation.java | 27 ++++-------- 7 files changed, 33 insertions(+), 95 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a448565/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosName.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosName.java b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosName.java index 4e7ee3c..287bb13 100644 --- a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosName.java +++ b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosName.java @@ -324,8 +324,8 @@ public class KerberosName { } } if (result != null && nonSimplePattern.matcher(result).find()) { - LOG.info("Non-simple name {} after auth_to_local rule {}", - result, this); + throw new NoMatchingRule("Non-simple name " + result + + " after auth_to_local rule " + this); } if (toLowerCase && result != null) { result = result.toLowerCase(Locale.ENGLISH); @@ -378,7 +378,7 @@ public class KerberosName { /** * Get the translation of the principal name into an operating system * user name. - * @return the user name + * @return the short name * @throws IOException throws if something is wrong with the rules */ public String getShortName() throws IOException { @@ -398,8 +398,7 @@ public class KerberosName { return result; } } - LOG.info("No auth_to_local rules applied to {}", this); - return toString(); + throw new NoMatchingRule("No rules applied to " + toString()); } /** http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a448565/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestKerberosAuthenticationHandler.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestKerberosAuthenticationHandler.java b/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestKerberosAuthenticationHandler.java index e672391..8b4bc15 100644 --- a/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestKerberosAuthenticationHandler.java +++ b/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestKerberosAuthenticationHandler.java @@ -108,7 +108,12 @@ public class TestKerberosAuthenticationHandler kn = new KerberosName("bar@BAR"); Assert.assertEquals("bar", kn.getShortName()); kn = new KerberosName("bar@FOO"); - Assert.assertEquals("bar@FOO", kn.getShortName()); + try { + kn.getShortName(); + Assert.fail(); + } + catch (Exception ex) { + } } @Test(timeout=60000) http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a448565/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/util/TestKerberosName.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/util/TestKerberosName.java b/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/util/TestKerberosName.java index c584fce..2db0df4 100644 --- a/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/util/TestKerberosName.java +++ b/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/util/TestKerberosName.java @@ -72,14 +72,23 @@ public class TestKerberosName { } } + private void checkBadTranslation(String from) { + System.out.println("Checking bad translation for " + from); + KerberosName nm = new KerberosName(from); + try { + nm.getShortName(); + Assert.fail("didn't get exception for " + from); + } catch (IOException ie) { + // PASS + } + } + @Test public void testAntiPatterns() throws Exception { checkBadName("owen/owen/o...@foo.com"); checkBadName("owen@foo/bar.com"); - - // no rules applied, these should pass - checkTranslation("f...@acme.com", "f...@acme.com"); - checkTranslation("root/j...@foo.com", "root/j...@foo.com"); + checkBadTranslation("f...@acme.com"); + checkBadTranslation("root/j...@foo.com"); } @Test http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a448565/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/KDiag.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/KDiag.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/KDiag.java index b4e535c..1711921 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/KDiag.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/KDiag.java @@ -22,7 +22,6 @@ import org.apache.commons.io.IOUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.io.Text; -import org.apache.hadoop.security.authentication.util.KerberosName; import org.apache.hadoop.security.token.Token; import org.apache.hadoop.security.token.TokenIdentifier; import org.apache.hadoop.util.ExitUtil; @@ -55,7 +54,6 @@ import java.util.Collections; import java.util.Date; import java.util.LinkedList; import java.util.List; -import java.util.regex.Pattern; import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.*; import static org.apache.hadoop.security.UserGroupInformation.*; @@ -131,12 +129,6 @@ public class KDiag extends Configured implements Tool, Closeable { private boolean nofail = false; private boolean nologin = false; private boolean jaas = false; - private boolean checkShortName = false; - - /** - * A pattern that recognizes simple/non-simple names. Per KerberosName - */ - private static final Pattern nonSimplePattern = Pattern.compile("[/@]"); /** * Flag set to true if a {@link #verify(boolean, String, String, Object...)} @@ -165,8 +157,6 @@ public class KDiag extends Configured implements Tool, Closeable { public static final String ARG_SECURE = "--secure"; - public static final String ARG_VERIFYSHORTNAME = "--verifyshortname"; - @SuppressWarnings("IOResourceOpenedButNotSafelyClosed") public KDiag(Configuration conf, PrintWriter out, @@ -210,7 +200,6 @@ public class KDiag extends Configured implements Tool, Closeable { nofail = popOption(ARG_NOFAIL, args); jaas = popOption(ARG_JAAS, args); nologin = popOption(ARG_NOLOGIN, args); - checkShortName = popOption(ARG_VERIFYSHORTNAME, args); // look for list of resources String resource; @@ -256,9 +245,7 @@ public class KDiag extends Configured implements Tool, Closeable { + arg(ARG_NOLOGIN, "", "Do not attempt to log in") + arg(ARG_OUTPUT, "<file>", "Write output to a file") + arg(ARG_RESOURCE, "<resource>", "Load an XML configuration resource") - + arg(ARG_SECURE, "", "Require the hadoop configuration to be secure") - + arg(ARG_VERIFYSHORTNAME, ARG_PRINCIPAL + " <principal>", - "Verify the short name of the specific principal does not contain '@' or '/'"); + + arg(ARG_SECURE, "", "Require the hadoop configuration to be secure"); } private String arg(String name, String params, String meaning) { @@ -291,7 +278,6 @@ public class KDiag extends Configured implements Tool, Closeable { println("%s = %d", ARG_KEYLEN, minKeyLength); println("%s = %s", ARG_KEYTAB, keytab); println("%s = %s", ARG_PRINCIPAL, principal); - println("%s = %s", ARG_VERIFYSHORTNAME, checkShortName); // Fail fast on a JVM without JCE installed. validateKeyLength(); @@ -391,10 +377,6 @@ public class KDiag extends Configured implements Tool, Closeable { validateJAAS(jaas); validateNTPConf(); - if (checkShortName) { - validateShortName(); - } - if (!nologin) { title("Logging in"); if (keytab != null) { @@ -449,32 +431,6 @@ public class KDiag extends Configured implements Tool, Closeable { } /** - * Verify whether auth_to_local rules transform a principal name - * <p> - * Having a local user name "b...@foo.com" may be harmless, so it is noted at - * info. However if what was intended is a transformation to "bar" - * it can be difficult to debug, hence this check. - */ - protected void validateShortName() { - failif(principal == null, CAT_KERBEROS, "No principal defined"); - - try { - KerberosName kn = new KerberosName(principal); - String result = kn.getShortName(); - if (nonSimplePattern.matcher(result).find()) { - warn(CAT_KERBEROS, principal + " short name: " + result - + " still contains @ or /"); - } - } catch (IOException e) { - throw new KerberosDiagsFailure(CAT_KERBEROS, e, - "Failed to get short name for " + principal, e); - } catch (IllegalArgumentException e) { - error(CAT_KERBEROS, "KerberosName(" + principal + ") failed: %s\n%s", - e, StringUtils.stringifyException(e)); - } - } - - /** * Get the default realm. * <p> * Not having a default realm may be harmless, so is noted at info. http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a448565/hadoop-common-project/hadoop-common/src/site/markdown/SecureMode.md ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/site/markdown/SecureMode.md b/hadoop-common-project/hadoop-common/src/site/markdown/SecureMode.md index ecf94eb..09f1eed 100644 --- a/hadoop-common-project/hadoop-common/src/site/markdown/SecureMode.md +++ b/hadoop-common-project/hadoop-common/src/site/markdown/SecureMode.md @@ -470,7 +470,6 @@ KDiag: Diagnose Kerberos Problems [--out <file>] : Write output to a file. [--resource <resource>] : Load an XML configuration resource. [--secure] : Require the hadoop configuration to be secure. - [--verifyshortname <principal>]: Verify the short name of the specific principal does not contain '@' or '/' ``` #### `--jaas`: Require a JAAS file to be defined in `java.security.auth.login.config`. @@ -566,11 +565,6 @@ or implicitly set to "simple": Needless to say, an application so configured cannot talk to a secure Hadoop cluster. -#### `--verifyshortname <principal>`: validate the short name of a principal - -This verifies that the short name of a principal contains neither the `"@"` -nor `"/"` characters. - ### Example ``` http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a448565/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestKDiag.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestKDiag.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestKDiag.java index e395566..3895ae1 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestKDiag.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestKDiag.java @@ -165,22 +165,6 @@ public class TestKDiag extends Assert { } @Test - public void testKerberosName() throws Throwable { - kdiagFailure(ARG_KEYLEN, KEYLEN, - ARG_VERIFYSHORTNAME, - ARG_PRINCIPAL, "foo/foo/f...@bar.com"); - } - - @Test - public void testShortName() throws Throwable { - kdiag(ARG_KEYLEN, KEYLEN, - ARG_KEYTAB, keytab.getAbsolutePath(), - ARG_PRINCIPAL, - ARG_VERIFYSHORTNAME, - ARG_PRINCIPAL, "f...@example.com"); - } - - @Test public void testFileOutput() throws Throwable { File f = new File("target/kdiag.txt"); kdiag(ARG_KEYLEN, KEYLEN, http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a448565/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 011e930..ce10067 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 @@ -332,15 +332,10 @@ public class TestUserGroupInformation { UserGroupInformation.setConfiguration(conf); testConstructorSuccess("user1", "user1"); testConstructorSuccess("user4@OTHER.REALM", "other-user4"); - - // pass through test, no transformation - testConstructorSuccess("user2@DEFAULT.REALM", "user2@DEFAULT.REALM"); - testConstructorSuccess("user3/cron@DEFAULT.REALM", "user3/cron@DEFAULT.REALM"); - testConstructorSuccess("user5/cron@OTHER.REALM", "user5/cron@OTHER.REALM"); - - // failures - testConstructorFailures("us...@example.com@OTHER.REALM"); - testConstructorFailures("us...@example.com@DEFAULT.REALM"); + // failure test + testConstructorFailures("user2@DEFAULT.REALM"); + testConstructorFailures("user3/cron@DEFAULT.REALM"); + testConstructorFailures("user5/cron@OTHER.REALM"); testConstructorFailures(null); testConstructorFailures(""); } @@ -354,13 +349,10 @@ public class TestUserGroupInformation { testConstructorSuccess("user1", "user1"); testConstructorSuccess("user2@DEFAULT.REALM", "user2"); - testConstructorSuccess("user3/cron@DEFAULT.REALM", "user3"); - - // no rules applied, local name remains the same - testConstructorSuccess("user4@OTHER.REALM", "user4@OTHER.REALM"); - testConstructorSuccess("user5/cron@OTHER.REALM", "user5/cron@OTHER.REALM"); - + testConstructorSuccess("user3/cron@DEFAULT.REALM", "user3"); // failure test + testConstructorFailures("user4@OTHER.REALM"); + testConstructorFailures("user5/cron@OTHER.REALM"); testConstructorFailures(null); testConstructorFailures(""); } @@ -401,9 +393,8 @@ public class TestUserGroupInformation { } catch (IllegalArgumentException e) { String expect = (userName == null || userName.isEmpty()) ? "Null user" : "Illegal principal name "+userName; - String expect2 = "Malformed Kerberos name: "+userName; - assertTrue("Did not find "+ expect + " or " + expect2 + " in " + e, - e.toString().contains(expect) || e.toString().contains(expect2)); + assertTrue("Did not find "+ expect + " in " + e, + e.toString().contains(expect)); } } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
