new tests added

zLukas · Sep 25, 2023 · 359bb51 · 359bb51
1 parent d6de2f4
commit 359bb51
Show file tree

Hide file tree

Showing 7 changed files with 103 additions and 70 deletions.
diff --git a/src/cert-generator/cmd/tls.go b/src/cert-generator/cmd/tls.go
@@ -34,12 +34,12 @@ func main() {
 		},
 	}
 
-	caKey, ca, err := tls.CreateCACert(&caTemplate, &generator, &generator)
+	caKey, ca, err := tls.CreateCACertBytes(&caTemplate, &generator, &generator)
 	if err != nil {
 		fmt.Printf("Error: %s", err)
 	}
 
-	ceKey, ce, err := tls.CreateCert(&ceTemplate, caKey, ca, &generator, &generator)
+	ceKey, ce, err := tls.CreateCertBytes(&ceTemplate, caKey, ca, &generator, &generator)
 	if err != nil {
 		fmt.Printf("Error: %s", err)
 	}

diff --git a/src/cert-generator/pkg/tls/x509.go b/src/cert-generator/pkg/tls/x509.go
@@ -22,17 +22,17 @@ func WriteKeyCertFile(Key []byte, Cert []byte, filePath string) error {
 	return nil
 }
 
-func CreateCACert(ca *CACert, p IPem, x Ix509) ([]byte, []byte, error) {
+func CreateCACertBytes(ca *CACert, p IPem, x Ix509) ([]byte, []byte, error) {
 	template := &x509.Certificate{
 		SerialNumber: ca.Serial,
 		Subject: pkix.Name{
-			Country:            removeEmptyString([]string{ca.Subject.Country}),
-			Organization:       removeEmptyString([]string{ca.Subject.Organization}),
-			OrganizationalUnit: removeEmptyString([]string{ca.Subject.OrganizationalUnit}),
-			Locality:           removeEmptyString([]string{ca.Subject.Locality}),
-			Province:           removeEmptyString([]string{ca.Subject.Province}),
-			StreetAddress:      removeEmptyString([]string{ca.Subject.StreetAddress}),
-			PostalCode:         removeEmptyString([]string{ca.Subject.PostalCode}),
+			Country:            RemoveEmptyString([]string{ca.Subject.Country}),
+			Organization:       RemoveEmptyString([]string{ca.Subject.Organization}),
+			OrganizationalUnit: RemoveEmptyString([]string{ca.Subject.OrganizationalUnit}),
+			Locality:           RemoveEmptyString([]string{ca.Subject.Locality}),
+			Province:           RemoveEmptyString([]string{ca.Subject.Province}),
+			StreetAddress:      RemoveEmptyString([]string{ca.Subject.StreetAddress}),
+			PostalCode:         RemoveEmptyString([]string{ca.Subject.PostalCode}),
 			CommonName:         ca.Subject.CommonName,
 		},
 		NotBefore:             time.Now(),
@@ -51,24 +51,24 @@ func CreateCACert(ca *CACert, p IPem, x Ix509) ([]byte, []byte, error) {
 	return keyBytes, certBytes, nil
 }
 
-func CreateCert(cert *Cert, caKey []byte, caCert []byte, p IPem, x Ix509) ([]byte, []byte, error) {
+func CreateCertBytes(cert *Cert, caKey []byte, caCert []byte, p IPem, x Ix509) ([]byte, []byte, error) {
 	template := &x509.Certificate{
 		SerialNumber: cert.Serial,
 		Subject: pkix.Name{
-			Country:            removeEmptyString([]string{cert.Subject.Country}),
-			Organization:       removeEmptyString([]string{cert.Subject.Organization}),
-			OrganizationalUnit: removeEmptyString([]string{cert.Subject.OrganizationalUnit}),
-			Locality:           removeEmptyString([]string{cert.Subject.Locality}),
-			Province:           removeEmptyString([]string{cert.Subject.Province}),
-			StreetAddress:      removeEmptyString([]string{cert.Subject.StreetAddress}),
-			PostalCode:         removeEmptyString([]string{cert.Subject.PostalCode}),
+			Country:            RemoveEmptyString([]string{cert.Subject.Country}),
+			Organization:       RemoveEmptyString([]string{cert.Subject.Organization}),
+			OrganizationalUnit: RemoveEmptyString([]string{cert.Subject.OrganizationalUnit}),
+			Locality:           RemoveEmptyString([]string{cert.Subject.Locality}),
+			Province:           RemoveEmptyString([]string{cert.Subject.Province}),
+			StreetAddress:      RemoveEmptyString([]string{cert.Subject.StreetAddress}),
+			PostalCode:         RemoveEmptyString([]string{cert.Subject.PostalCode}),
 			CommonName:         cert.Subject.CommonName,
 		},
 		NotBefore:   time.Now(),
 		NotAfter:    time.Now().AddDate(cert.ValidForYears, 0, 0),
 		ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth, x509.ExtKeyUsageServerAuth},
 		KeyUsage:    x509.KeyUsageDigitalSignature,
-		DNSNames:    removeEmptyString(cert.DNSNames),
+		DNSNames:    RemoveEmptyString(cert.DNSNames),
 	}
 
 	caKeyParsed, err := key.PrivateKeyPemToRSA(caKey)
@@ -120,7 +120,7 @@ func createCert(template *x509.Certificate, caKey *rsa.PrivateKey, caCert *x509.
 	return keyOut.Bytes(), certOut.Bytes(), nil
 }
 
-func removeEmptyString(input []string) []string {
+func RemoveEmptyString(input []string) []string {
 	if len(input) == 1 && input[0] == "" {
 		return []string{}
 	}

diff --git a/src/cert-generator/tests/pkg/tls/pem_mock.go b/src/cert-generator/tests/pkg/tls/pem_mock.go
@@ -0,0 +1,28 @@
+package tests
+
+import (
+	"crypto/x509"
+	"encoding/pem"
+	"fmt"
+	"io"
+)
+
+type mockPemOK struct{}
+type mockPemFail struct{}
+type mockX509OK struct{}
+type mockX509Fail struct{}
+
+func (m *mockPemOK) Decode(input []byte) (*pem.Block, []byte) {
+	b := pem.Block{Bytes: input}
+	return &b, nil
+}
+func (m *mockPemOK) Encode(out io.Writer, b *pem.Block) error {
+	return nil
+}
+
+func (m *mockPemFail) Decode(input []byte) (*pem.Block, []byte) {
+	return nil, nil
+}
+
+func (m *mockPemFail) Encode(out io.Writer, b *pem.Block) error {
+	return fmt.Errorf("cannot encode buffer")
diff --git a/src/cert-generator/tests/pkg/tls/pem_test.go b/src/cert-generator/tests/pkg/tls/pem_test.go
@@ -1,6 +1,7 @@
 package tests
 
 import (
+	"encoding/pem"
 	"testing"
 
 	"github.com/zLukas/CloudTools/src/cert-generator/pkg/tls"
@@ -15,7 +16,7 @@ func TestPemToX509_ok(t *testing.T) {
 		t.Errorf("err expected to be nil, got %s ", err)
 	}
 	if results == nil {
-		t.Errorf("results var execept to be %v, got nil ", tls.Block{Bytes: false_bytes})
+		t.Errorf("results var execept to be %v, got nil ", pem.Block{Bytes: false_bytes})
 	}
 
 }

diff --git a/src/cert-generator/tests/pkg/tls/types.go b/src/cert-generator/tests/pkg/tls/types.go
diff --git a/src/cert-generator/tests/pkg/tls/x509_mock.go b/src/cert-generator/tests/pkg/tls/x509_mock.go
@@ -0,0 +1,28 @@
+package tests
+
+import (
+	"crypto/x509"
+	"fmt"
+	"io"
+)
+
+type mockCreateCertificateCA struct{}
+type mockCreateCertificateCE struct{}
+
+func (m *mockCreateCertificateCA) CreateCertificate(rand io.Reader, template *x509.Certificate, parent *x509.Certificate, pub any, priv any) ([]byte, error) {
+	b := []byte{0xAA}
+	return b, nil
+}
+
+func (m *mockX509Fail) CreateCertificate(rand io.Reader, template *x509.Certificate, parent *x509.Certificate, pub any, priv any) ([]byte, error) {
+	b := []byte{0x56, 0xAA, 0x21}
+	return b, nil
+}
+
+func (m *mockX509OK) ParseCertificate(der []byte) (*x509.Certificate, error) {
+	return &x509.Certificate{}, nil
+}
+
+func (m *mockX509Fail) ParseCertificate(der []byte) (*x509.Certificate, error) {
+	return nil, fmt.Errorf("x509: malformed certificate")
+}
diff --git a/src/cert-generator/tests/pkg/tls/x509_test.go b/src/cert-generator/tests/pkg/tls/x509_test.go
@@ -0,0 +1,25 @@
+package tests
+
+import (
+	"testing"
+
+	"github.com/zLukas/CloudTools/src/cert-generator/pkg/tls"
+)
+
+func TestRemoveEmptyStringEmptyString(t *testing.T) {
+	empty_string := []string{""}
+	result := tls.RemoveEmptyString(empty_string)
+
+	if len(result) != 0 {
+		t.Errorf("string array should have 0 lenght, go %v", len(result))
+	}
+}
+
+func TestRemoveEmptyStringNotEmptyString(t *testing.T) {
+	empty_string := []string{"asd", "asd", "wersfds"}
+	result := tls.RemoveEmptyString(empty_string)
+
+	if len(result) != 3 {
+		t.Errorf("string array should have 3 lenght, go %v", len(result))
+	}
+}