|
6 | 6 | import static org.junit.jupiter.api.Assertions.assertNotNull;
|
7 | 7 | import static org.junit.jupiter.api.Assertions.assertTrue;
|
8 | 8 |
|
| 9 | +import io.kafbat.ui.api.model.Action; |
9 | 10 | import io.kafbat.ui.container.OpenLdapContainer;
|
10 | 11 | import io.kafbat.ui.model.AuthenticationInfoDTO;
|
11 | 12 | import io.kafbat.ui.model.ResourceTypeDTO;
|
@@ -60,26 +61,19 @@ public void testUserPermissions() {
|
60 | 61 |
|
61 | 62 | assertNotNull(info);
|
62 | 63 | assertTrue(info.getRbacEnabled());
|
63 |
| - System.out.println("info = " + info); |
64 | 64 | List<UserPermissionDTO> permissions = info.getUserInfo().getPermissions();
|
65 | 65 | assertFalse(permissions.isEmpty());
|
66 | 66 | assertTrue(permissions.stream().anyMatch(permission ->
|
67 |
| - permission.getClusters().contains(LOCAL) && permission.getResource() == ResourceTypeDTO.TOPIC)); |
| 67 | + permission.getClusters().contains(LOCAL) |
| 68 | + && permission.getResource() == ResourceTypeDTO.TOPIC |
| 69 | + && permission.getActions().stream() |
| 70 | + .allMatch(action -> Action.fromValue(action.getValue()) != Action.ALL) |
| 71 | + ) |
| 72 | + ); |
68 | 73 | assertEquals(permissions, authenticationInfo("johnwick").getUserInfo().getPermissions());
|
69 | 74 | assertEquals(permissions, authenticationInfo("jacksmith").getUserInfo().getPermissions());
|
70 | 75 | }
|
71 | 76 |
|
72 |
| - @Test |
73 |
| - public void testDirectUserPermissions() { |
74 |
| - AuthenticationInfoDTO info = authenticationInfo("jacksmith"); |
75 |
| - |
76 |
| - assertNotNull(info); |
77 |
| - assertTrue(info.getRbacEnabled()); |
78 |
| - System.out.println("info = " + info); |
79 |
| - List<UserPermissionDTO> permissions = info.getUserInfo().getPermissions(); |
80 |
| - assertFalse(permissions.isEmpty()); |
81 |
| - } |
82 |
| - |
83 | 77 | @Test
|
84 | 78 | public void testEmptyPermissions() {
|
85 | 79 | assertTrue(Objects.requireNonNull(authenticationInfo("johnjames"))
|
@@ -123,7 +117,6 @@ public static class Initializer implements ApplicationContextInitializer<Configu
|
123 | 117 | @Override
|
124 | 118 | public void initialize(ConfigurableApplicationContext context) {
|
125 | 119 | System.setProperty("spring.ldap.urls", LDAP_CONTAINER.getLdapUrl());
|
126 |
| - System.setProperty("oauth2.ldap.activeDirectory", "false"); |
127 | 120 | }
|
128 | 121 | }
|
129 | 122 | }
|
0 commit comments