Feature/us 572876 - Adding more extensions to certificate list. (#198)

* US-572876 - Adding more extensions to certificate Co-authored-by: [email protected] <[email protected]>
pegasystems · Dec 11, 2023 · cb255fc · cb255fc
1 parent 08c227f
commit cb255fc
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 4 deletions.
diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh
@@ -152,7 +152,7 @@ if [ "$(ls -A "${pega_root}/artifactory/cert"/*)" ]; then
            filename=$(basename "$certfile")
            ext="${filename##*.}"
            echo "$filename"
-           if [ "$ext" = "cer" ] || [ "$ext" = "pem" ] || [ "$ext" = "crt" ] || [ "$ext" = "der" ]; then
+           if [[ "$ext" =~ ^(cer|pem|crt|der|cert|jks|p7b|p7c|key)$ ]]; then
               echo "$certfile"
               custom_artifactory_certificate="--cacert "$certfile
            else
@@ -212,7 +212,7 @@ do
     filename=$(basename "$certfile")
     ext="${filename##*.}"
     echo "$filename"
-    if [ "$ext" = "cer" ] || [ "$ext" = "pem" ] || [ "$ext" = "crt" ] || [ "$ext" = "der" ]; then
+    if [[ "$ext" =~ ^(cer|pem|crt|der|cert|jks|p7b|p7c|key)$ ]]; then
       echo "${filename%.*}"cert
       keytool -keystore "$JAVA_HOME"/lib/security/cacerts -storepass changeit -noprompt -trustcacerts -importcert -alias "${filename%.*}"cert -file "$certfile"
     fi

diff --git a/tests/pega-web-ready-testcases.yaml b/tests/pega-web-ready-testcases.yaml
@@ -1586,9 +1586,10 @@ commandTests:
         bash -c './scripts/docker-entrypoint.sh run &'&&
         sleep 15s &&
         keytool -list -keystore $JAVA_HOME/lib/security/cacerts	-alias badsslcert  -storepass changeit &&
-        keytool -list -keystore $JAVA_HOME/lib/security/cacerts	-alias goodsslcert  -storepass changeit
+        keytool -list -keystore $JAVA_HOME/lib/security/cacerts	-alias goodsslcert  -storepass changeit &&
+        keytool -list -keystore $JAVA_HOME/lib/security/cacerts	-alias testcert  -storepass changeit
     exitCode: 0
-    expectedOutput: ["badsslcert(.*)trustedCertEntry,","goodsslcert(.*)trustedCertEntry,"]
+    expectedOutput: ["badsslcert(.*)trustedCertEntry,","goodsslcert(.*)trustedCertEntry,","testcert(.*)trustedCertEntry,"]
 
   # Verify custom artifactory invalid certificate
   - name: "Custom artifactory invalid certificate check"

diff --git a/tests/test-artifacts/certs/test.crt b/tests/test-artifacts/certs/test.crt
@@ -0,0 +1,37 @@
+-----BEGIN CERTIFICATE-----
+MIIGizCCBXOgAwIBAgIQYnvLQo/q1fYkYzoTIwLnUTANBgkqhkiG9w0BAQsFADBE
+MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMU
+R2VvVHJ1c3QgU1NMIENBIC0gRzMwHhcNMTYxMDI1MDAwMDAwWhcNMTgxMTI0MjM1
+OTU5WjCBgzELMAkGA1UEBhMCTVgxGTAXBgNVBAgMEERpc3RyaXRvIEZlZGVyYWwx
+GTAXBgNVBAcMEENpdWRhZCBkZSBNZXhpY28xJDAiBgNVBAoMG0VsZWN0cm9uaWMg
+QmlsbHMgJiBTZXJ2aWNlczEYMBYGA1UEAwwPZWJzLWNmZGkuY29tLm14MIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyiHnBIOWZFmZlpHU/3t0n4uBlhuc
+Ws1hAJ85EiCJqlPSBKjApl8LgWn6IDBPo5Fxy3sZI0FfkfHWx4kX7XJeDD0p1ET3
+6pAfUpL5iqKWozYF1LEZhse/Vv1C3HK7J0Q58vI19cyIy3OrvXUkZ4U2bQ25/7Dx
+wR+juhBNrxr72GmVrJqUdkaQKDksMN8uqjqeWh33i8HIjC55zusBq/5BycTS6LzZ
+uAaueozASmmj/iMDjc1RimKTM3/MU4/ww0pXz8zOSJhXbFUwzmwz5sIodo3+ePG+
+6zKeBshvlOLLrMIaUsU3978BqMWhZXGsvolinjkKB8wrJ8TGKOqsg7KLPwIDAQAB
+o4IDNzCCAzMwLwYDVR0RBCgwJoIPZWJzLWNmZGkuY29tLm14ghN3d3cuZWJzLWNm
+ZGkuY29tLm14MAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgWgMCsGA1UdHwQkMCIw
+IKAeoByGGmh0dHA6Ly9nbi5zeW1jYi5jb20vZ24uY3JsMIGdBgNVHSAEgZUwgZIw
+gY8GBmeBDAECAjCBhDA/BggrBgEFBQcCARYzaHR0cHM6Ly93d3cuZ2VvdHJ1c3Qu
+Y29tL3Jlc291cmNlcy9yZXBvc2l0b3J5L2xlZ2FsMEEGCCsGAQUFBwICMDUMM2h0
+dHBzOi8vd3d3Lmdlb3RydXN0LmNvbS9yZXNvdXJjZXMvcmVwb3NpdG9yeS9sZWdh
+bDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAU0m/3
+lvSFP3I8MH0j2oV4m6N8WnwwVwYIKwYBBQUHAQEESzBJMB8GCCsGAQUFBzABhhNo
+dHRwOi8vZ24uc3ltY2QuY29tMCYGCCsGAQUFBzAChhpodHRwOi8vZ24uc3ltY2Iu
+Y29tL2duLmNydDCCAX0GCisGAQQB1nkCBAIEggFtBIIBaQFnAHYA3esdK3oNT6Yg
+i4GtgWhwfi6OnQHVXIiNPRHEzbbsvswAAAFX/e3IRgAABAMARzBFAiBarKRL+C6T
+CuSVymwfSvrvIfohTzHTz1eRg3lVZJYIcwIhAJADAJR5U7SEZVM3buA5e+AL48Ke
+mlLZPuJ4L7rvMRd6AHUAaPaY+B9kgr46jO65KB1M/HFRXWeT1ETRCmesu09P+8QA
+AAFX/e3IYAAABAMARjBEAiB++rmbLX29JC7BnvT2H3Lb3zedNNZvk8mKAWW2e6Y+
+zQIgQqGJBYEwm0b54iDxBNXHZJj88LldHXC1ZPbeq+cWhuoAdgDuS723dc5guuFC
+aR+r4Z5mow9+X7By2IMAxHuJeqj9ywAAAVf97ciIAAAEAwBHMEUCIDZL2qZpyFZw
+KMiW1EYYbjZ04r1kb5yq1oWDI8AgiDdjAiEAyFQeCZdunoyVKHSSC24gmjgNyiOr
+0P9NLZSMW4IMXmIwDQYJKoZIhvcNAQELBQADggEBAGzLoI3ExFq9C0DW66TQ+xzq
+CiFeTGeMImtO7ohRUIOyQQiScuGTIQv3tr52x1VLEDDHFLoHbVirxQnWEOg4VjhZ
+ZlCdXPONs/eHQMwTk7u8FrNqM1d4eFMM4ob4mQrQSWvOV4iis3bkCLfKM4ZLZhxV
+gqjvQlZggiPWSR11db21DKTwyv7rZJKHXFCi5qxJfsQHgGkXN1F+mD56r7e0WHL/
+gIWWzShIa8IqMu71i/15hwRWAe8a79nPQsSH/pi9BNqHUko9B3Jurd48iiRoqSip
+OS+3jR+VjfzTJzo1lk1otde3p7E9TLehK4VI00PflZIPEeidTtXBfLi2yzDNWqY=
+-----END CERTIFICATE-----
diff --git a/tests/test-artifacts/certs/test.inv b/tests/test-artifacts/certs/test.inv
@@ -0,0 +1,37 @@
+-----BEGIN CERTIFICATE-----
+MIIGizCCBXOgAwIBAgIQYnvLQo/q1fYkYzoTIwLnUTANBgkqhkiG9w0BAQsFADBE
+MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMU
+R2VvVHJ1c3QgU1NMIENBIC0gRzMwHhcNMTYxMDI1MDAwMDAwWhcNMTgxMTI0MjM1
+OTU5WjCBgzELMAkGA1UEBhMCTVgxGTAXBgNVBAgMEERpc3RyaXRvIEZlZGVyYWwx
+GTAXBgNVBAcMEENpdWRhZCBkZSBNZXhpY28xJDAiBgNVBAoMG0VsZWN0cm9uaWMg
+QmlsbHMgJiBTZXJ2aWNlczEYMBYGA1UEAwwPZWJzLWNmZGkuY29tLm14MIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyiHnBIOWZFmZlpHU/3t0n4uBlhuc
+Ws1hAJ85EiCJqlPSBKjApl8LgWn6IDBPo5Fxy3sZI0FfkfHWx4kX7XJeDD0p1ET3
+6pAfUpL5iqKWozYF1LEZhse/Vv1C3HK7J0Q58vI19cyIy3OrvXUkZ4U2bQ25/7Dx
+wR+juhBNrxr72GmVrJqUdkaQKDksMN8uqjqeWh33i8HIjC55zusBq/5BycTS6LzZ
+uAaueozASmmj/iMDjc1RimKTM3/MU4/ww0pXz8zOSJhXbFUwzmwz5sIodo3+ePG+
+6zKeBshvlOLLrMIaUsU3978BqMWhZXGsvolinjkKB8wrJ8TGKOqsg7KLPwIDAQAB
+o4IDNzCCAzMwLwYDVR0RBCgwJoIPZWJzLWNmZGkuY29tLm14ghN3d3cuZWJzLWNm
+ZGkuY29tLm14MAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgWgMCsGA1UdHwQkMCIw
+IKAeoByGGmh0dHA6Ly9nbi5zeW1jYi5jb20vZ24uY3JsMIGdBgNVHSAEgZUwgZIw
+gY8GBmeBDAECAjCBhDA/BggrBgEFBQcCARYzaHR0cHM6Ly93d3cuZ2VvdHJ1c3Qu
+Y29tL3Jlc291cmNlcy9yZXBvc2l0b3J5L2xlZ2FsMEEGCCsGAQUFBwICMDUMM2h0
+dHBzOi8vd3d3Lmdlb3RydXN0LmNvbS9yZXNvdXJjZXMvcmVwb3NpdG9yeS9sZWdh
+bDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAU0m/3
+lvSFP3I8MH0j2oV4m6N8WnwwVwYIKwYBBQUHAQEESzBJMB8GCCsGAQUFBzABhhNo
+dHRwOi8vZ24uc3ltY2QuY29tMCYGCCsGAQUFBzAChhpodHRwOi8vZ24uc3ltY2Iu
+Y29tL2duLmNydDCCAX0GCisGAQQB1nkCBAIEggFtBIIBaQFnAHYA3esdK3oNT6Yg
+i4GtgWhwfi6OnQHVXIiNPRHEzbbsvswAAAFX/e3IRgAABAMARzBFAiBarKRL+C6T
+CuSVymwfSvrvIfohTzHTz1eRg3lVZJYIcwIhAJADAJR5U7SEZVM3buA5e+AL48Ke
+mlLZPuJ4L7rvMRd6AHUAaPaY+B9kgr46jO65KB1M/HFRXWeT1ETRCmesu09P+8QA
+AAFX/e3IYAAABAMARjBEAiB++rmbLX29JC7BnvT2H3Lb3zedNNZvk8mKAWW2e6Y+
+zQIgQqGJBYEwm0b54iDxBNXHZJj88LldHXC1ZPbeq+cWhuoAdgDuS723dc5guuFC
+aR+r4Z5mow9+X7By2IMAxHuJeqj9ywAAAVf97ciIAAAEAwBHMEUCIDZL2qZpyFZw
+KMiW1EYYbjZ04r1kb5yq1oWDI8AgiDdjAiEAyFQeCZdunoyVKHSSC24gmjgNyiOr
+0P9NLZSMW4IMXmIwDQYJKoZIhvcNAQELBQADggEBAGzLoI3ExFq9C0DW66TQ+xzq
+CiFeTGeMImtO7ohRUIOyQQiScuGTIQv3tr52x1VLEDDHFLoHbVirxQnWEOg4VjhZ
+ZlCdXPONs/eHQMwTk7u8FrNqM1d4eFMM4ob4mQrQSWvOV4iis3bkCLfKM4ZLZhxV
+gqjvQlZggiPWSR11db21DKTwyv7rZJKHXFCi5qxJfsQHgGkXN1F+mD56r7e0WHL/
+gIWWzShIa8IqMu71i/15hwRWAe8a79nPQsSH/pi9BNqHUko9B3Jurd48iiRoqSip
+OS+3jR+VjfzTJzo1lk1otde3p7E9TLehK4VI00PflZIPEeidTtXBfLi2yzDNWqY=
+-----END CERTIFICATE-----