From: John W <jjw-github@johntology.org>
Date: Fri, 14 Mar 2014 01:41:05 +0000 (-0400)
Subject: Adding truststore properties; making clientAuth configurable
X-Git-Tag: 4.3~324^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f264a8ec40e64689e41a60087838fb3cc513f1b1;p=sonarqube.git

Adding truststore properties; making clientAuth configurable
---

diff --git a/sonar-application/src/main/java/org/sonar/application/Connectors.java b/sonar-application/src/main/java/org/sonar/application/Connectors.java
index 2fdb9c8ebe7..a6cfd1f0bb0 100644
--- a/sonar-application/src/main/java/org/sonar/application/Connectors.java
+++ b/sonar-application/src/main/java/org/sonar/application/Connectors.java
@@ -102,7 +102,11 @@ class Connectors {
       setConnectorAttribute(connector, "keystoreFile", props.of("sonar.web.https.keystoreFile"));
       setConnectorAttribute(connector, "keystoreType", props.of("sonar.web.https.keystoreType", "JKS"));
       setConnectorAttribute(connector, "keystoreProvider", props.of("sonar.web.https.keystoreProvider"));
-      setConnectorAttribute(connector, "clientAuth", false);
+      setConnectorAttribute(connector, "truststorePass", props.of("sonar.web.https.truststorePass", "changeit"));
+      setConnectorAttribute(connector, "truststoreFile", props.of("sonar.web.https.truststoreFile"));
+      setConnectorAttribute(connector, "truststoreType", props.of("sonar.web.https.truststoreType", "JKS"));
+      setConnectorAttribute(connector, "truststoreProvider", props.of("sonar.web.https.truststoreProvider"));
+      setConnectorAttribute(connector, "clientAuth", props.of("sonar.web.https.clientAuth", "false"));
       setConnectorAttribute(connector, "sslProtocol", "TLS");
       setConnectorAttribute(connector, "SSLEnabled", true);
       info("HTTPS connector is enabled on port " + port);