Apache/nifi
1
0
Fork 0
mirror of https://github.com/apache/nifi.git synced 2025-02-28 22:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

NIFI-10882 Set credentials for ElasticSearchClientService based on AuthorizationScheme

Browse Source 
This closes #6722

Signed-off-by: David Handermann <exceptionfactory@apache.org>
This commit is contained in:
Chris Sampson 2022-11-28 10:25:19 +00:00 committed by exceptionfactory
parent e8d554d9b4
commit 43a8b858ca
No known key found for this signature in database
GPG Key ID: 29B6A52D2AAE8DBA
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchClientServiceImpl.java
View File

@ -249,6 +249,8 @@ public class ElasticSearchClientServiceImpl extends AbstractControllerService im
}
private RestClient setupClient(final ConfigurationContext context) throws MalformedURLException, InitializationException {
final AuthorizationScheme authorizationScheme = AuthorizationScheme.valueOf(context.getProperty(AUTHORIZATION_SCHEME).getValue());
final String hosts = context.getProperty(HTTP_HOSTS).evaluateAttributeExpressions().getValue();
final String[] hostsSplit = hosts.split(",\\s*");
this.url = hostsSplit[0];
@ -261,7 +263,7 @@ public class ElasticSearchClientServiceImpl extends AbstractControllerService im
final String apiKey = context.getProperty(API_KEY).getValue();
final Integer connectTimeout = context.getProperty(CONNECT_TIMEOUT).asInteger();
final Integer readTimeout = context.getProperty(SOCKET_TIMEOUT).asInteger();
final Integer socketTimeout = context.getProperty(SOCKET_TIMEOUT).asInteger();
final ProxyConfigurationService proxyConfigurationService = context.getProperty(PROXY_CONFIGURATION_SERVICE).asControllerService(ProxyConfigurationService.class);
@ -287,11 +289,11 @@ public class ElasticSearchClientServiceImpl extends AbstractControllerService im
}
CredentialsProvider credentialsProvider = null;
if (username != null && password != null) {
if (AuthorizationScheme.BASIC == authorizationScheme && username != null && password != null) {
credentialsProvider = addCredentials(null, AuthScope.ANY, username, password);
}
if (apiKeyId != null && apiKey != null) {
if (AuthorizationScheme.API_KEY == authorizationScheme && apiKeyId != null && apiKey != null) {
httpClientBuilder.setDefaultHeaders(Collections.singletonList(createApiKeyAuthorizationHeader(apiKeyId, apiKey)));
}
@ -313,7 +315,7 @@ public class ElasticSearchClientServiceImpl extends AbstractControllerService im
})
.setRequestConfigCallback(requestConfigBuilder -> {
requestConfigBuilder.setConnectTimeout(connectTimeout);
requestConfigBuilder.setSocketTimeout(readTimeout);
requestConfigBuilder.setSocketTimeout(socketTimeout);
return requestConfigBuilder;
});