Skip to content

Commit b88feac

Browse files
authored
fix: use http as protocol if attls enabled (#4949)
Signed-off-by: ac892247 <a.chmelo@gmail.com>
1 parent 867406e commit b88feac

2 files changed

Lines changed: 3 additions & 0 deletions

File tree

caching-service-package/src/main/resources/bin/start.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,13 @@ if [ "${ATTLS_SERVER_ENABLED}" = "true" ]; then
142142
ZWE_configs_server_ssl_enabled="false"
143143
fi
144144

145+
internalProtocol="https"
145146
# Verify discovery service URL in case AT-TLS is enabled, assumes outgoing rules are in place
146147
ZWE_DISCOVERY_SERVICES_LIST=${ZWE_DISCOVERY_SERVICES_LIST:-"https://${ZWE_haInstance_hostname:-localhost}:${ZWE_components_discovery_port:-7553}/eureka/"}
147148
if [ "${ATTLS_CLIENT_ENABLED}" = "true" ]; then
148149
add_profile "attlsClient"
149150
ZWE_DISCOVERY_SERVICES_LIST=$(echo "${ZWE_DISCOVERY_SERVICES_LIST=}" | sed -e 's|https://|http://|g')
151+
internalProtocol="http"
150152
fi
151153

152154
get_enabled_protocol_limit() {

caching-service/src/main/java/org/zowe/apiml/caching/config/MessageConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ public MessageService messageService() {
2222
MessageService messageService = YamlMessageServiceInstance.getInstance();
2323
messageService.loadMessages("/utility-log-messages.yml");
2424
messageService.loadMessages("/caching-log-messages.yml");
25+
messageService.loadMessages("/security-common-log-messages.yml");
2526
return messageService;
2627
}
2728
}

0 commit comments

Comments
 (0)