apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

server: Make HTTP handler of embedded server to be configured (#2762)

Browse Source 
This is to have the possibility to completely disable HTTP and only use HTTPS.
This commit is contained in:
Khosrow Moossavi 2018-07-26 03:29:25 -04:00 committed by Rohit Yadav
parent 6156b442dd
commit 1960124819
2 changed files with 57 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/conf/server.properties.in
View File

@ -22,6 +22,7 @@ bind.interface=::
context.path=/client context.path=/client
# The HTTP port to be used by the management server # The HTTP port to be used by the management server
http.enable=true
http.port=8080 http.port=8080
# Max inactivity time in minutes for the session # Max inactivity time in minutes for the session
@ -33,6 +34,7 @@ session.timeout=30
# keystore file should exists and be readable by the management server. # keystore file should exists and be readable by the management server.
https.enable=false https.enable=false
https.port=8443 https.port=8443
# The keystore and manager passwords are assumed to be same. # The keystore and manager passwords are assumed to be same.
https.keystore=/etc/cloudstack/management/cloud.jks https.keystore=/etc/cloudstack/management/cloud.jks
https.keystore.password=vmops.com https.keystore.password=vmops.com

85
client/src/main/java/org/apache/cloudstack/ServerDaemon.java
View File

@ -66,6 +66,7 @@ public class ServerDaemon implements Daemon {
private static final String BIND_INTERFACE = "bind.interface"; private static final String BIND_INTERFACE = "bind.interface";
private static final String CONTEXT_PATH = "context.path"; private static final String CONTEXT_PATH = "context.path";
private static final String SESSION_TIMEOUT = "session.timeout"; private static final String SESSION_TIMEOUT = "session.timeout";
private static final String HTTP_ENABLE = "http.enable";
private static final String HTTP_PORT = "http.port"; private static final String HTTP_PORT = "http.port";
private static final String HTTPS_ENABLE = "https.enable"; private static final String HTTPS_ENABLE = "https.enable";
private static final String HTTPS_PORT = "https.port"; private static final String HTTPS_PORT = "https.port";
@ -80,6 +81,7 @@ public class ServerDaemon implements Daemon {
private Server server; private Server server;
private boolean httpEnable = true;
private int httpPort = 8080; private int httpPort = 8080;
private int httpsPort = 8443; private int httpsPort = 8443;
private int sessionTimeout = 30; private int sessionTimeout = 30;
@ -105,8 +107,8 @@ public class ServerDaemon implements Daemon {
public void init(final DaemonContext context) { public void init(final DaemonContext context) {
final File confFile = PropertiesUtil.findConfigFile("server.properties"); final File confFile = PropertiesUtil.findConfigFile("server.properties");
if (confFile == null) { if (confFile == null) {
LOG.warn(String.format("Server configuration file not found. Initializing server daemon on %s:%s, with https.enabled=%s, https.port=%s, context.path=%s", LOG.warn(String.format("Server configuration file not found. Initializing server daemon on %s, with http.enable=%s, http.port=%s, https.enable=%s, https.port=%s, context.path=%s",
bindInterface, httpPort, httpsEnable, httpsPort, contextPath)); bindInterface, httpEnable, httpPort, httpsEnable, httpsPort, contextPath));
return; return;
} }
@ -119,6 +121,7 @@ public class ServerDaemon implements Daemon {
} }
setBindInterface(properties.getProperty(BIND_INTERFACE, "")); setBindInterface(properties.getProperty(BIND_INTERFACE, ""));
setContextPath(properties.getProperty(CONTEXT_PATH, "/client")); setContextPath(properties.getProperty(CONTEXT_PATH, "/client"));
setHttpEnable(Boolean.valueOf(properties.getProperty(HTTP_ENABLE, "true")));
setHttpPort(Integer.valueOf(properties.getProperty(HTTP_PORT, "8080"))); setHttpPort(Integer.valueOf(properties.getProperty(HTTP_PORT, "8080")));
setHttpsEnable(Boolean.valueOf(properties.getProperty(HTTPS_ENABLE, "false"))); setHttpsEnable(Boolean.valueOf(properties.getProperty(HTTPS_ENABLE, "false")));
setHttpsPort(Integer.valueOf(properties.getProperty(HTTPS_PORT, "8443"))); setHttpsPort(Integer.valueOf(properties.getProperty(HTTPS_PORT, "8443")));
@ -129,9 +132,15 @@ public class ServerDaemon implements Daemon {
setSessionTimeout(Integer.valueOf(properties.getProperty(SESSION_TIMEOUT, "30"))); setSessionTimeout(Integer.valueOf(properties.getProperty(SESSION_TIMEOUT, "30")));
} catch (final IOException e) { } catch (final IOException e) {
LOG.warn("Failed to load configuration from server.properties file", e); LOG.warn("Failed to load configuration from server.properties file", e);
} finally {
// make sure that at least HTTP is enabled if both of them are set to false (misconfiguration)
if (!httpEnable && !httpsEnable) {
setHttpEnable(true);
LOG.warn("Server configuration malformed, neither http nor https is enabled, http will be enabled.");
}
} }
LOG.info(String.format("Initializing server daemon on %s:%s, with https.enabled=%s, https.port=%s, context.path=%s", LOG.info(String.format("Initializing server daemon on %s, with http.enable=%s, http.port=%s, https.enable=%s, https.port=%s, context.path=%s",
bindInterface, httpPort, httpsEnable, httpsPort, contextPath)); bindInterface, httpEnable, httpPort, httpsEnable, httpsPort, contextPath));
} }
@Override @Override
@ -163,11 +172,7 @@ public class ServerDaemon implements Daemon {
httpConfig.setSendDateHeader(false); httpConfig.setSendDateHeader(false);
// HTTP Connector // HTTP Connector
final ServerConnector httpConnector = new ServerConnector(server, new HttpConnectionFactory(httpConfig)); createHttpConnector(httpConfig);
httpConnector.setPort(httpPort);
httpConnector.setHost(bindInterface);
httpConnector.setIdleTimeout(30000);
server.addConnector(httpConnector);
// Setup handlers // Setup handlers
server.setHandler(createHandlers()); server.setHandler(createHandlers());
@ -175,27 +180,8 @@ public class ServerDaemon implements Daemon {
// Extra config options // Extra config options
server.setStopAtShutdown(true); server.setStopAtShutdown(true);
// Configure SSL // HTTPS Connector
if (httpsEnable && !Strings.isNullOrEmpty(keystoreFile) && new File(keystoreFile).exists()) { createHttpsConnector(httpConfig);
// SSL Context
final SslContextFactory sslContextFactory = new SslContextFactory();
// Define keystore path and passwords
sslContextFactory.setKeyStorePath(keystoreFile);
sslContextFactory.setKeyStorePassword(keystorePassword);
sslContextFactory.setKeyManagerPassword(keystorePassword);
// HTTPS config
final HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);
httpsConfig.addCustomizer(new SecureRequestCustomizer());
// HTTPS connector
final ServerConnector sslConnector = new ServerConnector(server,
new SslConnectionFactory(sslContextFactory, "http/1.1"),
new HttpConnectionFactory(httpsConfig));
sslConnector.setPort(httpsPort);
sslConnector.setHost(bindInterface);
server.addConnector(sslConnector);
}
server.start(); server.start();
server.join(); server.join();
@ -215,6 +201,41 @@ public class ServerDaemon implements Daemon {
/////////////// Private methods /////////////////// /////////////// Private methods ///////////////////
/////////////////////////////////////////////////// ///////////////////////////////////////////////////
private void createHttpConnector(final HttpConfiguration httpConfig) {
if (httpEnable) {
final ServerConnector httpConnector = new ServerConnector(server, new HttpConnectionFactory(httpConfig));
httpConnector.setPort(httpPort);
httpConnector.setHost(bindInterface);
httpConnector.setIdleTimeout(30000);
server.addConnector(httpConnector);
}
}
private void createHttpsConnector(final HttpConfiguration httpConfig) {
// Configure SSL
if (httpsEnable && !Strings.isNullOrEmpty(keystoreFile) && new File(keystoreFile).exists()) {
// SSL Context
final SslContextFactory sslContextFactory = new SslContextFactory();
// Define keystore path and passwords
sslContextFactory.setKeyStorePath(keystoreFile);
sslContextFactory.setKeyStorePassword(keystorePassword);
sslContextFactory.setKeyManagerPassword(keystorePassword);
// HTTPS config
final HttpConfiguration httpsConfig = new HttpConfiguration(httpConfig);
httpsConfig.addCustomizer(new SecureRequestCustomizer());
// HTTPS Connector
final ServerConnector sslConnector = new ServerConnector(server,
new SslConnectionFactory(sslContextFactory, "http/1.1"),
new HttpConnectionFactory(httpsConfig));
sslConnector.setPort(httpsPort);
sslConnector.setHost(bindInterface);
server.addConnector(sslConnector);
}
}
private HandlerCollection createHandlers() { private HandlerCollection createHandlers() {
final WebAppContext webApp = new WebAppContext(); final WebAppContext webApp = new WebAppContext();
webApp.setContextPath(contextPath); webApp.setContextPath(contextPath);
@ -283,6 +304,10 @@ public class ServerDaemon implements Daemon {
this.httpPort = httpPort; this.httpPort = httpPort;
} }
public void setHttpEnable(boolean httpEnable) {
this.httpEnable = httpEnable;
}
public void setHttpsPort(int httpsPort) { public void setHttpsPort(int httpsPort) {
this.httpsPort = httpsPort; this.httpsPort = httpsPort;
} }