Files
ziti/controller/handler_ctrl/connect.go
T
Andrew Martinez 8c919dfbe2 backport openziti/ziti#4094 to release-v2.0.x accept first-party certs issued by a separate edge signing CA (#4153)
- publishes FirstPartyX509CertValidation/ThirdPartyX509CertValidation usages and
  intermediates on router data model public keys, deprecating ClientX509CertValidation
- builds the router first-party cert pool from RDM first-party keys unioned with
  ctrl-channel roots; TLS and VerifyClientCert paths share buildClientCertRoots with
  fallback to the deprecated usage for old controllers
- trusts the edge enrollment signing CA when verifying the certificate a router
  presents on the control channel, so a signing CA outside the controller's own
  trust bundle no longer refuses every router; the anchors go into a clone of the
  identity's pool, never the pool its live tls.Configs share
- propagates full controller signing cert chains over the mesh via
  SigningCertChainHeader and persists them in Controller store CertPem
- sends stored public keys during router sync instead of rebuilding them; publishes
  controller certs leaf-only
- stops router controller reconnect loops after shutdown
- gives each in-process controller its own command decoder registry
- adds the ha-3 three-controller harness and first-party cert integration tests
- drains the cli test stdout pipe while commands run; anchors the totp token
  issued-at assertion to the test clock
- backports the SPIFFE-capable test PKI from openziti/ziti#3947: --not-before on
  ziti pki create, tests/testdata/create-pki.sh/.ps1, and the generated PKI under
  tests/testdata/pki including the separate edge signing root and per-controller
  signing intermediates; existing config sets stay on the testdata/ca PKI
- skips *.pem, *.cert and *.key files in codespell
2026-08-26 14:43:34 -04:00

166 lines
7.5 KiB
Go

