Skip to content

[ISSUE #10836] fix(common): validate group when parsing POP retry topics #10846

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

[ISSUE #10836] fix(common): validate group when parsing POP retry topics #10846

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
15 changes: 8 additions & 7 deletions common/src/main/java/org/apache/rocketmq/common/KeyBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,15 @@ public static String buildPopRetryTopicV1(String topic, String cid) {
}

public static String parseNormalTopic(String topic, String cid) {
if (topic.startsWith(MixAll.RETRY_GROUP_TOPIC_PREFIX)) {
if (topic.startsWith(MixAll.RETRY_GROUP_TOPIC_PREFIX + cid + POP_RETRY_SEPARATOR_V2)) {
return topic.substring((MixAll.RETRY_GROUP_TOPIC_PREFIX + cid + POP_RETRY_SEPARATOR_V2).length());
}
return topic.substring((MixAll.RETRY_GROUP_TOPIC_PREFIX + cid + POP_RETRY_SEPARATOR_V1).length());
} else {
return topic;
String retryPrefixV2 = MixAll.RETRY_GROUP_TOPIC_PREFIX + cid + POP_RETRY_SEPARATOR_V2;
if (topic.startsWith(retryPrefixV2)) {
return topic.substring(retryPrefixV2.length());
}
String retryPrefixV1 = MixAll.RETRY_GROUP_TOPIC_PREFIX + cid + POP_RETRY_SEPARATOR_V1;
if (topic.startsWith(retryPrefixV1)) {
return topic.substring(retryPrefixV1.length());
}
return topic;
}

public static String parseNormalTopic(String retryTopic) {
Expand Down
16 changes: 15 additions & 1 deletion common/src/test/java/org/apache/rocketmq/common/KeyBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,20 @@ public void testParseNormalTopic() {
assertThat(KeyBuilder.parseNormalTopic(popRetryTopic)).isEqualTo(topic);
}

@Test
public void testParseNormalTopicDoesNotStripAnotherGroup() {
String retryTopic = KeyBuilder.buildPopRetryTopicV1(topic, "another-group");

assertThat(KeyBuilder.parseNormalTopic(retryTopic, group)).isEqualTo(retryTopic);
}

@Test
public void testParseNormalTopicDoesNotFailForRegularRetryTopic() {
String retryTopic = MixAll.RETRY_GROUP_TOPIC_PREFIX + group;

assertThat(KeyBuilder.parseNormalTopic(retryTopic, group)).isEqualTo(retryTopic);
}

@Test
public void testParseGroup() {
String popRetryTopic = KeyBuilder.buildPopRetryTopicV2(topic, group);
Expand All @@ -60,4 +74,4 @@ public void testIsPopRetryTopicV2() {
String popRetryTopicV1 = KeyBuilder.buildPopRetryTopicV1(topic, group);
assertThat(KeyBuilder.isPopRetryTopicV2(popRetryTopicV1)).isEqualTo(false);
}
}
}
Loading