Move topic matching tests to unit tests. Needs improving.

eclipse · Oct 10, 2018 · 6609bba · 6609bba
1 parent c0ff424
commit 6609bba
Show file tree

Hide file tree

Showing 13 changed files with 399 additions and 360 deletions.
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -69,7 +69,7 @@ set(C_SRC
  time_mosq.c
  tls_mosq.c
  utf8_mosq.c
- util_mosq.c util_mosq.h
+ util_mosq.c util_topic.c util_mosq.h
  will_mosq.c will_mosq.h)
 
 set (LIBRARIES ${OPENSSL_LIBRARIES} ${PTHREAD_LIBRARIES})

diff --git a/lib/Makefile b/lib/Makefile
@@ -38,6 +38,7 @@ MOSQ_OBJS=mosquitto.o \
  tls_mosq.o \
  utf8_mosq.o \
  util_mosq.o \
+ util_topic.o \
  will_mosq.o
 
 ALL_DEPS=libmosquitto.so.${SOVERSION}
@@ -189,6 +190,9 @@ utf8_mosq.o : utf8_mosq.c
 util_mosq.o : util_mosq.c util_mosq.h
  ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@
 
+util_topic.o : util_topic.c util_mosq.h
+ ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@
+
 will_mosq.o : will_mosq.c will_mosq.h
  ${CROSS_COMPILE}$(CC) $(LIB_CFLAGS) -c $< -o $@
 
diff --git a/lib/util_mosq.c b/lib/util_mosq.c
@@ -134,217 +134,6 @@ uint16_t mosquitto__mid_generate(struct mosquitto *mosq)
  return mid;
 }
 
