Merge pull request #210 from Open-MBEE/release/4.0.12

Release/4.0.12
Open-MBEE · Oct 7, 2022 · 2722f1b · 2722f1b
2 parents 74245ae + 226c9d0
commit 2722f1b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=4.0.11
+version=4.0.12
 group=org.openmbee.mms
 
 springBootVersion=2.6.7

diff --git a/groups/src/main/java/org/openmbee/mms/groups/constants/GroupConstants.java b/groups/src/main/java/org/openmbee/mms/groups/constants/GroupConstants.java
@@ -6,7 +6,7 @@ public class GroupConstants {
     public static final String GROUP_NOT_EMPTY = "Group is not empty";
     public static final String GROUP_NOT_FOUND = "Group not found";
     public static final String INVALID_ACTION = "Invalid action";
-    public static final String INVALID_GROUP_NAME= "Invalid group name";
+    public static final String INVALID_GROUP_NAME = "Invalid group name";
     public static final String NAME = "name";
     public static final String NO_USERS_PROVIDED = "No users provided";
     public static final String RESTRICTED_GROUP = "Restricted group";

diff --git a/groups/src/main/java/org/openmbee/mms/groups/services/GroupValidationService.java b/groups/src/main/java/org/openmbee/mms/groups/services/GroupValidationService.java
@@ -12,20 +12,20 @@
 @Service
 public class GroupValidationService {
 
-    private static final Set<String> RESTRICTED_NAMES =  Set.of(MMSADMIN, EVERYONE);
-    private Pattern VALID_GROUP_NAME_PATTERN = Pattern.compile("^[\\w-]+");
+    private static final Set<String> RESTRICTED_NAMES = Set.of(MMSADMIN, EVERYONE);
+    private final Pattern VALID_GROUP_NAME_PATTERN = Pattern.compile("^[ -~]+");
 
     public boolean isRestrictedGroup(String groupName) {
         return RESTRICTED_NAMES.contains(groupName);
     }
 
-    public boolean isValidGroupName(String groupName){
+    public boolean isValidGroupName(String groupName) {
         return groupName != null &&
             !isRestrictedGroup(groupName) &&
             VALID_GROUP_NAME_PATTERN.matcher(groupName).matches();
     }
 
-    public boolean canDeleteGroup(Group group){
+    public boolean canDeleteGroup(Group group) {
         return !isRestrictedGroup(group.getName()) &&
             (group.getUsers() == null || group.getUsers().isEmpty());
     }

diff --git a/ldap/src/main/java/org/openmbee/mms/ldap/LdapSecurityConfig.java b/ldap/src/main/java/org/openmbee/mms/ldap/LdapSecurityConfig.java
@@ -21,6 +21,7 @@
 import org.springframework.ldap.core.support.BaseLdapPathContextSource;
 import org.springframework.ldap.core.support.LdapContextSource;
 import org.springframework.ldap.filter.*;
+import org.springframework.ldap.support.LdapEncoder;
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.authentication.configurers.ldap.LdapAuthenticationProviderConfigurer;
@@ -185,7 +186,7 @@ public Collection<? extends GrantedAuthority> getGrantedAuthorities(
 
                 AndFilter andFilter = new AndFilter();
                 HardcodedFilter groupsFilter = new HardcodedFilter(
-                    groupSearchFilter.replace("{0}", userDn));
+                    groupSearchFilter.replace("{0}", LdapEncoder.filterEncode(userDn)));
                 andFilter.and(groupsFilter);
                 andFilter.and(orFilter);