Switch keyring pattern to allow more types of keyrings

Signed-off-by: 1000TurquoisePogs <[email protected]>
zowe · Nov 15, 2023 · 12b74f5 · 12b74f5
1 parent c221053
commit 12b74f5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/defaults/serverConfig/defaults.yaml b/defaults/serverConfig/defaults.yaml
@@ -32,23 +32,23 @@ components:
                      } else { return Number(7556); } };
                 a() }}"
         keys: '${{ function a() {
-                     if (zowe.certificate?.keystore?.type == "JCERACFKS") {
+                     if (zowe.certificate?.keystore?.type && zowe.certificate.keystore.type.match("JCE.*KS")) {
                        return [ zowe.certificate.keystore.file+"&"+zowe.certificate.keystore.alias ];
                      } else if (zowe.certificate?.pem?.key) {
                        return [ zowe.certificate.pem.key ];
                      } else {
                        return [ "../defaults/serverConfig/zlux.keystore.key" ]; } };
                 a() }}'
         certificates: '${{ function a(){
-                             if (zowe.certificate?.keystore?.type == "JCERACFKS") {
+                             if (zowe.certificate?.keystore?.type && zowe.certificate.keystore.type.match("JCE.*KS")) {
                                return [ zowe.certificate.keystore.file+"&"+zowe.certificate.keystore.alias ];
                              } else if (zowe.certificate?.pem?.certificate) {
                                return [ zowe.certificate.pem.certificate ];
                              } else {
                                return [ "../defaults/serverConfig/zlux.keystore.cer" ]; } };
                         a() }}'
         certificateAuthorities: '${{ function a() {
-                                       if (zowe.certificate?.truststore?.type == "JCERACFKS") {
+                                       if (zowe.certificate?.truststore?.type && zowe.certificate.truststore.type.match("JCE.*KS")) {
                                           return [ zowe.certificate.truststore.file ];
                                        } else if(zowe.certificate?.pem?.certificateAuthorities) {
                                           if (Array.isArray(zowe.certificate.pem.certificateAuthorities)) {

diff --git a/schemas/app-server-config.json b/schemas/app-server-config.json
@@ -660,14 +660,14 @@
     },
     "safKeyringCertObject": {
       "type": "string",
-      "pattern": "^safkeyring:(\/\/)+.*$"
+      "pattern": "^safkeyring.*:(\/\/)+.*$"
     },
     "pathCertObject": {
       "type": "string",
       "not": {
         "anyOf": [
           { "pattern": "^file:\/\/.*$" },
-          { "pattern": "^safkeyring:(\/\/)+.*$" }
+          { "pattern": "^safkeyring.*:(\/\/)+.*$" }
         ]
       }
     },