Merge pull request #300 from zowe/bugfix/v2/attls

Fix defaults to allow attls
zowe · May 28, 2024 · 176e9f6 · 176e9f6
2 parents 24ce06d + fc336e4
commit 176e9f6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git 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.
 

diff --git 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?.tls?.attls === true) {
+                  return { 'port': components['app-server'].port || Number(7556)};
+                } else if (zowe.network?.server?.tls?.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?.network?.server?.tls?.attls === true) {
+                       return undefined;
+                     } 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);
                      } else if (components['app-server'].port) {
                        return components['app-server'].port;