WARN when setting rhq.server.tomcat.security.client-auth-mode to a va…

…lue different than true or false.
rhq-project · Jan 16, 2017 · 8465a42 · 8465a42
1 parent e3280e6
commit 8465a42
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/...les/enterprise/comm/src/main/java/org/rhq/enterprise/communications/ServiceContainer.java b/...les/enterprise/comm/src/main/java/org/rhq/enterprise/communications/ServiceContainer.java
@@ -1246,6 +1246,15 @@ private void setupServerConnector() throws Exception {
             if (transport.equals("https")) {
                 connector_config.put("SSLImplementation", RemotingSSLImplementation.class.getName());
             }
+
+            if (transport.equals("sslservlet") || transport.equals("https")) {
+                String tomcatAuthMode = "rhq.server.tomcat.security.client-auth-mode";
+                String tomcatAuthModeValue = System.getProperty("rhq.server.tomcat.security.client-auth-mode");
+                if (!tomcatAuthModeValue.equals("true") && !tomcatAuthModeValue.equals("false")) {
+                    LOG.warn(CommI18NResourceKeys.SERVICE_CONTAINER_CONFIGURATION_INVALID_TOMCAT_CLIENT_AUTH,
+                            tomcatAuthMode, tomcatAuthModeValue, "true", "false");
+                }
+            }
         }
 
         // we can now instantiate our connector with the locator URI and other configuration

diff --git a/...prise/comm/src/main/java/org/rhq/enterprise/communications/i18n/CommI18NResourceKeys.java b/...prise/comm/src/main/java/org/rhq/enterprise/communications/i18n/CommI18NResourceKeys.java
@@ -675,6 +675,9 @@ public interface CommI18NResourceKeys {
     @I18NMessages( { @I18NMessage("The [{0}] preference specified is invalid [{1}] - it must be one of [{2}, {3}, {4}]. Setting it to [{5}]") })
     String SERVICE_CONTAINER_CONFIGURATION_INVALID_CLIENT_AUTH = "ServiceContainerConfiguration.invalid-client-auth";
 
+    @I18NMessages( { @I18NMessage("The [{0}] preference specified is invalid [{1}] - it must be one of [{2}, {3}] (case sensitive).") })
+    String SERVICE_CONTAINER_CONFIGURATION_INVALID_TOMCAT_CLIENT_AUTH = "ServiceContainerConfiguration.invalid-tomcat-client-auth";
+
     @I18NMessages( { @I18NMessage("<unknown>"), @I18NMessage(value = "<unbekannt>", locale = "de") })
     String SERVICE_CONTAINER_CONFIGURATION_UNKNOWN = "ServiceContainerConfiguration.unknown";