gresockj commented on a change in pull request #5034: URL: https://github.com/apache/nifi/pull/5034#discussion_r623166495
########## File path: nifi-commons/nifi-vault-utils/src/main/java/org/apache/nifi/vault/StandardVaultCommunicationService.java ########## @@ -0,0 +1,90 @@ +/* + * 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.vault; + +import org.apache.nifi.util.FormatUtils; +import org.apache.nifi.vault.config.VaultConfiguration; +import org.apache.nifi.vault.config.VaultProperties; +import org.springframework.vault.authentication.SimpleSessionManager; +import org.springframework.vault.client.ClientHttpRequestFactoryFactory; +import org.springframework.vault.core.VaultTemplate; +import org.springframework.vault.support.Ciphertext; +import org.springframework.vault.support.ClientOptions; +import org.springframework.vault.support.Plaintext; +import org.springframework.vault.support.SslConfiguration; + +import java.time.Duration; +import java.util.Optional; +import java.util.concurrent.TimeUnit; + +/** + * Implements the VaultCommunicationService using Spring Vault + */ +public class StandardVaultCommunicationService implements VaultCommunicationService { + private static final String HTTPS = "https"; + + private final VaultConfiguration vaultConfiguration; + private final VaultTemplate vaultTemplate; + + /** + * Creates a VaultCommunicationService that uses Spring Vault. + * @param vaultProperties Properties to configure the service + * @throws VaultConfigurationException If the configuration was invalid + */ + public StandardVaultCommunicationService(final VaultProperties vaultProperties) throws VaultConfigurationException { + this.vaultConfiguration = new VaultConfiguration(vaultProperties); + + final SslConfiguration sslConfiguration = vaultProperties.getUri().contains(HTTPS) + ? vaultConfiguration.sslConfiguration() : SslConfiguration.unconfigured(); + + final ClientOptions clientOptions = getClientOptions(vaultProperties); + + vaultTemplate = new VaultTemplate(vaultConfiguration.vaultEndpoint(), + ClientHttpRequestFactoryFactory.create(clientOptions, sslConfiguration), + new SimpleSessionManager(vaultConfiguration.clientAuthentication())); + } + + private static ClientOptions getClientOptions(VaultProperties vaultProperties) { + final ClientOptions clientOptions = new ClientOptions(); + Duration readTimeoutDuration = clientOptions.getReadTimeout(); + Duration connectionTimeoutDuration = clientOptions.getConnectionTimeout(); + final Optional<String> configuredReadTimeout = vaultProperties.getReadTimeout(); + if (configuredReadTimeout.isPresent()) { + readTimeoutDuration = getDuration(configuredReadTimeout.get()); + } + final Optional<String> configuredConnectionTimeout = vaultProperties.getConnectionTimeout(); + if (configuredConnectionTimeout.isPresent()) { + connectionTimeoutDuration = getDuration(configuredConnectionTimeout.get()); + } + return new ClientOptions(connectionTimeoutDuration, readTimeoutDuration); + } + + private static Duration getDuration(String formattedDuration) { + final double duration = FormatUtils.getPreciseTimeDuration(formattedDuration, TimeUnit.MILLISECONDS); + return Duration.ofMillis(Double.valueOf(duration).longValue()); + } + + @Override + public String encrypt(String transitKey, byte[] plainText) { + return vaultTemplate.opsForTransit().encrypt(transitKey, Plaintext.of(plainText)).getCiphertext(); Review comment: To reduce the overhead, we could store VaultTransitTemplate as a field and initialize it in the constructor. The idea going forward was to continue to add interface methods and other VaultTemplate calls like vaultTemplate.opsForKeyValue(...), which returns VaultKeyValueOperations. So we could either go with storing all of these *Operations objects as fields in the StandardVaultCommunicationService, or go with separate interfaces and implementations. I could see benefits of either approach, any strong opinions either way? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
