OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[rest] Allow colons and dashes in sse topic filter validator (#1052) 

Fixes #1043 

Signed-off-by: Feras Almanna <firas.almanna3@gmail.com>
pull/1054/head
Feras Almannaa 2019-09-29 16:06:37 +03:00 committed by Christoph Weitkamp
parent d2af7a350b
commit b48f1c1925
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bundles/org.openhab.core.io.rest.sse/src/main/java/org/eclipse/smarthome/io/rest/sse/internal/util/SseUtil.java
View File

@ -30,7 +30,7 @@ import org.glassfish.jersey.media.sse.OutboundEvent;
* @author Dennis Nobel - Changed EventBean
*/
public class SseUtil {
static final String TOPIC_VALIDATE_PATTERN = "(\\w*\\*?\\/?,?\\s*)*";
static final String TOPIC_VALIDATE_PATTERN = "(\\w*\\*?\\/?,?:?-?\\s*)*";
/**
* Creates a new {@link OutboundEvent} object containing an {@link EventBean} created for the given Eclipse

2
bundles/org.openhab.core.io.rest.sse/src/test/java/org/eclipse/smarthome/io/rest/sse/internal/util/SseUtilTest.java
View File

@ -52,6 +52,8 @@ public class SseUtilTest {
assertThat(SseUtil.isValidTopicFilter("////////////"), is(true));
assertThat(SseUtil.isValidTopicFilter("*/added"), is(true));
assertThat(SseUtil.isValidTopicFilter("*added"), is(true));
assertThat(SseUtil.isValidTopicFilter("smarthome/test/test:test:123/test"), is(true));
assertThat(SseUtil.isValidTopicFilter("smarthome/test/test-test-123-test:test:123/test"), is(true));
}
@Test