Skip to content
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

NIFI-14059 - add properties needed to use Kafka authentication mechan… #9607

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

NIFI-14059 - add properties needed to use Kafka authentication mechan… #9607

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8dfa7c5
NIFI-14059 - add properties needed to use Kafka authentication mechan…
greyp9 Dec 31, 2024
f045b0a
NIFI-14059 - Kafka/KerberosUserService compatibility
greyp9 Jan 3, 2025
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
15 changes: 13 additions & 2 deletions ...-kafka-3-service/src/main/java/org/apache/nifi/kafka/service/Kafka3ConnectionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
import org.apache.nifi.kafka.shared.property.provider.KafkaPropertyProvider;
import org.apache.nifi.kafka.shared.property.provider.StandardKafkaPropertyProvider;
import org.apache.nifi.kafka.shared.transaction.TransactionIdSupplier;
import org.apache.nifi.kerberos.SelfContainedKerberosUserService;
import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.ssl.SSLContextService;
Expand All @@ -70,6 +71,7 @@

import static org.apache.nifi.components.ConfigVerificationResult.Outcome.FAILED;
import static org.apache.nifi.components.ConfigVerificationResult.Outcome.SUCCESSFUL;
import static org.apache.nifi.kafka.shared.component.KafkaClientComponent.KERBEROS_SERVICE_NAME;
import static org.apache.nifi.kafka.shared.property.KafkaClientProperty.SSL_KEYSTORE_LOCATION;
import static org.apache.nifi.kafka.shared.property.KafkaClientProperty.SSL_KEYSTORE_PASSWORD;
import static org.apache.nifi.kafka.shared.property.KafkaClientProperty.SSL_KEYSTORE_TYPE;
Expand Down Expand Up @@ -146,6 +148,14 @@ public class Kafka3ConnectionService extends AbstractControllerService implement
)
.build();

public static final PropertyDescriptor SELF_CONTAINED_KERBEROS_USER_SERVICE = new PropertyDescriptor.Builder()
.name("kerberos-user-service")
.displayName("Kerberos User Service")
.description("Service supporting user authentication with Kerberos")
.identifiesControllerService(SelfContainedKerberosUserService.class)
.required(false)
.build();

public static final PropertyDescriptor SSL_CONTEXT_SERVICE = new PropertyDescriptor.Builder()
.name("SSL Context Service")
.description("Service supporting SSL communication with Kafka brokers")
Expand Down Expand Up @@ -220,6 +230,8 @@ public class Kafka3ConnectionService extends AbstractControllerService implement
SASL_MECHANISM,
SASL_USERNAME,
SASL_PASSWORD,
SELF_CONTAINED_KERBEROS_USER_SERVICE,
KERBEROS_SERVICE_NAME,
SSL_CONTEXT_SERVICE,
TRANSACTION_ISOLATION_LEVEL,
MAX_POLL_RECORDS,
Expand Down Expand Up @@ -272,8 +284,7 @@ public KafkaConsumerService getConsumerService(final PollingContext pollingConte
consumer.subscribe(topics);
}

final Kafka3ConsumerService consumerService = new Kafka3ConsumerService(getLogger(), consumer, subscription, pollingContext.getMaxUncommittedTime());
return consumerService;
return new Kafka3ConsumerService(getLogger(), consumer, subscription, pollingContext.getMaxUncommittedTime());
}

private Subscription createSubscription(final PollingContext pollingContext) {
Expand Down
Loading