Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

fix(cloudhsm): add issuer key identifiers to hardware chain (#4707)

XuJiana5dd3c2f2e59
diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudhsmv2/CloudHsmV2Service.java b/src/main/java/io/github/hectorvent/floci/services/cloudhsmv2/CloudHsmV2Service.java
index 199775fe28..d2c62bcabc 100644
--- a/src/main/java/io/github/hectorvent/floci/services/cloudhsmv2/CloudHsmV2Service.java
+++ b/src/main/java/io/github/hectorvent/floci/services/cloudhsmv2/CloudHsmV2Service.java
@@ -5,23 +5,26 @@ import io.github.hectorvent.floci.core.common.AwsException;
import io.github.hectorvent.floci.core.storage.StorageBackend;
import io.github.hectorvent.floci.core.storage.StorageFactory;
import io.github.hectorvent.floci.services.acm.CertificateGenerator;
+import io.github.hectorvent.floci.services.cloudhsmv2.model.Backup;
+import io.github.hectorvent.floci.services.cloudhsmv2.model.BackupRetentionPolicy;
import io.github.hectorvent.floci.services.cloudhsmv2.model.Certificates;
import io.github.hectorvent.floci.services.cloudhsmv2.model.Cluster;
import io.github.hectorvent.floci.services.cloudhsmv2.model.ClusterState;
import io.github.hectorvent.floci.services.cloudhsmv2.model.Hsm;
+import io.github.hectorvent.floci.services.ec2.Ec2Service;
+import io.github.hectorvent.floci.services.ec2.model.Subnet;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import org.bouncycastle.asn1.x500.X500Name;
+import org.bouncycastle.cert.X509CertificateHolder;
import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
-
+import org.bouncycastle.openssl.PEMParser;
import org.bouncycastle.openssl.jcajce.JcaPEMWriter;
import org.bouncycastle.operator.ContentSigner;
import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
import org.bouncycastle.pkcs.PKCS10CertificationRequest;
import org.bouncycastle.pkcs.PKCS10CertificationRequestBuilder;
import org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequestBuilder;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.openssl.PEMParser;
import org.jboss.logging.Logger;
import java.io.StringReader;
@@ -29,15 +32,16 @@ import java.io.StringWriter;
import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.security.SecureRandom;
-import io.github.hectorvent.floci.services.cloudhsmv2.model.Backup;
-import io.github.hectorvent.floci.services.cloudhsmv2.model.BackupRetentionPolicy;
+import java.security.cert.X509Certificate;
+import java.time.Instant;
import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
-import java.time.Instant;
-import java.util.*;
-
-import io.github.hectorvent.floci.services.ec2.Ec2Service;
-import io.github.hectorvent.floci.services.ec2.model.Subnet;
/**
* CloudHSM v2 service implementation for the local emulator.
@@ -170,20 +174,40 @@ public class CloudHsmV2Service {
certs.setClusterCsr(generateCsr(clusterId));
try {
- KeyPair mfrKeyPair = generateKeyPair();
- X500Name mfrName = new X500Name("CN=HSM Manufacturer CA,O=AWS,C=US");
+ Instant certificateNotBefore = Instant.now();
+ Instant certificateNotAfter = certificateNotBefore.plus(365, ChronoUnit.DAYS);
+ Instant rootNotAfter = certificateNotBefore.plus(3650, ChronoUnit.DAYS);
+
+ KeyPair manufacturerRootKeyPair = generateKeyPair();
+ X500Name manufacturerRootName = new X500Name("CN=HSM Manufacturer Root CA,O=AWS,C=US");
+ X509Certificate manufacturerRoot = certificateGenerator.signCertificate(
+ manufacturerRootName, manufacturerRootKeyPair.getPublic(), manufacturerRootName,
+ manufacturerRootKeyPair.getPrivate(), List.of(), true, null,
+ certificateNotBefore, rootNotAfter);
+
+ KeyPair awsRootKeyPair = generateKeyPair();
+ X500Name awsRootName = new X500Name("CN=AWS CloudHSM Root CA,O=AWS,C=US");
+ X509Certificate awsRoot = certificateGenerator.signCertificate(
+ awsRootName, awsRootKeyPair.getPublic(), awsRootName,
+ awsRootKeyPair.getPrivate(), List.of(), true, null,
+ certificateNotBefore, rootNotAfter);
+
+ KeyPair hardwareKeyPair = generateKeyPair();
+ X500Name hardwareName = new X500Name("CN=HSM Hardware " + clusterId + ",O=AWS,C=US");
certs.setManufacturerHardwareCertificate(certificateGenerator.toPem(certificateGenerator.signCertificate(
- mfrName, mfrKeyPair.getPublic(), mfrName, mfrKeyPair.getPrivate(), List.of(), true, null, 365)));
-
- KeyPair awsKeyPair = generateKeyPair();
- X500Name awsName = new X500Name("CN=AWS CloudHSM Hardware CA,O=AWS,C=US");
+ hardwareName, hardwareKeyPair.getPublic(), manufacturerRootName,
+ manufacturerRootKeyPair.getPrivate(), List.of(), true, null,
+ certificateNotBefore, certificateNotAfter, manufacturerRoot.getPublicKey())));
certs.setAwsHardwareCertificate(certificateGenerator.toPem(certificateGenerator.signCertificate(
- awsName, awsKeyPair.getPublic(), mfrName, mfrKeyPair.getPrivate(), List.of(), true, null, 365)));
+ hardwareName, hardwareKeyPair.getPublic(), awsRootName,
+ awsRootKeyPair.getPrivate(), List.of(), true, null,
+ certificateNotBefore, certificateNotAfter, awsRoot.getPublicKey())));
KeyPair hsmKeyPair = generateKeyPair();
X500Name hsmName = new X500Name("CN=HSM Instance " + clusterId + ",O=AWS,C=US");
certs.setHsmCertificate(certificateGenerator.toPem(certificateGenerator.signCertificate(
- hsmName, hsmKeyPair.getPublic(), awsName, awsKeyPair.getPrivate(), List.of(), false, null, 365)));
+ hsmName, hsmKeyPair.getPublic(), hardwareName, hardwareKeyPair.getPrivate(), List.of(), false, null,
+ certificateNotBefore, certificateNotAfter, hardwareKeyPair.getPublic())));
} catch (Exception e) {
LOG.warnv("Failed to generate emulated hardware certs: {0}", e.getMessage());
}
diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudhsmv2/CloudHsmCertificateChainIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudhsmv2/CloudHsmCertificateChainIntegrationTest.java
new file mode 100644
index 0000000000..17a08dbce5
--- /dev/null
+++ b/src/test/java/io/github/hectorvent/floci/services/cloudhsmv2/CloudHsmCertificateChainIntegrationTest.java
@@ -0,0 +1,94 @@
+package io.github.hectorvent.floci.services.cloudhsmv2;
+
+import io.github.hectorvent.floci.services.acm.CertificateGenerator;
+import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.path.json.JsonPath;
+import org.bouncycastle.asn1.ASN1OctetString;
+import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier;
+import org.bouncycastle.asn1.x509.Extension;
+import org.bouncycastle.asn1.x509.SubjectKeyIdentifier;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.security.cert.X509Certificate;
+import java.util.Arrays;
+
+import static io.restassured.RestAssured.given;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@QuarkusTest
+class CloudHsmCertificateChainIntegrationTest {
+
+ @BeforeAll
+ static void configureRestAssured() {
+ RestAssuredJsonUtils.configureAwsContentTypes();
+ }
+
+ @Test
+ void createClusterIssuesTwoCertificatesForTheSameHardwareKey() throws Exception {
+ JsonPath response = given()
+ .header("X-Amz-Target", "BaldrApiService.CreateCluster")
+ .contentType("application/x-amz-json-1.1")
+ .body("""
+ {"HsmType":"hsm1.medium","SubnetIds":["subnet-abcdef01"]}
+ """)
+ .when()
+ .post("/")
+ .then()
+ .statusCode(200)
+ .extract().jsonPath();
+
+ CertificateGenerator generator = new CertificateGenerator();
+ X509Certificate manufacturer = generator.parseCertificate(
+ response.getString("Cluster.Certificates.ManufacturerHardwareCertificate"));
+ X509Certificate aws = generator.parseCertificate(
+ response.getString("Cluster.Certificates.AwsHardwareCertificate"));
+ X509Certificate hsm = generator.parseCertificate(
+ response.getString("Cluster.Certificates.HsmCertificate"));
+
+ assertEquals(manufacturer.getSubjectX500Principal(), aws.getSubjectX500Principal());
+ assertArrayEquals(manufacturer.getPublicKey().getEncoded(), aws.getPublicKey().getEncoded());
+ assertArrayEquals(subjectKeyIdentifier(manufacturer), subjectKeyIdentifier(aws));
+ assertTrue(manufacturer.getBasicConstraints() >= 0);
+ assertTrue(aws.getBasicConstraints() >= 0);
+ assertTrue(manufacturer.getKeyUsage()[5]);
+ assertTrue(aws.getKeyUsage()[5]);
+
+ assertNotEquals(manufacturer.getSubjectX500Principal(), manufacturer.getIssuerX500Principal());
+ assertNotEquals(aws.getSubjectX500Principal(), aws.getIssuerX500Principal());
+ assertNotEquals(manufacturer.getIssuerX500Principal(), aws.getIssuerX500Principal());
+ assertFalse(Arrays.equals(authorityKeyIdentifier(manufacturer), authorityKeyIdentifier(aws)));
+ assertFalse(Arrays.equals(subjectKeyIdentifier(manufacturer), authorityKeyIdentifier(manufacturer)));
+ assertFalse(Arrays.equals(subjectKeyIdentifier(aws), authorityKeyIdentifier(aws)));
+
+ assertEquals(-1, hsm.getBasicConstraints());
+ assertFalse(Arrays.equals(hsm.getPublicKey().getEncoded(), aws.getPublicKey().getEncoded()));
+ assertIssuedBy(hsm, aws);
+ assertIssuedBy(hsm, manufacturer);
+ }
+
+ private static void assertIssuedBy(X509Certificate certificate, X509Certificate issuer) throws Exception {
+ assertEquals(issuer.getSubjectX500Principal(), certificate.getIssuerX500Principal());
+ assertNotNull(certificate.getExtensionValue(Extension.subjectKeyIdentifier.getId()));
+ assertArrayEquals(subjectKeyIdentifier(issuer), authorityKeyIdentifier(certificate));
+ certificate.verify(issuer.getPublicKey());
+ }
+
+ private static byte[] subjectKeyIdentifier(X509Certificate certificate) {
+ assertNotNull(certificate.getExtensionValue(Extension.subjectKeyIdentifier.getId()));
+ return SubjectKeyIdentifier.getInstance(ASN1OctetString.getInstance(
+ certificate.getExtensionValue(Extension.subjectKeyIdentifier.getId())).getOctets()).getKeyIdentifier();
+ }
+
+ private static byte[] authorityKeyIdentifier(X509Certificate certificate) {
+ assertNotNull(certificate.getExtensionValue(Extension.authorityKeyIdentifier.getId()));
+ return AuthorityKeyIdentifier.getInstance(ASN1OctetString.getInstance(
+ certificate.getExtensionValue(Extension.authorityKeyIdentifier.getId())).getOctets()).getKeyIdentifier();
+ }
+}