Skip to content

Ignore case for username #232

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 1 commit into from
Mar 14, 2023
Merged

Ignore case for username #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 groups/src/main/java/org/openmbee/mms/groups/controllers/LocalGroupsController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public GroupUpdateResponse updateGroupUsers(@PathVariable String group,
response.setGroup(group);

groupUpdateRequest.getUsers().forEach(newUser -> {
User user = userRepository.findByUsername(newUser).orElse(null);
User user = userRepository.findByUsernameIgnoreCase(newUser).orElse(null);
if (user != null) {

if (groupUpdateRequest.getAction() == Action.ADD) {
Expand Down
3 changes: 1 addition & 2 deletions 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 @@ -29,7 +29,6 @@
import org.springframework.security.core.authority.AuthorityUtils;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.ldap.SpringSecurityLdapTemplate;
import org.springframework.security.ldap.authentication.LdapAuthenticationProvider;
import org.springframework.security.ldap.authentication.ad.ActiveDirectoryLdapAuthenticationProvider;
import org.springframework.security.ldap.userdetails.LdapAuthoritiesPopulator;
import org.springframework.transaction.annotation.EnableTransactionManagement;
Expand Down Expand Up @@ -155,7 +154,7 @@ private CustomLdapAuthoritiesPopulator(BaseLdapPathContextSource ldapContextSour
public Collection<? extends GrantedAuthority> getGrantedAuthorities(
DirContextOperations userData, String username) {
logger.debug("Populating authorities using LDAP");
Optional<User> userOptional = userRepository.findByUsername(username);
Optional<User> userOptional = userRepository.findByUsernameIgnoreCase(username);

if (userOptional.isEmpty()) {
logger.info("No user record for {} in the userRepository, creating...", userData.getDn());
Expand Down
4 changes: 2 additions & 2 deletions localuser/src/main/java/org/openmbee/mms/localuser/security/UserDetailsServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public void setPasswordEncoder(PasswordEncoder passwordEncoder) {

@Override
public UserDetailsImpl loadUserByUsername(String username) throws UsernameNotFoundException {
Optional<User> user = userRepository.findByUsername(username);
Optional<User> user = userRepository.findByUsernameIgnoreCase(username);

if (!user.isPresent()) {
throw new UsernameNotFoundException(
Expand Down Expand Up @@ -59,7 +59,7 @@ public User register(UserCreateRequest req) {

@Transactional
public void changeUserPassword(String username, String password, boolean asAdmin) {
Optional<User> userOptional = userRepository.findByUsername(username);
Optional<User> userOptional = userRepository.findByUsernameIgnoreCase(username);
if(! userOptional.isPresent()) {
throw new UsernameNotFoundException(
String.format("No user found with username '%s'.", username));
Expand Down
8 changes: 4 additions & 4 deletions ...c/main/java/org/openmbee/mms/permissions/delegation/DefaultBranchPermissionsDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public void initializePermissions(String creator) {
@Override
public void initializePermissions(String creator, boolean inherit) {

Optional<User> user = getUserRepo().findByUsername(creator);
Optional<User> user = getUserRepo().findByUsernameIgnoreCase(creator);
Optional<Role> role = getRoleRepo().findByName("ADMIN");

if (!user.isPresent()) {
Expand Down Expand Up @@ -131,7 +131,7 @@ public PermissionUpdateResponse updateUserPermissions(PermissionUpdateRequest re
switch(req.getAction()) {
case MODIFY:
for (PermissionUpdateRequest.Permission p: req.getPermissions()) {
Optional<User> user = getUserRepo().findByUsername(p.getName());
Optional<User> user = getUserRepo().findByUsernameIgnoreCase(p.getName());
Optional<Role> role = getRoleRepo().findByName(p.getRole());
if (!user.isPresent() || !role.isPresent()) {
//throw exception or skip
Expand Down Expand Up @@ -160,7 +160,7 @@ public PermissionUpdateResponse updateUserPermissions(PermissionUpdateRequest re
branchUserPermRepo.findAllByBranchAndInherited(branch, false));
branchUserPermRepo.deleteByBranchAndInherited(branch, false);
for (PermissionUpdateRequest.Permission p: req.getPermissions()) {
Optional<User> user = getUserRepo().findByUsername(p.getName());
Optional<User> user = getUserRepo().findByUsernameIgnoreCase(p.getName());
Optional<Role> role = getRoleRepo().findByName(p.getRole());
if (!user.isPresent() || !role.isPresent()) {
//throw exception or skip
Expand All @@ -174,7 +174,7 @@ public PermissionUpdateResponse updateUserPermissions(PermissionUpdateRequest re
case REMOVE:
Set<String> users = new HashSet<>();
req.getPermissions().forEach(p -> {
Optional<User> user = getUserRepo().findByUsername(p.getName());
Optional<User> user = getUserRepo().findByUsernameIgnoreCase(p.getName());
if(! user.isPresent()) {
//throw or skip;
return;
Expand Down
8 changes: 4 additions & 4 deletions .../src/main/java/org/openmbee/mms/permissions/delegation/DefaultOrgPermissionsDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public void initializePermissions(String creator, boolean inherit) {
throw new IllegalArgumentException("Cannot inherit permissions for an Org");
}

Optional<User> user = getUserRepo().findByUsername(creator);
Optional<User> user = getUserRepo().findByUsernameIgnoreCase(creator);
Optional<Role> role = getRoleRepo().findByName(AuthorizationConstants.ADMIN);

if (!user.isPresent()) {
Expand Down Expand Up @@ -116,7 +116,7 @@ public PermissionUpdateResponse updateUserPermissions(PermissionUpdateRequest re
switch(req.getAction()) {
case MODIFY:
for (PermissionUpdateRequest.Permission p: req.getPermissions()) {
Optional<User> user = getUserRepo().findByUsername(p.getName());
Optional<User> user = getUserRepo().findByUsernameIgnoreCase(p.getName());
Optional<Role> role = getRoleRepo().findByName(p.getRole());
if (!user.isPresent() || !role.isPresent()) {
//throw exception or skip
Expand Down Expand Up @@ -146,7 +146,7 @@ public PermissionUpdateResponse updateUserPermissions(PermissionUpdateRequest re
orgUserPermRepo.deleteByOrganization(organization);

for (PermissionUpdateRequest.Permission p: req.getPermissions()) {
Optional<User> user = getUserRepo().findByUsername(p.getName());
Optional<User> user = getUserRepo().findByUsernameIgnoreCase(p.getName());
Optional<Role> role = getRoleRepo().findByName(p.getRole());
if (!user.isPresent() || !role.isPresent()) {
//throw exception or skip
Expand All @@ -160,7 +160,7 @@ public PermissionUpdateResponse updateUserPermissions(PermissionUpdateRequest re
case REMOVE:
Set<String> users = new HashSet<>();
req.getPermissions().forEach(p -> {
Optional<User> user = getUserRepo().findByUsername(p.getName());
Optional<User> user = getUserRepo().findByUsernameIgnoreCase(p.getName());
if(! user.isPresent()) {
//throw or skip;
return;
Expand Down
8 changes: 4 additions & 4 deletions .../main/java/org/openmbee/mms/permissions/delegation/DefaultProjectPermissionsDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public void initializePermissions(String creator) {

@Override
public void initializePermissions(String creator, boolean inherit) {
Optional<User> user = getUserRepo().findByUsername(creator);
Optional<User> user = getUserRepo().findByUsernameIgnoreCase(creator);
Optional<Role> role = getRoleRepo().findByName("ADMIN");

if (!user.isPresent()) {
Expand Down Expand Up @@ -133,7 +133,7 @@ public PermissionUpdateResponse updateUserPermissions(PermissionUpdateRequest re
switch(req.getAction()) {
case MODIFY:
for (PermissionUpdateRequest.Permission p: req.getPermissions()) {
Optional<User> user = getUserRepo().findByUsername(p.getName());
Optional<User> user = getUserRepo().findByUsernameIgnoreCase(p.getName());
Optional<Role> role = getRoleRepo().findByName(p.getRole());
if (!user.isPresent() || !role.isPresent()) {
//throw exception or skip
Expand Down Expand Up @@ -162,7 +162,7 @@ public PermissionUpdateResponse updateUserPermissions(PermissionUpdateRequest re
projectUserPermRepo.findAllByProjectAndInherited(project, false));
projectUserPermRepo.deleteByProjectAndInherited(project, false);
for (PermissionUpdateRequest.Permission p: req.getPermissions()) {
Optional<User> user = getUserRepo().findByUsername(p.getName());
Optional<User> user = getUserRepo().findByUsernameIgnoreCase(p.getName());
Optional<Role> role = getRoleRepo().findByName(p.getRole());
if (!user.isPresent() || !role.isPresent()) {
//throw exception or skip
Expand All @@ -176,7 +176,7 @@ public PermissionUpdateResponse updateUserPermissions(PermissionUpdateRequest re
case REMOVE:
Set<String> users = new HashSet<>();
req.getPermissions().forEach(p -> {
Optional<User> user = getUserRepo().findByUsername(p.getName());
Optional<User> user = getUserRepo().findByUsernameIgnoreCase(p.getName());
if(! user.isPresent()) {
//throw or skip;
return;
Expand Down
2 changes: 1 addition & 1 deletion rdb/src/main/java/org/openmbee/mms/rdb/repositories/UserRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ public interface UserRepository extends JpaRepository<User, Long> {

Optional<User> findByEmail(String email);

Optional<User> findByUsername(String username);
Optional<User> findByUsernameIgnoreCase(String username);

}
2 changes: 1 addition & 1 deletion twc/src/main/java/org/openmbee/mms/twc/security/TwcUserDetailsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public void setUserRepository(UserRepository userRepository) {

@Override
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
Optional<User> user = userRepository.findByUsername(username);
Optional<User> user = userRepository.findByUsernameIgnoreCase(username);

User u;
if (!user.isPresent()) {
Expand Down