Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-8463: Support custom SASL protocol name in PutKudu (#5023) 

As of KUDU-1884, Kudu supports custom Kerberos principals on server-side
and custom SASL protocol (service) names on client-side which must match
the SPN base, i.e. if the SPN is kudu/_HOST, SASL protocol name *must*
be "kudu" in the client to be able to connect to the cluster.

This patch adds the ability to configure this in the PutKudu processor.

Signed-off-by: Attila Bukor <abukor@apache.org>
This commit is contained in:
Attila Bukor 2021-06-24 23:42:04 +02:00 committed by GitHub
parent 5ebbe0028b
commit 27c35c8c42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/src/main/java/org/apache/nifi/processors/kudu/AbstractKuduProcessor.java
View File

@ -139,6 +139,16 @@ public abstract class AbstractKuduProcessor extends AbstractProcessor {
.addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR)
.build();
static final PropertyDescriptor KUDU_SASL_PROTOCOL_NAME = new Builder()
.name("kudu-sasl-protocol-name")
.displayName("Kudu SASL Protocol Name")
.description("The SASL protocol name to use for authenticating via Kerberos. Must match the service principal name.")
.required(false)
.defaultValue("kudu")
.addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
private volatile KuduClient kuduClient;
private final ReadWriteLock kuduClientReadWriteLock = new ReentrantReadWriteLock();
private final Lock kuduClientReadLock = kuduClientReadWriteLock.readLock();
@ -200,6 +210,7 @@ public abstract class AbstractKuduProcessor extends AbstractProcessor {
final String masters = context.getProperty(KUDU_MASTERS).evaluateAttributeExpressions().getValue();
final int operationTimeout = context.getProperty(KUDU_OPERATION_TIMEOUT_MS).evaluateAttributeExpressions().asTimePeriod(TimeUnit.MILLISECONDS).intValue();
final int adminOperationTimeout = context.getProperty(KUDU_KEEP_ALIVE_PERIOD_TIMEOUT_MS).evaluateAttributeExpressions().asTimePeriod(TimeUnit.MILLISECONDS).intValue();
final String saslProtocolName = context.getProperty(KUDU_SASL_PROTOCOL_NAME).evaluateAttributeExpressions().getValue();
final int workerCount = context.getProperty(WORKER_COUNT).asInteger();
// Create Executor following approach of Executors.newCachedThreadPool() using worker count as maximum pool size
@ -217,6 +228,7 @@ public abstract class AbstractKuduProcessor extends AbstractProcessor {
return new KuduClient.KuduClientBuilder(masters)
.defaultOperationTimeoutMs(operationTimeout)
.defaultSocketReadTimeoutMs(adminOperationTimeout)
.saslProtocolName(saslProtocolName)
.workerCount(workerCount)
.nioExecutor(nioExecutor)
.build();

1
nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/src/main/java/org/apache/nifi/processors/kudu/PutKudu.java
View File

@ -300,6 +300,7 @@ public class PutKudu extends AbstractKuduProcessor {
properties.add(KUDU_OPERATION_TIMEOUT_MS);
properties.add(KUDU_KEEP_ALIVE_PERIOD_TIMEOUT_MS);
properties.add(WORKER_COUNT);
properties.add(KUDU_SASL_PROTOCOL_NAME);
return properties;
}

5
nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/src/test/java/org/apache/nifi/processors/kudu/ITPutKudu.java
View File

@ -68,6 +68,8 @@ public class ITPutKudu {
new MiniKuduCluster.MiniKuduClusterBuilder()
.addMasterServerFlag("--use_hybrid_clock=false")
.addTabletServerFlag("--use_hybrid_clock=false")
.enableKerberos()
.principal("oryx")
);
private TestRunner testRunner;
@ -99,6 +101,9 @@ public class ITPutKudu {
testRunner.setProperty(PutKudu.LOWERCASE_FIELD_NAMES, "false");
testRunner.setProperty(PutKudu.RECORD_READER, "mock-reader-factory");
testRunner.setProperty(PutKudu.INSERT_OPERATION, OperationType.INSERT_IGNORE.toString());
testRunner.setProperty(PutKudu.KERBEROS_PRINCIPAL, "test-user");
testRunner.setProperty(PutKudu.KERBEROS_PASSWORD, "test-user");
testRunner.setProperty(PutKudu.KUDU_SASL_PROTOCOL_NAME, "oryx");
}
private void createKuduTable() throws KuduException {

2
nifi-nar-bundles/nifi-kudu-bundle/pom.xml
View File

@ -29,7 +29,7 @@
<properties>
<exclude.tests>None</exclude.tests>
<kudu.version>1.14.0</kudu.version>
<kudu.version>1.15.0</kudu.version>
</properties>
<modules>