diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java index 178f761191..515148e929 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java @@ -497,7 +497,12 @@ public HttpServer2 build() throws IOException { prefix -> this.conf.get(prefix + "type") .equals(PseudoAuthenticationHandler.TYPE)) ) { - server.initSpnego(conf, hostName, usernameConfKey, keytabConfKey); + server.initSpnego( + conf, + hostName, + getFilterProperties(conf, authFilterConfigurationPrefixes), + usernameConfKey, + keytabConfKey); } for (URI ep : endpoints) { @@ -1340,8 +1345,12 @@ public void setThreads(int min, int max) { } private void initSpnego(Configuration conf, String hostName, - String usernameConfKey, String keytabConfKey) throws IOException { + Properties authFilterConfigurationPrefixes, String usernameConfKey, String keytabConfKey) + throws IOException { Map params = new HashMap<>(); + for (Map.Entry entry : authFilterConfigurationPrefixes.entrySet()) { + params.put(String.valueOf(entry.getKey()), String.valueOf(entry.getValue())); + } String principalInConf = conf.get(usernameConfKey); if (principalInConf != null && !principalInConf.isEmpty()) { params.put("kerberos.principal", SecurityUtil.getServerPrincipal( diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServerWithSpnego.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServerWithSpnego.java index dfcd98801d..cddbc2a195 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServerWithSpnego.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServerWithSpnego.java @@ -19,8 +19,10 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeys; +import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.minikdc.MiniKdc; import org.apache.hadoop.net.NetUtils; +import org.apache.hadoop.security.AuthenticationFilterInitializer; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.authentication.KerberosTestUtils; import org.apache.hadoop.security.authentication.client.AuthenticatedURL; @@ -104,7 +106,9 @@ public static void tearDown() { */ @Test public void testAuthenticationWithProxyUser() throws Exception { - Configuration spengoConf = getSpengoConf(new Configuration()); + Configuration spnegoConf = getSpnegoConf(new Configuration()); + spnegoConf.set(HttpServer2.FILTER_INITIALIZER_PROPERTY, + ProxyUserAuthenticationFilterInitializer.class.getName()); //setup logs dir System.setProperty("hadoop.log.dir", testRootDir.getAbsolutePath()); @@ -118,15 +122,15 @@ public void testAuthenticationWithProxyUser() throws Exception { new String[]{"groupC"}); // Make userA impersonate users in groupB - spengoConf.set("hadoop.proxyuser.userA.hosts", "*"); - spengoConf.set("hadoop.proxyuser.userA.groups", "groupB"); - ProxyUsers.refreshSuperUserGroupsConfiguration(spengoConf); + spnegoConf.set("hadoop.proxyuser.userA.hosts", "*"); + spnegoConf.set("hadoop.proxyuser.userA.groups", "groupB"); + ProxyUsers.refreshSuperUserGroupsConfiguration(spnegoConf); HttpServer2 httpServer = null; try { // Create http server to test. httpServer = getCommonBuilder() - .setConf(spengoConf) + .setConf(spnegoConf) .setACL(new AccessControlList("userA groupA")) .build(); httpServer.start(); @@ -191,6 +195,48 @@ public void testAuthenticationWithProxyUser() throws Exception { } } + @Test + public void testAuthenticationToAllowList() throws Exception { + Configuration spnegoConf = getSpnegoConf(new Configuration()); + String[] allowList = new String[] {"/jmx", "/prom"}; + String[] denyList = new String[] {"/conf", "/stacks", "/logLevel"}; + spnegoConf.set(PREFIX + "kerberos.endpoint.whitelist", String.join(",", allowList)); + spnegoConf.set(CommonConfigurationKeysPublic.HADOOP_PROMETHEUS_ENABLED, "true"); + spnegoConf.set(HttpServer2.FILTER_INITIALIZER_PROPERTY, + AuthenticationFilterInitializer.class.getName()); + + //setup logs dir + System.setProperty("hadoop.log.dir", testRootDir.getAbsolutePath()); + + HttpServer2 httpServer = null; + try { + // Create http server to test. + httpServer = getCommonBuilder().setConf(spnegoConf).setSecurityEnabled(true) + .setUsernameConfKey(PREFIX + "kerberos.principal") + .setKeytabConfKey(PREFIX + "kerberos.keytab").build(); + httpServer.start(); + + String serverURL = "http://" + NetUtils.getHostPortString(httpServer.getConnectorAddress(0)); + + // endpoints in whitelist should not require Kerberos authentication + for (String endpoint : allowList) { + HttpURLConnection conn = (HttpURLConnection) new URL(serverURL + endpoint).openConnection(); + Assert.assertEquals(HttpURLConnection.HTTP_OK, conn.getResponseCode()); + } + + // endpoints not in whitelist should require Kerberos authentication + for (String endpoint : denyList) { + HttpURLConnection conn = (HttpURLConnection) new URL(serverURL + endpoint).openConnection(); + Assert.assertEquals(HttpURLConnection.HTTP_UNAUTHORIZED, conn.getResponseCode()); + } + + } finally { + if (httpServer != null) { + httpServer.stop(); + } + } + } + private AuthenticatedURL.Token getEncryptedAuthToken(Signer signer, String user) throws Exception { AuthenticationToken token = @@ -209,10 +255,8 @@ private Signer getSignerToEncrypt() throws Exception { return new Signer(secretProvider); } - private Configuration getSpengoConf(Configuration conf) { + private Configuration getSpnegoConf(Configuration conf) { conf = new Configuration(); - conf.set(HttpServer2.FILTER_INITIALIZER_PROPERTY, - ProxyUserAuthenticationFilterInitializer.class.getName()); conf.set(PREFIX + "type", "kerberos"); conf.setBoolean(PREFIX + "simple.anonymous.allowed", false); conf.set(PREFIX + "signature.secret.file",