Merge pull request #4443 from inception-project/feature/4442-Option-t…

…o-allow-spaces-in-usernames #4442 - Option to allow spaces in usernames
inception-project · Jan 22, 2024 · 84f34e9 · 84f34e9
2 parents d74e081 + 4eb2b99
commit 84f34e9
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 10 deletions.
diff --git a/.../tudarmstadt/ukp/inception/project/export/controller/ExportServiceControllerImplTest.java b/.../tudarmstadt/ukp/inception/project/export/controller/ExportServiceControllerImplTest.java
@@ -275,8 +275,8 @@ public Type getPayloadType(StompHeaders aHeaders)
                         public void handleFrame(StompHeaders aHeaders, Object aPayload)
                         {
                             LOG.info("GOT MESSAGE: {}", aPayload);
-                            responseRecievedLatch.countDown();
                             messageRecieved.set(true);
+                            responseRecievedLatch.countDown();
                         }
                     });
         }

diff --git a/...eption-security/src/main/java/de/tudarmstadt/ukp/clarin/webanno/security/UserDaoImpl.java b/...eption-security/src/main/java/de/tudarmstadt/ukp/clarin/webanno/security/UserDaoImpl.java
@@ -488,8 +488,8 @@ public List<ValidationError> validateUsername(String aName)
         }
 
         // Do not allow space
-        if (containsAnyCharacterMatching(aName, Character::isWhitespace)) {
-            errors.add(new ValidationError("Username cannot contain a space character") //
+        if (containsAnyCharacterMatching(aName, this::isWhitespaceIllegalInUsername)) {
+            errors.add(new ValidationError("Username cannot contain whitespace") //
                     .addKey(MSG_USERNAME_ERROR_ILLEGAL_SPACE));
             return errors;
         }
@@ -552,6 +552,15 @@ public List<ValidationError> validateUsername(String aName)
         return errors;
     }
 
+    private boolean isWhitespaceIllegalInUsername(char ch)
+    {
+        if (securityProperties.isSpaceAllowedInUsername() && ch == ' ') {
+            return false;
+        }
+
+        return Character.isWhitespace((int) ch);
+    }
+
     @Override
     public boolean isValidUsername(String aName)
     {

diff --git a/...y/src/main/java/de/tudarmstadt/ukp/clarin/webanno/security/config/SecurityProperties.java b/...y/src/main/java/de/tudarmstadt/ukp/clarin/webanno/security/config/SecurityProperties.java
@@ -53,4 +53,6 @@ public interface SecurityProperties
     Pattern getUsernamePattern();
 
     Pattern getPasswordPattern();
+
+    boolean isSpaceAllowedInUsername();
 }
diff --git a/...c/main/java/de/tudarmstadt/ukp/clarin/webanno/security/config/SecurityPropertiesImpl.java b/...c/main/java/de/tudarmstadt/ukp/clarin/webanno/security/config/SecurityPropertiesImpl.java
@@ -31,6 +31,7 @@ public class SecurityPropertiesImpl
     private String defaultAdminUsername;
     private String defaultAdminPassword;
     private boolean defaultAdminRemoteAccess = false;
+    private boolean spaceAllowedInUsername = false;
 
     public static final int HARD_MINIMUM_PASSWORD_LENGTH = 0;
     public static final int DEFAULT_MINIMUM_PASSWORD_LENGTH = 8;
@@ -152,4 +153,15 @@ public void setPasswordPattern(Pattern aPasswordPattern)
     {
         passwordPattern = aPasswordPattern;
     }
+
+    @Override
+    public boolean isSpaceAllowedInUsername()
+    {
+        return spaceAllowedInUsername;
+    }
+
+    public void setSpaceAllowedInUsername(boolean aSpaceInUsernameAllowed)
+    {
+        spaceAllowedInUsername = aSpaceInUsernameAllowed;
+    }
 }
diff --git a/...ain/resources/META-INF/asciidoc/admin-guide/security-authentication-policy.adoc b/...ain/resources/META-INF/asciidoc/admin-guide/security-authentication-policy.adoc
@@ -64,6 +64,10 @@ NOTE: In addition to the restrictions imposed here, {product-name} may impose ad
 | `.*`
 | `(?=.\*[a-z])(?=.*[A-Z])(?=.\*[0-9])(?=.*\p{Punct}).*`
 
