VedaKadam commented on a change in pull request #4670: URL: https://github.com/apache/nifi/pull/4670#discussion_r526380294
########## File path: nifi-toolkit/nifi-toolkit-tls/src/main/java/org/apache/nifi/toolkit/tls/diagnosis/TlsToolkitGetDiagnosisStandalone.java ########## @@ -0,0 +1,664 @@ +/* + * 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.diagnosis; + +import org.apache.commons.cli.CommandLineParser; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.DefaultParser; +import org.apache.commons.cli.HelpFormatter; +import org.apache.commons.cli.Option; +import org.apache.commons.cli.Options; +import org.apache.commons.cli.ParseException; +import org.apache.http.conn.util.InetAddressUtils; +import org.apache.nifi.properties.NiFiPropertiesLoader; +import org.apache.nifi.security.kms.CryptoUtils; +import org.apache.nifi.security.util.CertificateUtils; +import org.apache.nifi.security.util.KeyStoreUtils; +import org.apache.nifi.security.util.TlsException; +import org.apache.nifi.toolkit.tls.commandLine.CommandLineParseException; +import org.apache.nifi.toolkit.tls.commandLine.ExitCode; +import org.apache.nifi.toolkit.tls.util.TlsHelper; +import org.apache.nifi.util.NiFiProperties; + +import org.apache.nifi.util.StringUtils; +import org.apache.nifi.util.Tuple; +import org.bouncycastle.asn1.x500.X500Name; +import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.io.FilenameFilter; +import java.io.IOException; + +import java.net.InetAddress; +import java.net.UnknownHostException; + +import java.security.KeyStore; +import java.security.KeyStoreException; +import java.security.PublicKey; +import java.security.NoSuchAlgorithmException; +import java.security.UnrecoverableEntryException; +import java.security.cert.CertificateExpiredException; +import java.security.cert.CertificateNotYetValidException; +import java.security.cert.CertificateParsingException; +import java.security.cert.X509Certificate; +import java.security.interfaces.DSAPublicKey; +import java.security.interfaces.RSAPublicKey; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Arrays; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.ArrayList; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; + + +public class TlsToolkitGetDiagnosisStandalone { + + private static final String NIFI_PROPERTIES_ARG = "nifiProperties"; + private static final String HELP_ARG = "help"; + private static final String QUIET_ARG = "quiet"; + private static final String BOOTSTRAP_ARG = "bootstrap"; + private static final String CN = "CN"; + private static final String SAN = "SAN"; + private static final String EKU = "EKU"; + private static final String VALIDITY = "VALIDITY"; + private static final String KEYSIZE = "KEYSIZE"; + private static final String SIGN = "SIGN"; + private static final String TRUSTSTORE = "TRUSTSTORE"; + private final Options options; + + private String keystorePath; + private String keystoreType; + private KeyStore keystore; + + private String truststorePath; + private String truststoreType; + private KeyStore truststore; + + private String niFiPropertiesPath; + private String bootstrapPath; + private NiFiProperties niFiProperties; + + private static Map<String, String> createEKUMap() { + Map<String, String> orderMap = new HashMap<>(); + int count = 0; + orderMap.put("serverAuth", "1.3.6.1.5.5.7.3.1"); + orderMap.put("clientAuth", "1.3.6.1.5.5.7.3.2"); + return Collections.unmodifiableMap(orderMap); + } + + private static Map<String, String> ekuMap = createEKUMap(); + + enum Output { + CORRECT, + WRONG, + NEEDS_ATTENTION + } + + private static Map<String, Tuple<String, Output>> outputSummary = new LinkedHashMap<>(); + private static final Logger logger = LoggerFactory.getLogger(TlsToolkitGetDiagnosisStandalone.class); + + public TlsToolkitGetDiagnosisStandalone() { + this.options = buildOptions(); + } + + private static Options buildOptions() { + Options options = new Options(); + options.addOption(Option.builder("n").longOpt(NIFI_PROPERTIES_ARG).hasArg(true).argName("file").desc("This field specifies nifi.properties file name").build()); + options.addOption(Option.builder("h").longOpt(HELP_ARG).hasArg(false).desc("Show usage information (this message)").build()); + options.addOption(Option.builder("q").longOpt(QUIET_ARG).hasArg(false).desc("Suppresses log info messages").build()); + options.addOption(Option.builder("b").longOpt(BOOTSTRAP_ARG).hasArg(true).desc("Suppresses log info messages").build()); + return options; + } + + private void parseCommandLine(String[] args) throws CommandLineParseException { + CommandLineParser parser = new DefaultParser(); + + try { + CommandLine commandLine = parser.parse(options, args); + if (commandLine.hasOption(HELP_ARG)) { + printUsage(""); + System.exit(0); + } + //nifi.properties present? + if (commandLine.hasOption(NIFI_PROPERTIES_ARG)) { + niFiPropertiesPath = commandLine.getOptionValue(NIFI_PROPERTIES_ARG); + logger.info("Parsed nifi.properties path: " + niFiPropertiesPath); + + if (commandLine.hasOption(BOOTSTRAP_ARG)) { + bootstrapPath = commandLine.getOptionValue(BOOTSTRAP_ARG); + } else { + logger.info("No bootstrap.conf provided. Looking in nifi.properties directory"); + bootstrapPath = new File(niFiPropertiesPath).getParent() + "/bootstrap.conf"; + } + + logger.info("Parsed bootstrap.conf path: " + bootstrapPath); + } + + } catch (ParseException e) { + logger.error("Encountered an error while parsing command line"); + printAndThrowParsingException("Error parsing command line. (" + e.getMessage() + ")", ExitCode.ERROR_PARSING_COMMAND_LINE); + } + } + + public static void printUsage(String errorMessage) { + if (!errorMessage.isEmpty()) { + System.out.println(errorMessage); + System.out.println(); + } + HelpFormatter helpFormatter = new HelpFormatter(); + helpFormatter.setWidth(160); + helpFormatter.setOptionComparator(null); + // preserve manual ordering of options when printing instead of alphabetical + helpFormatter.printHelp(TlsToolkitGetDiagnosisStandalone.class.getCanonicalName(), buildOptions(), true); + } + + public static void printAndThrowParsingException(String errorMessage, ExitCode exitCode) throws CommandLineParseException { + printUsage(errorMessage); + throw new CommandLineParseException(errorMessage, exitCode); + } + + private static void displaySummaryReport() { + int correct = 0, wrong = 0, needsAttention = 0; + System.out.println("\n***********STANDALONE DIAGNOSIS SUMMARY***********\n"); + for (Map.Entry<String, Tuple<String, Output>> each : outputSummary.entrySet()) { + String output = each.getValue().getValue().toString(); + String type = StringUtils.rightPad(each.getKey(), 12); + System.out.println(type + " ==> " + each.getValue().getKey()); + switch (output) { + case "WRONG": + wrong++; + break; + case "CORRECT": + correct++; + break; + case "NEEDS_ATTENTION": + needsAttention++; + break; + } + } + System.out.println("\nCORRECT checks: " + correct + "/7"); + System.out.println("WRONG checks: " + wrong + "/7"); + System.out.println("NEEDS ATTENTION checks: " + needsAttention + "/7"); + System.out.println("**************************************************\n"); + } + + + public static void main(String[] args) { + TlsToolkitGetDiagnosisStandalone standalone = new TlsToolkitGetDiagnosisStandalone(); + + // TODO: If -v was added, change the logging config value + + //Parse + try { + standalone.parseCommandLine(args); + standalone.niFiProperties = standalone.loadNiFiProperties(); + } catch (CommandLineParseException e) { + System.exit(e.getExitCode().ordinal()); + } catch (IOException e) { + printUsage(e.getLocalizedMessage()); + System.exit(-1); + } + + //Get keystore and truststore path + standalone.keystorePath = standalone.niFiProperties.getProperty("nifi.security.keystore"); + standalone.truststorePath = standalone.niFiProperties.getProperty("nifi.security.truststore"); + char[] keystorePassword = standalone.niFiProperties.getProperty("nifi.security.keystorePasswd").toCharArray(); + standalone.keystoreType = standalone.niFiProperties.getProperty("nifi.security.keystoreType"); + standalone.truststoreType = standalone.niFiProperties.getProperty("nifi.security.truststoreType"); + char[] truststorePassword = standalone.niFiProperties.getProperty("nifi.security.truststorePasswd").toCharArray(); + + //Verify keystore and truststore are located at the correct file path + if ((doesFileExist(standalone.keystorePath, standalone.niFiPropertiesPath, ".jks") + && doesFileExist(standalone.truststorePath, standalone.niFiPropertiesPath, ".jks"))) { Review comment: I think for toolkit we are only using .jks . I referred this link: https://nifi.apache.org/docs/nifi-docs/html/walkthroughs.html#securing-nifi-with-provided-certificates = "PKCS12 keystores are usable by NiFi, but JKS format is handled more robustly and causes fewer edge cases. JKS keystores cannot be formed directly from PEM files, so the PKCS12 keystore serves as an intermediate form" Since this is for common deployment scenario, for now I have used only .jks keystores. This can be something to add further. Adding it as TODO. ---------------------------------------------------------------- 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: [email protected]
