pvillard31 commented on code in PR #11854: URL: https://github.com/apache/nifi/pull/11854#discussion_r4380779576
########## nifi-commons/nifi-kubernetes-client/src/main/java/org/apache/nifi/kubernetes/client/KubernetesHttpClientFactory.java: ########## @@ -0,0 +1,135 @@ +/* + * 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.kubernetes.client; + +import io.fabric8.kubernetes.client.Config; +import io.fabric8.kubernetes.client.ConfigBuilder; +import io.fabric8.kubernetes.client.KubernetesClientException; +import io.fabric8.kubernetes.client.http.HttpClient; +import io.fabric8.kubernetes.client.internal.CertUtils; +import io.fabric8.kubernetes.client.jdkhttp.JdkHttpClientFactory; +import io.fabric8.kubernetes.client.utils.Utils; +import org.apache.nifi.security.ssl.PemCertificateKeyStoreBuilder; +import org.apache.nifi.security.ssl.StandardTrustManagerBuilder; + +import java.io.InputStream; +import java.security.KeyStore; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509ExtendedTrustManager; + +/** + * Kubernetes HTTP Client Factory that builds the SSL Context from the configured Certificate Authority using default Key Store Type + */ +public final class KubernetesHttpClientFactory extends JdkHttpClientFactory { + + /** Priority higher than the Fabric8 JDK implementation, which uses the interface default of 0 */ + private static final int PRIORITY = 1; + + /** + * Get factory priority indicating precedence over the default Kubernetes Client implementations + * + * @return factory priority + */ + @Override + public int priority() { + return PRIORITY; + } + + /** + * Create an HTTP Client Builder configured with an SSL Context containing a Trust Manager built from the configured + * Certificate Authority, or the default builder when the default SSL Context handling is required + * + * @param config Kubernetes Client configuration + * @return HTTP Client Builder + */ + @Override + public HttpClient.Builder newBuilder(final Config config) { + final HttpClient.Builder builder; + + if (isDefaultSslContextRequired(config)) { + builder = super.newBuilder(config); + } else { + builder = super.newBuilder(getConfigWithoutCertificateAuthority(config)); + + final TrustManager[] trustManagers = getTrustManagers(config); + builder.sslContext(null, trustManagers); + } + + return builder; + } + + /** + * Determine whether the default SSL Context handling is required instead of the Certificate Authority Trust + * Managers built from PEM certificates + * + * @param config Kubernetes Client configuration + * @return whether the default SSL Context handling is required + */ + static boolean isDefaultSslContextRequired(final Config config) { + final boolean certificateAuthorityNotConfigured = Utils.isNullOrEmpty(config.getCaCertData()) && Utils.isNullOrEmpty(config.getCaCertFile()); + // Client Certificates require default SSLContext handling to support different types of Private Keys + final boolean clientCertificateConfigured = Utils.isNotNullOrEmpty(config.getClientCertData()) || Utils.isNotNullOrEmpty(config.getClientCertFile()); + + return config.isTrustCerts() || certificateAuthorityNotConfigured || clientCertificateConfigured; Review Comment: Should isDefaultSslContextRequired also return true when config.getTrustStoreFile() is set? In fabric8, SSLUtils.trustManagers(config) passes getTrustStoreFile() and getTrustStorePassphrase() to CertUtils.createTrustStore. That method loads the configured trust store file. If no file is configured, it loads the JVM default trust store (javax.net.ssl.trustStore or the cacerts file under java.home). Then it adds the PEM CA certificates to that store. This new path builds a trust store with only the CA certificates, so a configured trust store file and the default JVM trust anchors are no longer used when a CA is present. Should we keep the default fabric8 handling when a trust store file is configured, so this does not change silently for those users? -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