+| `security.space-allowed-in-username`
+| Whether simple space characters are permitted in usernames. Enable this option only when necessary to restore access to existing accounts in certain scenarios such as when using external authentication. Usernames with spaces may lead to problems e.g. when exporting/importing projects or documents or when constructing certain URLs.
+| `false`
+| `true`
 |===
 
 
diff --git a/...on-security/src/test/java/de/tudarmstadt/ukp/clarin/webanno/security/UserDaoImplTest.java b/...on-security/src/test/java/de/tudarmstadt/ukp/clarin/webanno/security/UserDaoImplTest.java
@@ -45,7 +45,9 @@
 import de.tudarmstadt.ukp.clarin.webanno.security.config.SecurityPropertiesImpl;
 import de.tudarmstadt.ukp.clarin.webanno.security.model.User;
 
-@DataJpaTest(showSql = false)
+@DataJpaTest(showSql = false, //
+        properties = { //
+                "spring.main.banner-mode=off" })
 @EnableAutoConfiguration
 @ImportAutoConfiguration( //
         exclude = { LiquibaseAutoConfiguration.class }, //
@@ -70,6 +72,7 @@ void setup()
         securityProperties.setMaximumUsernameLength(DEFAULT_MAXIMUM_USERNAME_LENGTH);
         securityProperties.setMinimumPasswordLength(DEFAULT_MINIMUM_PASSWORD_LENGTH);
         securityProperties.setMaximumPasswordLength(DEFAULT_MINIMUM_PASSWORD_LENGTH);
+        securityProperties.setSpaceAllowedInUsername(false);
     }
 
     @Test
@@ -121,6 +124,18 @@ void thatUsernamePatternIsRespected()
         assertThat(userDao.isValidUsername("ay")).isFalse();
     }
 
+    @Test
+    void thatAllowingSpaceInUsernameWorks()
+    {
+        securityProperties.setMinimumUsernameLength(0);
+
+        securityProperties.setSpaceAllowedInUsername(false);
+        assertThat(userDao.isValidUsername("a z")).isFalse();
+
+        securityProperties.setSpaceAllowedInUsername(true);
+        assertThat(userDao.isValidUsername("a z")).isTrue();
+    }
+
     @Test
     void thatInvalidDefaultUserNameIsRejected()
     {
@@ -150,27 +165,27 @@ void testUsernameValidationErrorMessages()
         assertThat(userDao.validateUsername(" john")) //
                 .hasSize(1) //
                 .extracting(ValidationError::getMessage).first().asString() //
-                .contains("cannot contain a space");
+                .contains("cannot contain whitespace");
 
         assertThat(userDao.validateUsername("john ")) //
                 .hasSize(1) //
                 .extracting(ValidationError::getMessage).first().asString() //
-                .contains("cannot contain a space");
+                .contains("cannot contain whitespace");
 
         assertThat(userDao.validateUsername("jo hn")) //
                 .hasSize(1) //
                 .extracting(ValidationError::getMessage).first().asString() //
-                .contains("cannot contain a space");
+                .contains("cannot contain whitespace");
 
         assertThat(userDao.validateUsername("jo\thn")) //
                 .hasSize(1) //
                 .extracting(ValidationError::getMessage).first().asString() //
-                .contains("cannot contain a space");
+                .contains("cannot contain whitespace");
 
         assertThat(userDao.validateUsername("john\n")) //
                 .hasSize(1) //
                 .extracting(ValidationError::getMessage).first().asString() //
-                .contains("cannot contain a space");
+                .contains("cannot contain whitespace");
 
         assertThat(userDao.validateUsername("john\0")) //
                 .hasSize(1) //

diff --git a/.../src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/WicketApplicationBase.properties b/.../src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/WicketApplicationBase.properties
@@ -132,7 +132,7 @@ password.error.pattern-mismatch=Password invalid. It must match the pattern ${pa
 password.error.control-characters=Password cannot contain any control characters
 
 username.error.blank=Username cannot be empty or blank
-username.error.illegal-space=Username cannot contain a space character
+username.error.illegal-space=Username cannot contain whitespace
 username.error.illegal-characters=Username cannot contain any of these characters: ${chars}
 username.error.control-characters=Username cannot contain any control characters
 username.error.reserved=Username is reserved