Skip to content

fix(common): do not throw on endpoint without dot in parseInstanceIdFromEndpoint #11137

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
zjncs wants to merge 1 commit into
base: develop
Choose a base branch
from
+13 −1
Open

fix(common): do not throw on endpoint without dot in parseInstanceIdFromEndpoint #11137

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
6 changes: 5 additions & 1 deletion common/src/main/java/org/apache/rocketmq/common/utils/NameServerAddressUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ public static String parseInstanceIdFromEndpoint(String endpoint) {
if (StringUtils.isEmpty(endpoint)) {
return null;
}
return endpoint.substring(endpoint.lastIndexOf("/") + 1, endpoint.indexOf('.'));
int dotIndex = endpoint.indexOf('.');
if (dotIndex < 0) {
return null;
}
return endpoint.substring(endpoint.lastIndexOf("/") + 1, dotIndex);
}

public static String getNameSrvAddrFromNamesrvEndpoint(String nameSrvEndpoint) {
Expand Down
8 changes: 8 additions & 0 deletions common/src/test/java/org/apache/rocketmq/common/utils/NameServerAddressUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,14 @@ public void testParseInstanceIdFromEndpoint() {
"MQ_INST_123456789_BXXUzaee");
}

@Test
public void testParseInstanceIdFromEndpointWithoutDot() {
// an endpoint without a dot is not an instance endpoint; the utility must
// not throw StringIndexOutOfBoundsException on it
assertThat(NameServerAddressUtils.parseInstanceIdFromEndpoint("MQ_INST_123456789_BXXUzaee:80")).isNull();
assertThat(NameServerAddressUtils.parseInstanceIdFromEndpoint("localhost")).isNull();
}

@Test
public void testGetNameSrvAddrFromNamesrvEndpoint() {
assertThat(NameServerAddressUtils.getNameSrvAddrFromNamesrvEndpoint(endpoint1))
Expand Down