Skip to content

KNOX-3314: Ensure secure length for encryptQueryString generated by d… #1220

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
May 5, 2026
+6 −3
Merged

KNOX-3314: Ensure secure length for encryptQueryString generated by d… #1220

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
5 changes: 3 additions & 2 deletions gateway-test/src/test/java/org/apache/knox/gateway/SimpleDescriptorHandlerFuncTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;

import static org.easymock.EasyMock.anyObject;
Expand Down Expand Up @@ -250,8 +251,8 @@ public void testSimpleDescriptorHandlerQueryStringCredentialAliasCreation() thro
assertEquals("Unexpected cluster name for the alias (should be the topology name).",
testDescriptor.getName(), capturedCluster.getValue());
assertEquals("Unexpected alias name.", "encryptQueryString", capturedAlias.getValue());
assertEquals("Unexpected alias value (should be master secret + topology name.",
testMasterSecret + testDescriptor.getName(), capturedPwd.getValue());
assertEquals("Unexpected alias value.",
String.format(Locale.ROOT, SimpleDescriptorHandler.ENCRYPT_QUERY_STRING_TEMPLATE, testMasterSecret, testDescriptor.getName()), capturedPwd.getValue());

assertEquals(1, NoOpServiceDiscovery.discoveryCalled);
} catch (Exception e) {
Expand Down
4 changes: 3 additions & 1 deletion ...simple/src/main/java/org/apache/knox/gateway/topology/simple/SimpleDescriptorHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ public class SimpleDescriptorHandler {
"CLIENTID",
"HEALTH").collect(Collectors.toSet()));

public static final String ENCRYPT_QUERY_STRING_TEMPLATE = "knox:query-encryption:%s:%s";

public static Map<String, File> handle(GatewayConfig config, File desc, File destDirectory, Service...gatewayServices) throws IOException {
return handle(config, SimpleDescriptorFactory.parse(desc.getAbsolutePath()), desc.getParentFile(), destDirectory, gatewayServices);
}
Expand Down Expand Up @@ -312,7 +314,7 @@ private static boolean provisionQueryParamEncryptionCredential(final String topo
AliasService aliasService = services.getService(ServiceType.ALIAS_SERVICE);
if (aliasService != null) {
// Derive and set the query param encryption password
String queryEncryptionPass = new String(ms.getMasterSecret()) + topologyName;
String queryEncryptionPass = String.format(Locale.ROOT, ENCRYPT_QUERY_STRING_TEMPLATE, new String(ms.getMasterSecret()), topologyName);
aliasService.addAliasForCluster(topologyName, "encryptQueryString", queryEncryptionPass);
result = true;
}
Expand Down
Loading