Merge pull request #73 from davco01a/latest

Review comments/clean up Pen Test updates

Dockerfile

@@ -12,7 +12,6 @@ COPY LICENSE /licenses/
 #FROM open-liberty:webProfile7-java8-openj9
 COPY --chown=1001:0 /target/kabanero-cli-service-1.0-SNAPSHOT.war /config/apps
 COPY --chown=1001:0 /src/main/liberty/config/cacerts /config/resources/security/cacerts
-COPY --chown=1001:0 /src/main/liberty/config/keystore.xml /config/configDropins/defaults
 COPY --chown=1001:0 /target/liberty/wlp/usr/servers/defaultServer/server.xml /config
 COPY --chown=1001:0 /src/main/liberty/config/jvm.options /config
 
@@ -23,14 +22,8 @@ RUN chmod 444 /config/server.xml
 RUN chmod 444 /config/server.env
 RUN chmod 444 /config/jvm.options
 RUN chmod 444 /config/resources/security/cacerts
-RUN chmod 444 /config/configDropins/defaults/keystore.xml
 RUN rm /config/configDropins/defaults/open-default-port.xml
 
-#COPY /src/main/liberty/config/cacerts /opt/ol/wlp/output/defaultServer/resources/security/cacerts
-#COPY /target/liberty/wlp/usr/servers/defaultServer/server.xml /opt/ol/wlp/output/defaultServer/server.xml
-#COPY --chown=1001:0 /src/main/liberty/config/jvm.options /opt/ol/wlp/output/defaultServer
-#RUN chmod 444 /opt/ol/wlp/output/defaultServer/server.xml
-#RUN chmod 444 /opt/ol/wlp/output/defaultServer/jvm.options
-#RUN chmod 444 /opt/ol/wlp/output/defaultServer/resources/security/cacerts
+
 
 

src/main/liberty/config/jvm.options

@@ -1,4 +1,4 @@
 #-javaagent:resources/javametrics-agent.jar
-#-Dcom.ibm.jsse2.sp800-131=strict
+-Dcom.ibm.jsse2.sp800-131=transition
 -Djdk.tls.client.protocols=TLSv1.2
 -Dhttps.protocols=TLSv1.2

src/main/liberty/config/server.xml

@@ -38,9 +38,7 @@
  sharedKey="${AESEncryptionKey}"/>
 
 
- <!--
- <keyStore id="defaultKeyStore" password="keyspass"/>
- -->
+
  <sslDefault sslRef="kabSSLConfig"/>
  <ssl id="kabSSLConfig" keyStoreRef="defaultKeyStore" trustStoreRef="validationKeystore"/>
  <keyStore id="defaultKeyStore" />