Strip space test

OpenConext · Dec 13, 2024 · fc9a34e · fc9a34e
1 parent 9250353
commit fc9a34e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/server/src/main/java/access/security/UserPermissions.java b/server/src/main/java/access/security/UserPermissions.java
@@ -41,11 +41,15 @@ public static void assertAuthority(User user, Authority authority) {
             throw new UserRestrictionException();
         }
 
+        if (user.isSuperUser()) {
+            return;
+        }
+
         if (user.isInstitutionAdmin() && Authority.INSTITUTION_ADMIN.hasEqualOrHigherRights(authority)) {
             return;
         }
-        if (!user.isSuperUser() && user.getUserRoles().stream()
-                .noneMatch(userRole -> userRole.getAuthority().hasEqualOrHigherRights(authority)))
+        if (user.getUserRoles().stream()
+                        .noneMatch(userRole -> userRole.getAuthority().hasEqualOrHigherRights(authority)))
             throw new UserRestrictionException();
     }
 

diff --git a/server/src/test/java/access/api/FullSearchQueryParserTest.java b/server/src/test/java/access/api/FullSearchQueryParserTest.java
@@ -15,6 +15,9 @@ void parse() {
 
         String emailParsed = FullSearchQueryParser.parse("[email protected]");
         assertEquals("+brand +ms +play*", emailParsed);
+
+        String strippedWhiteSpace = FullSearchQueryParser.parse(" [email protected]  ");
+        assertEquals("+Leitndhireedisvea +example*", strippedWhiteSpace);
     }
 
     @Test