From a14a227515aac53ce63aec39fe83ebd59d38ae5f Mon Sep 17 00:00:00 2001
From: Michael Suzuki <michael.suzuki@alfresco.com>
Date: Thu, 3 Nov 2016 15:47:37 +0000
Subject: [PATCH] Search-229, enforce certifacte check to prevent browsers from
 viewing solr.

---
 search-services/packaging/config.properties          |  3 ++-
 search-services/packaging/src/docker/compose-ssl.yml | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/search-services/packaging/config.properties b/search-services/packaging/config.properties
index 32fd410d3..966fa502e 100644
--- a/search-services/packaging/config.properties
+++ b/search-services/packaging/config.properties
@@ -1,5 +1,6 @@
 alfresco.solr.ssl=<Set name="KeyStoreType"><Property name="solr.jetty.keystore.type" default="JCEKS"/></Set>\
-${line.separator}  <Set name="TrustStoreType"><Property name="solr.jetty.truststore.type" default="JCEKS"/></Set>
+${line.separator}  <Set name="TrustStoreType"><Property name="solr.jetty.truststore.type" default="JCEKS"/></Set>\
+${line.separator}  <Set name="NeedClientAuth"><Property name="solr.jetty.ssl.needclientauth" default="true"/></Set>
 alfresco.solr.config=# Alfresco configuration. This file is automatically included by solr. You can define your custom settings here\
 ${line.separator}SOLR_OPTS="$SOLR_OPTS -Dsolr.jetty.request.header.size=1000000 -Dsolr.jetty.threads.stop.timeout=300000"
 alfresco.solr.config.win=REM Alfresco configuration. This file is automatically included by solr. You can define your custom settings here\
diff --git a/search-services/packaging/src/docker/compose-ssl.yml b/search-services/packaging/src/docker/compose-ssl.yml
index e58d70e44..9a405e71d 100644
--- a/search-services/packaging/src/docker/compose-ssl.yml
+++ b/search-services/packaging/src/docker/compose-ssl.yml
@@ -33,11 +33,11 @@ services:
       #Create the default alfresco and archive cores
       #SOLR_CREATE_ALFRESCO_DEFAULTS : alfresco,archive
 
-      #SSL setup
-      #SOLR_SSL_KEY_STORE: /opt/alfresco/alf_data/keystore/ssl.repo.client.keystore
-      #SOLR_SSL_KEY_STORE_PASSWORD: kT9X6oe68t
-      #SOLR_SSL_TRUST_STORE: /opt/alfresco/alf_data/keystore/ssl.repo.client.truststore
-      #SOLR_SSL_TRUST_STORE_PASSWORD: kT9X6oe68t
+      #SOLR_OPTS: "$SOLR_OPTS -Djavax.net.debug=SSL,keymanager,trustmanager"
+      SOLR_SSL_KEY_STORE: /opt/alfresco/alf_data/keystore/ssl.repo.client.keystore
+      SOLR_SSL_KEY_STORE_PASSWORD: kT9X6oe68t
+      SOLR_SSL_TRUST_STORE: /opt/alfresco/alf_data/keystore/ssl.repo.client.truststore
+      SOLR_SSL_TRUST_STORE_PASSWORD: kT9X6oe68t
 
     ports:
       - "8984:8084" #Browser port