You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ex...@apache.org on 2022/07/29 15:48:53 UTC
[nifi] branch main updated: NIFI-10292 Refactor nifi-framework-authorization-providers tests with Java and JUnit 5
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 67c463627c NIFI-10292 Refactor nifi-framework-authorization-providers tests with Java and JUnit 5
67c463627c is described below
commit 67c463627c0d67810493f8b8fb4e75bd63bb65c6
Author: Emilio Setiadarma <em...@gmail.com>
AuthorDate: Thu Jul 28 10:21:27 2022 -0700
NIFI-10292 Refactor nifi-framework-authorization-providers tests with Java and JUnit 5
This closes #6257
Signed-off-by: David Handermann <ex...@apache.org>
---
.../authorization/user/NiFiUserUtilsTest.groovy | 111 ---------------------
...CompositeConfigurableUserGroupProviderTest.java | 99 +++++++++---------
.../CompositeUserGroupProviderTest.java | 89 +++++++++--------
.../CompositeUserGroupProviderTestBase.java | 4 +-
.../StandardManagedAuthorizerTest.java | 55 +++++-----
.../nifi/authorization/user/NiFiUserUtilsTest.java | 84 ++++++++++++++++
6 files changed, 213 insertions(+), 229 deletions(-)
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/test/groovy/org/apache/nifi/authorization/user/NiFiUserUtilsTest.groovy b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/test/groovy/org/apache/nifi/authorization/user/NiFiUserUtilsTest.groovy
deleted file mode 100644
index e76b1713e8..0000000000
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/test/groovy/org/apache/nifi/authorization/user/NiFiUserUtilsTest.groovy
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.authorization.user
-
-import org.junit.After
-import org.junit.Before
-import org.junit.BeforeClass
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
-
-@RunWith(JUnit4.class)
-class NiFiUserUtilsTest {
- private static final Logger logger = LoggerFactory.getLogger(NiFiUserUtilsTest.class)
-
- private static final String SAFE_USER_NAME_ANDY = "alopresto"
- private static final String SAFE_USER_DN_ANDY = "CN=${SAFE_USER_NAME_ANDY}, OU=Apache NiFi"
-
- private static final String SAFE_USER_NAME_JOHN = "jdoe"
- private static final String SAFE_USER_DN_JOHN = "CN=${SAFE_USER_NAME_JOHN}, OU=Apache NiFi"
-
- private static final String SAFE_USER_NAME_PROXY_1 = "proxy1.nifi.apache.org"
- private static final String SAFE_USER_DN_PROXY_1 = "CN=${SAFE_USER_NAME_PROXY_1}, OU=Apache NiFi"
-
- private static final String SAFE_USER_NAME_PROXY_2 = "proxy2.nifi.apache.org"
- private static final String SAFE_USER_DN_PROXY_2 = "CN=${SAFE_USER_NAME_PROXY_2}, OU=Apache NiFi"
-
- @BeforeClass
- static void setUpOnce() throws Exception {
- logger.metaClass.methodMissing = { String name, args ->
- logger.info("[${name?.toUpperCase()}] ${(args as List).join(" ")}")
- }
- }
-
- @Before
- void setUp() {
- }
-
- @After
- void tearDown() {
- }
-
- @Test
- void testShouldBuildProxyChain() throws Exception {
- // Arrange
- def mockProxy1 = [getIdentity: { -> SAFE_USER_NAME_PROXY_1}, getChain: { -> null}, isAnonymous: { -> false}] as NiFiUser
- def mockJohn = [getIdentity: { -> SAFE_USER_NAME_JOHN}, getChain: { -> mockProxy1}, isAnonymous: { -> false}] as NiFiUser
-
- // Act
- List<String> proxiedEntitiesChain = NiFiUserUtils.buildProxiedEntitiesChain(mockJohn)
- logger.info("Proxied entities chain: ${proxiedEntitiesChain}")
-
- // Assert
- assert proxiedEntitiesChain == [SAFE_USER_NAME_JOHN, SAFE_USER_NAME_PROXY_1]
- }
-
- @Test
- void testShouldBuildProxyChainFromSingleUser() throws Exception {
- // Arrange
- def mockJohn = [getIdentity: { -> SAFE_USER_NAME_JOHN}, getChain: { -> null}, isAnonymous: { -> false}] as NiFiUser
-
- // Act
- List<String> proxiedEntitiesChain = NiFiUserUtils.buildProxiedEntitiesChain(mockJohn)
- logger.info("Proxied entities chain: ${proxiedEntitiesChain}")
-
- // Assert
- assert proxiedEntitiesChain == [SAFE_USER_NAME_JOHN]
- }
-
- @Test
- void testShouldBuildProxyChainFromAnonymousUser() throws Exception {
- // Arrange
- def mockProxy1 = [getIdentity: { -> SAFE_USER_NAME_PROXY_1}, getChain: { -> null}, isAnonymous: { -> false}] as NiFiUser
- def mockAnonymous = [getIdentity: { -> "anonymous"}, getChain: { -> mockProxy1}, isAnonymous: { -> true}] as NiFiUser
-
- // Act
- List<String> proxiedEntitiesChain = NiFiUserUtils.buildProxiedEntitiesChain(mockAnonymous)
- logger.info("Proxied entities chain: ${proxiedEntitiesChain}")
-
- // Assert
- assert proxiedEntitiesChain == ["", SAFE_USER_NAME_PROXY_1]
- }
-
- @Test
- void testBuildProxyChainFromNullUserShouldBeEmpty() throws Exception {
- // Arrange
-
- // Act
- List<String> proxiedEntitiesChain = NiFiUserUtils.buildProxiedEntitiesChain(null)
- logger.info("Proxied entities chain: ${proxiedEntitiesChain}")
-
- // Assert
- assert proxiedEntitiesChain == []
- }
-}
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/test/java/org/apache/nifi/authorization/CompositeConfigurableUserGroupProviderTest.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/test/java/org/apache/nifi/authorization/CompositeConfigurableUserGroupProviderTest.java
index 443164f134..0b721e3cfe 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/test/java/org/apache/nifi/authorization/CompositeConfigurableUserGroupProviderTest.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/test/java/org/apache/nifi/authorization/CompositeConfigurableUserGroupProviderTest.java
@@ -19,8 +19,7 @@ package org.apache.nifi.authorization;
import org.apache.nifi.attribute.expression.language.StandardPropertyValue;
import org.apache.nifi.authorization.exception.AuthorizerCreationException;
import org.apache.nifi.parameter.ParameterLookup;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.HashMap;
import java.util.Map;
@@ -30,9 +29,11 @@ import java.util.stream.Stream;
import static org.apache.nifi.authorization.CompositeConfigurableUserGroupProvider.PROP_CONFIGURABLE_USER_GROUP_PROVIDER;
import static org.apache.nifi.authorization.CompositeUserGroupProvider.PROP_USER_GROUP_PROVIDER_PREFIX;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -45,31 +46,37 @@ public class CompositeConfigurableUserGroupProviderTest extends CompositeUserGro
public static final String CONFIGURABLE_USER_GROUP_PROVIDER = "configurable-user-group-provider";
public static final String NOT_CONFIGURABLE_USER_GROUP_PROVIDER = "not-configurable-user-group-provider";
- @Test(expected = AuthorizerCreationException.class)
- public void testNoConfigurableUserGroupProviderSpecified() throws Exception {
- initCompositeUserGroupProvider(new CompositeConfigurableUserGroupProvider(), null, configurationContext -> {
- when(configurationContext.getProperty(PROP_CONFIGURABLE_USER_GROUP_PROVIDER)).thenReturn(new StandardPropertyValue(null, null, ParameterLookup.EMPTY));
+ @Test
+ public void testNoConfigurableUserGroupProviderSpecified() {
+ assertThrows(AuthorizerCreationException.class, () -> {
+ initCompositeUserGroupProvider(new CompositeConfigurableUserGroupProvider(), null, configurationContext -> {
+ when(configurationContext.getProperty(PROP_CONFIGURABLE_USER_GROUP_PROVIDER)).thenReturn(new StandardPropertyValue(null, null, ParameterLookup.EMPTY));
+ });
});
}
- @Test(expected = AuthorizerCreationException.class)
- public void testUnknownConfigurableUserGroupProvider() throws Exception {
- initCompositeUserGroupProvider(new CompositeConfigurableUserGroupProvider(), null, configurationContext -> {
- when(configurationContext.getProperty(PROP_CONFIGURABLE_USER_GROUP_PROVIDER)).thenReturn(new StandardPropertyValue("unknown-user-group-provider", null, ParameterLookup.EMPTY));
+ @Test
+ public void testUnknownConfigurableUserGroupProvider() {
+ assertThrows(AuthorizerCreationException.class, () -> {
+ initCompositeUserGroupProvider(new CompositeConfigurableUserGroupProvider(), null, configurationContext -> {
+ when(configurationContext.getProperty(PROP_CONFIGURABLE_USER_GROUP_PROVIDER)).thenReturn(new StandardPropertyValue("unknown-user-group-provider", null, ParameterLookup.EMPTY));
+ });
});
}
- @Test(expected = AuthorizerCreationException.class)
- public void testNonConfigurableUserGroupProvider() throws Exception {
- initCompositeUserGroupProvider(new CompositeConfigurableUserGroupProvider(), lookup -> {
- when(lookup.getUserGroupProvider(eq(NOT_CONFIGURABLE_USER_GROUP_PROVIDER))).thenReturn(mock(UserGroupProvider.class));
- }, configurationContext -> {
- when(configurationContext.getProperty(PROP_CONFIGURABLE_USER_GROUP_PROVIDER)).thenReturn(new StandardPropertyValue(NOT_CONFIGURABLE_USER_GROUP_PROVIDER, null, ParameterLookup.EMPTY));
+ @Test
+ public void testNonConfigurableUserGroupProvider() {
+ assertThrows(AuthorizerCreationException.class, () -> {
+ initCompositeUserGroupProvider(new CompositeConfigurableUserGroupProvider(), lookup -> {
+ when(lookup.getUserGroupProvider(eq(NOT_CONFIGURABLE_USER_GROUP_PROVIDER))).thenReturn(mock(UserGroupProvider.class));
+ }, configurationContext -> {
+ when(configurationContext.getProperty(PROP_CONFIGURABLE_USER_GROUP_PROVIDER)).thenReturn(new StandardPropertyValue(NOT_CONFIGURABLE_USER_GROUP_PROVIDER, null, ParameterLookup.EMPTY));
+ });
});
}
- @Test(expected = AuthorizerCreationException.class)
- public void testDuplicateProviders() throws Exception {
+ @Test
+ public void testDuplicateProviders() {
// Mock UserGroupProviderLookup
UserGroupProvider configurableUserGroupProvider = getConfigurableUserGroupProvider();
@@ -89,13 +96,15 @@ public class CompositeConfigurableUserGroupProviderTest extends CompositeUserGro
when(configurationContext.getProperties()).thenReturn(configurationContextProperties);
// configure (should throw exception)
- CompositeConfigurableUserGroupProvider provider = new CompositeConfigurableUserGroupProvider();
- provider.initialize(initializationContext);
- provider.onConfigured(configurationContext);
+ assertThrows(AuthorizerCreationException.class, () -> {
+ CompositeConfigurableUserGroupProvider provider = new CompositeConfigurableUserGroupProvider();
+ provider.initialize(initializationContext);
+ provider.onConfigured(configurationContext);
+ });
}
@Test
- public void testConfigurableUserGroupProviderOnly() throws Exception {
+ public void testConfigurableUserGroupProviderOnly() {
final UserGroupProvider userGroupProvider = initCompositeUserGroupProvider(new CompositeConfigurableUserGroupProvider(), lookup -> {
when(lookup.getUserGroupProvider(eq(CONFIGURABLE_USER_GROUP_PROVIDER))).thenReturn(getConfigurableUserGroupProvider());
}, configurationContext -> {
@@ -103,8 +112,8 @@ public class CompositeConfigurableUserGroupProviderTest extends CompositeUserGro
});
// users and groups
- Assert.assertEquals(2, userGroupProvider.getUsers().size());
- Assert.assertEquals(1, userGroupProvider.getGroups().size());
+ assertEquals(2, userGroupProvider.getUsers().size());
+ assertEquals(1, userGroupProvider.getGroups().size());
// unknown
assertNull(userGroupProvider.getUser(NOT_A_REAL_USER_IDENTIFIER));
@@ -120,7 +129,7 @@ public class CompositeConfigurableUserGroupProviderTest extends CompositeUserGro
}
@Test
- public void testConfigurableUserGroupProviderWithConflictingUserGroupProvider() throws Exception {
+ public void testConfigurableUserGroupProviderWithConflictingUserGroupProvider() {
final UserGroupProvider userGroupProvider = initCompositeUserGroupProvider(new CompositeConfigurableUserGroupProvider(), lookup -> {
when(lookup.getUserGroupProvider(eq(CONFIGURABLE_USER_GROUP_PROVIDER))).thenReturn(getConfigurableUserGroupProvider());
}, configurationContext -> {
@@ -128,8 +137,8 @@ public class CompositeConfigurableUserGroupProviderTest extends CompositeUserGro
}, getConflictingUserGroupProvider());
// users and groups
- Assert.assertEquals(3, userGroupProvider.getUsers().size());
- Assert.assertEquals(2, userGroupProvider.getGroups().size());
+ assertEquals(3, userGroupProvider.getUsers().size());
+ assertEquals(2, userGroupProvider.getGroups().size());
// unknown
assertNull(userGroupProvider.getUser(NOT_A_REAL_USER_IDENTIFIER));
@@ -141,25 +150,19 @@ public class CompositeConfigurableUserGroupProviderTest extends CompositeUserGro
assertNull(unknownUserAndGroups.getGroups());
// providers
- try {
+ Exception exception = assertThrows(IllegalStateException.class, () -> {
testConfigurableUserGroupProvider(userGroupProvider);
- assertTrue("Should never get here as we expect the line above to throw an exception", false);
- } catch (Exception e) {
- assertTrue(e instanceof IllegalStateException);
- assertTrue(e.getMessage().contains(USER_1_IDENTITY));
- }
+ });
+ assertTrue(exception.getMessage().contains(USER_1_IDENTITY));
- try {
+ exception = assertThrows(IllegalStateException.class, () -> {
testConflictingUserGroupProvider(userGroupProvider);
- assertTrue("Should never get here as we expect the line above to throw an exception", false);
- } catch (Exception e) {
- assertTrue(e instanceof IllegalStateException);
- assertTrue(e.getMessage().contains(USER_1_IDENTITY));
- }
+ });
+ assertTrue(exception.getMessage().contains(USER_1_IDENTITY));
}
@Test
- public void testConfigurableUserGroupProviderWithCollaboratingUserGroupProvider() throws Exception {
+ public void testConfigurableUserGroupProviderWithCollaboratingUserGroupProvider() {
final UserGroupProvider userGroupProvider = initCompositeUserGroupProvider(new CompositeConfigurableUserGroupProvider(), lookup -> {
when(lookup.getUserGroupProvider(eq(CONFIGURABLE_USER_GROUP_PROVIDER))).thenReturn(getConfigurableUserGroupProvider());
}, configurationContext -> {
@@ -167,8 +170,8 @@ public class CompositeConfigurableUserGroupProviderTest extends CompositeUserGro
}, getCollaboratingUserGroupProvider());
// users and groups
- Assert.assertEquals(3, userGroupProvider.getUsers().size());
- Assert.assertEquals(2, userGroupProvider.getGroups().size());
+ assertEquals(3, userGroupProvider.getUsers().size());
+ assertEquals(2, userGroupProvider.getGroups().size());
// unknown
assertNull(userGroupProvider.getUser(NOT_A_REAL_USER_IDENTIFIER));
@@ -183,7 +186,7 @@ public class CompositeConfigurableUserGroupProviderTest extends CompositeUserGro
final UserAndGroups user1AndGroups = userGroupProvider.getUserAndGroups(USER_1_IDENTITY);
assertNotNull(user1AndGroups);
assertNotNull(user1AndGroups.getUser());
- Assert.assertEquals(2, user1AndGroups.getGroups().size()); // from CollaboratingUGP
+ assertEquals(2, user1AndGroups.getGroups().size()); // from CollaboratingUGP
}
private UserGroupProvider getConfigurableUserGroupProvider() {
@@ -206,7 +209,7 @@ public class CompositeConfigurableUserGroupProviderTest extends CompositeUserGro
final UserAndGroups user1AndGroups = userGroupProvider.getUserAndGroups(USER_1_IDENTITY);
assertNotNull(user1AndGroups);
assertNotNull(user1AndGroups.getUser());
- Assert.assertEquals(1, user1AndGroups.getGroups().size());
+ assertEquals(1, user1AndGroups.getGroups().size());
assertNotNull(userGroupProvider.getUser(USER_5_IDENTIFIER));
assertNotNull(userGroupProvider.getUserByIdentity(USER_5_IDENTITY));
@@ -217,6 +220,6 @@ public class CompositeConfigurableUserGroupProviderTest extends CompositeUserGro
assertTrue(user5AndGroups.getGroups().isEmpty());
assertNotNull(userGroupProvider.getGroup(GROUP_1_IDENTIFIER));
- Assert.assertEquals(1, userGroupProvider.getGroup(GROUP_1_IDENTIFIER).getUsers().size());
+ assertEquals(1, userGroupProvider.getGroup(GROUP_1_IDENTIFIER).getUsers().size());
}
}
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/test/java/org/apache/nifi/authorization/CompositeUserGroupProviderTest.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/test/java/org/apache/nifi/authorization/CompositeUserGroupProviderTest.java
index b872e54ceb..4f08b85f65 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/test/java/org/apache/nifi/authorization/CompositeUserGroupProviderTest.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/test/java/org/apache/nifi/authorization/CompositeUserGroupProviderTest.java
@@ -19,31 +19,34 @@ package org.apache.nifi.authorization;
import org.apache.nifi.attribute.expression.language.StandardPropertyValue;
import org.apache.nifi.authorization.exception.AuthorizerCreationException;
import org.apache.nifi.parameter.ParameterLookup;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.nifi.authorization.CompositeUserGroupProvider.PROP_USER_GROUP_PROVIDER_PREFIX;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
public class CompositeUserGroupProviderTest extends CompositeUserGroupProviderTestBase {
- @Test(expected = AuthorizerCreationException.class)
- public void testNoConfiguredProviders() throws Exception {
- initCompositeUserGroupProvider(new CompositeUserGroupProvider(), null, null);
+ @Test
+ public void testNoConfiguredProviders() {
+ assertThrows(AuthorizerCreationException.class, () -> {
+ initCompositeUserGroupProvider(new CompositeUserGroupProvider(), null, null);
+ });
}
@Test
- public void testNoConfiguredProvidersAllowed() throws Exception {
+ public void testNoConfiguredProvidersAllowed() {
initCompositeUserGroupProvider(new CompositeUserGroupProvider(true), null, null);
}
- @Test(expected = AuthorizerCreationException.class)
- public void testUnknownProvider() throws Exception {
+ @Test
+ public void testUnknownProvider() {
// initialization
final UserGroupProviderInitializationContext initializationContext = mock(UserGroupProviderInitializationContext.class);
when(initializationContext.getUserGroupProviderLookup()).thenReturn(new UserGroupProviderLookup() {
@@ -58,24 +61,28 @@ public class CompositeUserGroupProviderTest extends CompositeUserGroupProviderTe
when(configurationContext.getProperty(eq(PROP_USER_GROUP_PROVIDER_PREFIX + "1"))).thenReturn(new StandardPropertyValue(String.valueOf("1"), null, ParameterLookup.EMPTY));
mockProperties(configurationContext);
- final CompositeUserGroupProvider compositeUserGroupProvider = new CompositeUserGroupProvider();
- compositeUserGroupProvider.initialize(initializationContext);
- compositeUserGroupProvider.onConfigured(configurationContext);
+ assertThrows(AuthorizerCreationException.class, () -> {
+ final CompositeUserGroupProvider compositeUserGroupProvider = new CompositeUserGroupProvider();
+ compositeUserGroupProvider.initialize(initializationContext);
+ compositeUserGroupProvider.onConfigured(configurationContext);
+ });
}
- @Test(expected = AuthorizerCreationException.class)
- public void testDuplicateProviders() throws Exception {
+ @Test
+ public void testDuplicateProviders() {
UserGroupProvider duplicatedUserGroupProvider = getUserGroupProviderOne();
- initCompositeUserGroupProvider(new CompositeUserGroupProvider(), null, null, duplicatedUserGroupProvider, duplicatedUserGroupProvider);
+ assertThrows(AuthorizerCreationException.class, () -> {
+ initCompositeUserGroupProvider(new CompositeUserGroupProvider(), null, null, duplicatedUserGroupProvider, duplicatedUserGroupProvider);
+ });
}
@Test
- public void testOneProvider() throws Exception {
+ public void testOneProvider() {
final UserGroupProvider userGroupProvider = initCompositeUserGroupProvider(new CompositeUserGroupProvider(), null, null, getUserGroupProviderOne());
// users and groups
- Assert.assertEquals(2, userGroupProvider.getUsers().size());
- Assert.assertEquals(1, userGroupProvider.getGroups().size());
+ assertEquals(2, userGroupProvider.getUsers().size());
+ assertEquals(1, userGroupProvider.getGroups().size());
// unknown
assertNull(userGroupProvider.getUser(NOT_A_REAL_USER_IDENTIFIER));
@@ -91,13 +98,13 @@ public class CompositeUserGroupProviderTest extends CompositeUserGroupProviderTe
}
@Test
- public void testMultipleProviders() throws Exception {
+ public void testMultipleProviders() {
final UserGroupProvider userGroupProvider = initCompositeUserGroupProvider(new CompositeUserGroupProvider(), null, null,
getUserGroupProviderOne(), getUserGroupProviderTwo());
// users and groups
- Assert.assertEquals(3, userGroupProvider.getUsers().size());
- Assert.assertEquals(2, userGroupProvider.getGroups().size());
+ assertEquals(3, userGroupProvider.getUsers().size());
+ assertEquals(2, userGroupProvider.getGroups().size());
// unknown
assertNull(userGroupProvider.getUser(NOT_A_REAL_USER_IDENTIFIER));
@@ -114,13 +121,13 @@ public class CompositeUserGroupProviderTest extends CompositeUserGroupProviderTe
}
@Test
- public void testMultipleProvidersWithConflictingUsers() throws Exception {
+ public void testMultipleProvidersWithConflictingUsers() {
final UserGroupProvider userGroupProvider = initCompositeUserGroupProvider(new CompositeUserGroupProvider(), null, null,
getUserGroupProviderOne(), getUserGroupProviderTwo(), getConflictingUserGroupProvider());
// users and groups
- Assert.assertEquals(4, userGroupProvider.getUsers().size());
- Assert.assertEquals(2, userGroupProvider.getGroups().size());
+ assertEquals(4, userGroupProvider.getUsers().size());
+ assertEquals(2, userGroupProvider.getGroups().size());
// unknown
assertNull(userGroupProvider.getUser(NOT_A_REAL_USER_IDENTIFIER));
@@ -134,31 +141,25 @@ public class CompositeUserGroupProviderTest extends CompositeUserGroupProviderTe
// providers
testUserGroupProviderTwo(userGroupProvider);
- try {
+ Exception exception = assertThrows(IllegalStateException.class, () -> {
testUserGroupProviderOne(userGroupProvider);
- assertTrue("Should never get here as we expect the line above to throw an exception", false);
- } catch (Exception e) {
- assertTrue(e instanceof IllegalStateException);
- assertTrue(e.getMessage().contains(USER_1_IDENTITY));
- }
-
- try {
- testConflictingUserGroupProvider(userGroupProvider);
- assertTrue("Should never get here as we expect the line above to throw an exception", false);
- } catch (Exception e) {
- assertTrue(e instanceof IllegalStateException);
- assertTrue(e.getMessage().contains(USER_1_IDENTITY));
- }
+ });
+ assertTrue(exception.getMessage().contains(USER_1_IDENTITY));
+
+ exception = assertThrows(IllegalStateException.class, () -> {
+ testConflictingUserGroupProvider(userGroupProvider);
+ });
+ assertTrue(exception.getMessage().contains(USER_1_IDENTITY));
}
@Test
- public void testMultipleProvidersWithCollaboratingUserGroupProvider() throws Exception {
+ public void testMultipleProvidersWithCollaboratingUserGroupProvider() {
final UserGroupProvider userGroupProvider = initCompositeUserGroupProvider(new CompositeUserGroupProvider(), null, null,
getUserGroupProviderOne(), getUserGroupProviderTwo(), getCollaboratingUserGroupProvider());
// users and groups
- Assert.assertEquals(4, userGroupProvider.getUsers().size());
- Assert.assertEquals(2, userGroupProvider.getGroups().size());
+ assertEquals(4, userGroupProvider.getUsers().size());
+ assertEquals(2, userGroupProvider.getGroups().size());
// unknown
assertNull(userGroupProvider.getUser(NOT_A_REAL_USER_IDENTIFIER));
@@ -175,6 +176,6 @@ public class CompositeUserGroupProviderTest extends CompositeUserGroupProviderTe
final UserAndGroups user1AndGroups = userGroupProvider.getUserAndGroups(USER_1_IDENTITY);
assertNotNull(user1AndGroups);
assertNotNull(user1AndGroups.getUser());
- Assert.assertEquals(2, user1AndGroups.getGroups().size()); // from UGP1 and CollaboratingUGP
+ assertEquals(2, user1AndGroups.getGroups().size()); // from UGP1 and CollaboratingUGP
}
}
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/test/java/org/apache/nifi/authorization/CompositeUserGroupProviderTestBase.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/test/java/org/apache/nifi/authorization/CompositeUserGroupProviderTestBase.java
index 6c60bb4e27..ce6c9ac50f 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/test/java/org/apache/nifi/authorization/CompositeUserGroupProviderTestBase.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/test/java/org/apache/nifi/authorization/CompositeUserGroupProviderTestBase.java
@@ -29,8 +29,8 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import static org.apache.nifi.authorization.CompositeUserGroupProvider.PROP_USER_GROUP_PROVIDER_PREFIX;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/test/java/org/apache/nifi/authorization/StandardManagedAuthorizerTest.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/test/java/org/apache/nifi/authorization/StandardManagedAuthorizerTest.java
index ff5299d13d..ac419ddd6a 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/test/java/org/apache/nifi/authorization/StandardManagedAuthorizerTest.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/test/java/org/apache/nifi/authorization/StandardManagedAuthorizerTest.java
@@ -20,15 +20,16 @@ import org.apache.nifi.attribute.expression.language.StandardPropertyValue;
import org.apache.nifi.authorization.exception.AuthorizationAccessException;
import org.apache.nifi.authorization.exception.AuthorizerCreationException;
import org.apache.nifi.parameter.ParameterLookup;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Collections;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
@@ -96,13 +97,15 @@ public class StandardManagedAuthorizerTest {
}
};
- @Test(expected = AuthorizerCreationException.class)
- public void testNullAccessPolicyProvider() throws Exception {
- getStandardManagedAuthorizer(null);
+ @Test
+ public void testNullAccessPolicyProvider() {
+ assertThrows(AuthorizerCreationException.class, () -> {
+ getStandardManagedAuthorizer(null);
+ });
}
@Test
- public void testEmptyFingerPrint() throws Exception {
+ public void testEmptyFingerPrint() {
final UserGroupProvider userGroupProvider = mock(UserGroupProvider.class);
final AccessPolicyProvider accessPolicyProvider = mock(AccessPolicyProvider.class);
@@ -113,7 +116,7 @@ public class StandardManagedAuthorizerTest {
}
@Test
- public void testNonEmptyFingerPrint() throws Exception {
+ public void testNonEmptyFingerPrint() {
final ConfigurableUserGroupProvider userGroupProvider = mock(ConfigurableUserGroupProvider.class);
when(userGroupProvider.getFingerprint()).thenReturn(TENANT_FINGERPRINT);
@@ -126,7 +129,7 @@ public class StandardManagedAuthorizerTest {
}
@Test
- public void testInheritEmptyFingerprint() throws Exception {
+ public void testInheritEmptyFingerprint() {
final ConfigurableUserGroupProvider userGroupProvider = mock(ConfigurableUserGroupProvider.class);
final ConfigurableAccessPolicyProvider accessPolicyProvider = mock(ConfigurableAccessPolicyProvider.class);
@@ -139,19 +142,21 @@ public class StandardManagedAuthorizerTest {
verify(accessPolicyProvider, times(0)).inheritFingerprint(anyString());
}
- @Test(expected = AuthorizationAccessException.class)
- public void testInheritInvalidFingerprint() throws Exception {
+ @Test
+ public void testInheritInvalidFingerprint() {
final ConfigurableUserGroupProvider userGroupProvider = mock(ConfigurableUserGroupProvider.class);
final ConfigurableAccessPolicyProvider accessPolicyProvider = mock(ConfigurableAccessPolicyProvider.class);
when(accessPolicyProvider.getUserGroupProvider()).thenReturn(userGroupProvider);
final StandardManagedAuthorizer managedAuthorizer = getStandardManagedAuthorizer(accessPolicyProvider);
- managedAuthorizer.inheritFingerprint("not a valid fingerprint");
+ assertThrows(AuthorizationAccessException.class, () -> {
+ managedAuthorizer.inheritFingerprint("not a valid fingerprint");
+ });
}
@Test
- public void testInheritNonEmptyFingerprint() throws Exception {
+ public void testInheritNonEmptyFingerprint() {
final ConfigurableUserGroupProvider userGroupProvider = mock(ConfigurableUserGroupProvider.class);
final ConfigurableAccessPolicyProvider accessPolicyProvider = mock(ConfigurableAccessPolicyProvider.class);
@@ -165,7 +170,7 @@ public class StandardManagedAuthorizerTest {
}
@Test
- public void testCheckInheritEmptyFingerprint() throws Exception {
+ public void testCheckInheritEmptyFingerprint() {
final ConfigurableUserGroupProvider userGroupProvider = mock(ConfigurableUserGroupProvider.class);
final ConfigurableAccessPolicyProvider accessPolicyProvider = mock(ConfigurableAccessPolicyProvider.class);
@@ -178,19 +183,21 @@ public class StandardManagedAuthorizerTest {
verify(accessPolicyProvider, times(0)).inheritFingerprint(anyString());
}
- @Test(expected = AuthorizationAccessException.class)
- public void testCheckInheritInvalidFingerprint() throws Exception {
+ @Test
+ public void testCheckInheritInvalidFingerprint() {
final ConfigurableUserGroupProvider userGroupProvider = mock(ConfigurableUserGroupProvider.class);
final ConfigurableAccessPolicyProvider accessPolicyProvider = mock(ConfigurableAccessPolicyProvider.class);
when(accessPolicyProvider.getUserGroupProvider()).thenReturn(userGroupProvider);
final StandardManagedAuthorizer managedAuthorizer = getStandardManagedAuthorizer(accessPolicyProvider);
- managedAuthorizer.checkInheritability("not a valid fingerprint");
+ assertThrows(AuthorizationAccessException.class, () -> {
+ managedAuthorizer.checkInheritability("not a valid fingerprint");
+ });
}
@Test
- public void testCheckInheritNonEmptyFingerprint() throws Exception {
+ public void testCheckInheritNonEmptyFingerprint() {
final ConfigurableUserGroupProvider userGroupProvider = mock(ConfigurableUserGroupProvider.class);
final ConfigurableAccessPolicyProvider accessPolicyProvider = mock(ConfigurableAccessPolicyProvider.class);
@@ -204,7 +211,7 @@ public class StandardManagedAuthorizerTest {
}
@Test
- public void testAuthorizationByUser() throws Exception {
+ public void testAuthorizationByUser() {
final String userIdentifier = "userIdentifier1";
final String userIdentity = "userIdentity1";
@@ -250,7 +257,7 @@ public class StandardManagedAuthorizerTest {
}
@Test
- public void testAuthorizationByGroup() throws Exception {
+ public void testAuthorizationByGroup() {
final String userIdentifier = "userIdentifier1";
final String userIdentity = "userIdentity1";
final String groupIdentifier = "groupIdentifier1";
@@ -303,7 +310,7 @@ public class StandardManagedAuthorizerTest {
}
@Test
- public void testAuthorizationByRequestGroups() throws Exception {
+ public void testAuthorizationByRequestGroups() {
final String userIdentifier = "userIdentifier1";
final String userIdentity = "userIdentity1";
final String groupIdentifier = "groupIdentifier1";
@@ -360,7 +367,7 @@ public class StandardManagedAuthorizerTest {
}
@Test
- public void testResourceNotFound() throws Exception {
+ public void testResourceNotFound() {
final String userIdentity = "userIdentity1";
final ConfigurableUserGroupProvider userGroupProvider = mock(ConfigurableUserGroupProvider.class);
@@ -382,7 +389,7 @@ public class StandardManagedAuthorizerTest {
}
@Test
- public void testUnauthorizedDueToUnknownUser() throws Exception {
+ public void testUnauthorizedDueToUnknownUser() {
final String userIdentifier = "userIdentifier1";
final String userIdentity = "userIdentity1";
final String notUser1Identity = "not userIdentity1";
@@ -429,7 +436,7 @@ public class StandardManagedAuthorizerTest {
}
@Test
- public void testUnauthorizedDueToLackOfPermission() throws Exception {
+ public void testUnauthorizedDueToLackOfPermission() {
final String userIdentifier = "userIdentifier1";
final String userIdentity = "userIdentity1";
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/test/java/org/apache/nifi/authorization/user/NiFiUserUtilsTest.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/test/java/org/apache/nifi/authorization/user/NiFiUserUtilsTest.java
new file mode 100644
index 0000000000..b53ff8d577
--- /dev/null
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/test/java/org/apache/nifi/authorization/user/NiFiUserUtilsTest.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.nifi.authorization.user;
+
+import org.junit.jupiter.api.Test;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class NiFiUserUtilsTest {
+ private static final Logger logger = LoggerFactory.getLogger(NiFiUserUtilsTest.class);
+
+ private static final String SAFE_USER_NAME_JOHN = "jdoe";
+ private static final String SAFE_USER_NAME_PROXY_1 = "proxy1.nifi.apache.org";
+
+ @Test
+ public void testShouldBuildProxyChain() {
+ final NiFiUser mockProxy1 = createMockNiFiUser(SAFE_USER_NAME_PROXY_1, null, false);
+ final NiFiUser mockJohn = createMockNiFiUser(SAFE_USER_NAME_JOHN, mockProxy1, false);
+
+ final List<String> proxiedEntitiesChain = NiFiUserUtils.buildProxiedEntitiesChain(mockJohn);
+ logger.info(String.format("Proxied entities chain: %s", proxiedEntitiesChain));
+
+ assertEquals(proxiedEntitiesChain, Arrays.asList(SAFE_USER_NAME_JOHN, SAFE_USER_NAME_PROXY_1));
+ }
+
+ @Test
+ public void testShouldBuildProxyChainFromSingleUser() {
+ final NiFiUser mockJohn = createMockNiFiUser(SAFE_USER_NAME_JOHN, null, false);
+
+ final List<String> proxiedEntitiesChain = NiFiUserUtils.buildProxiedEntitiesChain(mockJohn);
+
+ assertEquals(proxiedEntitiesChain, Arrays.asList(SAFE_USER_NAME_JOHN));
+ }
+
+ @Test
+ public void testShouldBuildProxyChainFromAnonymousUser() throws Exception {
+ final NiFiUser mockProxy1 = createMockNiFiUser(SAFE_USER_NAME_PROXY_1, null, false);
+ final NiFiUser mockAnonymous = createMockNiFiUser("anonymous", mockProxy1, true);
+
+ final List<String> proxiedEntitiesChain = NiFiUserUtils.buildProxiedEntitiesChain(mockAnonymous);
+ logger.info(String.format("Proxied entities chain: %s", proxiedEntitiesChain));
+
+ assertEquals(proxiedEntitiesChain, Arrays.asList("", SAFE_USER_NAME_PROXY_1));
+ }
+
+ @Test
+ public void testBuildProxyChainFromNullUserShouldBeEmpty() {
+ final List<String> proxiedEntitiesChain = NiFiUserUtils.buildProxiedEntitiesChain(null);
+ logger.info(String.format("Proxied entities chain: %s", proxiedEntitiesChain));
+
+ assertEquals(proxiedEntitiesChain, Collections.EMPTY_LIST);
+ }
+
+ private NiFiUser createMockNiFiUser(final String identity, final NiFiUser chain, final boolean isAnonymous) {
+ final NiFiUser mockUser = mock(NiFiUser.class);
+ when(mockUser.getIdentity()).thenReturn(identity);
+ when(mockUser.getChain()).thenReturn(chain);
+ when(mockUser.isAnonymous()).thenReturn(isAnonymous);
+ return mockUser;
+ }
+}