Skip to content

Commit be3c83c

Browse files
committed
BE: RBAC: Subject type/value is unintended to be optional
minor test refactoring
1 parent 5595b56 commit be3c83c

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

api/src/test/java/io/kafbat/ui/ActiveDirectoryIntegrationTest.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import static io.kafbat.ui.AbstractIntegrationTest.CONFLUENT_PLATFORM_VERSION;
44
import static io.kafbat.ui.AbstractIntegrationTest.LOCAL;
55
import static io.kafbat.ui.container.ActiveDirectoryContainer.DOMAIN;
6+
import static io.kafbat.ui.container.ActiveDirectoryContainer.EMPTY_PERMISSIONS_USER;
67
import static io.kafbat.ui.container.ActiveDirectoryContainer.FIRST_GROUP_USER;
78
import static io.kafbat.ui.container.ActiveDirectoryContainer.PASSWORD;
89
import static io.kafbat.ui.container.ActiveDirectoryContainer.SECOND_GROUP_USER;
@@ -79,6 +80,7 @@ public void testUserPermissions() {
7980
assertTrue(permissions.stream().anyMatch(permission ->
8081
permission.getClusters().contains(LOCAL) && permission.getResource() == ResourceTypeDTO.TOPIC));
8182
assertEquals(permissions, authenticationInfo(SECOND_GROUP_USER).getUserInfo().getPermissions());
83+
assertEquals(permissions, authenticationInfo(USER_WITHOUT_GROUP).getUserInfo().getPermissions());
8284
}
8385

8486
@Test
@@ -106,7 +108,7 @@ public void testCreateTopic() {
106108

107109
@Test
108110
public void testEmptyPermissions() {
109-
assertTrue(Objects.requireNonNull(authenticationInfo(USER_WITHOUT_GROUP))
111+
assertTrue(Objects.requireNonNull(authenticationInfo(EMPTY_PERMISSIONS_USER))
110112
.getUserInfo()
111113
.getPermissions()
112114
.isEmpty()
@@ -125,7 +127,7 @@ private String session(String name) {
125127
.isFound()
126128
.returnResult(String.class)
127129
.getResponseCookies()
128-
.getFirst("SESSION"))
130+
.getFirst(SESSION))
129131
.getValue();
130132
}
131133

api/src/test/java/io/kafbat/ui/container/ActiveDirectoryContainer.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ public class ActiveDirectoryContainer extends GenericContainer<ActiveDirectoryCo
1313
public static final String PASSWORD = "StrongPassword123";
1414
public static final String FIRST_GROUP_USER = "JohnDoe";
1515
public static final String SECOND_GROUP_USER = "JohnWick";
16-
public static final String USER_WITHOUT_GROUP = "JohnJames";
16+
public static final String EMPTY_PERMISSIONS_USER = "JohnJames";
17+
public static final String USER_WITHOUT_GROUP = "JackSmith";
1718

1819
private static final String DOMAIN_DC = "dc=corp,dc=kafbat,dc=io";
1920
private static final String GROUP = "group";
@@ -39,6 +40,7 @@ public ActiveDirectoryContainer() {
3940
}
4041

4142
protected void containerIsStarted(InspectContainerResponse containerInfo) {
43+
createUser(EMPTY_PERMISSIONS_USER);
4244
createUser(USER_WITHOUT_GROUP);
4345
createUser(FIRST_GROUP_USER);
4446
createUser(SECOND_GROUP_USER);

api/src/test/resources/application-rbac-ad.yml

+3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ rbac:
1515
- provider: ldap_ad
1616
type: group
1717
value: secondGroup
18+
- provider: ldap_ad
19+
type: user
20+
value: JackSmith
1821
permissions:
1922
- resource: applicationconfig
2023
actions: all

0 commit comments

Comments
 (0)