anmolnar commented on code in PR #2362:
URL: https://github.com/apache/zookeeper/pull/2362#discussion_r3081389970
##########
zookeeper-metrics-providers/zookeeper-prometheus-metrics/src/main/java/org/apache/zookeeper/metrics/prometheus/PrometheusMetricsProvider.java:
##########
@@ -171,23 +181,47 @@ public void start() throws
MetricsProviderLifeCycleException {
int acceptors = 1;
int selectors = 1;
- // Configure HTTP connector if enabled
- if (this.httpPort != -1) {
- ServerConnector httpConnector = new ServerConnector(server,
acceptors, selectors);
- httpConnector.setPort(this.httpPort);
- httpConnector.setHost(this.host);
- server.addConnector(httpConnector);
- }
+ ServerConnector connector = null;
+
+ if (this.httpPort != -1 && this.httpsPort != -1 && this.httpPort
== this.httpsPort) {
+ SecureRequestCustomizer customizer = new
SecureRequestCustomizer();
+ customizer.setStsMaxAge(DEFAULT_STS_MAX_AGE);
+ customizer.setStsIncludeSubDomains(true);
+
+ HttpConfiguration config = new HttpConfiguration();
+ config.setSecureScheme("https");
+ config.addCustomizer(customizer);
- // Configure HTTPS connector if enabled
- if (this.httpsPort != -1) {
SslContextFactory.Server sslContextFactory =
createSslContextFactory();
- KeyStoreScanner keystoreScanner = new
KeyStoreScanner(sslContextFactory);
- keystoreScanner.setScanInterval(SCAN_INTERVAL);
- server.addBean(keystoreScanner);
- server.addConnector(createSslConnector(server, acceptors,
selectors, sslContextFactory));
+ setKeyStoreScanner(sslContextFactory);
+
+ String nextProtocol =
HttpVersion.fromVersion(httpVersion).asString();
+ connector = new ServerConnector(server,
+ new UnifiedConnectionFactory(sslContextFactory,
nextProtocol),
+ new HttpConnectionFactory(config));
+ connector.setPort(this.httpPort);
+ connector.setHost(this.host);
+ LOG.debug("Created unified ServerConnector for host: {},
httpPort: {}", host, httpPort);
Review Comment:
You can move these messages to INFO level. We should see clearly which type
of server has been initialized.
##########
zookeeper-metrics-providers/zookeeper-prometheus-metrics/src/main/java/org/apache/zookeeper/metrics/prometheus/PrometheusMetricsProvider.java:
##########
@@ -171,23 +181,47 @@ public void start() throws
MetricsProviderLifeCycleException {
int acceptors = 1;
int selectors = 1;
- // Configure HTTP connector if enabled
- if (this.httpPort != -1) {
- ServerConnector httpConnector = new ServerConnector(server,
acceptors, selectors);
- httpConnector.setPort(this.httpPort);
- httpConnector.setHost(this.host);
- server.addConnector(httpConnector);
- }
+ ServerConnector connector = null;
+
+ if (this.httpPort != -1 && this.httpsPort != -1 && this.httpPort
== this.httpsPort) {
+ SecureRequestCustomizer customizer = new
SecureRequestCustomizer();
+ customizer.setStsMaxAge(DEFAULT_STS_MAX_AGE);
+ customizer.setStsIncludeSubDomains(true);
Review Comment:
We might need to add some comments to briefly explain what is this about.
##########
zookeeper-metrics-providers/zookeeper-prometheus-metrics/src/main/java/org/apache/zookeeper/metrics/prometheus/PrometheusMetricsProvider.java:
##########
@@ -171,23 +181,47 @@ public void start() throws
MetricsProviderLifeCycleException {
int acceptors = 1;
int selectors = 1;
- // Configure HTTP connector if enabled
- if (this.httpPort != -1) {
- ServerConnector httpConnector = new ServerConnector(server,
acceptors, selectors);
- httpConnector.setPort(this.httpPort);
- httpConnector.setHost(this.host);
- server.addConnector(httpConnector);
- }
+ ServerConnector connector = null;
+
+ if (this.httpPort != -1 && this.httpsPort != -1 && this.httpPort
== this.httpsPort) {
+ SecureRequestCustomizer customizer = new
SecureRequestCustomizer();
+ customizer.setStsMaxAge(DEFAULT_STS_MAX_AGE);
Review Comment:
What is STS?
--
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]
