Mark.TwoFive/home-cert-assistant
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Wiki Activity Actions

fix: Renaming issues & re-used usage closing twice

Browse source
This commit is contained in:
Magnus Leßmann (@MarkL4YG) 2024-11-20 16:53:10 +01:00
parent 1d6bf0facc
commit 3e4fba83db
3 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/de/mlessmann/certassist/openssl/OpenSSLCertificateCreator.java
View file

@ -282,11 +282,8 @@ public class OpenSSLCertificateCreator {
"-out", "-out",
outFile.toString(), outFile.toString(),
"-extfile", "-extfile",
extFile.toString(), extFile.toString()
"-passout",
"env:KEY_PASS"
) )
.environment("KEY_PASS", certPassword)
.redirectOutput(Slf4jStream.ofCaller().asDebug()) .redirectOutput(Slf4jStream.ofCaller().asDebug())
.redirectError(Slf4jStream.ofCaller().asError()) .redirectError(Slf4jStream.ofCaller().asError())
.start(); .start();

4
src/main/java/de/mlessmann/certassist/service/CertificateCreationService.java
View file

@ -47,8 +47,8 @@ public class CertificateCreationService {
certificateRequest certificateRequest
); );
) { ) {
certificate.setPrivateKey(Files.readAllBytes(certificateCreatorResult.getPrivateKeyPath())); certificate.setPrivateKey(Files.readAllBytes(certificateCreatorResult.certificateKeyPath()));
certificate.setCert(Files.readAllBytes(certificateCreatorResult.getCertificatePath())); certificate.setCert(Files.readAllBytes(certificateCreatorResult.certificatePath()));
} catch (InterruptedException e) { } catch (InterruptedException e) {
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
throw new IllegalStateException("Interrupted exception", e); throw new IllegalStateException("Interrupted exception", e);

23
src/test/java/de/mlessmann/certassist/TestOpenSSLCertificateCreator.java
View file

@ -1,8 +1,7 @@
package de.mlessmann.certassist; package de.mlessmann.certassist;
import static org.assertj.core.api.Assertions.*; import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.*;
import static org.mockito.Mockito.when;
import de.mlessmann.certassist.openssl.*; import de.mlessmann.certassist.openssl.*;
import de.mlessmann.certassist.openssl.CertificateRequest.RequestType; import de.mlessmann.certassist.openssl.CertificateRequest.RequestType;
@ -38,8 +37,24 @@ class TestOpenSSLCertificateCreator {
.build(); .build();
try (var cert = certificateCreator.createCertificate(certRequest)) { try (var cert = certificateCreator.createCertificate(certRequest)) {
assertThat(certificateCreator.verifyCertificate(cert.getCertificatePath())).isEqualTo(true); assertThat(certificateCreator.verifyCertificate(cert.certificatePath())).isEqualTo(true);
System.out.println("Certificate created: " + cert); System.out.println("Certificate created: " + cert);
CertificateRequest childRequest = CertificateRequest
.builder()
.commonName("test.local")
.type(RequestType.NORMAL_CERTIFICATE)
.trustingAuthority(cert.fingerprint())
.subject(CertificateSubject.builder().country("DE").state("SH").locality("HH").organization("Crazy-Cats"))
.build();
var spiedCert = spy(cert);
doNothing().when(spiedCert).close();
when(certificateProvider.requestCertificateUsage(cert.fingerprint())).thenReturn(spiedCert);
try (var childCert = certificateCreator.createCertificate(childRequest)) {
System.out.println("Child certificate created: " + childCert);
assertThat(certificateCreator.verifyCertificate(childCert.certificatePath())).isEqualTo(true);
}
} }
} }
} }