diff --git a/src/main/java/stirling/software/SPDF/config/security/UserService.java b/src/main/java/stirling/software/SPDF/config/security/UserService.java index 4b130d11..6b1457dc 100644 --- a/src/main/java/stirling/software/SPDF/config/security/UserService.java +++ b/src/main/java/stirling/software/SPDF/config/security/UserService.java @@ -304,7 +304,13 @@ public class UserService implements UserServiceInterface { boolean isValidEmail = username.matches( "^(?=.{1,64}@)[A-Za-z0-9]+(\\.[A-Za-z0-9_+.-]+)*@[^-][A-Za-z0-9-]+(\\.[A-Za-z0-9-]+)*(\\.[A-Za-z]{2,})$"); - return isValidSimpleUsername || isValidEmail; + + List notAllowedUserList = new ArrayList<>(); + notAllowedUserList.add("ALL_USERS".toLowerCase()); + + boolean notAllowedUser = notAllowedUserList.contains(username.toLowerCase()); + + return (isValidSimpleUsername || isValidEmail) && !notAllowedUser; } private String getInvalidUsernameMessage() {