Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

AMBARI-26137:Add whitelist setting for host access control #3831

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
+27 −0
Open

AMBARI-26137:Add whitelist setting for host access control #3831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,6 +705,15 @@ public class Configuration {
public static final ConfigurationProperty<String> SRVR_DISABLED_PROTOCOLS = new ConfigurationProperty<>(
"security.server.disabled.protocols", "");

/**
* The list of hosts which will be allowed to access Ambari server.
*/
@Markdown(
description = "The list of hosts which will be allowed to access this server.",
examples = { "192.168.0.118-168,192.168.1.5" })
public static final ConfigurationProperty<String> SRVR_ACCESS_WHITELIST = new ConfigurationProperty<>(
"security.server.access.whitelist", "");

/**
* The location on the Ambari Server where all resources exist, including common services, stacks, and scripts.
*/
Expand Down Expand Up @@ -2899,6 +2908,7 @@ public Configuration(Properties properties) {
configsMap.put(SRVR_CRT_PASS_LEN.getKey(), getProperty(SRVR_CRT_PASS_LEN));
configsMap.put(SRVR_DISABLED_CIPHERS.getKey(), getProperty(SRVR_DISABLED_CIPHERS));
configsMap.put(SRVR_DISABLED_PROTOCOLS.getKey(), getProperty(SRVR_DISABLED_PROTOCOLS));
configsMap.put(SRVR_ACCESS_WHITELIST.getKey(), getProperty(SRVR_ACCESS_WHITELIST));

configsMap.put(CLIENT_API_SSL_KSTR_DIR_NAME.getKey(),
properties.getProperty(CLIENT_API_SSL_KSTR_DIR_NAME.getKey(),
Expand Down Expand Up @@ -4340,6 +4350,11 @@ public String getSrvrDisabledProtocols() {
return disabledProtocols.trim();
}

public String getSrvrAccessWhiteList() {
String whiteLists = getProperty(SRVR_ACCESS_WHITELIST);
return whiteLists.trim();
}

public int getOneWayAuthPort() {
return Integer.parseInt(getProperty(SRVR_ONE_WAY_SSL_PORT));
}
Expand Down
12 changes: 12 additions & 0 deletions ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.net.BindException;
import java.net.PasswordAuthentication;
import java.net.URL;
import java.util.Arrays;
import java.util.EnumSet;
import java.util.Enumeration;
import java.util.Map;
Expand Down Expand Up @@ -140,6 +141,7 @@
import org.eclipse.jetty.server.SessionIdManager;
import org.eclipse.jetty.server.SslConnectionFactory;
import org.eclipse.jetty.server.handler.HandlerCollection;
import org.eclipse.jetty.server.handler.InetAccessHandler;
import org.eclipse.jetty.server.handler.RequestLogHandler;
import org.eclipse.jetty.server.handler.gzip.GzipHandler;
import org.eclipse.jetty.server.session.DefaultSessionIdManager;
Expand Down Expand Up @@ -486,6 +488,16 @@ public void run() throws Exception {

server.setHandler(handlerList);

String srvrAccessWhiteList = configs.getSrvrAccessWhiteList();
if (!srvrAccessWhiteList.isEmpty())
{
String[] whiteListHosts = srvrAccessWhiteList.split(",");
InetAccessHandler inetAccessHandler = new InetAccessHandler();
Arrays.asList(whiteListHosts).forEach(host -> inetAccessHandler.include(host.trim()));
inetAccessHandler.setHandler(server.getHandler());
server.setHandler(inetAccessHandler);
}

ServletHolder agent = new ServletHolder(ServletContainer.class);
agent.setInitParameter("com.sun.jersey.config.property.resourceConfigClass",
"com.sun.jersey.api.core.PackagesResourceConfig");
Expand Down