|
@@ -19,6 +19,7 @@ package org.springframework.security.provisioning;
|
|
|
import java.util.Collection;
|
|
|
import java.util.Enumeration;
|
|
|
import java.util.HashMap;
|
|
|
+import java.util.Locale;
|
|
|
import java.util.Map;
|
|
|
import java.util.Properties;
|
|
|
|
|
@@ -97,35 +98,33 @@ public class InMemoryUserDetailsManager implements UserDetailsManager, UserDetai
|
|
|
@Override
|
|
|
public void createUser(UserDetails user) {
|
|
|
Assert.isTrue(!userExists(user.getUsername()), "user should not exist");
|
|
|
-
|
|
|
if (user instanceof MutableUserDetails mutable) {
|
|
|
- this.users.put(user.getUsername().toLowerCase(), mutable);
|
|
|
+ this.users.put(user.getUsername().toLowerCase(Locale.ROOT), mutable);
|
|
|
}
|
|
|
else {
|
|
|
- this.users.put(user.getUsername().toLowerCase(), new MutableUser(user));
|
|
|
+ this.users.put(user.getUsername().toLowerCase(Locale.ROOT), new MutableUser(user));
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public void deleteUser(String username) {
|
|
|
- this.users.remove(username.toLowerCase());
|
|
|
+ this.users.remove(username.toLowerCase(Locale.ROOT));
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public void updateUser(UserDetails user) {
|
|
|
Assert.isTrue(userExists(user.getUsername()), "user should exist");
|
|
|
-
|
|
|
if (user instanceof MutableUserDetails mutable) {
|
|
|
- this.users.put(user.getUsername().toLowerCase(), mutable);
|
|
|
+ this.users.put(user.getUsername().toLowerCase(Locale.ROOT), mutable);
|
|
|
}
|
|
|
else {
|
|
|
- this.users.put(user.getUsername().toLowerCase(), new MutableUser(user));
|
|
|
+ this.users.put(user.getUsername().toLowerCase(Locale.ROOT), new MutableUser(user));
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public boolean userExists(String username) {
|
|
|
- return this.users.containsKey(username.toLowerCase());
|
|
|
+ return this.users.containsKey(username.toLowerCase(Locale.ROOT));
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -156,14 +155,14 @@ public class InMemoryUserDetailsManager implements UserDetailsManager, UserDetai
|
|
|
@Override
|
|
|
public UserDetails updatePassword(UserDetails user, String newPassword) {
|
|
|
String username = user.getUsername();
|
|
|
- MutableUserDetails mutableUser = this.users.get(username.toLowerCase());
|
|
|
+ MutableUserDetails mutableUser = this.users.get(username.toLowerCase(Locale.ROOT));
|
|
|
mutableUser.setPassword(newPassword);
|
|
|
return mutableUser;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
|
|
|
- UserDetails user = this.users.get(username.toLowerCase());
|
|
|
+ UserDetails user = this.users.get(username.toLowerCase(Locale.ROOT));
|
|
|
if (user == null) {
|
|
|
throw new UsernameNotFoundException(username);
|
|
|
}
|