revert new ciphers (#83)

* revert previous cipher update * fix dockle to work w/ labkeyServer.jar name
LabKey · Mar 22, 2024 · a84dd81 · a84dd81
1 parent a800169
commit a84dd81
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/dockle_xeol.yml b/.github/workflows/dockle_xeol.yml
@@ -18,6 +18,7 @@ jobs:
         uses: actions/checkout@v3
       - name: Build an image from Dockerfile
         run: |
+          cp labkeyServer-HelloWorld.jar labkeyServer.jar
           LABKEY_VERSION=HelloWorld make build
       - name: Run dockle on helloworld image
         uses: goodwithtech/dockle-action@0.1.0

diff --git a/Dockerfile b/Dockerfile
@@ -73,7 +73,7 @@ ENV DEBUG="${DEBUG}" \
     TOMCAT_KEYSTORE_FORMAT="PKCS12" \
     TOMCAT_KEYSTORE_ALIAS="tomcat" \
     \
-    TOMCAT_SSL_CIPHERS="HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!kRSA:!EDH:!DHE:!DH:!ECDH" \
+    TOMCAT_SSL_CIPHERS="HIGH:!ADH:!EXP:!SSLv2:!SSLv3:!MEDIUM:!LOW:!NULL:!aNULL" \
     TOMCAT_SSL_PROTOCOL="TLS" \
     TOMCAT_SSL_ENABLED_PROTOCOLS="TLSv1.3,TLSv1.2" \
     \

diff --git a/application.properties b/application.properties
@@ -121,7 +121,7 @@ server.http2.enabled=true
 
 server.ssl.enabled=true
 
-server.ssl.ciphers=${TOMCAT_SSL_CIPHERS:-HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!kRSA:!EDH:!DHE:!DH:!ECDH}
+server.ssl.ciphers=${TOMCAT_SSL_CIPHERS:-HIGH:!ADH:!EXP:!SSLv2:!SSLv3:!MEDIUM:!LOW:!NULL:!aNULL}
 server.ssl.enabled-protocols=${TOMCAT_SSL_ENABLED_PROTOCOLS:-TLSv1.3,TLSv1.2}
 server.ssl.protocol=${TOMCAT_SSL_PROTOCOL:-TLS}