-/* Check that a topic used for publishing is valid.
- * Search for + or # in a topic. Return MOSQ_ERR_INVAL if found.
- * Also returns MOSQ_ERR_INVAL if the topic string is too long.
- * Returns MOSQ_ERR_SUCCESS if everything is fine.
- */
-int mosquitto_pub_topic_check(const char *str)
-{
- int len = 0;
- while(str && str[0]){
- if(str[0] == '+' || str[0] == '#'){
- return MOSQ_ERR_INVAL;
- }
- len++;
- str = &str[1];
- }
- if(len > 65535) return MOSQ_ERR_INVAL;
-
- return MOSQ_ERR_SUCCESS;
-}
-
-int mosquitto_pub_topic_check2(const char *str, size_t len)
-{
- int i;
-
- if(len > 65535) return MOSQ_ERR_INVAL;
-
- for(i=0; i<len; i++){
- if(str[i] == '+' || str[i] == '#'){
- return MOSQ_ERR_INVAL;
- }
- }
-
- return MOSQ_ERR_SUCCESS;
-}
-
-/* Check that a topic used for subscriptions is valid.
- * Search for + or # in a topic, check they aren't in invalid positions such as
- * foo/#/bar, foo/+bar or foo/bar#.
- * Return MOSQ_ERR_INVAL if invalid position found.
- * Also returns MOSQ_ERR_INVAL if the topic string is too long.
- * Returns MOSQ_ERR_SUCCESS if everything is fine.
- */
-int mosquitto_sub_topic_check(const char *str)
-{
- char c = '\0';
- int len = 0;
- while(str && str[0]){
- if(str[0] == '+'){
- if((c != '\0' && c != '/') || (str[1] != '\0' && str[1] != '/')){
- return MOSQ_ERR_INVAL;
- }
- }else if(str[0] == '#'){
- if((c != '\0' && c != '/') || str[1] != '\0'){
- return MOSQ_ERR_INVAL;
- }
- }
- len++;
- c = str[0];
- str = &str[1];
- }
- if(len > 65535) return MOSQ_ERR_INVAL;
-
- return MOSQ_ERR_SUCCESS;
-}
-
-int mosquitto_sub_topic_check2(const char *str, size_t len)
-{
- char c = '\0';
- int i;
-
- if(len > 65535) return MOSQ_ERR_INVAL;
-
- for(i=0; i<len; i++){
- if(str[i] == '+'){
- if((c != '\0' && c != '/') || (i<len-1 && str[i+1] != '/')){
- return MOSQ_ERR_INVAL;
- }
- }else if(str[i] == '#'){
- if((c != '\0' && c != '/') || i<len-1){
- return MOSQ_ERR_INVAL;
- }
- }
- c = str[i];
- }
-
- return MOSQ_ERR_SUCCESS;
-}
-
-int mosquitto_topic_matches_sub(const char *sub, const char *topic, bool *result)
-{
- int slen, tlen;
-
- if(!result) return MOSQ_ERR_INVAL;
- *result = false;
-
- if(!sub || !topic){
- return MOSQ_ERR_INVAL;
- }
-
- slen = strlen(sub);
- tlen = strlen(topic);
-
- return mosquitto_topic_matches_sub2(sub, slen, topic, tlen, result);
-}
-
-/* Does a topic match a subscription? */
-int mosquitto_topic_matches_sub2(const char *sub, size_t sublen, const char *topic, size_t topiclen, bool *result)
-{
- int spos, tpos;
- bool multilevel_wildcard = false;
-
- if(!result) return MOSQ_ERR_INVAL;
- *result = false;
-
- if(!sub || !topic){
- return MOSQ_ERR_INVAL;
- }
-
- if(!sublen || !topiclen){
- *result = false;
- return MOSQ_ERR_INVAL;
- }
-
- if(sublen && topiclen){
- if((sub[0] == '$' && topic[0] != '$')
- || (topic[0] == '$' && sub[0] != '$')){
-
- return MOSQ_ERR_SUCCESS;
- }
- }
-
- spos = 0;
- tpos = 0;
-
- while(spos < sublen && tpos <= topiclen){
- if(sub[spos] == topic[tpos]){
- if(tpos == topiclen-1){
- /* Check for e.g. foo matching foo/# */
- if(spos == sublen-3
- && sub[spos+1] == '/'
- && sub[spos+2] == '#'){
- *result = true;
- multilevel_wildcard = true;
- return MOSQ_ERR_SUCCESS;
- }
- }
- spos++;
- tpos++;
- if(spos == sublen && tpos == topiclen){
- *result = true;
- return MOSQ_ERR_SUCCESS;
- }else if(tpos == topiclen && spos == sublen-1 && sub[spos] == '+'){
- if(spos > 0 && sub[spos-1] != '/'){
- return MOSQ_ERR_INVAL;
- }
- spos++;
- *result = true;
- return MOSQ_ERR_SUCCESS;
- }
- }else{
- if(sub[spos] == '+'){
- /* Check for bad "+foo" or "a/+foo" subscription */
- if(spos > 0 && sub[spos-1] != '/'){
- return MOSQ_ERR_INVAL;
- }
- /* Check for bad "foo+" or "foo+/a" subscription */
- if(spos < sublen-1 && sub[spos+1] != '/'){
- return MOSQ_ERR_INVAL;
- }
- spos++;
- while(tpos < topiclen && topic[tpos] != '/'){
- tpos++;
- }
- if(tpos == topiclen && spos == sublen){
- *result = true;
- return MOSQ_ERR_SUCCESS;
- }
- }else if(sub[spos] == '#'){
- if(spos > 0 && sub[spos-1] != '/'){
- return MOSQ_ERR_INVAL;
- }
- multilevel_wildcard = true;
- if(spos+1 != sublen){
- return MOSQ_ERR_INVAL;
- }else{
- *result = true;
- return MOSQ_ERR_SUCCESS;
- }
- }else{
- /* Check for e.g. foo/bar matching foo/+/# */
- if(spos > 0
- && spos+2 == sublen
- && tpos == topiclen
- && sub[spos-1] == '+'
- && sub[spos] == '/'
- && sub[spos+1] == '#')
- {
- *result = true;
- multilevel_wildcard = true;
- return MOSQ_ERR_SUCCESS;
- }
- return MOSQ_ERR_SUCCESS;
- }
- }
- }
- if(multilevel_wildcard == false && (tpos < topiclen || spos < sublen)){
- *result = false;
- }
-
- return MOSQ_ERR_SUCCESS;
-}
 
 #ifdef WITH_TLS_PSK
 int mosquitto__hex2bin(const char *hex, unsigned char *bin, int bin_max_len)