Github user brosander commented on a diff in the pull request:
https://github.com/apache/nifi/pull/695#discussion_r72882052
--- Diff:
nifi-toolkit/nifi-toolkit-tls/src/main/java/org/apache/nifi/toolkit/tls/service/TlsCertificateAuthorityClient.java
---
@@ -0,0 +1,158 @@
+/*
+ * 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.toolkit.tls.service;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.nifi.toolkit.tls.TlsToolkitMain;
+import org.apache.nifi.toolkit.tls.configuration.TlsClientConfig;
+import org.apache.nifi.toolkit.tls.configuration.TlsConfig;
+import org.apache.nifi.toolkit.tls.util.InputStreamFactory;
+import org.apache.nifi.toolkit.tls.util.OutputStreamFactory;
+import org.apache.nifi.toolkit.tls.util.PasswordUtil;
+import org.apache.nifi.toolkit.tls.util.TlsHelper;
+import org.apache.nifi.util.StringUtils;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.security.KeyPair;
+import java.security.KeyStore;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.security.cert.X509Certificate;
+
+/**
+ * Client that will generate a CSR and submit to a CA, writing out the
results to a keystore and truststore along with a config file if successful
+ */
+public class TlsCertificateAuthorityClient {
+ private final File configFile;
+ private final TlsHelper tlsHelper;
+ private final PasswordUtil passwordUtil;
+ private final TlsClientConfig tlsClientConfig;
+ private final OutputStreamFactory outputStreamFactory;
+ private final ObjectMapper objectMapper;
+ private final TlsCertificateSigningRequestPerformer
tlsCertificateSigningRequestPerformer;
+
+ public TlsCertificateAuthorityClient(File configFile) throws
IOException, NoSuchAlgorithmException {
+ this(configFile, FileInputStream::new, FileOutputStream::new);
+ }
+
+ public TlsCertificateAuthorityClient(File configFile,
InputStreamFactory inputStreamFactory, OutputStreamFactory outputStreamFactory)
+ throws IOException, NoSuchAlgorithmException {
+ this(configFile, outputStreamFactory, new
ObjectMapper().readValue(inputStreamFactory.create(configFile),
TlsClientConfig.class));
+ }
+
+ public TlsCertificateAuthorityClient(File configFile,
OutputStreamFactory outputStreamFactory, TlsClientConfig tlsClientConfig)
+ throws NoSuchAlgorithmException {
+ this.configFile = configFile;
+ this.objectMapper = new ObjectMapper();
+ this.tlsClientConfig = tlsClientConfig;
+ this.tlsHelper = tlsClientConfig.createTlsHelper();
+ this.passwordUtil = new PasswordUtil(new SecureRandom());
+ this.outputStreamFactory = outputStreamFactory;
+ this.tlsCertificateSigningRequestPerformer =
tlsClientConfig.createCertificateSigningRequestPerformer();
+ }
+
+ public static void main(String[] args) throws Exception {
+ TlsHelper.addBouncyCastleProvider();
+ if (args.length != 1 || StringUtils.isEmpty(args[0])) {
+ throw new Exception("Expected config file as only argument");
+ }
+ TlsCertificateAuthorityClient tlsCertificateAuthorityClient = new
TlsCertificateAuthorityClient(new File(args[0]));
+ if (tlsCertificateAuthorityClient.needsRun()) {
+
tlsCertificateAuthorityClient.generateCertificateAndGetItSigned();
+ }
+ }
+
+ public boolean needsRun() {
+ return !(new File(tlsClientConfig.getKeyStore()).exists() && new
File(tlsClientConfig.getTrustStore()).exists());
+ }
+
+ public void generateCertificateAndGetItSigned() throws Exception {
+ generateCertificateAndGetItSigned(null);
+ }
+
+ public void generateCertificateAndGetItSigned(String certificateFile)
throws Exception {
+ KeyPair keyPair = tlsHelper.generateKeyPair();
+
+ String keyStoreType = tlsClientConfig.getKeyStoreType();
+ if (StringUtils.isEmpty(keyStoreType)) {
+ keyStoreType = TlsConfig.DEFAULT_KEY_STORE_TYPE;
+ tlsClientConfig.setKeyStoreType(keyStoreType);
+ }
+
+ KeyStore keyStore = tlsHelper.createKeyStore(keyStoreType);
+ String keyPassword = tlsClientConfig.getKeyPassword();
+ char[] passphrase;
+ if (TlsHelper.PKCS12.equals(keyStoreType)) {
+ passphrase = null;
+ tlsClientConfig.setKeyPassword(null);
+ } else {
+ if (StringUtils.isEmpty(keyPassword)) {
+ keyPassword = passwordUtil.generatePassword();
+ tlsClientConfig.setKeyPassword(keyPassword);
+ }
+ passphrase = keyPassword.toCharArray();
+ }
+ X509Certificate[] certificates =
tlsCertificateSigningRequestPerformer.perform(objectMapper, keyPair);
+ tlsHelper.addToKeyStore(keyStore, keyPair,
TlsToolkitMain.NIFI_KEY, passphrase, certificates);
+
+ String keyStorePassword = tlsClientConfig.getKeyStorePassword();
+ if (StringUtils.isEmpty(keyStorePassword)) {
+ keyStorePassword = passwordUtil.generatePassword();
+ tlsClientConfig.setKeyStorePassword(keyStorePassword);
+ }
+
+ try (OutputStream outputStream = outputStreamFactory.create(new
File(tlsClientConfig.getKeyStore()))) {
+ keyStore.store(outputStream, keyStorePassword.toCharArray());
+ }
+
+ String trustStoreType = tlsClientConfig.getTrustStoreType();
+ if (StringUtils.isEmpty(trustStoreType)) {
+ trustStoreType = TlsConfig.DEFAULT_KEY_STORE_TYPE;
+ tlsClientConfig.setTrustStoreType(trustStoreType);
+ }
+
+ KeyStore trustStore = tlsHelper.createKeyStore(trustStoreType);
+ trustStore.setCertificateEntry(TlsToolkitMain.NIFI_CERT,
certificates[certificates.length - 1]);
+
+ String trustStorePassword =
tlsClientConfig.getTrustStorePassword();
+ if (StringUtils.isEmpty(trustStorePassword)) {
+ trustStorePassword = passwordUtil.generatePassword();
+ tlsClientConfig.setTrustStorePassword(trustStorePassword);
+ }
+
+ try (OutputStream outputStream = outputStreamFactory.create(new
File(tlsClientConfig.getTrustStore()))) {
+ trustStore.store(outputStream,
trustStorePassword.toCharArray());
+ }
+
+ if (!StringUtils.isEmpty(certificateFile)) {
+ try (Writer writer = new
OutputStreamWriter(outputStreamFactory.create(new File(certificateFile)))) {
--- End diff --
set umask to 177 in the shell script
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
