AGDNS-3720 Refactor TLS vol.3

Author: makazantsev

internal/aghtest/interface.go

@@ -203,9 +203,13 @@ func (m *Registrar) Register(method, path string, h http.HandlerFunc) {
 	m.OnRegister(method, path, h)
 }
 
-// TLSConfigProvider is a fake [aghtls.TLSConfigProvider] implementation for
-// tests.
-type TLSConfigProvider struct {
+// Manager is a fake [aghtls.Manager] implementation for tests.
+type Manager struct {
+	OnStart                func(ctx context.Context) (err error)
+	OnShutdown             func(ctx context.Context) (err error)
+	OnRefresh              func(ctx context.Context) (err error)
+	OnSet                  func(ctx context.Context, certKey aghtls.TLSPair) (err error)
+	OnUpdates              func(ctx context.Context) (updates <-chan aghtls.UpdateSignal)
 	OnTLSConfig            func() (conf *tls.Config)
 	OnRootCAs              func() (cert *x509.CertPool)
 	OnHasIPAddrs           func() (ok bool)
@@ -214,42 +218,68 @@ type TLSConfigProvider struct {
 		ctx context.Context,
 		servePlainDNS aghalg.NullBool,
 		conf *aghtls.ExtendedTLSConfig,
-	) (changed bool, err error)
+	) (restartHTTPS bool, err error)
+	OnCipherSuites func() (cs []uint16)
 }
 
 // type check
-var _ aghtls.TLSConfigProvider = (*TLSConfigProvider)(nil)
+var _ aghtls.Manager = (*Manager)(nil)
+
+// CipherSuites implements the [aghtls.Manager] interface for *Manager.
+func (m *Manager) CipherSuites() (cs []uint16) {
+	return m.OnCipherSuites()
+}
+
+// Set implements the [aghtls.Manager] interface for *Manager.
+func (m *Manager) Set(ctx context.Context, certKey aghtls.TLSPair) (err error) {
+	return m.OnSet(ctx, certKey)
+}
+
+// Start implements the [aghtls.Manager] interface for *Manager.
+func (m *Manager) Start(ctx context.Context) (err error) {
+	return m.OnStart(ctx)
+}
+
+// Shutdown implements the [aghtls.Manager] interface for *Manager.
+func (m *Manager) Shutdown(ctx context.Context) (err error) {
+	return m.OnShutdown(ctx)
+}
+
+// Refresh implements the [aghtls.Manager] interface for *Manager.
+func (m *Manager) Refresh(ctx context.Context) (err error) {
+	return m.OnRefresh(ctx)
+}
+
+// Updates implements the [aghtls.Manager] interface for *Manager.
+func (m *Manager) Updates(ctx context.Context) (updates <-chan aghtls.UpdateSignal) {
+	return m.OnUpdates(ctx)
+}
 
-// TLSConfig implements the [aghtls.TLSConfigProvider] interface for
-// *TLSConfigProvider.
-func (t *TLSConfigProvider) TLSConfig() (conf *tls.Config) {
-	return t.OnTLSConfig()
+// TLSConfig implements the [aghtls.Manager] interface for *Manager.
+func (m *Manager) TLSConfig() (conf *tls.Config) {
+	return m.OnTLSConfig()
 }
 
-// RootCAs implements the [aghtls.TLSConfigProvider] interface for
-// *TLSConfigProvider.
-func (t *TLSConfigProvider) RootCAs() (pool *x509.CertPool) {
-	return t.OnRootCAs()
+// RootCAs implements the [aghtls.Manager] interface for *Manager.
+func (m *Manager) RootCAs() (pool *x509.CertPool) {
+	return m.OnRootCAs()
 }
 
-// HasIPAddrs implements the [aghtls.TLSConfigProvider] interface for
-// *TLSConfigProvider.
-func (t *TLSConfigProvider) HasIPAddrs() (ok bool) {
-	return t.OnHasIPAddrs()
+// HasIPAddrs implements the [aghtls.Manager] interface for *Manager.
+func (m *Manager) HasIPAddrs() (ok bool) {
+	return m.OnHasIPAddrs()
 }
 
-// ExtendedTLSConfig implements the [aghtls.TLSConfigProvider] interface for
-// *TLSConfigProvider.
-func (t *TLSConfigProvider) ExtendedTLSConfig() (conf *aghtls.ExtendedTLSConfig) {
-	return t.OnExtendedTLSConfig()
+// ExtendedTLSConfig implements the [aghtls.Manager] interface for *Manager.
+func (m *Manager) ExtendedTLSConfig() (conf *aghtls.ExtendedTLSConfig) {
+	return m.OnExtendedTLSConfig()
 }
 
-// SetExtendedTLSConfig implements the [aghtls.TLSConfigProvider] interface for
-// *TLSConfigProvider.
-func (t *TLSConfigProvider) SetExtendedTLSConfig(
+// SetExtendedTLSConfig implements the [aghtls.Manager] interface for *Manager.
+func (m *Manager) SetExtendedTLSConfig(
 	ctx context.Context,
 	servePlainDNS aghalg.NullBool,
 	conf *aghtls.ExtendedTLSConfig,
-) (changed bool, err error) {
-	return t.OnSetExtendedTLSConfig(ctx, servePlainDNS, conf)
+) (restartHTTPS bool, err error) {
+	return m.OnSetExtendedTLSConfig(ctx, servePlainDNS, conf)
 }

internal/aghtls/config.go

@@ -7,7 +7,7 @@ import (
 
 // ExtendedTLSConfig is the TLS configuration for DNS-over-TLS, DNS-over-QUIC,
 // and HTTPS.  When adding new properties, update the [ExtendedTLSConfig.Clone]
-// and [home.setPrivateFieldsAndCompare] methods as necessary.
+// and [setPrivateFieldsAndCompare] methods as necessary.
 //
 // TODO(m.kazantsev):  Add documentation for each field.
 type ExtendedTLSConfig struct {