fix: use Reasoncode type instead of raw string (#86)

pimg · Aug 1, 2024 · 65f60d5 · 65f60d5
1 parent 71207c2
commit 65f60d5
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -74,7 +74,7 @@ func runInteractiveCertGuard(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	_, err = crl.NewStorage(libsqlStorage, cacheDir) // TODO consider better setup for this
+	_, err = crl.NewStorage(libsqlStorage, cacheDir)
 	if err != nil {
 		return err
 	}

diff --git a/internal/adapter/db/certificate_revocation_list.go b/internal/adapter/db/certificate_revocation_list.go
@@ -105,7 +105,7 @@ func (s *LibSqlStorage) List(ctx context.Context) ([]*crl.CertificateRevocationL
 			ThisUpdate: thisUpdate,
 			NextUpdate: nextUpdate,
 			Raw:        dbCrl.Raw,
-			URL:        url, // TODO convert to URL
+			URL:        url,
 		}
 	}
 
@@ -133,7 +133,7 @@ func (s *LibSqlStorage) SaveRevokedCertificates(ctx context.Context, revocationL
 		err := qtx.CreateRevokedCertificates(ctx, queries.CreateRevokedCertificatesParams{
 			Serialnumber:   revokedCertificateEntry.SerialNumber.String(),
 			RevocationDate: revokedCertificateEntry.RevocationTime,
-			Reason:         reason,
+			Reason:         reason.String(),
 			RevocationList: revocationListId,
 		})
 		if err != nil {

diff --git a/internal/ports/models/list.go b/internal/ports/models/list.go
@@ -60,7 +60,6 @@ func (i item) FilterValue() string { return i.serialnumber }
 
 const TOP_INFO_HEIGHT = 12
 
-// TODO refactor model to not use x509.RevocationList but a domain model or refactor commands/revoked_certificate to return a x.509 revoked certificate
 type ListModel struct {
 	keys         listKeyMap
 	styles       *styles.Styles

diff --git a/internal/ports/models/revoked_certificate.go b/internal/ports/models/revoked_certificate.go
@@ -69,7 +69,7 @@ func (r RevokedCertificateModel) View() string {
 	if err != nil {
 		revocationReason = "Unknown revocation reason"
 	} else {
-		revocationReason = r.styles.RevokedCertificateText.Render("Revocation reason: ") + crl.RevocationReasons[revocationReasonCode]
+		revocationReason = r.styles.RevokedCertificateText.Render("Revocation reason: ") + crl.RevocationReasons[revocationReasonCode].String()
 	}
 
 	return fmt.Sprintf("%s%s%s", serialnumber, revocationDate, revocationReason)

diff --git a/pkg/domain/crl/certificate_revocation_list.go b/pkg/domain/crl/certificate_revocation_list.go
@@ -19,7 +19,7 @@ type CertificateRevocationList struct {
 }
 
 // TODO changeto map[int]RevocationReason
-var RevocationReasons = map[int]string{
+var RevocationReasons = map[int]RevocationReason{
 	0:  "unspecified",
 	1:  "keyCompromise",
 	2:  "cACompromise",

diff --git a/pkg/domain/crl/revoked_certificate.go b/pkg/domain/crl/revoked_certificate.go
@@ -11,6 +11,10 @@ type RevokedCertificate struct {
 
 type RevocationReason string
 
+func (r RevocationReason) String() string {
+	return string(r)
+}
+
 const (
 	RevocationReasonUnspecified          RevocationReason = "unspecified"
 	RevocationReasonKeyCompromise        RevocationReason = "keyCompromise"