Skip to content

Commit

Permalink
Merge pull request #583 from zowe/v3/use-client-attls-status-in-eureka
Browse files Browse the repository at this point in the history
Use gateway client attls status in eureka object to determine http vs…
  • Loading branch information
1000TurquoisePogs authored Jan 14, 2025
2 parents 1aad7ce + 84d57a3 commit b5af35b
Showing 1 changed file with 21 additions and 2 deletions.
23 changes: 21 additions & 2 deletions lib/apiml.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,19 @@ function ApimlConnector({ hostName, port, discoveryUrls,
discoveryPort, tlsOptions, eurekaOverrides, isClientAttls }) {
Object.assign(this, { hostName, port, discoveryUrls,
discoveryPort, tlsOptions, eurekaOverrides, isClientAttls });
//TODO config should never be checked through env var, but is temporarily needed to temporarily read gateway's ATTLS state to provide it with Eureka info it can work with.
const clientGlobalAttls = process.env['ZWE_zowe_network_client_tls_attls'];
const clientGatewayAttls = process.env['ZWE_components_gateway_zowe_network_client_tls_attls'];
const clientAttls = (clientGlobalAttls == 'true') || (clientGatewayAttls == 'true');
this.isGatewayClientAttls = false;
if ((clientGlobalAttls === undefined) && (clientGatewayAttls === undefined)) {
// If client attls env vars are not set, have client follow server attls variable. it simplifies common case in which users want both.
const serverGlobalAttls = process.env['ZWE_zowe_network_server_tls_attls'] == 'true';
const serverGatewayAttls = process.env['ZWE_components_gateway_zowe_network_server_tls_attls'] == 'true';
this.isGatewayClientAttls = serverGlobalAttls || serverGatewayAttls;
} else {
this.isGatewayClientAttls = clientAttls;
}
this.vipAddress = hostName;
}

Expand Down Expand Up @@ -168,8 +181,14 @@ ApimlConnector.prototype = {
// If the HTTP port is set to 0 then the API ML doesn't load zlux
httpPort: Number(this.port),
httpsPort: Number(this.port),
httpEnabled: false,
httpsEnabled: true
// TODO while the server should always be HTTPS for security,
// When AT-TLS is used, programs need to know when AT-TLS will add TLS to their traffic
// To align with the correct amount of TLS (Avoid no TLS and double TLS)
// It seems the gateway wants to be told app-server is 'http' when client TLS is set on it
// So this eureka object will be based upon that setting.
// This may change in the future, revisit.
httpEnabled: this.isGatewayClientAttls,
httpsEnabled: !this.isGatewayClientAttls
};

log.debug("ZWED0141I", 'https', this.port); //"Protocol:", proto, "Port", port);
Expand Down

0 comments on commit b5af35b

Please sign in to comment.