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

Change duplicate create admin user api return code to 4xx. (#12149)

Browse Source
This commit is contained in:
杨翊 SionYang 2024-05-30 15:28:29 +08:00 committed by GitHub
parent 0a797223c0
commit 98edf22e8c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugin-default-impl/nacos-default-auth-plugin/src/main/java/com/alibaba/nacos/plugin/auth/impl/controller/UserController.java
View File

@ -118,7 +118,7 @@ public class UserController {
public Object createAdminUser(@RequestParam(required = false) String password) { public Object createAdminUser(@RequestParam(required = false) String password) {
if (AuthSystemTypes.NACOS.name().equalsIgnoreCase(authConfigs.getNacosAuthSystemType())) { if (AuthSystemTypes.NACOS.name().equalsIgnoreCase(authConfigs.getNacosAuthSystemType())) {
if (iAuthenticationManager.hasGlobalAdminRole()) { if (iAuthenticationManager.hasGlobalAdminRole()) {
return RestResultUtils.failed("have admin user cannot use it"); return RestResultUtils.failed(HttpStatus.CONFLICT.value(), "have admin user cannot use it");
} }
if (StringUtils.isBlank(password)) { if (StringUtils.isBlank(password)) {
password = PasswordGeneratorUtil.generateRandomPassword(); password = PasswordGeneratorUtil.generateRandomPassword();
@ -132,7 +132,7 @@ public class UserController {
result.put(AuthConstants.PARAM_PASSWORD, password); result.put(AuthConstants.PARAM_PASSWORD, password);
return result; return result;
} else { } else {
return RestResultUtils.failed("not support"); return RestResultUtils.failed(HttpStatus.NOT_IMPLEMENTED.value(), "not support");
} }
} }
@ -264,7 +264,7 @@ public class UserController {
if (AuthSystemTypes.NACOS.name().equalsIgnoreCase(authConfigs.getNacosAuthSystemType()) if (AuthSystemTypes.NACOS.name().equalsIgnoreCase(authConfigs.getNacosAuthSystemType())
|| AuthSystemTypes.LDAP.name().equalsIgnoreCase(authConfigs.getNacosAuthSystemType())) { || AuthSystemTypes.LDAP.name().equalsIgnoreCase(authConfigs.getNacosAuthSystemType())) {
NacosUser user = iAuthenticationManager.authenticate(request); NacosUser user = iAuthenticationManager.authenticate(request);
response.addHeader(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.TOKEN_PREFIX + user.getToken()); response.addHeader(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.TOKEN_PREFIX + user.getToken());