From 50290a77e50170387fd5ffdae3adf65564bd4c6a Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Fri, 14 Jul 2023 10:45:29 -0400 Subject: [PATCH 1/3] Update defaults logic for multi-pem Signed-off-by: 1000TurquoisePogs --- defaults/serverConfig/defaults.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/defaults/serverConfig/defaults.yaml b/defaults/serverConfig/defaults.yaml index 6a0451f..5ea33f5 100644 --- 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() }}" From a642471c0d8d86c54b8ac5c45e533df38589a202 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Fri, 14 Jul 2023 10:48:43 -0400 Subject: [PATCH 2/3] Update CHANGELOG.md Signed-off-by: 1000TurquoisePogs --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6f1bf6..0ec16a5 100644 --- 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) From 8db02e713516a7e4079c90db544aba9b5f8b6bd8 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Fri, 14 Jul 2023 10:51:51 -0400 Subject: [PATCH 3/3] Update defaults.yaml Signed-off-by: 1000TurquoisePogs --- defaults/serverConfig/defaults.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/serverConfig/defaults.yaml b/defaults/serverConfig/defaults.yaml index 5ea33f5..f60f6fe 100644 --- a/defaults/serverConfig/defaults.yaml +++ b/defaults/serverConfig/defaults.yaml @@ -54,7 +54,7 @@ components: if (Array.isArray(zowe.certificate.pem.certificateAuthorities)) { return zowe.certificate.pem.certificateAuthorities; } else { - return zowe.certificate.pem.certificateAuthorities.split(','); + return zowe.certificate.pem.certificateAuthorities.split(","); } } else { return ["../defaults/serverConfig/apiml-localca.cer"]; } }; a() }}'