[nifi-registry] 01/01: NIFIREG-380 - Allow NiFi Registry admins to configure whether Jetty will send the Jetty server version in responses.

[thenatog]

This is an automated email from the ASF dual-hosted git repository.

thenatog pushed a commit to branch NIFIREG-380
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git

commit eae3a8632fd6d88b8cf0eede5599df7bccf0ec9e
Author: Nathan Gough <thena...@gmail.com>
AuthorDate: Mon Apr 6 21:10:25 2020 -0400

    NIFIREG-380 - Allow NiFi Registry admins to configure whether Jetty will 
send the Jetty server version in responses.
---
 .../src/main/java/org/apache/nifi/registry/jetty/JettyServer.java   | 1 +
 .../org/apache/nifi/registry/properties/NiFiRegistryProperties.java | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git 
a/nifi-registry-core/nifi-registry-jetty/src/main/java/org/apache/nifi/registry/jetty/JettyServer.java
 
b/nifi-registry-core/nifi-registry-jetty/src/main/java/org/apache/nifi/registry/jetty/JettyServer.java
index 387857f..d20fce4 100644
--- 
a/nifi-registry-core/nifi-registry-jetty/src/main/java/org/apache/nifi/registry/jetty/JettyServer.java
+++ 
b/nifi-registry-core/nifi-registry-jetty/src/main/java/org/apache/nifi/registry/jetty/JettyServer.java
@@ -148,6 +148,7 @@ public class JettyServer {
         final HttpConfiguration httpConfiguration = new HttpConfiguration();
         httpConfiguration.setRequestHeaderSize(HEADER_BUFFER_SIZE);
         httpConfiguration.setResponseHeaderSize(HEADER_BUFFER_SIZE);
+        
httpConfiguration.setSendServerVersion(properties.shouldSendServerVersion());
 
         if (properties.getPort() != null) {
             final Integer port = properties.getPort();
diff --git 
a/nifi-registry-core/nifi-registry-properties/src/main/java/org/apache/nifi/registry/properties/NiFiRegistryProperties.java
 
b/nifi-registry-core/nifi-registry-properties/src/main/java/org/apache/nifi/registry/properties/NiFiRegistryProperties.java
index e1e9a39..d3b4a25 100644
--- 
a/nifi-registry-core/nifi-registry-properties/src/main/java/org/apache/nifi/registry/properties/NiFiRegistryProperties.java
+++ 
b/nifi-registry-core/nifi-registry-properties/src/main/java/org/apache/nifi/registry/properties/NiFiRegistryProperties.java
@@ -38,6 +38,7 @@ public class NiFiRegistryProperties extends Properties {
     public static final String WEB_HTTPS_HOST = "nifi.registry.web.https.host";
     public static final String WEB_WORKING_DIR = 
"nifi.registry.web.jetty.working.directory";
     public static final String WEB_THREADS = "nifi.registry.web.jetty.threads";
+    public static final String WEB_SHOULD_SEND_SERVER_VERSION = 
"nifi.registry.web.should.send.server.version";
 
     public static final String SECURITY_KEYSTORE = 
"nifi.registry.security.keystore";
     public static final String SECURITY_KEYSTORE_TYPE = 
"nifi.registry.security.keystoreType";
@@ -95,6 +96,7 @@ public class NiFiRegistryProperties extends Properties {
     public static final String 
DEFAULT_SECURITY_IDENTITY_PROVIDER_CONFIGURATION_FILE = 
"./conf/identity-providers.xml";
     public static final String DEFAULT_AUTHENTICATION_EXPIRATION = "12 hours";
     public static final String DEFAULT_EXTENSIONS_WORKING_DIR = 
"./work/extensions";
+    public static final String DEFAULT_WEB_SHOULD_SEND_SERVER_VERSION = "true";
 
     public int getWebThreads() {
         int webThreads = 200;
@@ -122,6 +124,10 @@ public class NiFiRegistryProperties extends Properties {
         return getSslPort() != null;
     }
 
+    public boolean shouldSendServerVersion() {
+        return 
Boolean.parseBoolean(getProperty(WEB_SHOULD_SEND_SERVER_VERSION, 
DEFAULT_WEB_SHOULD_SEND_SERVER_VERSION));
+    }
+
     public String getHttpsHost() {
         return getProperty(WEB_HTTPS_HOST);
     }