From 45e594f98cfcca46e1119d474895650b31871572 Mon Sep 17 00:00:00 2001
From: Mariano Cano <mariano.cano@gmail.com>
Date: Tue, 20 Sep 2022 11:36:45 -0700
Subject: [PATCH] Make the constraint service public

---
 authority/internal/constraints/constraints.go      | 10 ++++++----
 authority/internal/constraints/constraints_test.go |  8 ++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/authority/internal/constraints/constraints.go b/authority/internal/constraints/constraints.go
index 5e27c41f..997b53aa 100644
--- a/authority/internal/constraints/constraints.go
+++ b/authority/internal/constraints/constraints.go
@@ -22,7 +22,9 @@ func (e ConstraintError) Error() string {
 	return e.Detail
 }
 
-type service struct {
+// Service implements a constraint validator for DNS names, IP addresses, Email
+// addresses and URIs.
+type Service struct {
 	hasNameConstraints      bool
 	permittedDNSDomains     []string
 	excludedDNSDomains      []string
@@ -36,8 +38,8 @@ type service struct {
 
 // New creates a constraint validation service that contains the given chain of
 // certificates.
-func New(chain ...*x509.Certificate) *service {
-	s := new(service)
+func New(chain ...*x509.Certificate) *Service {
+	s := new(Service)
 	for _, crt := range chain {
 		s.permittedDNSDomains = append(s.permittedDNSDomains, crt.PermittedDNSDomains...)
 		s.excludedDNSDomains = append(s.excludedDNSDomains, crt.ExcludedDNSDomains...)
@@ -62,7 +64,7 @@ func New(chain ...*x509.Certificate) *service {
 
 // Validate checks the given names with the name constraints defined in the
 // service.
-func (s *service) Validate(dnsNames []string, ipAddresses []net.IP, emailAddresses []string, uris []*url.URL) error {
+func (s *Service) Validate(dnsNames []string, ipAddresses []net.IP, emailAddresses []string, uris []*url.URL) error {
 	if !s.hasNameConstraints {
 		return nil
 	}
diff --git a/authority/internal/constraints/constraints_test.go b/authority/internal/constraints/constraints_test.go
index 69aa51ad..34e204e0 100644
--- a/authority/internal/constraints/constraints_test.go
+++ b/authority/internal/constraints/constraints_test.go
@@ -47,12 +47,12 @@ func TestNew(t *testing.T) {
 	tests := []struct {
 		name string
 		args args
-		want *service
+		want *Service
 	}{
-		{"ok", args{[]*x509.Certificate{ca1.Intermediate, ca1.Root}}, &service{
+		{"ok", args{[]*x509.Certificate{ca1.Intermediate, ca1.Root}}, &Service{
 			hasNameConstraints: false,
 		}},
-		{"ok with constraints", args{[]*x509.Certificate{ca2.Intermediate, ca2.Root}}, &service{
+		{"ok with constraints", args{[]*x509.Certificate{ca2.Intermediate, ca2.Root}}, &Service{
 			hasNameConstraints:  true,
 			permittedDNSDomains: []string{"internal.example.org"},
 			excludedDNSDomains:  []string{"internal.example.com"},
@@ -205,7 +205,7 @@ func Test_service_Validate(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			s := &service{
+			s := &Service{
 				hasNameConstraints:      tt.fields.hasNameConstraints,
 				permittedDNSDomains:     tt.fields.permittedDNSDomains,
 				excludedDNSDomains:      tt.fields.excludedDNSDomains,