✨ 优化 topic 检验

lets-mica · Aug 30, 2023 · c5924d3 · c5924d3
1 parent 730868b
commit c5924d3
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/mica-mqtt-common/src/main/java/net/dreamlu/iot/mqtt/core/util/TopicUtil.java b/mica-mqtt-common/src/main/java/net/dreamlu/iot/mqtt/core/util/TopicUtil.java
@@ -61,8 +61,8 @@ public static void validateTopicFilter(String topicFilter) throws IllegalArgumen
 					throw new IllegalArgumentException("Mqtt subscribe topicFilter illegal:" + topicFilter);
 				}
 			} else if (ch == MqttCodecUtil.TOPIC_WILDCARDS_ONE) {
-				// 校验: 单独 + 是允许的，判断 + 号前一位是否为 /
-				if (i > 0 && topicFilterChars[i - 1] != '/') {
+				// 校验: 单独 + 是允许的，判断 + 号前一位是否为 /，如果有后一位也必须为 /
+				if ((i > 0 && topicFilterChars[i - 1] != '/') || (i < topicFilterIdxEnd && topicFilterChars[i + 1] != '/')) {
 					throw new IllegalArgumentException("Mqtt subscribe topicFilter illegal:" + topicFilter);
 				}
 			}
@@ -110,8 +110,8 @@ public static boolean match(String topicFilter, String topicName) {
 				}
 				return true;
 			} else if (ch == MqttCodecUtil.TOPIC_WILDCARDS_ONE) {
-				// 校验: 单独 + 是允许的，判断 + 号前一位是否为 /
-				if (i > 0 && topicFilterChars[i - 1] != '/') {
+				// 校验: 单独 + 是允许的，判断 + 号前一位是否为 /，如果有后一位也必须为 /
+				if ((i > 0 && topicFilterChars[i - 1] != '/') || (i < topicFilterIdxEnd && topicFilterChars[i + 1] != '/')) {
 					throw new IllegalArgumentException("Mqtt subscribe topicFilter illegal:" + topicFilter);
 				}
 				// 如果 + 是最后一位，判断 topicName 中是否还存在层级 /

diff --git a/mica-mqtt-common/src/test/java/net/dreamlu/iot/mqtt/core/util/TopicUtilTest.java b/mica-mqtt-common/src/test/java/net/dreamlu/iot/mqtt/core/util/TopicUtilTest.java
@@ -69,4 +69,23 @@ void test2() {
 		Assertions.assertEquals(s3, s2);
 	}
 
+	@Test
+	void test3() {
+		Assertions.assertThrows(IllegalArgumentException.class, () -> {
+			TopicUtil.validateTopicFilter("/iot/test/+a");
+		});
+		Assertions.assertThrows(IllegalArgumentException.class, () -> {
+			TopicUtil.validateTopicFilter("/iot/test/a+");
+		});
+		Assertions.assertThrows(IllegalArgumentException.class, () -> {
+			TopicUtil.validateTopicFilter("/iot/test/+a/");
+		});
+		Assertions.assertThrows(IllegalArgumentException.class, () -> {
+			TopicUtil.validateTopicFilter("/iot/test/a+/");
+		});
+		Assertions.assertDoesNotThrow(() -> TopicUtil.validateTopicFilter("+"));
+		Assertions.assertDoesNotThrow(() -> TopicUtil.validateTopicFilter("/iot/test/+"));
+		Assertions.assertDoesNotThrow(() -> TopicUtil.validateTopicFilter("/iot/test/+/"));
+	}
+
 }