fix: Added constraints for valid usernames

[demos/kafka/chat] / src / main / java / de / juplo / kafka / chat / backend / domain / ChatRoom.java

diff --git a/src/main/java/de/juplo/kafka/chat/backend/domain/ChatRoom.java b/src/main/java/de/juplo/kafka/chat/backend/domain/ChatRoom.java
index 58efa54..3019743 100644 (file)
--- a/src/main/java/de/juplo/kafka/chat/backend/domain/ChatRoom.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/domain/ChatRoom.java
@@ -11,6 +11,8 @@ import reactor.core.publisher.Sinks;
 import java.time.Clock;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 
 @Slf4j
@@ -18,6 +20,7 @@ import java.util.*;
 @ToString(of = { "id", "name" })
 public class ChatRoom
 {
+  public final static Pattern VALID_USER = Pattern.compile("^[a-z0-9-]{2,}$");
   @Getter
   private final UUID id;
   @Getter
@@ -48,6 +51,10 @@ public class ChatRoom
       String user,
       String text)
   {
+    Matcher matcher = VALID_USER.matcher(user);
+    if (!matcher.matches())
+      throw new InvalidUsernameException(user);
+
     Message.MessageKey key = Message.MessageKey.of(user, id);
     return service
         .getMessage(key)
@@ -56,7 +63,7 @@ public class ChatRoom
             : Mono.error(() -> new MessageMutationException(existing, text)))
         .switchIfEmpty(
             Mono
-                .just(service.persistMessage(key, LocalDateTime.now(clock), text))
+                .fromSupplier(() ->service.persistMessage(key, LocalDateTime.now(clock), text))
                 .doOnNext(m ->
                 {
                   Sinks.EmitResult result = sink.tryEmitNext(m);