Merge pull request #266 from zowe/bugfix/v2/multi-pem

Update defaults logic for multi-pem
zowe · Jul 31, 2023 · 39e4dd2 · 39e4dd2
2 parents 53d91da + c3d9d48
commit 39e4dd2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to the Zlux App Server package will be documented in this file.
 
+## v2.11.0
+
+- Bugfix: The server couldn't load more than one certificate authority specified within the zowe.certificate.pem.certificateAuthorities section under any condition. Now, it is supported regardless of if the section is an array or a comma-separated string. (#266)
+
 ## v2.10.0
 
 - Enhancement: Migrated app-server configuration options into a "defaults.yaml" file which adheres to the schema of the Zowe config. This allows users to see the default behaviors more clearly, and can serve as an example by which users can customize their Zowe config to override such defaults. (#247)

diff --git a/defaults/serverConfig/defaults.yaml b/defaults/serverConfig/defaults.yaml
@@ -51,7 +51,11 @@ components:
                                        if (zowe.certificate?.truststore?.type == "JCERACFKS") {
                                           return [ zowe.certificate.truststore.file ];
                                        } else if(zowe.certificate?.pem?.certificateAuthorities) {
-                                          return [zowe.certificate.pem.certificateAuthorities];
+                                          if (Array.isArray(zowe.certificate.pem.certificateAuthorities)) {
+                                            return zowe.certificate.pem.certificateAuthorities;
+                                          } else {
+                                            return zowe.certificate.pem.certificateAuthorities.split(",");
+                                          }
                                         } else { return ["../defaults/serverConfig/apiml-localca.cer"]; } };
                                   a() }}'
       loopbackAddress: "${{ function a(){ if (process.env.ZOWE_LOOPBACK_ADDRESS) { return process.env.ZOWE_LOOPBACK_ADDRESS; } else { return undefined; } }; a() }}"