}
*/
function fetchImagePath() {
- const getImgUrl = `${getBaseUrl()}/custom-logo`;
+ const baseUrl = getBaseUrl().endsWith('/') ? getBaseUrl().slice(0, -1) : getBaseUrl();
+ const getImgUrl = `${baseUrl}/custom-logo`;
return fetch(getImgUrl)
.then((response) => {
@@ -143,6 +144,14 @@ function handleWhiteHeader(uiConfig) {
}
}
+export const closeMobileMenu = () => {
+ document.body.classList.remove('mobile-menu-open');
+};
+
+export const openMobileMenu = (event) => {
+ document.body.classList.toggle('mobile-menu-open');
+};
+
/**
* Custom the UI look to match the setup from the service metadata
* @param uiConfig the configuration to customize the UI
diff --git a/apiml-common/src/main/java/org/zowe/apiml/product/web/HttpConfig.java b/apiml-common/src/main/java/org/zowe/apiml/product/web/HttpConfig.java
index 6eb82f8c23..86e33f7d72 100644
--- a/apiml-common/src/main/java/org/zowe/apiml/product/web/HttpConfig.java
+++ b/apiml-common/src/main/java/org/zowe/apiml/product/web/HttpConfig.java
@@ -299,5 +299,9 @@ public EurekaJerseyClient eurekaJerseyClient() {
return eurekaJerseyClientBuilder.build();
}
+ @Bean
+ public EurekaJerseyClientBuilder eurekaJerseyClientBuilder() {
+ return eurekaJerseyClientBuilder;
+ }
}
diff --git a/build.gradle b/build.gradle
index 41fd943939..3a33088326 100644
--- a/build.gradle
+++ b/build.gradle
@@ -101,6 +101,10 @@ allprojects {
//substitute(module('javax.inject:javax.inject:1')).using(module('jakarta.inject:jakarta.inject-api:1.0.5'))
substitute(module('javax.activation:javax.activation-api:1.0')).using(module('jakarta.activation:jakarta.activation-api:1.2.2'))
}
+
+ resolutionStrategy.force libs.slf4j.api
+ resolutionStrategy.force libs.log4j.api
+ resolutionStrategy.force libs.log4j.to.slf4j
}
}
diff --git a/config/local/gateway-service.yml b/config/local/gateway-service.yml
index ac7a4e4d5d..12b54c1cb5 100644
--- a/config/local/gateway-service.yml
+++ b/config/local/gateway-service.yml
@@ -5,7 +5,9 @@ apiml:
hostname: localhost
ipAddress: 127.0.0.1
port: 10010
+ centralRegistryUrls: https://localhost:10021/eureka/,https://localhost:10031/eureka/
discoveryServiceUrls: https://localhost:10011/eureka/
+
security:
allowTokenRefresh: true
webfinger:
diff --git a/gateway-package/src/main/resources/bin/start.sh b/gateway-package/src/main/resources/bin/start.sh
index a606db8ad4..633a4ce34d 100755
--- a/gateway-package/src/main/resources/bin/start.sh
+++ b/gateway-package/src/main/resources/bin/start.sh
@@ -52,6 +52,7 @@
# - ZWE_configs_apiml_security_oidc_identityMapperUrl
# - ZWE_configs_apiml_security_oidc_identityMapperUser
# - ZWE_configs_apiml_service_allowEncodedSlashes - Allows encoded slashes on on URLs through gateway
+# - ZWE_configs_apiml_service_centralRegistryUrls - List of additional Discovery Services URLs to register with
# - ZWE_configs_apiml_service_corsEnabled
# - ZWE_configs_certificate_keystore_alias - The alias of the key within the keystore
# - ZWE_configs_certificate_keystore_file - The keystore to use for SSL certificates
@@ -207,7 +208,9 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${GATEWAY_CODE} java \
-Dapiml.service.hostname=${ZWE_haInstance_hostname:-localhost} \
-Dapiml.service.port=${ZWE_configs_port:-7554} \
-Dapiml.service.discoveryServiceUrls=${ZWE_DISCOVERY_SERVICES_LIST:-"https://${ZWE_haInstance_hostname:-localhost}:${ZWE_components_discovery_port:-7553}/eureka/"} \
+ -Dapiml.service.centralRegistryUrls=${ZWE_configs_apiml_service_centralRegistryUrls:-} \
-Dapiml.service.allowEncodedSlashes=${ZWE_configs_apiml_service_allowEncodedSlashes:-true} \
+ -Dapiml.service.centralRegistryUrls=${ZWE_configs_apiml_service_centralRegistryUrls:-} \
-Dapiml.service.corsEnabled=${ZWE_configs_apiml_service_corsEnabled:-false} \
-Dapiml.service.externalUrl="${httpProtocol}://${ZWE_zowe_externalDomains_0}:${ZWE_zowe_externalPort}" \
-Dapiml.service.apimlId=${ZWE_configs_apimlId:-} \
diff --git a/gateway-service/src/main/java/org/zowe/apiml/gateway/config/DiscoveryClientConfig.java b/gateway-service/src/main/java/org/zowe/apiml/gateway/config/DiscoveryClientConfig.java
index 234b8e36bd..c845e68824 100644
--- a/gateway-service/src/main/java/org/zowe/apiml/gateway/config/DiscoveryClientConfig.java
+++ b/gateway-service/src/main/java/org/zowe/apiml/gateway/config/DiscoveryClientConfig.java
@@ -14,22 +14,32 @@
import com.netflix.appinfo.HealthCheckHandler;
import com.netflix.discovery.AbstractDiscoveryClientOptionalArgs;
import com.netflix.discovery.EurekaClientConfig;
+import com.netflix.discovery.shared.transport.jersey.EurekaJerseyClientImpl;
import lombok.RequiredArgsConstructor;
-import org.springframework.aop.support.AopUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.cloud.netflix.eureka.EurekaClientConfigBean;
+import org.springframework.cloud.netflix.eureka.MutableDiscoveryClientOptionalArgs;
import org.springframework.cloud.util.ProxyUtils;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.zowe.apiml.gateway.discovery.ApimlDiscoveryClient;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
/**
* This configuration override bean EurekaClient with custom ApimlDiscoveryClient. This bean offer additional method
* fetchRegistry. User can call this method to asynchronously fetch new data from discovery service. There is no time
* to fetching.
*
- * Configuration also add listeners to call other beans waiting for fetch new registry. It speed up distribution of
+ * Configuration also add listeners to call other beans waiting for fetch new registry. It speeds up distribution of
* changes in whole gateway.
*/
@Configuration
@@ -37,23 +47,53 @@
public class DiscoveryClientConfig {
private final ApplicationContext context;
private final AbstractDiscoveryClientOptionalArgs optionalArgs;
+ private final EurekaJerseyClientImpl.EurekaJerseyClientBuilder eurekaJerseyClientBuilder;
+
+ @Value("${apiml.service.centralRegistryUrls:-}")
+ private String[] centralRegistryUrls;
@Bean(destroyMethod = "shutdown")
@RefreshScope
- public ApimlDiscoveryClient eurekaClient(ApplicationInfoManager manager,
- EurekaClientConfig config,
- @Autowired(required = false) HealthCheckHandler healthCheckHandler
+ public ApimlDiscoveryClient primaryApimlEurekaClient(ApplicationInfoManager manager,
+ EurekaClientConfig config,
+ @Autowired(required = false) HealthCheckHandler healthCheckHandler
) {
- ApplicationInfoManager appManager;
- if (AopUtils.isAopProxy(manager)) {
- appManager = ProxyUtils.getTargetObject(manager);
- } else {
- appManager = manager;
- }
+ ApplicationInfoManager appManager = ProxyUtils.getTargetObject(manager);
+
final ApimlDiscoveryClient discoveryClientClient = new ApimlDiscoveryClient(appManager, config, this.optionalArgs, this.context);
discoveryClientClient.registerHealthCheck(healthCheckHandler);
return discoveryClientClient;
}
+ @Bean(destroyMethod = "shutdown")
+ @ConditionalOnProperty(name = "apiml.service.centralRegistryUrls")
+ @RefreshScope
+ public DiscoveryClientWrapper additionalDiscoveryClientWrapper(ApplicationInfoManager manager,
+ EurekaClientConfig config,
+ @Autowired(required = false) HealthCheckHandler healthCheckHandler
+ ) {
+ ApplicationInfoManager appManager = ProxyUtils.getTargetObject(manager);
+ List discoveryClientsList = new ArrayList<>();
+
+ for (String url : centralRegistryUrls) {
+
+ EurekaClientConfigBean configBean = new EurekaClientConfigBean();
+ BeanUtils.copyProperties(config, configBean);
+
+ Map urls = new HashMap<>();
+ urls.put("defaultZone", url);
+
+ configBean.setServiceUrl(urls);
+
+ MutableDiscoveryClientOptionalArgs args = new MutableDiscoveryClientOptionalArgs();
+ args.setEurekaJerseyClient(eurekaJerseyClientBuilder.build());
+
+ final ApimlDiscoveryClient discoveryClientClient = new ApimlDiscoveryClient(appManager, configBean, args, this.context);
+ discoveryClientClient.registerHealthCheck(healthCheckHandler);
+ discoveryClientsList.add(discoveryClientClient);
+ }
+
+ return new DiscoveryClientWrapper(discoveryClientsList);
+ }
}
diff --git a/gateway-service/src/main/java/org/zowe/apiml/gateway/config/DiscoveryClientWrapper.java b/gateway-service/src/main/java/org/zowe/apiml/gateway/config/DiscoveryClientWrapper.java
new file mode 100644
index 0000000000..063c695220
--- /dev/null
+++ b/gateway-service/src/main/java/org/zowe/apiml/gateway/config/DiscoveryClientWrapper.java
@@ -0,0 +1,29 @@
+/*
+ * This program and the accompanying materials are made available under the terms of the
+ * Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Copyright Contributors to the Zowe Project.
+ */
+
+package org.zowe.apiml.gateway.config;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.zowe.apiml.gateway.discovery.ApimlDiscoveryClient;
+
+import java.util.List;
+
+@AllArgsConstructor
+@Getter
+public class DiscoveryClientWrapper {
+ private List discoveryClients;
+
+ public void shutdown() {
+ if (discoveryClients != null) {
+ discoveryClients.forEach(ApimlDiscoveryClient::shutdown);
+ }
+ }
+}
diff --git a/gateway-service/src/main/java/org/zowe/apiml/gateway/controllers/CacheServiceController.java b/gateway-service/src/main/java/org/zowe/apiml/gateway/controllers/CacheServiceController.java
index 772c284c3a..3194e959fc 100644
--- a/gateway-service/src/main/java/org/zowe/apiml/gateway/controllers/CacheServiceController.java
+++ b/gateway-service/src/main/java/org/zowe/apiml/gateway/controllers/CacheServiceController.java
@@ -23,7 +23,7 @@
/**
* This controller allows control the caches about services. The main purpose is to evict cached data
- * about services when a update happened in discovery service. Discovery service notifies about any
+ * about services when an update happened in discovery service. Discovery service notifies about any
* change to be sure that cache on gateway is still valid.
*/
@AllArgsConstructor
diff --git a/gateway-service/src/main/java/org/zowe/apiml/gateway/discovery/ApimlDiscoveryClient.java b/gateway-service/src/main/java/org/zowe/apiml/gateway/discovery/ApimlDiscoveryClient.java
index dece07c343..986a1061ec 100644
--- a/gateway-service/src/main/java/org/zowe/apiml/gateway/discovery/ApimlDiscoveryClient.java
+++ b/gateway-service/src/main/java/org/zowe/apiml/gateway/discovery/ApimlDiscoveryClient.java
@@ -26,7 +26,7 @@
import java.util.concurrent.TimeUnit;
/**
- * Custom implementation of Eureka client. It support additional feature:
+ * Custom implementation of Eureka client. It supports additional feature:
* - fetchRegistry - invoke asynchronous task to update registry from discovery client immediatelly
*/
public class ApimlDiscoveryClient extends CloudEurekaClient {
diff --git a/gateway-service/src/main/java/org/zowe/apiml/gateway/security/service/JwtSecurity.java b/gateway-service/src/main/java/org/zowe/apiml/gateway/security/service/JwtSecurity.java
index 31a8af5a87..581d249f27 100644
--- a/gateway-service/src/main/java/org/zowe/apiml/gateway/security/service/JwtSecurity.java
+++ b/gateway-service/src/main/java/org/zowe/apiml/gateway/security/service/JwtSecurity.java
@@ -258,7 +258,6 @@ public Optional getJwkPublicKey() {
*/
private void validateInitializationWhenZosmfIsAvailable() {
zosmfListener.register();
-
new Thread(() -> {
try {
events.add("Started waiting for z/OSMF instance " + zosmfServiceId + " to be registered and known by the discovery service");
@@ -273,7 +272,6 @@ private void validateInitializationWhenZosmfIsAvailable() {
apimlLog.log("org.zowe.apiml.gateway.jwtProducerConfigError", StringUtils.join(events, "\n"));
}
apimlLog.log("org.zowe.apiml.security.zosmfInstanceNotFound", zosmfServiceId);
- System.exit(1);
}
}).start();
}
@@ -317,7 +315,7 @@ public void onEvent(EurekaEvent event) {
synchronized (events) {
apimlLog.log("org.zowe.apiml.gateway.jwtProducerConfigError", StringUtils.join(events, "\n"));
}
- System.exit(1);
+ System.exit(1); // TODO remove
}
} else {
events.add("z/OSMF instance " + zosmfServiceId + " is not available and online yet.");
diff --git a/gateway-service/src/main/java/org/zowe/apiml/gateway/security/service/zosmf/AbstractZosmfService.java b/gateway-service/src/main/java/org/zowe/apiml/gateway/security/service/zosmf/AbstractZosmfService.java
index 065d103378..db8a33208c 100644
--- a/gateway-service/src/main/java/org/zowe/apiml/gateway/security/service/zosmf/AbstractZosmfService.java
+++ b/gateway-service/src/main/java/org/zowe/apiml/gateway/security/service/zosmf/AbstractZosmfService.java
@@ -12,16 +12,12 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.netflix.discovery.DiscoveryClient;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.security.authentication.AuthenticationServiceException;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.core.Authentication;
-import org.springframework.web.client.HttpClientErrorException;
-import org.springframework.web.client.ResourceAccessException;
-import org.springframework.web.client.RestClientException;
-import org.springframework.web.client.RestClientResponseException;
-import org.springframework.web.client.RestTemplate;
+import org.springframework.web.client.*;
import org.zowe.apiml.message.log.ApimlLogger;
import org.zowe.apiml.product.logging.annotations.InjectApimlLogger;
import org.zowe.apiml.security.common.config.AuthConfigurationProperties;
@@ -30,7 +26,6 @@
import org.zowe.apiml.util.EurekaUtils;
import javax.net.ssl.SSLHandshakeException;
-
import java.net.ConnectException;
import java.nio.charset.StandardCharsets;
import java.util.*;
@@ -38,6 +33,7 @@
import static org.zowe.apiml.security.SecurityUtils.readPassword;
+@RequiredArgsConstructor
@Slf4j
public abstract class AbstractZosmfService {
@@ -54,18 +50,6 @@ public abstract class AbstractZosmfService {
protected final RestTemplate restTemplateWithoutKeystore;
protected final ObjectMapper securityObjectMapper;
- protected AbstractZosmfService(
- AuthConfigurationProperties authConfigurationProperties,
- DiscoveryClient discovery,
- @Qualifier("restTemplateWithoutKeystore") RestTemplate restTemplateWithoutKeystore,
- ObjectMapper securityObjectMapper
- ) {
- this.authConfigurationProperties = authConfigurationProperties;
- this.discovery = discovery;
- this.restTemplateWithoutKeystore = restTemplateWithoutKeystore;
- this.securityObjectMapper = securityObjectMapper;
- }
-
/**
* @return serviceId of z/OSMF service from configuration, which is used
*/
@@ -121,7 +105,6 @@ protected String getAuthenticationValue(Authentication authentication) {
*
* @param zosmf the z/OSMF service id
* @return the uri
- *
* @throws ServiceNotAccessibleException if z/OSMF is not available in discovery service
*/
protected String getURI(String zosmf) {
diff --git a/gateway-service/src/main/resources/application.yml b/gateway-service/src/main/resources/application.yml
index a92173051b..a2b2e7f4b3 100644
--- a/gateway-service/src/main/resources/application.yml
+++ b/gateway-service/src/main/resources/application.yml
@@ -43,6 +43,7 @@ apiml:
scheme: https # "https" or "http"
preferIpAddress: false
ignoredHeadersWhenCorsEnabled: Access-Control-Request-Method,Access-Control-Request-Headers,Access-Control-Allow-Origin,Access-Control-Allow-Methods,Access-Control-Allow-Headers,Access-Control-Allow-Credentials,Origin
+ centralRegistryUrls: # List of additional Discovery Services URLs to register with
httpclient:
conn-pool:
@@ -101,6 +102,9 @@ spring:
application:
name: ${apiml.service.id}
cloud:
+ discovery:
+ reactive:
+ enabled: false
compatibilityVerifier:
enabled: false # Should be removed when upgrade to Spring Cloud 3.x
client:
diff --git a/gateway-service/src/test/java/org/zowe/apiml/gateway/config/DiscoveryClientBeanTest.java b/gateway-service/src/test/java/org/zowe/apiml/gateway/config/DiscoveryClientBeanTest.java
new file mode 100644
index 0000000000..cae8fc56a0
--- /dev/null
+++ b/gateway-service/src/test/java/org/zowe/apiml/gateway/config/DiscoveryClientBeanTest.java
@@ -0,0 +1,51 @@
+/*
+ * This program and the accompanying materials are made available under the terms of the
+ * Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Copyright Contributors to the Zowe Project.
+ */
+
+package org.zowe.apiml.gateway.config;
+
+import com.netflix.appinfo.*;
+import com.netflix.discovery.shared.transport.jersey.EurekaJerseyClientImpl;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.cloud.netflix.eureka.EurekaClientConfigBean;
+import org.springframework.context.ApplicationContext;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class DiscoveryClientBeanTest {
+ DiscoveryClientConfig dcConfig;
+
+ @BeforeEach
+ void setup() {
+ ApplicationContext context = mock(ApplicationContext.class);
+ EurekaJerseyClientImpl.EurekaJerseyClientBuilder builder = mock(EurekaJerseyClientImpl.EurekaJerseyClientBuilder.class);
+ dcConfig = new DiscoveryClientConfig(context, null, builder);
+ }
+
+ @Test
+ void givenListOfCentralRegistryURLs_thenCreateNewDiscoveryClientForEach() {
+ String[] centralRegistryUrls = {"https://host:10021/eureka", "https://host:10011/eureka"};
+ ReflectionTestUtils.setField(dcConfig, "centralRegistryUrls", centralRegistryUrls);
+ ApplicationInfoManager manager = mock(ApplicationInfoManager.class);
+ InstanceInfo info = mock(InstanceInfo.class);
+ when(manager.getInfo()).thenReturn(info);
+ when(info.getIPAddr()).thenReturn("127.0.0.1");
+ when(info.getDataCenterInfo()).thenReturn(new MyDataCenterInfo(DataCenterInfo.Name.MyOwn));
+ LeaseInfo leaseInfo = mock(LeaseInfo.class);
+ when(info.getLeaseInfo()).thenReturn(leaseInfo);
+ EurekaClientConfigBean bean = new EurekaClientConfigBean();
+ DiscoveryClientWrapper wrapper = dcConfig.additionalDiscoveryClientWrapper(manager, bean, null);
+ wrapper.shutdown();
+ assertEquals(2, wrapper.getDiscoveryClients().size());
+ }
+}
diff --git a/gateway-service/src/test/java/org/zowe/apiml/gateway/config/DiscoveryClientWrapperTest.java b/gateway-service/src/test/java/org/zowe/apiml/gateway/config/DiscoveryClientWrapperTest.java
new file mode 100644
index 0000000000..71722d0bf5
--- /dev/null
+++ b/gateway-service/src/test/java/org/zowe/apiml/gateway/config/DiscoveryClientWrapperTest.java
@@ -0,0 +1,38 @@
+/*
+ * This program and the accompanying materials are made available under the terms of the
+ * Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Copyright Contributors to the Zowe Project.
+ */
+
+package org.zowe.apiml.gateway.config;
+
+import org.junit.jupiter.api.Test;
+import org.zowe.apiml.gateway.discovery.ApimlDiscoveryClient;
+
+import java.util.Arrays;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.mockito.Mockito.*;
+
+class DiscoveryClientWrapperTest {
+
+ @Test
+ void givenExistingListOfClient_thenCallShutdownForEach() {
+ ApimlDiscoveryClient client1 = mock(ApimlDiscoveryClient.class);
+ ApimlDiscoveryClient client2 = mock(ApimlDiscoveryClient.class);
+ DiscoveryClientWrapper wrapper = new DiscoveryClientWrapper(Arrays.asList(client1, client2));
+ wrapper.shutdown();
+ verify(client1, times(1)).shutdown();
+ verify(client2, times(1)).shutdown();
+ }
+
+ @Test
+ void givenNullListOfClient_thenSkipShutdown() {
+ DiscoveryClientWrapper wrapper = new DiscoveryClientWrapper(null);
+ assertDoesNotThrow(wrapper::shutdown);
+ }
+}
diff --git a/gateway-service/src/test/resources/application.yml b/gateway-service/src/test/resources/application.yml
index 9de8024694..1230908692 100644
--- a/gateway-service/src/test/resources/application.yml
+++ b/gateway-service/src/test/resources/application.yml
@@ -16,6 +16,7 @@ apiml:
allowEncodedSlashes: true
discoveryServiceUrls: https://localhost:10011/eureka/
ignoredHeadersWhenCorsEnabled: Access-Control-Request-Method,Access-Control-Request-Headers,Access-Control-Allow-Origin,Access-Control-Allow-Methods,Access-Control-Allow-Headers,Access-Control-Allow-Credentials,Origin
+ centralRegistryUrls: # List of additional Discovery Services URLs to register with
loadBalancer:
distribute: false
gateway:
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
index 9b5f9bb97e..e32e5c37ed 100644
--- a/gradle/versions.gradle
+++ b/gradle/versions.gradle
@@ -5,10 +5,10 @@ dependencyResolutionManagement {
version('projectNode', '18.14.0')
version('projectNpm', '9.3.1')
- version('springBoot', '2.7.12')
+ version('springBoot', '2.7.15')
version('springCloud', '2.2.10.RELEASE')
- version('springCloudCommons', '3.1.6')
- version('springCloudVersion3', '3.1.6')
+ version('springCloudCommons', '3.1.7')
+ version('springCloudVersion3', '3.1.7')
version('springCloudCB', '2.1.7')
version('springCloudGateway', '3.1.7')
version('springSecurity') {
@@ -48,7 +48,7 @@ dependencyResolutionManagement {
version('gradleGitProperties', '2.2.4') // Used in classpath dependencies
version('gradleNode', '3.0.1') // Used in classpath dependencies
version('gson', '2.9.1')
- version('guava', '31.1-jre')
+ version('guava', '32.1.2-jre')
version('hamcrest', '1.3')
version('httpClient', '4.5.14')
version('httpCore', '4.4.16')
@@ -109,7 +109,7 @@ dependencyResolutionManagement {
version('restAssured', '5.3.0')
version('rhino', '1.7.14')
version('slf4j', '1.7.36')
- version('snakeyaml', '2.0')
+ version('snakeyaml', '2.2')
version('springFox', '2.9.2')
version('springDoc') {
// version 1.7+ has a conflict with Jackson databind (displaying of examples)
@@ -122,7 +122,7 @@ dependencyResolutionManagement {
version('swaggerCore', '1.6.10')
version('swaggerInflector', '2.0.9')
version('swaggerJaxrs2', '2.2.9')
- version('thymeleaf', '3.0.15.RELEASE')
+ version('thymeleaf', '3.1.2.RELEASE')
version('tomcat', '9.0.75')
version('velocity', '2.3')
version('woodstoxCore', '6.5.1')
diff --git a/integration-tests/build.gradle b/integration-tests/build.gradle
index c89170ec9f..cfd47f6758 100644
--- a/integration-tests/build.gradle
+++ b/integration-tests/build.gradle
@@ -135,7 +135,8 @@ task runIntegrationTests(type: Test) {
'AdditionalLocalTest',
'HATest',
'ChaoticHATest',
- 'OktaOauth2Test'
+ 'OktaOauth2Test',
+ 'MultipleRegistrationsTest'
)
}
}
@@ -155,7 +156,8 @@ task runLocalIntegrationTests(type: Test) {
'AdditionalLocalTest',
'HATest',
'ChaoticHATest',
- 'OktaOauth2Test'
+ 'OktaOauth2Test',
+ 'MultipleRegistrationsTest'
)
}
outputs.upToDateWhen { false }
@@ -175,7 +177,8 @@ task runAllLocalIntegrationTests(type: Test) {
'MainframeDependentTests',
'HATest',
'ChaoticHATest',
- 'OktaOauth2Test'
+ 'OktaOauth2Test',
+ 'MultipleRegistrationsTest'
)
}
outputs.upToDateWhen { false }
@@ -197,7 +200,8 @@ task runAllIntegrationTestsNormal(type: Test) {
'HATest',
'ChaoticHATest',
'NotAttlsTest',
- 'OktaOauth2Test'
+ 'OktaOauth2Test',
+ 'MultipleRegistrationsTest'
)
}
@@ -246,7 +250,8 @@ task runAllIntegrationTestsForZoweTesting(type: Test) {
'DiscoverableClientDependentTest',
'HATest',
'ChaoticHATest',
- 'OktaOauth2Test'
+ 'OktaOauth2Test',
+ 'MultipleRegistrationsTest'
)
}
outputs.upToDateWhen { false }
@@ -272,7 +277,8 @@ task runCITests(type: Test) {
'ServiceIdPrefixReplacerTest',
'HATest',
'ChaoticHATest',
- 'OktaOauth2Test'
+ 'OktaOauth2Test',
+ 'MultipleRegistrationsTest'
)
}
}
@@ -352,7 +358,8 @@ task runBaseTests(type: Test) {
'InfinispanStorageTest',
'OktaOauth2Test',
'CloudGatewayProxyTest',
- 'CloudGatewayServiceRouting'
+ 'CloudGatewayServiceRouting',
+ 'MultipleRegistrationsTest'
)
}
}
diff --git a/integration-tests/src/test/java/org/zowe/apiml/functional/gateway/DiscoveryServiceRegistrationTest.java b/integration-tests/src/test/java/org/zowe/apiml/functional/gateway/DiscoveryServiceRegistrationTest.java
new file mode 100644
index 0000000000..4359ceec1b
--- /dev/null
+++ b/integration-tests/src/test/java/org/zowe/apiml/functional/gateway/DiscoveryServiceRegistrationTest.java
@@ -0,0 +1,40 @@
+/*
+ * This program and the accompanying materials are made available under the terms of the
+ * Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Copyright Contributors to the Zowe Project.
+ */
+
+package org.zowe.apiml.functional.gateway;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.zowe.apiml.util.config.ItSslConfigFactory;
+import org.zowe.apiml.util.config.SslContext;
+
+import static io.restassured.RestAssured.given;
+import static org.apache.http.HttpStatus.SC_OK;
+import static org.hamcrest.core.Is.is;
+import static org.zowe.apiml.util.service.DiscoveryUtils.getAdditionalDiscoveryUrl;
+
+@Tag("MultipleRegistrationsTest")
+public class DiscoveryServiceRegistrationTest {
+
+ @BeforeAll
+ public static void init() throws Exception {
+ SslContext.prepareSslAuthentication(ItSslConfigFactory.integrationTests());
+ }
+
+ @Test
+ void givenGatewayIsRegisteredInAdditionalDiscovery_thenReturnInfoFromDiscoveryService() {
+ given().config(SslContext.clientCertValid)
+ .when()
+ .get(getAdditionalDiscoveryUrl() + "/eureka/apps/gateway")
+ .then()
+ .statusCode(is(SC_OK));
+ }
+}
diff --git a/integration-tests/src/test/java/org/zowe/apiml/util/config/ConfigReader.java b/integration-tests/src/test/java/org/zowe/apiml/util/config/ConfigReader.java
index 464e181d3d..376f795768 100644
--- a/integration-tests/src/test/java/org/zowe/apiml/util/config/ConfigReader.java
+++ b/integration-tests/src/test/java/org/zowe/apiml/util/config/ConfigReader.java
@@ -50,7 +50,7 @@ public static EnvironmentConfiguration environmentConfiguration() {
Credentials credentials = new Credentials("user", "user");
GatewayServiceConfiguration gatewayServiceConfiguration
= new GatewayServiceConfiguration("https", "localhost", 10010, 10017, 1, "10010", ROUTED_SERVICE);
- DiscoveryServiceConfiguration discoveryServiceConfiguration = new DiscoveryServiceConfiguration("https", "eureka", "password", "localhost", 10011, 1);
+ DiscoveryServiceConfiguration discoveryServiceConfiguration = new DiscoveryServiceConfiguration("https", "eureka", "password", "localhost","localhost", 10011,10021, 1);
DiscoverableClientConfiguration discoverableClientConfiguration = new DiscoverableClientConfiguration("https", "ZOWEAPPL", "localhost", 10012, 1);
TlsConfiguration tlsConfiguration = TlsConfiguration.builder()
@@ -99,7 +99,9 @@ public static EnvironmentConfiguration environmentConfiguration() {
configuration.getDiscoveryServiceConfiguration().setUser(System.getProperty("discovery.user", configuration.getDiscoveryServiceConfiguration().getUser()));
configuration.getDiscoveryServiceConfiguration().setPassword(System.getProperty("discovery.password", configuration.getDiscoveryServiceConfiguration().getPassword()));
configuration.getDiscoveryServiceConfiguration().setHost(System.getProperty("discovery.host", configuration.getDiscoveryServiceConfiguration().getHost()));
+ configuration.getDiscoveryServiceConfiguration().setAdditionalHost(System.getProperty("discovery.additionalHost", configuration.getDiscoveryServiceConfiguration().getAdditionalHost()));
configuration.getDiscoveryServiceConfiguration().setPort(Integer.parseInt(System.getProperty("discovery.port", String.valueOf(configuration.getDiscoveryServiceConfiguration().getPort()))));
+ configuration.getDiscoveryServiceConfiguration().setAdditionalPort(Integer.parseInt(System.getProperty("discovery.additionalPort", String.valueOf(configuration.getDiscoveryServiceConfiguration().getAdditionalPort()))));
configuration.getDiscoveryServiceConfiguration().setInstances(Integer.parseInt(System.getProperty("discovery.instances", String.valueOf(configuration.getDiscoveryServiceConfiguration().getInstances()))));
configuration.getAuxiliaryUserList().setValue(System.getProperty("auxiliaryUserList.value", String.valueOf(configuration.getAuxiliaryUserList().getValue())));
diff --git a/integration-tests/src/test/java/org/zowe/apiml/util/config/DiscoveryServiceConfiguration.java b/integration-tests/src/test/java/org/zowe/apiml/util/config/DiscoveryServiceConfiguration.java
index bb83f62c98..89f6b0bca6 100644
--- a/integration-tests/src/test/java/org/zowe/apiml/util/config/DiscoveryServiceConfiguration.java
+++ b/integration-tests/src/test/java/org/zowe/apiml/util/config/DiscoveryServiceConfiguration.java
@@ -22,7 +22,9 @@ public class DiscoveryServiceConfiguration {
private String user;
private String password;
private String host;
+ private String additionalHost;
private int port;
+ private int additionalPort;
private int instances;
}
diff --git a/integration-tests/src/test/java/org/zowe/apiml/util/requests/ha/HADiscoveryRequests.java b/integration-tests/src/test/java/org/zowe/apiml/util/requests/ha/HADiscoveryRequests.java
index 5b480222c6..1a72a61b7b 100644
--- a/integration-tests/src/test/java/org/zowe/apiml/util/requests/ha/HADiscoveryRequests.java
+++ b/integration-tests/src/test/java/org/zowe/apiml/util/requests/ha/HADiscoveryRequests.java
@@ -27,11 +27,8 @@ public class HADiscoveryRequests {
public List discoveryServices = new ArrayList<>();
public HADiscoveryRequests() {
- String[] discoveryHosts = environmentConfiguration().getDiscoveryServiceConfiguration().getHost().split(",");
- for (String host : discoveryHosts) {
- discoveryServices.add(new DiscoveryRequests(host));
- }
-
+ discoveryServices.add(new DiscoveryRequests(environmentConfiguration().getDiscoveryServiceConfiguration().getHost()));
+ discoveryServices.add(new DiscoveryRequests(environmentConfiguration().getDiscoveryServiceConfiguration().getAdditionalHost()));
log.info("Created HADiscoveryRequests");
}
diff --git a/integration-tests/src/test/java/org/zowe/apiml/util/service/DiscoveryUtils.java b/integration-tests/src/test/java/org/zowe/apiml/util/service/DiscoveryUtils.java
index 438628bd66..572fd0aebb 100644
--- a/integration-tests/src/test/java/org/zowe/apiml/util/service/DiscoveryUtils.java
+++ b/integration-tests/src/test/java/org/zowe/apiml/util/service/DiscoveryUtils.java
@@ -36,16 +36,20 @@
*/
public class DiscoveryUtils {
- public static final String getDiscoveryUrl() {
+ public static String getDiscoveryUrl() {
DiscoveryServiceConfiguration discoveryServiceConfiguration = ConfigReader.environmentConfiguration().getDiscoveryServiceConfiguration();
return discoveryServiceConfiguration.getScheme() + "://" + discoveryServiceConfiguration.getHost() + ":" + discoveryServiceConfiguration.getPort();
}
+ public static String getAdditionalDiscoveryUrl() {
+ DiscoveryServiceConfiguration discoveryServiceConfiguration = ConfigReader.environmentConfiguration().getDiscoveryServiceConfiguration();
+ return discoveryServiceConfiguration.getScheme() + "://" + discoveryServiceConfiguration.getAdditionalHost() + ":" + discoveryServiceConfiguration.getAdditionalPort();
+ }
- public static final List getGatewayUrls() {
+ public static List getGatewayUrls() {
return getInstances("gateway").stream().filter(InstanceInfo.ONLY_UP).map(InstanceInfo::getUrl).collect(Collectors.toList());
}
- public static final List getInstances(String serviceId) {
+ public static List getInstances(String serviceId) {
SSLConfig originalConfig = RestAssured.config.getSSLConfig();
RestAssured.config = RestAssured.config().sslConfig(getConfiguredSslConfig());
List instances = getInstances(serviceId, null);
@@ -53,7 +57,7 @@ public static final List getInstances(String serviceId) {
return instances;
}
- public static final List getInstances(String serviceId, String instanceId) {
+ public static List getInstances(String serviceId, String instanceId) {
final List out = new LinkedList<>();
final StringBuilder url = new StringBuilder().append(getDiscoveryUrl()).append("/eureka");
diff --git a/integration-tests/src/test/resources/environment-configuration-attls.yml b/integration-tests/src/test/resources/environment-configuration-attls.yml
index 523903b25f..a8c02dc4a3 100644
--- a/integration-tests/src/test/resources/environment-configuration-attls.yml
+++ b/integration-tests/src/test/resources/environment-configuration-attls.yml
@@ -15,6 +15,8 @@ discoveryServiceConfiguration:
user: user
password: user
host: localhost
+ additionalHost: localhost
+ additionalPort: 10031
port: 10001
instances: 1
discoverableClientConfiguration:
diff --git a/integration-tests/src/test/resources/environment-configuration-docker.yml b/integration-tests/src/test/resources/environment-configuration-docker.yml
index 56928e9b5c..ff1639b79b 100644
--- a/integration-tests/src/test/resources/environment-configuration-docker.yml
+++ b/integration-tests/src/test/resources/environment-configuration-docker.yml
@@ -15,6 +15,8 @@ discoveryServiceConfiguration:
user: user
password: user
host: discovery-service
+ additionalHost: discovery-service-2
+ additionalPort: 10011
port: 10011
instances: 1
discoverableClientConfiguration:
diff --git a/integration-tests/src/test/resources/environment-configuration-ha.yml b/integration-tests/src/test/resources/environment-configuration-ha.yml
index 03a2e4fa75..6e114d3208 100644
--- a/integration-tests/src/test/resources/environment-configuration-ha.yml
+++ b/integration-tests/src/test/resources/environment-configuration-ha.yml
@@ -14,7 +14,9 @@ discoveryServiceConfiguration:
scheme: https
user: user
password: user
- host: discovery-service,discovery-service-2
+ host: discovery-service
+ additionalHost: discovery-service-2
+ additionalPort: 10011
port: 10011
instances: 2
discoverableClientConfiguration:
diff --git a/integration-tests/src/test/resources/environment-configuration.yml b/integration-tests/src/test/resources/environment-configuration.yml
index 6252390ead..45524bdd21 100644
--- a/integration-tests/src/test/resources/environment-configuration.yml
+++ b/integration-tests/src/test/resources/environment-configuration.yml
@@ -15,6 +15,8 @@ discoveryServiceConfiguration:
user: user
password: user
host: localhost
+ additionalHost: localhost
+ additionalPort: 10021
port: 10011
instances: 1
discoverableClientConfiguration:
diff --git a/schemas/cloud-gateway-schema.json b/schemas/cloud-gateway-schema.json
index a62ed57a15..32b2162b97 100644
--- a/schemas/cloud-gateway-schema.json
+++ b/schemas/cloud-gateway-schema.json
@@ -10,7 +10,7 @@
"type": "object",
"additionalProperties": true,
"properties": {
- "discovery-service": {
+ "cloud-gateway-service": {
"allOf": [
{"$ref": "https://zowe.org/schemas/v2/server-base#zoweComponent"},
{
@@ -18,10 +18,17 @@
"properties": {
"apiml": {
"type": "object",
+ "description": "Zowe API ML specific properties.",
"properties": {
- "serviceIdPrefixReplacer": {
- "type": "string",
- "description": "A comma separated tuple to replace service ID with new one in API ML registry."
+ "service": {
+ "type": "object",
+ "properties": {
+ "forwardClientCertEnabled": {
+ "type": "boolean",
+ "description": "Enables forwarding client certificate from request to next gateway in a special request header.",
+ "default": false
+ }
+ }
}
}
},
diff --git a/schemas/gateway-schema.json b/schemas/gateway-schema.json
index 57d557c49e..8e35d7822a 100644
--- a/schemas/gateway-schema.json
+++ b/schemas/gateway-schema.json
@@ -102,6 +102,15 @@
"description": "Enable if client certificate should be considered as a source of authentication.",
"default": false
},
+ "acceptForwardedCert": {
+ "type": "boolean",
+ "description": "Enable if the the Client Certificate forwarded in a dedicated header should be accepted",
+ "default": false
+ },
+ "certificatesUrl": {
+ "type": "string",
+ "description": "URL of the Central Gateway and its endpoint where it provides its public certificates."
+ },
"externalMapperUrl": {
"type": "string",
"description": "URL of the service where certificate will be mapped to user. ZSS is used if no value is provided."
@@ -148,6 +157,12 @@
"description": "Allow URLs on gateway to contain encoded slashes.",
"default": true
},
+ "centralRegistryUrls": {
+ "type": "array",
+ "description": "List of additional Discovery Services URLs to register with.",
+ "minItems": 1,
+ "uniqueItems": true
+ },
"corsEnabled": {
"type": "boolean",
"description": "Allow CORS on gateway.",