Skip to content

Release/4.0.12 #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HuiJun merged 5 commits into from
Oct 7, 2022
Merged

Release/4.0.12 #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1a654a3
fix(ldap): encode group search filter
ivan-gomes Oct 7, 2022
501e5d2
feat(groups): allow all printable ASCII characters in group name
ivan-gomes Oct 7, 2022
5bd2995
Merge pull request #207 from Open-MBEE/feature/206
HuiJun Oct 7, 2022
2ac9a98
Merge pull request #209 from Open-MBEE/feature/208
HuiJun Oct 7, 2022
226c9d0
Bump version for release
HuiJun Oct 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=4.0.11
version=4.0.12
group=org.openmbee.mms

springBootVersion=2.6.7
Expand Down
2 changes: 1 addition & 1 deletion groups/src/main/java/org/openmbee/mms/groups/constants/GroupConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
8 changes: 4 additions & 4 deletions groups/src/main/java/org/openmbee/mms/groups/services/GroupValidationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand Down
3 changes: 2 additions & 1 deletion ldap/src/main/java/org/openmbee/mms/ldap/LdapSecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down