Make client attls follow server attls if not defined

Signed-off-by: 1000TurquoisePogs <[email protected]>
zowe · May 28, 2024 · f7aaa30 · f7aaa30
1 parent c528a27
commit f7aaa30
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/lib/util.js b/lib/util.js
@@ -502,7 +502,15 @@ module.exports.isServerHttps = function(zoweConfig) {
 }
 
 function isClientAttls(zoweConfig) {
-  return zoweConfig.zowe.network?.client?.tls?.attls || zoweConfig.components['app-server'].zowe?.network?.client?.tls?.attls;
+  let clientGlobalAttls = zoweConfig.zowe.network?.client?.tls?.attls;
+  let clientLocalAttls zoweConfig.components['app-server'].zowe?.network?.client?.tls?.attls;
+  let clientAttls = clientGlobalAttls || clientLocalAttls;
+  if ((clientGlobalAttls !== false) && (clientLocalAttls !== false) && (!clientAttls)) {
+    // If client attls not explicitly false OR truthy, use have client follow server attls variable. it simplifies common case in which users want both.
+    return zoweConfig.zowe.network?.server?.tls?.attls || zoweConfig.components['app-server'].zowe?.network?.server?.tls?.attls;
+  } else {
+    return clientAttls;
+  }
 }
 module.exports.isClientAttls = isClientAttls;