Skip to content

Fix issue when registering a KM for 'Other' KM type #13554

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

Open
msm1992 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix issue when registering a KM for 'Other' KM type #13554

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e1bd3d
Fix issue when registering a KM for 'Other' KM type
msm1992 Jan 16, 2026
737ba31
Address review comments
msm1992 Jan 16, 2026
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
39 changes: 23 additions & 16 deletions ...t/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIAdminImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1742,23 +1742,30 @@ private String getEncryptedValue(String value) {
private void maskValues(KeyManagerConfigurationDTO keyManagerConfigurationDTO) {
KeyManagerConnectorConfiguration keyManagerConnectorConfiguration = ServiceReferenceHolder.getInstance()
.getKeyManagerConnectorConfiguration(keyManagerConfigurationDTO.getType());

Map<String, Object> additionalProperties = keyManagerConfigurationDTO.getAdditionalProperties();
List<ConfigurationDto> connectionConfigurations =
keyManagerConnectorConfiguration.getConnectionConfigurations();
for (ConfigurationDto connectionConfiguration : connectionConfigurations) {
if (connectionConfiguration.isMask()) {
additionalProperties.replace(connectionConfiguration.getName(),
APIConstants.DEFAULT_MODIFIED_ENDPOINT_PASSWORD);
// When the KM is used for Token Exchange,there won't be any connection configurations to mask.
if (keyManagerConnectorConfiguration != null) {
Map<String, Object> additionalProperties = keyManagerConfigurationDTO.getAdditionalProperties();
List<ConfigurationDto> connectionConfigurations =
keyManagerConnectorConfiguration.getConnectionConfigurations();
if (connectionConfigurations != null && !connectionConfigurations.isEmpty()) {
for (ConfigurationDto connectionConfiguration : connectionConfigurations) {
if (connectionConfiguration.isMask()) {
additionalProperties.replace(connectionConfiguration.getName(),
APIConstants.DEFAULT_MODIFIED_ENDPOINT_PASSWORD);
}
}
}
}
// if authConfiguration array is not empty, check for maskable values there as well
if (keyManagerConnectorConfiguration.getAuthConfigurations() != null
&& !(keyManagerConnectorConfiguration.getAuthConfigurations().isEmpty())) {
List<ConfigurationDto> authConfigurations = keyManagerConnectorConfiguration.getAuthConfigurations();
// Recursively check nested objects in authConfigurations and apply masking
for (ConfigurationDto authConfiguration : authConfigurations) {
applyMaskToNestedFields(authConfiguration.getValues(), additionalProperties);

// if authConfiguration array is not empty, check for maskable values there as well
if (keyManagerConnectorConfiguration.getAuthConfigurations() != null
&& !(keyManagerConnectorConfiguration.getAuthConfigurations().isEmpty())) {
List<ConfigurationDto> authConfigurations = keyManagerConnectorConfiguration.getAuthConfigurations();
if (authConfigurations != null && !authConfigurations.isEmpty()) {
// Recursively check nested objects in authConfigurations and apply masking
for (ConfigurationDto authConfiguration : authConfigurations) {
applyMaskToNestedFields(authConfiguration.getValues(), additionalProperties);
}
}
}
}
}
Expand Down
Loading