Merge pull request #1 from dschowta/nameValidation

Exporting separate function for validating name

senml.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"encoding/xml"
 	"fmt"
+	"regexp"
 	"strconv"
 	"strings"
 	"time"
@@ -349,16 +350,10 @@ func (p Pack) Validate() error {
 			bname = r.BaseName
 		}
 		name := bname + r.Name
-		if len(name) == 0 {
-			return fmt.Errorf("empty name")
-		}
-		if (name[0] == '-') || (name[0] == ':') || (name[0] == '.') || (name[0] == '/') || (name[0] == '_') {
-			return fmt.Errorf("bad first char in name")
-		}
-		for _, l := range name {
-			if (l < 'a' || l > 'z') && (l < 'A' || l > 'Z') && (l < '0' || l > '9') && (l != '-') && (l != ':') && (l != '.') && (l != '/') && (l != '_') {
-				return fmt.Errorf("bad char in name")
-			}
+		err := ValidateName(name)
+
+		if err != nil {
+			return err
 		}
 
 		valueCount := 0
@@ -396,3 +391,18 @@ func (p Pack) Validate() error {
 
 	return nil
 }
+
+// ValidateName validates the SenML name
+func ValidateName(name string) error {
+	if len(name) == 0 {
+		return fmt.Errorf("empty name")
+	}
+	validName, err := regexp.Compile(`^[a-zA-Z0-9]+[a-zA-Z0-9-:./_]*$`)
+	if err != nil {
+		fmt.Println(err)
+	}
+	if !validName.MatchString(name) {
+		return fmt.Errorf("invalid name: must begin with alphanumeric and contain alphanumeric or one of - : . / _")
+	}
+	return nil
+}

senml_test.go

@@ -226,6 +226,11 @@ func TestBadInputNumericBaseName(t *testing.T) {
 	if err == nil {
 		t.Fail()
 	}
+	data = []byte("[ { \"bn\": \"3h#\" , \"n\":\"i\" , \"v\":1.0} ] ")
+	_, err = Decode(data, JSON)
+	if err == nil {
+		t.Fail()
+	}
 }
 
 // TODO add