Skip to content

KNOX-3298: Change ApiClientFactory password check to isNotBlank #1200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hanicz merged 1 commit into from
Apr 15, 2026
+11 −6
Merged

KNOX-3298: Change ApiClientFactory password check to isNotBlank #1200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...very-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/ApiClientFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public static DiscoveryApiClient getApiClient(final GatewayConfig gatewayConfig,
final AliasService aliasService, final KeyStore truststore) {
try {
final char[] trustStorePassword = aliasService.getPasswordFromAliasForGateway(TRUSTSTORE_PASSWORD_ALIAS);
if (trustStorePassword != null) {
if (trustStorePassword != null && trustStorePassword.length > 0) {
System.setProperty(TRUSTSTORE_PASSWORD_SYSTEM_PROPERTY, new String(trustStorePassword));
}
return new DiscoveryApiClient(gatewayConfig, discoveryConfig, aliasService, truststore);
Expand Down
15 changes: 10 additions & 5 deletions ...-cm/src/test/java/org/apache/knox/gateway/topology/discovery/cm/ApiClientFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package org.apache.knox.gateway.topology.discovery.cm;

import org.apache.commons.lang3.StringUtils;
import org.apache.knox.gateway.config.GatewayConfig;
import org.apache.knox.gateway.services.security.AliasService;
import org.apache.knox.gateway.services.security.AliasServiceException;
Expand Down Expand Up @@ -46,16 +47,20 @@ public void tearDown() {

@Test
public void testSystemPropertySetWhenAliasExists() throws AliasServiceException {
testGetApiClient(true);
testGetApiClient(true, "changeit");
}

@Test
public void testSystemPropertyNotSetWhenAliasNotExists() throws AliasServiceException {
testGetApiClient(false);
testGetApiClient(false, null);
}

private void testGetApiClient(final boolean shouldSetSystemProperty) throws AliasServiceException {
final String trustStorePassword = "changeit";
@Test
public void testSystemPropertySetWhenAliasEmpty() throws AliasServiceException {
testGetApiClient(true, "");
}

private void testGetApiClient(final boolean shouldSetSystemProperty, String trustStorePassword) throws AliasServiceException {
final RecordingProperties testProps = new RecordingProperties(originalProps);
System.setProperties(testProps);

Expand All @@ -82,7 +87,7 @@ private void testGetApiClient(final boolean shouldSetSystemProperty) throws Alia
EasyMock.replay(aliasService, gatewayConfig, serviceDiscoveryConfig, trustStore);
ApiClientFactory.getApiClient(gatewayConfig, serviceDiscoveryConfig, aliasService, trustStore);

if (shouldSetSystemProperty) {
if (shouldSetSystemProperty && StringUtils.isNotBlank(trustStorePassword)) {
Assert.assertEquals(ApiClientFactory.TRUSTSTORE_PASSWORD_SYSTEM_PROPERTY, testProps.lastSetKey);
Assert.assertEquals(trustStorePassword, testProps.lastSetValue);
Assert.assertEquals(ApiClientFactory.TRUSTSTORE_PASSWORD_SYSTEM_PROPERTY, testProps.lastRemovedKey);
Expand Down
Loading