Skip to content

Minor bug fix for BrokerView#validateAllowedUri #1900

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
cshannon merged 1 commit into from
Apr 10, 2026
+11 −5
Merged

Minor bug fix for BrokerView#validateAllowedUri #1900

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
7 changes: 4 additions & 3 deletions activemq-broker/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,8 @@ private static void validateAllowedUrl(String uriString) throws URISyntaxExcepti
// Validate the URI does not contain VM transport
private static void validateAllowedUri(URI uri, int depth) throws URISyntaxException {
// Don't allow more than 5 nested URIs to prevent blowing the stack
if (depth > 5) {
// If we are greater than 4 then this is the 5th level of composite
if (depth > 4) {
throw new IllegalArgumentException("URI can't contain more than 5 nested composite URIs");
}

Expand All @@ -625,10 +626,10 @@ private static void validateAllowedUri(URI uri, int depth) throws URISyntaxExcep
// Each URI could be a nested composite URI so call validateAllowedUri()
// to validate it. This check if composite first so we don't add to
// the recursive stack depth if there's a lot of URIs that are not composite
if (URISupport.isCompositeURI(uri)) {
if (URISupport.isCompositeURI(component)) {
validateAllowedUri(component, depth);
} else {
validateAllowedScheme(uri.getScheme());
validateAllowedScheme(component.getScheme());
}
}
}
Expand Down
9 changes: 7 additions & 2 deletions activemq-unit-tests/src/test/java/org/apache/activemq/jmx/JmxCreateNCTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,16 @@ public void testVmBridgeBlocked() throws Exception {

@Test
public void testAddNetworkConnectorMaxComposite() throws Exception {
// Should allow 5 nested (excludes first wrapper) so no exception thrown
assertNotNull(proxy.addNetworkConnector(
"static:(static:(static:(static:(static:(bad://localhost)))))"));

try {
// verify nested composite URI with more than 5 levels is blocked
// verify nested composite URI with more than 5 levels is blocked. This has 6 nested
// (not including first wrapper url
proxy.addNetworkConnector(
"static:(failover:(failover:(failover:(failover:(failover:(tcp://localhost:0))))))");
fail("Should have failed trying to add vm connector bridge");
fail("Should have failed trying to add more than 5 connector bridges");
} catch (IllegalArgumentException e) {
assertEquals("URI can't contain more than 5 nested composite URIs", e.getMessage());
}
Expand Down