Skip to content

Commit

Permalink
test: fix vault pki test cases
Browse files Browse the repository at this point in the history 
Since vault version 1.11.0 the full CA chain is returned for signed
certs: hashicorp/vault#15155 (while the PR is
closed the behaviour was still merged, see note hashicorp/vault#15155 (comment)).

Signed-off-by: LukasAuerbeck <17929465+LukasAuerbeck@users.noreply.github.com>
  • Loading branch information
@LukasAuerbeck
LukasAuerbeck committed May 8, 2023
1 parent 3dbc6dc commit f9efafe
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 13 deletions.
6 changes: 3 additions & 3 deletions ...ntrollers/e2e_test/vaultcertificateauthority/vaultcertificateauthority_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ var _ = Describe("VaultCertificateAuthority Controller", func() {
publicInfoSecretPath := core.SecretPath(common.GetCAInfoSecretPath(ca))
privateInfoSecretPath := core.SecretPath(common.GetCAPrivateKeySecretPath(ca))
Test.VaultEnv.KvSecret(common.InternalKvEngine, publicInfoSecretPath).Should(HaveKvSecretFieldWithValue("certificate", e2e_test.RootCertificate))
Test.VaultEnv.KvSecret(common.InternalKvEngine, publicInfoSecretPath).Should(HaveKvSecretFieldFieldWithLength("certificate_chain", 0))
Test.VaultEnv.KvSecret(common.InternalKvEngine, publicInfoSecretPath).Should(HaveKvSecretField("certificate_chain"))
Test.VaultEnv.KvSecret(common.InternalKvEngine, publicInfoSecretPath).Should(HaveKvSecretFieldWithValue("full_certificate_chain", e2e_test.RootCertificate))
Test.VaultEnv.KvSecret(common.InternalKvEngine, publicInfoSecretPath).Should(HaveKvSecretFieldWithValue("issuer", e2e_test.RootCertificate))
Test.VaultEnv.KvSecret(common.InternalKvEngine, publicInfoSecretPath).Should(HaveKvSecretFieldWithValue("serial_number", "39:af:8c:ff:af:94:27:5f:49:7f:91:99:cc:ad:2e:cc:a3:bf:15:d7"))
Expand Down Expand Up @@ -259,7 +259,7 @@ var _ = Describe("VaultCertificateAuthority Controller", func() {
publicInfoSecretPath := core.SecretPath(common.GetCAInfoSecretPath(ca))
privateInfoSecretPath := core.SecretPath(common.GetCAPrivateKeySecretPath(ca))
Test.VaultEnv.KvSecret(common.InternalKvEngine, publicInfoSecretPath).Should(HaveKvSecretField("certificate"))
Test.VaultEnv.KvSecret(common.InternalKvEngine, publicInfoSecretPath).Should(HaveKvSecretFieldFieldWithLength("certificate_chain", 0))
Test.VaultEnv.KvSecret(common.InternalKvEngine, publicInfoSecretPath).Should(HaveKvSecretField("certificate_chain"))
Test.VaultEnv.KvSecret(common.InternalKvEngine, publicInfoSecretPath).Should(HaveKvSecretField("full_certificate_chain"))
Test.VaultEnv.KvSecret(common.InternalKvEngine, publicInfoSecretPath).Should(HaveKvSecretField("issuer"))
Test.VaultEnv.KvSecret(common.InternalKvEngine, publicInfoSecretPath).Should(HaveKvSecretField("serial_number"))
Expand Down Expand Up @@ -347,7 +347,7 @@ var _ = Describe("VaultCertificateAuthority Controller", func() {
publicInfoSecretPath := core.SecretPath(common.GetCAInfoSecretPath(ca))
privateInfoSecretPath := core.SecretPath(common.GetCAPrivateKeySecretPath(ca))
Test.VaultEnv.KvSecret(common.InternalKvEngine, publicInfoSecretPath).Should(HaveKvSecretFieldWithValue("certificate", e2e_test.RootCertificate))
Test.VaultEnv.KvSecret(common.InternalKvEngine, publicInfoSecretPath).Should(HaveKvSecretFieldFieldWithLength("certificate_chain", 0))
Test.VaultEnv.KvSecret(common.InternalKvEngine, publicInfoSecretPath).Should(HaveKvSecretField("certificate_chain"))
Test.VaultEnv.KvSecret(common.InternalKvEngine, publicInfoSecretPath).Should(HaveKvSecretFieldWithValue("full_certificate_chain", e2e_test.RootCertificate))
Test.VaultEnv.KvSecret(common.InternalKvEngine, publicInfoSecretPath).Should(HaveKvSecretFieldWithValue("issuer", e2e_test.RootCertificate))
Test.VaultEnv.KvSecret(common.InternalKvEngine, publicInfoSecretPath).Should(HaveKvSecretFieldWithValue("serial_number", "39:af:8c:ff:af:94:27:5f:49:7f:91:99:cc:ad:2e:cc:a3:bf:15:d7"))
Expand Down
24 changes: 14 additions & 10 deletions pkg/vault/e2e_test/pki_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ var _ = Describe("PKI API", func() {
Expect(info.PrivateKey).To(BeEmpty())
Expect(info.PrivateKeyType).To(BeEmpty())
Expect(info.Certificate).NotTo(BeEmpty())
Expect(info.CertificateChain).To(BeEmpty())
Expect(info.CertificateChain).NotTo(BeEmpty())
Expect(info.IssuingCertificateAuthority).To(Equal(info.Certificate))

Expect(vaultAPI.UpdateRootCA(root)).To(Succeed())
Expand All @@ -134,7 +134,7 @@ var _ = Describe("PKI API", func() {
Expect(info.PrivateKey).NotTo(BeEmpty())
Expect(info.PrivateKeyType).NotTo(BeEmpty())
Expect(info.Certificate).NotTo(BeEmpty())
Expect(info.CertificateChain).To(BeEmpty())
Expect(info.CertificateChain).NotTo(BeEmpty())
Expect(info.IssuingCertificateAuthority).To(Equal(info.Certificate))

Expect(vaultAPI.UpdateRootCA(root)).To(Succeed())
Expand Down Expand Up @@ -288,7 +288,7 @@ var _ = Describe("PKI API", func() {
Expect(info.PrivateKey).To(BeEmpty())
Expect(info.PrivateKeyType).To(BeEmpty())
Expect(info.Certificate).To(Equal(rootCertificate))
Expect(info.CertificateChain).To(BeEmpty())
Expect(info.CertificateChain).To(Equal(rootCertificate))
Expect(info.IssuingCertificateAuthority).To(Equal(rootCertificate))

Expect(vaultAPI.UpdateRootCA(root)).To(Succeed())
Expand All @@ -315,7 +315,7 @@ var _ = Describe("PKI API", func() {
Expect(info.PrivateKey).To(Equal(rootPrivateKey))
Expect(info.PrivateKeyType).To(Equal(pki.KeyTypeRSA))
Expect(info.Certificate).To(Equal(rootCertificate))
Expect(info.CertificateChain).To(BeEmpty())
Expect(info.CertificateChain).To(Equal(rootCertificate))
Expect(info.IssuingCertificateAuthority).To(Equal(rootCertificate))

Expect(vaultAPI.UpdateRootCA(root)).To(Succeed())
Expand Down Expand Up @@ -516,7 +516,8 @@ var _ = Describe("PKI API", func() {
Expect(info.PrivateKey).To(BeEmpty())
Expect(info.PrivateKeyType).To(BeEmpty())
Expect(info.Certificate).NotTo(BeEmpty())
Expect(info.CertificateChain).To(Equal(info.Certificate))
expectedChain := fmt.Sprintf("%s\n%s", info.Certificate, rootCACert)
Expect(info.CertificateChain).To(Equal(expectedChain))
Expect(info.IssuingCertificateAuthority).NotTo(BeEmpty())
Expect(info.IssuingCertificateAuthority).NotTo(Equal(info.Certificate))
Expect(info.IssuingCertificateAuthority).To(Equal(rootCACert))
Expand Down Expand Up @@ -544,7 +545,8 @@ var _ = Describe("PKI API", func() {
Expect(info.PrivateKey).To(BeEmpty())
Expect(info.PrivateKeyType).To(BeEmpty())
Expect(info.Certificate).NotTo(BeEmpty())
Expect(info.CertificateChain).To(Equal(info.Certificate))
expectedChain := fmt.Sprintf("%s\n%s", info.Certificate, rootCACert)
Expect(info.CertificateChain).To(Equal(expectedChain))
Expect(info.IssuingCertificateAuthority).NotTo(BeEmpty())
Expect(info.IssuingCertificateAuthority).NotTo(Equal(info.Certificate))
Expect(info.IssuingCertificateAuthority).To(Equal(rootCACert))
Expand All @@ -570,7 +572,7 @@ var _ = Describe("PKI API", func() {
Expect(info2.PrivateKey).To(BeEmpty())
Expect(info2.PrivateKeyType).To(BeEmpty())
Expect(info2.Certificate).NotTo(BeEmpty())
Expect(info2.CertificateChain).To(Equal(fmt.Sprintf("%s\n%s", info2.Certificate, info.Certificate)))
Expect(info2.CertificateChain).To(Equal(fmt.Sprintf("%s\n%s\n%s", info2.Certificate, info.Certificate, rootCACert)))
Expect(info2.IssuingCertificateAuthority).NotTo(Equal(info2.Certificate))
Expect(info2.IssuingCertificateAuthority).To(Equal(info.Certificate))

Expand All @@ -597,7 +599,8 @@ var _ = Describe("PKI API", func() {
Expect(info.PrivateKey).NotTo(BeEmpty())
Expect(info.PrivateKeyType).NotTo(BeEmpty())
Expect(info.Certificate).NotTo(BeEmpty())
Expect(info.CertificateChain).To(Equal(info.Certificate))
expectedChain := fmt.Sprintf("%s\n%s", info.Certificate, rootCACert)
Expect(info.CertificateChain).To(Equal(expectedChain))
Expect(info.IssuingCertificateAuthority).NotTo(BeEmpty())
Expect(info.IssuingCertificateAuthority).NotTo(Equal(info.Certificate))
Expect(info.IssuingCertificateAuthority).To(Equal(rootCACert))
Expand Down Expand Up @@ -625,7 +628,8 @@ var _ = Describe("PKI API", func() {
Expect(info.PrivateKey).NotTo(BeEmpty())
Expect(info.PrivateKeyType).NotTo(BeEmpty())
Expect(info.Certificate).NotTo(BeEmpty())
Expect(info.CertificateChain).To(Equal(info.Certificate))
expectedChain := fmt.Sprintf("%s\n%s", info.Certificate, rootCACert)
Expect(info.CertificateChain).To(Equal(expectedChain))
Expect(info.IssuingCertificateAuthority).NotTo(BeEmpty())
Expect(info.IssuingCertificateAuthority).NotTo(Equal(info.Certificate))
Expect(info.IssuingCertificateAuthority).To(Equal(rootCACert))
Expand All @@ -651,7 +655,7 @@ var _ = Describe("PKI API", func() {
Expect(info2.PrivateKey).NotTo(BeEmpty())
Expect(info2.PrivateKeyType).NotTo(BeEmpty())
Expect(info2.Certificate).NotTo(BeEmpty())
Expect(info2.CertificateChain).To(Equal(fmt.Sprintf("%s\n%s", info2.Certificate, info.Certificate)))
Expect(info2.CertificateChain).To(Equal(fmt.Sprintf("%s\n%s\n%s", info2.Certificate, info.Certificate, rootCACert)))
Expect(info2.IssuingCertificateAuthority).NotTo(Equal(info2.Certificate))
Expect(info2.IssuingCertificateAuthority).To(Equal(info.Certificate))

Expand Down

0 comments on commit f9efafe

Please sign in to comment.