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 1f2820a39a NIFI-10119 Upgraded test hadoop-minikdc from 3.1.0 to 3.3.3
1f2820a39a is described below
commit 1f2820a39a3720b25bf0e19f07e83da58fdfa639
Author: UcanInfosec <[email protected]>
AuthorDate: Wed Jun 15 09:49:25 2022 -0400
NIFI-10119 Upgraded test hadoop-minikdc from 3.1.0 to 3.3.3
- Corrected JUnit 5 Assetions usage in KerberosUserIT
This closes #6129
Signed-off-by: David Handermann <[email protected]>
---
nifi-commons/nifi-security-kerberos/pom.xml | 2 +-
.../apache/nifi/security/krb/KerberosUserIT.java | 35 ++++++++++------------
2 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/nifi-commons/nifi-security-kerberos/pom.xml
b/nifi-commons/nifi-security-kerberos/pom.xml
index 96b985ab21..7830c03f00 100644
--- a/nifi-commons/nifi-security-kerberos/pom.xml
+++ b/nifi-commons/nifi-security-kerberos/pom.xml
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minikdc</artifactId>
- <version>3.1.0</version>
+ <version>3.3.3</version>
<scope>test</scope>
<exclusions>
<exclusion>
diff --git
a/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/KerberosUserIT.java
b/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/KerberosUserIT.java
index a7a3cb1032..1fbf89dcac 100644
---
a/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/KerberosUserIT.java
+++
b/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/KerberosUserIT.java
@@ -17,7 +17,6 @@
package org.apache.nifi.security.krb;
import org.apache.nifi.logging.ComponentLog;
-import org.apache.nifi.processor.ProcessContext;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
@@ -26,7 +25,6 @@ import org.mockito.Mockito;
import javax.security.auth.Subject;
import javax.security.auth.kerberos.KerberosPrincipal;
import javax.security.auth.kerberos.KerberosTicket;
-import javax.security.auth.login.LoginException;
import java.io.File;
import java.nio.file.Path;
import java.security.AccessControlContext;
@@ -38,9 +36,9 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.assertThrows;
public class KerberosUserIT {
@@ -77,23 +75,23 @@ public class KerberosUserIT {
}
@Test
- public void testKeytabUserSuccessfulLoginAndLogout() throws LoginException
{
+ public void testKeytabUserSuccessfulLoginAndLogout() {
// perform login for user1
- final KerberosUser user1 = new
KerberosKeytabUser(principal1.getName(),
principal1KeytabFile.getAbsolutePath());
+ final KerberosKeytabUser user1 = new
KerberosKeytabUser(principal1.getName(),
principal1KeytabFile.getAbsolutePath());
user1.login();
// perform login for user2
- final KerberosUser user2 = new
KerberosKeytabUser(principal2.getName(),
principal2KeytabFile.getAbsolutePath());
+ final KerberosKeytabUser user2 = new
KerberosKeytabUser(principal2.getName(),
principal2KeytabFile.getAbsolutePath());
user2.login();
// verify user1 Subject only has user1 principal
- final Subject user1Subject = ((KerberosKeytabUser) user1).getSubject();
+ final Subject user1Subject = user1.getSubject();
final Set<Principal> user1SubjectPrincipals =
user1Subject.getPrincipals();
assertEquals(1, user1SubjectPrincipals.size());
assertEquals(principal1.getName(),
user1SubjectPrincipals.iterator().next().getName());
// verify user2 Subject only has user2 principal
- final Subject user2Subject = ((KerberosKeytabUser) user2).getSubject();
+ final Subject user2Subject = user2.getSubject();
final Set<Principal> user2SubjectPrincipals =
user2Subject.getPrincipals();
assertEquals(1, user2SubjectPrincipals.size());
assertEquals(principal2.getName(),
user2SubjectPrincipals.iterator().next().getName());
@@ -115,17 +113,17 @@ public class KerberosUserIT {
public void testKeytabLoginWithUnknownPrincipal() {
final String unknownPrincipal = "doesnotexist@" + kdc.getRealm();
final KerberosUser user1 = new KerberosKeytabUser(unknownPrincipal,
principal1KeytabFile.getAbsolutePath());
- assertThrows(Exception.class, () -> user1.login());
+ assertThrows(Exception.class, user1::login);
}
@Test
- public void testPasswordUserSuccessfulLoginAndLogout() throws
LoginException {
+ public void testPasswordUserSuccessfulLoginAndLogout() {
// perform login for user
- final KerberosUser user = new
KerberosPasswordUser(principal3.getName(), principal3Password);
+ final KerberosPasswordUser user = new
KerberosPasswordUser(principal3.getName(), principal3Password);
user.login();
// verify user Subject only has user principal
- final Subject userSubject = ((KerberosPasswordUser) user).getSubject();
+ final Subject userSubject = user.getSubject();
final Set<Principal> userSubjectPrincipals =
userSubject.getPrincipals();
assertEquals(1, userSubjectPrincipals.size());
assertEquals(principal3.getName(),
userSubjectPrincipals.iterator().next().getName());
@@ -144,11 +142,11 @@ public class KerberosUserIT {
public void testPasswordUserLoginWithInvalidPassword() {
// perform login for user
final KerberosUser user = new KerberosPasswordUser("user3", "NOT THE
PASSWORD");
- assertThrows(LoginException.class, () -> user.login());
+ assertThrows(KerberosLoginException.class, user::login);
}
@Test
- public void testCheckTGTAndRelogin() throws LoginException,
InterruptedException {
+ public void testCheckTGTAndRelogin() throws InterruptedException {
final KerberosUser user1 = new
KerberosKeytabUser(principal1.getName(),
principal1KeytabFile.getAbsolutePath());
user1.login();
@@ -165,7 +163,7 @@ public class KerberosUserIT {
break;
}
}
- assertEquals(true, performedRelogin);
+ assertTrue(performedRelogin);
Subject subject = user1.doAs((PrivilegedAction<Subject>) () -> {
AccessControlContext context = AccessController.getContext();
@@ -196,11 +194,10 @@ public class KerberosUserIT {
return null;
};
- final ProcessContext context = Mockito.mock(ProcessContext.class);
final ComponentLog logger = Mockito.mock(ComponentLog.class);
// create the action to test and execute it
- final KerberosAction kerberosAction = new KerberosAction<>(user1,
privilegedAction, logger);
+ final KerberosAction<Void> kerberosAction = new
KerberosAction<>(user1, privilegedAction, logger);
kerberosAction.execute();
// if the result holder has the string success then we know the action
executed
