From 369ec32d383d570446984e787b489c135587383e Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Fri, 5 Apr 2024 13:03:04 -0400 Subject: [PATCH 1/4] Fix defaults to allow attls Signed-off-by: 1000TurquoisePogs --- defaults/serverConfig/defaults.yaml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/defaults/serverConfig/defaults.yaml b/defaults/serverConfig/defaults.yaml index 53969ee..bddc7b6 100644 --- a/defaults/serverConfig/defaults.yaml +++ b/defaults/serverConfig/defaults.yaml @@ -18,6 +18,15 @@ components: debug: false node: hostname: "${{ function a(){ if (process.env.ZWE_INTERNAL_HOST) { return process.env.ZWE_INTERNAL_HOST; } else if (process.env.ZWE_haInstance_hostname) { return process.env.ZWE_haInstance_hostname; } else { return undefined; } }; a() }}" + http: "${{ function a() { + if (components['app-server'].zowe?.network?.server?.attls === true) { + return { 'port': components['app-server'].port || Number(7556)}; + } else if (zowe.network?.server?.attls === true) { + return { 'port': components['app-server'].port || Number(7556)}; + } else { + return undefined; + } }; + a() }}" https: ipAddresses: "${{ function a(){ let addresses; @@ -33,7 +42,11 @@ components: } else { return addresses } }; a() }}" port: "${{ function a(){ - if (process.env.ZWED_SERVER_HTTPS_PORT) { + if (components['app-server'].zowe?.server?.attls === true) { + return undefined; + } else if (zowe?.server?.attls === true) { + return undefined; + } else if (process.env.ZWED_SERVER_HTTPS_PORT) { return Number(process.env.ZWED_SERVER_HTTPS_PORT); } else if (components['app-server'].port) { return components['app-server'].port; From 7498e3a3c29352e2259f6ba1c20bd5393a81a879 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Mon, 8 Apr 2024 13:54:05 -0400 Subject: [PATCH 2/4] Update zowe.server to zowe.network.server Signed-off-by: 1000TurquoisePogs --- defaults/serverConfig/defaults.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/defaults/serverConfig/defaults.yaml b/defaults/serverConfig/defaults.yaml index bddc7b6..660e276 100644 --- a/defaults/serverConfig/defaults.yaml +++ b/defaults/serverConfig/defaults.yaml @@ -42,9 +42,9 @@ components: } else { return addresses } }; a() }}" port: "${{ function a(){ - if (components['app-server'].zowe?.server?.attls === true) { + if (components['app-server'].zowe?.network?.server?.attls === true) { return undefined; - } else if (zowe?.server?.attls === true) { + } else if (zowe?.network?.server?.attls === true) { return undefined; } else if (process.env.ZWED_SERVER_HTTPS_PORT) { return Number(process.env.ZWED_SERVER_HTTPS_PORT); From 386c51076ae2e2ebdc2428f7f3f0abd89ec802a7 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Mon, 8 Apr 2024 13:56:56 -0400 Subject: [PATCH 3/4] server.attls to server.tls.attls Signed-off-by: 1000TurquoisePogs --- defaults/serverConfig/defaults.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/defaults/serverConfig/defaults.yaml b/defaults/serverConfig/defaults.yaml index 660e276..e665265 100644 --- a/defaults/serverConfig/defaults.yaml +++ b/defaults/serverConfig/defaults.yaml @@ -19,9 +19,9 @@ components: node: hostname: "${{ function a(){ if (process.env.ZWE_INTERNAL_HOST) { return process.env.ZWE_INTERNAL_HOST; } else if (process.env.ZWE_haInstance_hostname) { return process.env.ZWE_haInstance_hostname; } else { return undefined; } }; a() }}" http: "${{ function a() { - if (components['app-server'].zowe?.network?.server?.attls === true) { + if (components['app-server'].zowe?.network?.server?.tls?.attls === true) { return { 'port': components['app-server'].port || Number(7556)}; - } else if (zowe.network?.server?.attls === true) { + } else if (zowe.network?.server?.tls?.attls === true) { return { 'port': components['app-server'].port || Number(7556)}; } else { return undefined; @@ -42,9 +42,9 @@ components: } else { return addresses } }; a() }}" port: "${{ function a(){ - if (components['app-server'].zowe?.network?.server?.attls === true) { + if (components['app-server'].zowe?.network?.server?.tls?.attls === true) { return undefined; - } else if (zowe?.network?.server?.attls === true) { + } else if (zowe?.network?.server?.tls?.attls === true) { return undefined; } else if (process.env.ZWED_SERVER_HTTPS_PORT) { return Number(process.env.ZWED_SERVER_HTTPS_PORT); From fc336e4299c841f5a9363920ef6a41984ec8caf8 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Tue, 28 May 2024 13:38:55 +0200 Subject: [PATCH 4/4] Update CHANGELOG.md Signed-off-by: 1000TurquoisePogs --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e39541..13c32fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ All notable changes to the Zlux App Server package will be documented in this file. +## v2.17.0 +- Enhancement: app-server can now use Zowe's standardized and simplified AT-TLS configuration simply by toggling `zowe.network.server.tls.attls: true` or `components.app-server.zowe.network.server.tls.attls: true`. If you wish to control client tls separately from server tls, you can also use `zowe.network.client.tls.attls` or `components.app-server.zowe.network.client.tls.attls`. (#300) + ## v2.16.0 - Bugfix: Removed message saying node not found prior to discovery of node. Now, you will only get an error message if node is not found after lookup in NODE_HOME.