zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(#12405): The LDAP default password is a fixed value 'nacos' and cannot be customized. (#12406)

Browse Source
This commit is contained in:
blake.qiu 2024-07-24 14:50:49 +08:00 committed by GitHub
parent fbfa39d06d
commit 96a93189c3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugin-default-impl/nacos-default-auth-plugin/src/main/java/com/alibaba/nacos/plugin/auth/impl/LdapAuthenticationProvider.java
View File

@ -94,11 +94,10 @@ public class LdapAuthenticationProvider implements AuthenticationProvider {
try { try {
userDetails = userDetailsService.loadUserByUsername(AuthConstants.LDAP_PREFIX + username); userDetails = userDetailsService.loadUserByUsername(AuthConstants.LDAP_PREFIX + username);
} catch (UsernameNotFoundException exception) { } catch (UsernameNotFoundException exception) {
String nacosPassword = PasswordEncoderUtil.encode(AuthConstants.LDAP_DEFAULT_PASSWORD); userDetailsService.createUser(AuthConstants.LDAP_PREFIX + username, AuthConstants.LDAP_DEFAULT_ENCODED_PASSWORD);
userDetailsService.createUser(AuthConstants.LDAP_PREFIX + username, nacosPassword);
User user = new User(); User user = new User();
user.setUsername(AuthConstants.LDAP_PREFIX + username); user.setUsername(AuthConstants.LDAP_PREFIX + username);
user.setPassword(nacosPassword); user.setPassword(AuthConstants.LDAP_DEFAULT_ENCODED_PASSWORD);
userDetails = new NacosUserDetails(user); userDetails = new NacosUserDetails(user);
} }
return new UsernamePasswordAuthenticationToken(userDetails, password, userDetails.getAuthorities()); return new UsernamePasswordAuthenticationToken(userDetails, password, userDetails.getAuthorities());

5
plugin-default-impl/nacos-default-auth-plugin/src/main/java/com/alibaba/nacos/plugin/auth/impl/constant/AuthConstants.java
View File

@ -74,10 +74,7 @@ public class AuthConstants {
*/ */
public static final String NACOS_CORE_AUTH_IGNORE_PARTIAL_RESULT_EXCEPTION = "nacos.core.auth.ldap.ignore.partial.result.exception"; public static final String NACOS_CORE_AUTH_IGNORE_PARTIAL_RESULT_EXCEPTION = "nacos.core.auth.ldap.ignore.partial.result.exception";
@Deprecated public static final String LDAP_DEFAULT_ENCODED_PASSWORD = PasswordEncoderUtil.encode(System.getProperty("ldap.default.password", "nacos"));
public static final String LDAP_DEFAULT_PASSWORD = "nacos";
public static final String LDAP_DEFAULT_ENCODED_PASSWORD = PasswordEncoderUtil.encode(LDAP_DEFAULT_PASSWORD);
public static final String LDAP_PREFIX = "LDAP_"; public static final String LDAP_PREFIX = "LDAP_";
} }

2
plugin-default-impl/nacos-default-auth-plugin/src/test/java/com/alibaba/nacos/plugin/auth/impl/LdapAuthenticationProviderTest.java
View File

@ -81,7 +81,7 @@ class LdapAuthenticationProviderTest {
private List<RoleInfo> roleInfos = new ArrayList<>(); private List<RoleInfo> roleInfos = new ArrayList<>();
private String defaultPassWord = "nacos"; private String defaultPassWord = System.getProperty("ldap.default.password", "nacos");
@BeforeEach @BeforeEach
void setUp() throws NoSuchMethodException { void setUp() throws NoSuchMethodException {