Update auth.CertificateAuthenticator interface

redis/auth/authenticator_certificate.go

@@ -14,45 +14,22 @@
 
 package auth
 
-// CertificateAuthenticator represents an authenticator for TLS certificates.
-type CertificateAuthenticator struct {
-	commonName string
-}
-
-// CertificateAuthenticatorOption represents an authenticator option.
-type CertificateAuthenticatorOption = func(*CertificateAuthenticator)
+import (
+	"github.com/cybergarage/go-authenticator/auth"
+)
 
-// NewCertificateAuthenticator returns a new certificate authenticator.
-func NewCertificateAuthenticatorWith(opts ...CertificateAuthenticatorOption) *CertificateAuthenticator {
-	authenticator := &CertificateAuthenticator{
-		commonName: "",
-	}
-	for _, opt := range opts {
-		opt(authenticator)
-	}
+// CertificateAuthenticator is the interface for authenticating a client using TLS certificates.
+type CertificateAuthenticator = auth.CertificateAuthenticator
 
-	return authenticator
-}
+// CertificateAuthenticatorOption represents an authenticator option.
+type CertificateAuthenticatorOption = auth.CertificateAuthenticatorOption
 
-// WithCommonName returns an authenticator option to set the common name.
-func WithCommonName(name string) func(*CertificateAuthenticator) {
-	return func(conn *CertificateAuthenticator) {
-		conn.commonName = name
-	}
+// WithCertificateAuthenticatorCommonName sets the common name.
+func WithCertificateAuthenticatorCommonNameRegexp(regexps ...string) CertificateAuthenticatorOption {
+	return auth.WithCertificateAuthenticatorCommonNameRegexp(regexps...)
 }
 
-// Authenticate authenticates the specified connection.
-func (authenticator *CertificateAuthenticator) Authenticate(conn Conn) (bool, error) {
-	conState, ok := conn.TLSConnectionState()
-	if !ok {
-		return false, nil
-	}
-	for _, cert := range conState.PeerCertificates {
-		if 0 < len(authenticator.commonName) {
-			if cert.Subject.CommonName == authenticator.commonName {
-				return true, nil
-			}
-		}
-	}
-	return false, nil
+// NewCertificateAuthenticator returns a new certificate authenticator.
+func NewCertificateAuthenticator(opts ...CertificateAuthenticatorOption) (CertificateAuthenticator, error) {
+	return auth.NewCertificateAuthenticator(opts...)
 }

redis/auth/manager.go

@@ -14,14 +14,20 @@
 
 package auth
 
+import (
+	"github.com/cybergarage/go-authenticator/auth"
+)
+
 // AuthManager represent an authenticator manager.
 type AuthManager struct {
+	auth.Manager
 	authenticators []Authenticator
 }
 
 // NewAuthManager returns a new authenticator manager.
 func NewAuthManager() *AuthManager {
 	manager := &AuthManager{
+		Manager:        auth.NewManager(),
 		authenticators: make([]Authenticator, 0),
 	}
 	return manager

redistest/server_test.go

@@ -103,7 +103,12 @@ func TestTLSServer(t *testing.T) {
 	server.SetTLSCertFile(serverCert)
 	server.SetTLSCaCertFile(rootCert)
 
-	server.AddAuthenticator(auth.NewCertificateAuthenticatorWith(auth.WithCommonName("localhost")))
+	ca, err := auth.NewCertificateAuthenticator(auth.WithCertificateAuthenticatorCommonNameRegexp("localhost"))
+	if err != nil {
+		t.Error(err)
+		return
+	}
+	server.SetCertificateAuthenticator(ca)
 
 	err = server.Start()
 	if err != nil {