Skip to content

fix: check for null entries in eureka properties #4829

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
pablocarle wants to merge 3 commits into
base: v3.x.x
Choose a base branch
from
+6 −2
Open

fix: check for null entries in eureka properties #4829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb615d0
check for null entries in eureka properties
Jul 21, 2026
e9563d4
Apply suggestion from @arxioly
pablocarle Jul 21, 2026
df2d5bd
Update MetadataFilterService.java
pablocarle Jul 21, 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
4 changes: 3 additions & 1 deletion discovery-service/src/main/java/org/zowe/apiml/discovery/metadata/MetadataFilterService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,11 @@ private boolean isAllowedDomain(String domain) {
if (StringUtils.isBlank(domain)) {
return true;
}
// Some services may not have correct path set, so it may be a malformed URL
var domainToCheck = domain.endsWith("null") ? domain.substring(0, domain.lastIndexOf("null")) : domain;
return allowedDomainsSet.stream().anyMatch(allowedDomain -> {
try {
return isAllowed(allowedDomain, domain);
return isAllowed(allowedDomain, domainToCheck);
} catch (MalformedURLException e) {
return false;
}
Expand Down
4 changes: 3 additions & 1 deletion ...ry-service/src/test/java/org/zowe/apiml/discovery/metadata/MetadataFilterServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ void setUp() throws Exception {
"apiml.customKey, https://invalid.org:8080, true",
"apiml.documentationUrl, invalid-url, false",
"apiml.externalUrl, HTTPS://LOCALHOST:8080, true",
"apiml.externalUrl, HTTPS://INVALID.ORG:8080, false"
"apiml.externalUrl, HTTPS://INVALID.ORG:8080, false",
"apiml.externalUrl, https://invalid.org:8080null, false",
"apiml.externalUrl, https://localhost:8080null, true"
})
void shouldVerifyMetadataKeysAndDomains(String metadataKey, String metadataValue, boolean isAllowed) throws Exception {
Map<String, String> metadata = new HashMap<>();
Expand Down
Loading