You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shenyu.apache.org by xi...@apache.org on 2021/08/26 03:29:46 UTC
[incubator-shenyu] branch master updated: fix admin Return password
question (#1962)
This is an automated email from the ASF dual-hosted git repository.
xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 096d2c0 fix admin Return password question (#1962)
096d2c0 is described below
commit 096d2c0ab1abfffbad727e36c0075a919f932027
Author: qurenneng <31...@users.noreply.github.com>
AuthorDate: Thu Aug 26 11:29:40 2021 +0800
fix admin Return password question (#1962)
* password encryption and password change logic for the admin user resolved
* password encryption and password change logic for the admin user resolved add test
* password encryption and password change logic for the admin user add test
* password encryption and password change logic for the admin user resolved
---
.../shenyu/admin/controller/DashboardUserController.java | 4 +---
.../shenyu/admin/service/impl/DashboardUserServiceImpl.java | 13 +------------
.../admin/controller/DashboardUserControllerTest.java | 2 +-
.../shenyu/admin/service/DashboardUserServiceTest.java | 3 ---
4 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/DashboardUserController.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/DashboardUserController.java
index b848eaa..049854b 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/DashboardUserController.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/DashboardUserController.java
@@ -92,11 +92,9 @@ public class DashboardUserController {
*/
@GetMapping("/{id}")
public ShenyuAdminResult detailDashboardUser(@PathVariable("id") final String id) {
- String key = secretProperties.getKey();
- String iv = secretProperties.getIv();
DashboardUserEditVO dashboardUserEditVO = dashboardUserService.findById(id);
return Optional.ofNullable(dashboardUserEditVO).map(item -> {
- item.setPassword(AesUtils.aesDecryption(item.getPassword(), key, iv));
+ item.setPassword("");
return ShenyuAdminResult.success(ShenyuResultMessage.DETAIL_SUCCESS, item);
}).orElseGet(() -> ShenyuAdminResult.error(ShenyuResultMessage.DASHBOARD_QUERY_ERROR));
}
diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DashboardUserServiceImpl.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DashboardUserServiceImpl.java
index bb2bd16..d47038b 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DashboardUserServiceImpl.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DashboardUserServiceImpl.java
@@ -256,18 +256,7 @@ public class DashboardUserServiceImpl implements DashboardUserService {
private DashboardUserVO loginByDatabase(final String userName, final String password) {
String key = secretProperties.getKey();
String iv = secretProperties.getIv();
- DashboardUserVO dashboardUserVO = findByQuery(userName, password);
- if (!ObjectUtils.isEmpty(dashboardUserVO)) {
- DashboardUserDTO dashboardUserDTO = DashboardUserDTO.builder()
- .id(dashboardUserVO.getId())
- .userName(dashboardUserVO.getUserName())
- .password(AesUtils.aesEncryption(dashboardUserVO.getPassword(), key, iv))
- .role(dashboardUserVO.getRole())
- .enabled(dashboardUserVO.getEnabled()).build();
- createOrUpdate(dashboardUserDTO);
- } else {
- dashboardUserVO = findByQuery(userName, AesUtils.aesEncryption(password, key, iv));
- }
+ DashboardUserVO dashboardUserVO = findByQuery(userName, AesUtils.aesEncryption(password, key, iv));
return dashboardUserVO;
}
diff --git a/shenyu-admin/src/test/java/org/apache/shenyu/admin/controller/DashboardUserControllerTest.java b/shenyu-admin/src/test/java/org/apache/shenyu/admin/controller/DashboardUserControllerTest.java
index 69cfdd1..ed616f9 100644
--- a/shenyu-admin/src/test/java/org/apache/shenyu/admin/controller/DashboardUserControllerTest.java
+++ b/shenyu-admin/src/test/java/org/apache/shenyu/admin/controller/DashboardUserControllerTest.java
@@ -122,7 +122,7 @@ public final class DashboardUserControllerTest {
mockMvc.perform(get(url))
.andExpect(status().isOk())
.andExpect(jsonPath("$.message", is(ShenyuResultMessage.DETAIL_SUCCESS)))
- .andExpect(jsonPath("$.data.password", is("123456")));
+ .andExpect(jsonPath("$.data.password", is("")));
given(dashboardUserService.findById(any())).willReturn(null);
mockMvc.perform(get(url))
diff --git a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/DashboardUserServiceTest.java b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/DashboardUserServiceTest.java
index 20edc1b..0b7f0b8 100644
--- a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/DashboardUserServiceTest.java
+++ b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/DashboardUserServiceTest.java
@@ -178,7 +178,6 @@ public final class DashboardUserServiceTest {
when(secretProperties.getKey()).thenReturn(key, key);
when(secretProperties.getIv()).thenReturn(iv, iv);
when(dashboardUserMapper.findByQuery(eq(TEST_USER_NAME), anyString())).thenReturn(dashboardUserDO);
- given(dashboardUserMapper.updateSelective(any(DashboardUserDO.class))).willReturn(1);
given(ldapTemplate.authenticate(anyString(), anyString(), anyString())).willReturn(true);
given(roleMapper.findByRoleName("default")).willReturn(RoleDO.buildRoleDO(new RoleDTO("1", "test", null, null)));
@@ -195,10 +194,8 @@ public final class DashboardUserServiceTest {
ReflectionTestUtils.setField(dashboardUserService, "ldapTemplate", null);
assertLoginSuccessful(dashboardUserDO, dashboardUserService.login(TEST_USER_NAME, TEST_PASSWORD));
verify(dashboardUserMapper).findByQuery(eq(TEST_USER_NAME), anyString());
- verify(dashboardUserMapper).updateSelective(any(DashboardUserDO.class));
assertLoginSuccessful(dashboardUserDO, dashboardUserService.login(TEST_USER_NAME, TEST_PASSWORD));
verify(dashboardUserMapper, times(2)).findByQuery(eq(TEST_USER_NAME), anyString());
- verify(dashboardUserMapper, times(2)).updateSelective(any(DashboardUserDO.class));
}
private DashboardUserDO createDashboardUserDO() {