From dd2e11c8e877b35661dc2c7b9e722a6ba0c53084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magnus=20Le=C3=9Fmann=20=28=40MarkL4YG=29?= Date: Sat, 23 Nov 2024 12:41:36 +0100 Subject: [PATCH] feat: Move OpenSSL output to custom logger --- .../openssl/OpenSSLCertificateCreator.java | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/src/main/java/de/mlessmann/certassist/openssl/OpenSSLCertificateCreator.java b/src/main/java/de/mlessmann/certassist/openssl/OpenSSLCertificateCreator.java index 18730c3..9b5d06e 100644 --- a/src/main/java/de/mlessmann/certassist/openssl/OpenSSLCertificateCreator.java +++ b/src/main/java/de/mlessmann/certassist/openssl/OpenSSLCertificateCreator.java @@ -1,6 +1,7 @@ package de.mlessmann.certassist.openssl; import static de.mlessmann.certassist.Constants.CERTASSIST_TMP_PREFIX; +import static org.slf4j.LoggerFactory.getLogger; import de.mlessmann.certassist.DeleteRecursiveFileVisitor; import de.mlessmann.certassist.ExecutableResolver; @@ -25,6 +26,7 @@ import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; import org.springframework.lang.NonNull; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -37,6 +39,7 @@ import org.zeroturnaround.exec.stream.slf4j.Slf4jStream; @Slf4j public class OpenSSLCertificateCreator { + private static final Logger openSSLLogger = getLogger("OpenSSL-Logger"); public static final String OPENSSL_CERT_SUBJECT_TEMPLATE = "/C=ISO-COUNTRY/ST=STATE/L=LOCALITY/O=ORGANIZATION/CN=COMMON-NAME"; private static final String CSR_EXT_TEMPLATE = @@ -141,8 +144,8 @@ public class OpenSSLCertificateCreator { Integer.toString(request.getRequestedKeyLength()) ) .environment("KEY_PASS", filePassword) - .redirectOutput(Slf4jStream.ofCaller().asDebug()) - .redirectError(Slf4jStream.ofCaller().asError()) + .redirectOutput(Slf4jStream.of(openSSLLogger).asDebug()) + .redirectError(Slf4jStream.of(openSSLLogger).asError()) .start(); keygenProc.getFuture().get(); } catch (IOException e) { @@ -181,8 +184,8 @@ public class OpenSSLCertificateCreator { certSubject ) .environment("KEY_PASS", certPassword) - .redirectOutput(Slf4jStream.ofCaller().asDebug()) - .redirectError(Slf4jStream.ofCaller().asError()) + .redirectOutput(Slf4jStream.of(openSSLLogger).asDebug()) + .redirectError(Slf4jStream.of(openSSLLogger).asError()) .start(); certGenProc.getFuture().get(); } catch (IOException e) { @@ -218,8 +221,8 @@ public class OpenSSLCertificateCreator { certSubject ) .environment("KEY_PASS", certPassword) - .redirectOutput(Slf4jStream.ofCaller().asDebug()) - .redirectError(Slf4jStream.ofCaller().asError()) + .redirectOutput(Slf4jStream.of(openSSLLogger).asDebug()) + .redirectError(Slf4jStream.of(openSSLLogger).asError()) .start(); certGenProc.getFuture().get(); } catch (IOException e) { @@ -264,8 +267,8 @@ public class OpenSSLCertificateCreator { StartedProcess verifyCommand = new ProcessExecutor() .command(resolveOpenSSL(), "verify", "-CAfile", tempTrustedBundle.toString(), fullChainFile.toString()) - .redirectOutput(Slf4jStream.ofCaller().asError()) - .redirectError(Slf4jStream.ofCaller().asError()) + .redirectOutput(Slf4jStream.of(openSSLLogger).asError()) + .redirectError(Slf4jStream.of(openSSLLogger).asError()) .start(); var verifyResult = verifyCommand.getFuture().get(); return verifyResult.getExitValue() == 0; @@ -316,8 +319,8 @@ public class OpenSSLCertificateCreator { "pass:" + passphrase, "-noout" ) - .redirectOutput(Slf4jStream.ofCaller().asError()) - .redirectError(Slf4jStream.ofCaller().asError()) + .redirectOutput(Slf4jStream.of(openSSLLogger).asError()) + .redirectError(Slf4jStream.of(openSSLLogger).asError()) .start(); var verifyResult = verifyCommand.getFuture().get(); return verifyResult.getExitValue() == 0; @@ -387,8 +390,8 @@ public class OpenSSLCertificateCreator { "-extfile", extFile.toString() ) - .redirectOutput(Slf4jStream.ofCaller().asDebug()) - .redirectError(Slf4jStream.ofCaller().asError()) + .redirectOutput(Slf4jStream.of(openSSLLogger).asDebug()) + .redirectError(Slf4jStream.of(openSSLLogger).asError()) .start(); certGenProc.getFuture().get(); } catch (IOException e) { @@ -405,7 +408,7 @@ public class OpenSSLCertificateCreator { StartedProcess fingerprintProc = new ProcessExecutor() .command(resolveOpenSSL(), "x509", "-in", certificate.toString(), "-noout", "-fingerprint") .readOutput(true) - .redirectError(Slf4jStream.ofCaller().asError()) + .redirectError(Slf4jStream.of(openSSLLogger).asError()) .start(); var fingerprintResult = fingerprintProc.getFuture().get(); String output = fingerprintResult.getOutput().getUTF8(); @@ -466,7 +469,7 @@ public class OpenSSLCertificateCreator { "lname" ) .readOutput(true) - .redirectError(Slf4jStream.ofCaller().asError()) + .redirectError(Slf4jStream.of(openSSLLogger).asError()) .start(); var infoResult = infoProc.getFuture().get(); String output = infoResult.getOutput().getUTF8(); @@ -490,7 +493,7 @@ public class OpenSSLCertificateCreator { StartedProcess versionProc = new ProcessExecutor() .command(path, "version") .readOutput(true) - .redirectError(Slf4jStream.ofCaller().asError()) + .redirectError(Slf4jStream.of(openSSLLogger).asError()) .start(); var versionResult = versionProc.getFuture().get(); if (versionResult.getExitValue() != 0) {