NihalJain commented on code in PR #6923:
URL: https://github.com/apache/hbase/pull/6923#discussion_r2095312434
##########
hbase-http/src/main/java/org/apache/hadoop/hbase/http/InfoServer.java:
##########
@@ -77,34 +77,46 @@ public InfoServer(String name, String bindAddress, int
port, boolean findPort,
c.get("ssl.server.truststore.type", "jks"));
builder.excludeCiphers(c.get("ssl.server.exclude.cipher.list"));
}
+
+ final String httpAuthType = c.get(HttpServer.HTTP_UI_AUTHENTICATION,
"").toLowerCase();
// Enable SPNEGO authentication
- if ("kerberos".equalsIgnoreCase(c.get(HttpServer.HTTP_UI_AUTHENTICATION,
null))) {
+ if ("kerberos".equals(httpAuthType)) {
builder.setUsernameConfKey(HttpServer.HTTP_SPNEGO_AUTHENTICATION_PRINCIPAL_KEY)
.setKeytabConfKey(HttpServer.HTTP_SPNEGO_AUTHENTICATION_KEYTAB_KEY)
.setKerberosNameRulesKey(HttpServer.HTTP_SPNEGO_AUTHENTICATION_KRB_NAME_KEY)
.setSignatureSecretFileKey(HttpServer.HTTP_AUTHENTICATION_SIGNATURE_SECRET_FILE_KEY)
.setSecurityEnabled(true);
+ }
- // Set an admin ACL on sensitive webUI endpoints
+ // Set an admin ACL on sensitive webUI endpoints (works only if SPNEGO or
LDAP is enabled)
+ if ("ldap".equals(httpAuthType) || "kerberos".equals(httpAuthType)) {
AccessControlList acl = buildAdminAcl(c);
builder.setACL(acl);
}
+
this.httpServer = builder.build();
}
/**
* Builds an ACL that will restrict the users who can issue commands to
endpoints on the UI which
* are meant only for administrators.
*/
- AccessControlList buildAdminAcl(Configuration conf) {
- final String userGroups =
conf.get(HttpServer.HTTP_SPNEGO_AUTHENTICATION_ADMIN_USERS_KEY, null);
+ static AccessControlList buildAdminAcl(Configuration conf) {
+ // Initialize admin users based on whether http ui auth is set to ldap or
kerberos
+ String httpAuthType = conf.get(HttpServer.HTTP_UI_AUTHENTICATION,
"").toLowerCase();
+ String adminUsers = null;
+ if ("kerberos".equals(httpAuthType)) {
+ adminUsers =
conf.get(HttpServer.HTTP_SPNEGO_AUTHENTICATION_ADMIN_USERS_KEY, null);
+ } else if ("ldap".equals(httpAuthType)) {
+ adminUsers =
conf.get(HttpServer.HTTP_LDAP_AUTHENTICATION_ADMIN_USERS_KEY, null);
+ }
Review Comment:
Fixed with
https://github.com/apache/hbase/pull/6923/commits/3e2891b8a15fad7eb92ba295d479f9a45f19d0ab
##########
hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestLdapAdminACL.java:
##########
@@ -0,0 +1,129 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.http;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import org.apache.directory.server.annotations.CreateLdapServer;
+import org.apache.directory.server.annotations.CreateTransport;
+import org.apache.directory.server.core.annotations.ApplyLdifs;
+import org.apache.directory.server.core.annotations.ContextEntry;
+import org.apache.directory.server.core.annotations.CreateDS;
+import org.apache.directory.server.core.annotations.CreatePartition;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.CommonConfigurationKeys;
+import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.http.resource.JerseyResource;
+import org.apache.hadoop.hbase.testclassification.MiscTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Test class for admin ACLs with LDAP authentication on the HttpServer.
+ */
+@Category({ MiscTests.class, SmallTests.class })
+@CreateLdapServer(
+ transports = { @CreateTransport(protocol = "LDAP", address =
LdapConstants.LDAP_SERVER_ADDR), })
+@CreateDS(name = "TestLdapAdminACL", allowAnonAccess = true,
+ partitions = { @CreatePartition(name = "Test_Partition", suffix =
LdapConstants.LDAP_BASE_DN,
+ contextEntry = @ContextEntry(entryLdif = "dn: " +
LdapConstants.LDAP_BASE_DN + " \n"
+ + "dc: example\n" + "objectClass: top\n" + "objectClass:
domain\n\n")) })
+@ApplyLdifs({ "dn: uid=bjones," + LdapConstants.LDAP_BASE_DN, "cn: Bob Jones",
"sn: Jones",
+ "objectClass: inetOrgPerson", "uid: bjones", "userPassword: p@ssw0rd",
+
+ "dn: uid=jdoe," + LdapConstants.LDAP_BASE_DN, "cn: John Doe", "sn: Doe",
+ "objectClass: inetOrgPerson", "uid: jdoe", "userPassword: secure123" })
+public class TestLdapAdminACL extends LdapServerTestBase {
+
+ @ClassRule
+ public static final HBaseClassTestRule CLASS_RULE =
+ HBaseClassTestRule.forClass(TestLdapAdminACL.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(TestLdapAdminACL.class);
+
+ private static final String ADMIN_CREDENTIALS = "bjones:p@ssw0rd";
+ private static final String NON_ADMIN_CREDENTIALS = "jdoe:secure123";
+ private static final String WRONG_CREDENTIALS = "bjones:password";
+
+ @BeforeClass
+ public static void setupServer() throws Exception {
+ Configuration conf = new Configuration();
+ setLdapConfigurationWithACLs(conf);
+
+ server = createTestServer(conf, InfoServer.buildAdminAcl(conf));
+ server.addUnprivilegedServlet("echo", "/echo",
TestHttpServer.EchoServlet.class);
+ // we will reuse /jmx which is a privileged servlet
+
server.addJerseyResourcePackage(JerseyResource.class.getPackage().getName(),
"/jersey/*");
+ server.start();
+
+ baseUrl = getServerURL(server);
+ LOG.info("HTTP server started: " + baseUrl);
+ }
+
+ private static Configuration setLdapConfigurationWithACLs(Configuration
conf) {
Review Comment:
Fixed with
https://github.com/apache/hbase/pull/6923/commits/3e2891b8a15fad7eb92ba295d479f9a45f19d0ab
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
