Skip to content

fix: guard empty deletedIds in PermissionServiceImpl event listeners (#6868) #6946

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

Open
juicewcode wants to merge 1 commit into
base: master
Choose a base branch
from
+44 −4
Open

fix: guard empty deletedIds in PermissionServiceImpl event listeners (#6868) #6946

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
12 changes: 8 additions & 4 deletions shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/PermissionServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,18 +162,22 @@ public void onResourcesCreated(final BatchResourceCreatedEvent event) {
* @param event event
*/
@EventListener(BatchResourceDeletedEvent.class)
public void onResourcesCreated(final BatchResourceDeletedEvent event) {
permissionMapper.deleteByResourceId(event.getDeletedIds());
public void onResourcesDeleted(final BatchResourceDeletedEvent event) {
if (CollectionUtils.isNotEmpty(event.getDeletedIds())) {
permissionMapper.deleteByResourceId(event.getDeletedIds());
}
}

/**
* listen {@link BatchRoleDeletedEvent} delete permission.
*
* @param event event
*/
@EventListener(BatchRoleDeletedEvent.class)
public void onRoleDeleted(final BatchRoleDeletedEvent event) {
permissionMapper.deleteByObjectIds(event.getDeletedIds());
if (CollectionUtils.isNotEmpty(event.getDeletedIds())) {
permissionMapper.deleteByObjectIds(event.getDeletedIds());
}
}

/**
Expand Down
36 changes: 36 additions & 0 deletions shenyu-admin/src/test/java/org/apache/shenyu/admin/service/PermissionServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@
import org.apache.shenyu.admin.model.entity.DashboardUserDO;
import org.apache.shenyu.admin.model.entity.PermissionDO;
import org.apache.shenyu.admin.model.entity.ResourceDO;
import org.apache.shenyu.admin.model.entity.RoleDO;
import org.apache.shenyu.admin.model.entity.UserRoleDO;
import org.apache.shenyu.admin.model.event.resource.BatchResourceDeletedEvent;
import org.apache.shenyu.admin.model.event.role.BatchRoleDeletedEvent;
import org.apache.shenyu.admin.model.vo.PermissionMenuVO;
import org.apache.shenyu.admin.service.impl.PermissionServiceImpl;
import org.apache.shenyu.admin.spring.SpringBeanUtils;
Expand Down Expand Up @@ -57,8 +60,11 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
import static org.mockito.ArgumentMatchers.anyList;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.mockStatic;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

/**
Expand Down Expand Up @@ -166,4 +172,34 @@ public void testGetAuthPermByUserName() {
final Set<String> result = permissionServiceImplUnderTest.getAuthPermByUserName("admin");
assertThat(result.size(), is(1));
}

@Test
public void testOnResourcesDeletedEmpty() {
final BatchResourceDeletedEvent event = new BatchResourceDeletedEvent(Collections.emptyList(), "admin");
permissionServiceImplUnderTest.onResourcesDeleted(event);
verify(mockPermissionMapper, never()).deleteByResourceId(anyList());
}

@Test
public void testOnResourcesDeleted() {
final ResourceDO resourceDO = ResourceDO.builder().id("resource-1").build();
final BatchResourceDeletedEvent event = new BatchResourceDeletedEvent(Collections.singletonList(resourceDO), "admin");
permissionServiceImplUnderTest.onResourcesDeleted(event);
verify(mockPermissionMapper).deleteByResourceId(Collections.singletonList("resource-1"));
}

@Test
public void testOnRoleDeletedEmpty() {
final BatchRoleDeletedEvent event = new BatchRoleDeletedEvent(Collections.emptyList(), "admin");
permissionServiceImplUnderTest.onRoleDeleted(event);
verify(mockPermissionMapper, never()).deleteByObjectIds(anyList());
}

@Test
public void testOnRoleDeleted() {
final RoleDO roleDO = RoleDO.builder().id("role-1").build();
final BatchRoleDeletedEvent event = new BatchRoleDeletedEvent(Collections.singletonList(roleDO), "admin");
permissionServiceImplUnderTest.onRoleDeleted(event);
verify(mockPermissionMapper).deleteByObjectIds(Collections.singletonList("role-1"));
}
}
Loading