/*
Copyright NetFoundry Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package handler_ctrl
import (
"crypto/sha1"
"crypto/x509"
"fmt"
"time"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v4"
"github.com/openziti/identity"
"github.com/openziti/ziti/v2/common/cert"
"github.com/openziti/ziti/v2/controller/model"
"github.com/openziti/ziti/v2/controller/network"
)
type ConnectHandler struct {
identity identity.Identity
network *network.Network
// signingCertRoots holds the edge enrollment signing CA bundle. A router presents its enrollment
// certificate as its control channel client certificate, so a deployment whose signing CA sits
// outside the controller's own trust bundle would otherwise have every router refused here.
signingCertRoots []*x509.Certificate
// separatelyValidatedTypes holds the control-channel type headers that are dispatched to a
// separate, self-validating acceptor (currently the raft mesh, when clustering is enabled).
separatelyValidatedTypes map[string]struct{}
}
// NewConnectHandler returns a ConnectHandler that admits routers whose leaf certificate chains either to
// the controller's own CA bundle or to signingCertRoots, the edge enrollment signing CA bundle.
// signingCertRoots may be empty, in which case only the controller's bundle is trusted.
func NewConnectHandler(identity identity.Identity, network *network.Network, signingCertRoots []*x509.Certificate) *ConnectHandler {
return &ConnectHandler{
identity: identity,
network: network,
signingCertRoots: signingCertRoots,
}
}
// SetSeparatelyValidatedChannelTypes records the control-channel type headers that are dispatched to a
// separate, self-validating acceptor (e.g. the raft mesh). Connections carrying one of these types are
// skipped by HandleConnection; everything else - router control channel types, unrecognized types, and
// legacy (no type header) connections, all of which the dispatcher routes to the router control
// acceptor - is validated here. This must be populated before the listener begins accepting.
func (self *ConnectHandler) SetSeparatelyValidatedChannelTypes(types map[string]struct{}) {
self.separatelyValidatedTypes = types
}
// isSeparatelyValidated reports whether the connection's channel type is handled by a separate,
// self-validating acceptor and therefore must not be validated as a router control connection here.
func (self *ConnectHandler) isSeparatelyValidated(hello *channel.Hello) bool {
underlayType, found := hello.Headers[channel.TypeHeader]
if !found {
return false
}
_, ok := self.separatelyValidatedTypes[string(underlayType)]
return ok
}
// isFirstCtrlConnection reports whether this hello establishes a new channel rather than adding an
// underlay to an existing grouped channel. A legacy (non-grouped) dial is always a new channel; for a
// grouped dial only the connection carrying IsFirstGroupConnection is.
func isFirstCtrlConnection(hello *channel.Hello) bool {
headers := channel.Headers(hello.Headers)
if grouped, _ := headers.GetBoolHeader(channel.IsGroupedHeader); !grouped {
return true
}
first, _ := headers.GetBoolHeader(channel.IsFirstGroupConnection)
return first
}
// withinChurnLimit reports whether an established connection is too new to be displaced by a new one.
//
// This is admission policy, not the uniqueness guarantee. At most one connection per router is enforced
// under the per-router lock in Network.ConnectRouter; this runs against the connected map with no lock
// held, so it can only avoid paying for a bind that would be refused there anyway.
//
// Displacing an established connection costs a round trip: the occupant's teardown runs, the connect is
// refused, and the router redials into the freed slot. A connection that has only just been established
// is therefore protected for churnLimit, so a flapping router cannot thrash a working channel. A zero
// limit disables the protection, making every new connection able to displace the current one.
func withinChurnLimit(connected *model.Router, churnLimit time.Duration) bool {
return time.Since(connected.ConnectTime) < churnLimit
}
func (self *ConnectHandler) HandleConnection(hello *channel.Hello, certificates []*x509.Certificate) error {
// Connections whose channel type is handled by a separate, self-validating acceptor (e.g. the raft
// mesh) are validated there, so skip them. Everything else - router control channel types,
// unrecognized types, and legacy (no type header) connections - is dispatched to the router control
// acceptor and must be validated here.
if self.isSeparatelyValidated(hello) {
return nil
}
id := hello.IdToken
log := pfxlog.Logger().WithField("routerId", id)
if len(certificates) == 0 {
return fmt.Errorf("no certificates provided, unable to verify dialer, routerId: %v", id)
}
// Verify the peer's leaf certificate (certificates[0], the certificate whose private key the TLS
// handshake proved) chains to the controller CA or the edge signing CA, and bind the router
// fingerprint check to that verified leaf. Matching the enrolled fingerprint against any presented
// certificate would let a peer present its own leaf followed by a target router's public
// certificate and pass without that router's private key.
leaf, err := cert.VerifyLeafCertChain(self.identity.CA(), certificates, self.signingCertRoots...)
if err != nil {
return fmt.Errorf("unable to verify dialer, routerId: %v: %w", id, err)
}
fingerprint := fmt.Sprintf("%x", sha1.Sum(leaf.Raw))
log.Debugf("peer leaf certificate fingerprint [%s], common name [%s]", fingerprint, leaf.Subject.CommonName)
// The churn / already-connected guard applies only when establishing a new channel. Additional
// underlays of an existing grouped control channel legitimately arrive while the router is already
// connected and must not be rejected here.
if isFirstCtrlConnection(hello) {
if router := self.network.GetConnectedRouter(id); router != nil {
if withinChurnLimit(router, self.network.GetOptions().RouterConnectChurnLimit) {
log.WithField("routerName", router.Name).Error("router already connected and churn threshold not met")
return fmt.Errorf("router already connected id: %s, name: %s", id, router.Name)
}
log.WithField("routerName", router.Name).Warn("router already connected, but churn threshold met. replacing connection")
}
}
if r, err := self.network.GetRouter(id); err == nil {
if r.Fingerprint == nil {
log.Error("router enrollment incomplete")
return fmt.Errorf("router enrollment incomplete, routerId: %v", id)
}
if fingerprint != *r.Fingerprint {
log.WithField("fp", *r.Fingerprint).WithField("givenFp", fingerprint).Error("router fingerprint mismatch")
return fmt.Errorf("incorrect fingerprint/unenrolled router, routerId: %v, given fingerprint: %v", id, fingerprint)
}
if r.Disabled {
log.Error("router disabled")
return fmt.Errorf("router disabld, routerId: %v", id)
}
} else {
log.Error("unknown/unenrolled router")
return fmt.Errorf("unknown/unenrolled router, routerId: %v", id)
}
return nil
}