chore: Add version logging for OpenSSL

This commit is contained in:
Magnus Leßmann (@MarkL4YG) 2024-11-22 20:27:50 +01:00
parent f2ed523285
commit d271be988f
4 changed files with 58 additions and 33 deletions

View file

@ -1,17 +1,16 @@
package de.mlessmann.certassist;
import static org.assertj.core.api.Assertions.assertThat;
import de.mlessmann.certassist.openssl.CertificateRequest;
import de.mlessmann.certassist.openssl.CertificateRequestExtension;
import de.mlessmann.certassist.openssl.CertificateSubject;
import de.mlessmann.certassist.service.CertificateCreationService;
import java.nio.file.Path;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import java.nio.file.Path;
import static org.assertj.core.api.Assertions.assertThat;
@SpringBootTest
public class CertificateServiceTest {
@ -20,18 +19,20 @@ public class CertificateServiceTest {
@Test
void testCanCreateCertificate() {
var request = CertificateRequest.builder()
.type(CertificateRequest.RequestType.STANDALONE_CERTIFICATE)
.subject(
CertificateSubject.builder()
.commonName("cert.creation")
.country("DE")
.state("SH")
.locality("HH")
.organization("Crazy-Cats")
)
.extension(CertificateRequestExtension.builder().alternativeNames("test2.home", "test3.home"))
.build();
var request = CertificateRequest
.builder()
.type(CertificateRequest.RequestType.STANDALONE_CERTIFICATE)
.subject(
CertificateSubject
.builder()
.commonName("cert.creation")
.country("DE")
.state("SH")
.locality("HH")
.organization("Crazy-Cats")
)
.extension(CertificateRequestExtension.builder().alternativeNames("test2.home", "test3.home"))
.build();
var cert = certificateService.createCertificate(request);
assertThat(cert).isNotNull();
assertThat(cert.getId()).isGreaterThan("0");
@ -40,8 +41,11 @@ public class CertificateServiceTest {
@Test
void testCanImportCertificate() {
Path certDir = TestOpenSSLCertificateCreator.TEST_CERT_PATH;
var importedCert = certificateService.importCertificate(certDir.resolve("x509forImport.pem"),
certDir.resolve("x509forImport.key.pem"), TestOpenSSLCertificateCreator.TEST_CERT_PASSPHRASE);
var importedCert = certificateService.importCertificate(
certDir.resolve("x509forImport.pem"),
certDir.resolve("x509forImport.key.pem"),
TestOpenSSLCertificateCreator.TEST_CERT_PASSPHRASE
);
assertThat(importedCert).isNotNull();
assertThat(importedCert.getId()).isGreaterThan("0");
}

View file

@ -66,10 +66,7 @@ class TestOpenSSLCertificateCreator {
.locality("HH")
.organization("Crazy-Cats")
)
.extension(
CertificateRequestExtension.builder()
.alternativeNames("test2.local", "test3.local")
)
.extension(CertificateRequestExtension.builder().alternativeNames("test2.local", "test3.local"))
.build();
var spiedCert = spy(cert);
@ -91,9 +88,9 @@ class TestOpenSSLCertificateCreator {
CertificateProvider certificateProvider = mock(CertificateProvider.class);
ExecutableResolver executableResolver = new ExecutableResolver();
var certificateCreator = new OpenSSLCertificateCreator(
executableResolver,
passwordProvider,
certificateProvider
executableResolver,
passwordProvider,
certificateProvider
);
var request = certificateCreator.getCertificateInfo(TEST_CERT_PATH.resolve("x509forImportCA.pem"));