Merge pull request #1322 from cyberdotgent/master

Fix issue related to invalid characters in tags being submitted.

Author: goekay

src/main/java/de/rwth/idsg/steve/web/validation/IdTag.java

@@ -36,7 +36,7 @@
 @Constraint(validatedBy = {IdTagValidator.class, IdTagListValidator.class})
 public @interface IdTag {
 
-    String message() default "ID Tag can only contain upper or lower case letters, numbers and dot, colon, dash, underscore symbols";
+    String message() default "ID Tag can only contain upper or lower case letters, numbers and dot, colon, dash, underscore or hash symbols";
 
     // Required by validation runtime
     Class<?>[] groups() default {};

src/main/java/de/rwth/idsg/steve/web/validation/IdTagValidator.java

@@ -31,7 +31,7 @@
  */
 public class IdTagValidator implements ConstraintValidator<IdTag, String> {
 
-    private static final String IDTAG_PATTERN = "^[a-zA-Z0-9.:_-]{1,20}$";
+    private static final String IDTAG_PATTERN = "^[a-zA-Z0-9.:_#-]{1,20}$";
     private static final Pattern PATTERN = Pattern.compile(IDTAG_PATTERN);
 
     @Override

src/test/java/de/rwth/idsg/steve/web/validation/IdTagValidatorTest.java

@@ -91,9 +91,20 @@ public void testColon() {
         Assertions.assertTrue(validator.isValid("VID:00XXXXXXXXXX", null));
     }
 
+    @Test
+    public void testPoundSign() {
+        Assertions.assertTrue(validator.isValid("#test", null));
+        Assertions.assertTrue(validator.isValid("test#", null));
+        Assertions.assertTrue(validator.isValid("te##st", null));
+
+        // Tag provided by Webasto charge points
+        // https://github.com/steve-community/steve/pull/1322
+        Assertions.assertTrue(validator.isValid("#FreeCharging", null));
+    }
+
     @Test
     public void testCombined() {
-        Assertions.assertTrue(validator.isValid("1t.E-S_:t20", null));
+        Assertions.assertTrue(validator.isValid("1t.E-S_:t20#", null));
     }
 
 }