mirror of
https://github.com/openziti/ziti.git
synced 2026-09-11 13:29:03 +00:00
d7076430c9
- reports edge router policy denials with an access-denied error naming the missing policy, replacing the session error reused on the sessionless ER/T and create-circuit-v3 paths - adds EdgeRouterManager.GetEdgeRouterAccess, which reports which of the two required policy links (identity-to-edge-router, service-to-edge-router) is absent, and removes the boolean IsAccessToEdgeRouterAllowed it replaces - logs the controller's rejection on the router at warn level, since it is recoverable and retried by the periodic scan; the router previously discarded the error code and message - delays a new terminator's first create attempt by a fixed 2s so config applied in quick succession settles before the router asks, avoiding a 2-3 minute wait for the retry scan; the delay is a deliberate stopgap until edge router policy visibility lands in the router data model - propagates the controller's error code and retry hint to SDK clients on the dial paths, which dropped the code and left every refusal classified as unknown - adds the retry hint header to controller error replies, grouped with the other error-reply headers rather than the create-circuit-v3 request headers - notes that the sync strategy headers alias the edge namespace's 1013-1015 ids and stay disjoint only by message content type - tests the per-policy denial reporting, the error code carried with and without a retry hint, the controller-to-SDK error code mapping at both dial relay sites, and the terminator settle gate - waits for terminator establishment in the tunneler dataflow tests instead of a fixed sleep, so they no longer race the settle delay - restores the tproxy multiple-lanIf and multiple-resolver changelog entries with keep markers, which regeneration drops because their commits reference pull requests rather than issues
247 lines
7.5 KiB
Go
247 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_edge_ctrl
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/michaelquigley/pfxlog"
|
|
"github.com/openziti/channel/v5"
|
|
"github.com/openziti/identity"
|
|
"github.com/openziti/sdk-golang/v2/ziti/edge"
|
|
"github.com/openziti/ziti/v2/controller/storage/boltz"
|
|
"github.com/openziti/ziti/v2/common/ctrl_msg"
|
|
"github.com/openziti/ziti/v2/common/logcontext"
|
|
"github.com/openziti/ziti/v2/common/pb/edge_ctrl_pb"
|
|
"github.com/openziti/ziti/v2/controller/env"
|
|
"github.com/openziti/ziti/v2/controller/model"
|
|
"github.com/openziti/ziti/v2/controller/xt"
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
// NewCreateCircuitV3Handler creates a handler for CreateCircuitV3 requests. These requests
|
|
// come from routers that have already authorized the dial locally via RDM, so no service
|
|
// session token is required. Instead, the request carries the identity ID and service ID,
|
|
// and either a pre-assigned circuit ID or an empty one, in which case the controller
|
|
// generates it.
|
|
func NewCreateCircuitV3Handler(appEnv *env.AppEnv, ch channel.Channel) channel.ContentTypeReceiver {
|
|
handler := &createCircuitHandler{
|
|
baseRequestHandler: baseRequestHandler{
|
|
ch: ch,
|
|
appEnv: appEnv,
|
|
},
|
|
}
|
|
return &channel.AsyncFunctionReceiveAdapter{
|
|
Type: int32(edge_ctrl_pb.ContentType_CreateCircuitV3RequestType),
|
|
Handler: handler.HandleReceiveCreateCircuitV3,
|
|
}
|
|
}
|
|
|
|
func (self *createCircuitHandler) HandleReceiveCreateCircuitV3(msg *channel.Message, ch channel.Channel) {
|
|
req, err := ctrl_msg.DecodeCreateCircuitV3Request(msg)
|
|
if err != nil {
|
|
pfxlog.ContextLogger(ch.Label()).WithError(err).Error("could not decode CreateCircuitV3Request")
|
|
return
|
|
}
|
|
|
|
ctx := &createCircuitV3RequestContext{
|
|
baseSessionRequestContext: baseSessionRequestContext{handler: self, msg: msg, env: self.appEnv},
|
|
req: req,
|
|
}
|
|
|
|
self.createCircuitV3(ctx, self.CreateCircuitV3Response)
|
|
}
|
|
|
|
func (self *createCircuitHandler) CreateCircuitV3Response(circuitInfo *model.Circuit, peerData map[uint32][]byte) (*channel.Message, error) {
|
|
response := &ctrl_msg.CreateCircuitV3Response{
|
|
CircuitId: circuitInfo.Id,
|
|
Address: circuitInfo.Path.IngressId,
|
|
PeerData: peerData,
|
|
Tags: circuitInfo.Tags,
|
|
}
|
|
|
|
return response.ToMessage(), nil
|
|
}
|
|
|
|
func (self *createCircuitHandler) createCircuitV3(ctx *createCircuitV3RequestContext, f createCircuitResponseFactory) {
|
|
if !ctx.loadRouter() {
|
|
return
|
|
}
|
|
ctx.setupLogContext()
|
|
ctx.loadServiceByIdForDial()
|
|
ctx.verifyEdgeRouterAccessForIdentity()
|
|
circuitInfo, peerData := ctx.createCircuit(ctx.req.TerminatorInstanceId, ctx.req.PeerData, ctx.newCircuitCreateParms)
|
|
|
|
if ctx.err != nil {
|
|
if circuitInfo != nil {
|
|
ctx.errRespF = func(resp *channel.Message) {
|
|
resp.PutStringHeader(edge.CircuitIdHeader, circuitInfo.Id)
|
|
}
|
|
}
|
|
self.returnError(ctx, ctx.err)
|
|
return
|
|
}
|
|
|
|
log := pfxlog.ContextLogger(self.ch.Label()).
|
|
WithField("identityId", ctx.req.IdentityId).
|
|
WithField("serviceId", ctx.req.ServiceId).
|
|
WithField("circuitId", circuitInfo.Id)
|
|
|
|
responseMsg, err := f(circuitInfo, peerData)
|
|
if err != nil {
|
|
log.WithError(err).Error("error generating create circuit v3 response")
|
|
}
|
|
log.Debug("responding with successful circuit v3 setup")
|
|
|
|
responseMsg.ReplyTo(ctx.msg)
|
|
if err = self.ch.Send(responseMsg); err != nil {
|
|
log.WithError(err).Error("failed to send create circuit v3 response")
|
|
}
|
|
}
|
|
|
|
type createCircuitV3RequestContext struct {
|
|
baseSessionRequestContext
|
|
req *ctrl_msg.CreateCircuitV3Request
|
|
errRespF func(m *channel.Message)
|
|
}
|
|
|
|
func (self *createCircuitV3RequestContext) UpdateResponse(m *channel.Message) {
|
|
if self.errRespF != nil {
|
|
self.errRespF(m)
|
|
}
|
|
}
|
|
|
|
func (self *createCircuitV3RequestContext) setupLogContext() {
|
|
if self.err != nil {
|
|
return
|
|
}
|
|
|
|
self.logContext = logcontext.NewContext()
|
|
traceSpec := self.handler.getAppEnv().TraceManager.GetIdentityTrace(self.req.IdentityId)
|
|
if traceSpec != nil && time.Now().Before(traceSpec.Until) {
|
|
self.logContext.SetChannelsMask(traceSpec.ChannelMask)
|
|
self.logContext.WithField("traceId", traceSpec.TraceId)
|
|
}
|
|
}
|
|
|
|
func (self *createCircuitV3RequestContext) loadServiceByIdForDial() {
|
|
if self.err != nil {
|
|
return
|
|
}
|
|
|
|
var err error
|
|
self.service, err = self.handler.getAppEnv().Managers.EdgeService.Read(self.req.ServiceId)
|
|
if err != nil {
|
|
if boltz.IsErrNotFoundErr(err) {
|
|
self.err = InvalidServiceError{}
|
|
} else {
|
|
self.err = internalError(err)
|
|
}
|
|
logrus.WithField("serviceId", self.req.ServiceId).
|
|
WithField("operation", self.handler.Label()).
|
|
WithError(self.err).
|
|
Error("service not found")
|
|
return
|
|
}
|
|
|
|
dialable, err := self.handler.getAppEnv().Managers.EdgeService.IsDialableByIdentity(self.req.ServiceId, self.req.IdentityId)
|
|
if err != nil {
|
|
self.err = internalError(err)
|
|
logrus.WithField("serviceId", self.req.ServiceId).
|
|
WithField("identityId", self.req.IdentityId).
|
|
WithField("operation", self.handler.Label()).
|
|
WithError(err).
|
|
Error("unable to verify dial access to service")
|
|
return
|
|
}
|
|
|
|
if !dialable {
|
|
self.err = InvalidServiceError{}
|
|
logrus.WithField("serviceId", self.req.ServiceId).
|
|
WithField("identityId", self.req.IdentityId).
|
|
WithField("operation", self.handler.Label()).
|
|
Error("identity does not have dial access to service")
|
|
}
|
|
}
|
|
|
|
func (self *createCircuitV3RequestContext) verifyEdgeRouterAccessForIdentity() {
|
|
if self.err != nil {
|
|
return
|
|
}
|
|
self.verifyEdgeRouterAccess(self.req.IdentityId, self.service.Id, self.newEdgeRouterAccessDeniedError)
|
|
}
|
|
|
|
func (self *createCircuitV3RequestContext) newCircuitCreateParms(serviceId string, peerData map[uint32][]byte) model.CreateCircuitParams {
|
|
return &connectV3CircuitParams{
|
|
circuitId: self.req.CircuitId,
|
|
serviceId: serviceId,
|
|
identityId: self.req.IdentityId,
|
|
sourceRouter: self.sourceRouter,
|
|
clientId: &identity.TokenId{Token: self.req.IdentityId, Data: peerData},
|
|
logCtx: self.logContext,
|
|
deadline: time.Now().Add(self.handler.getAppEnv().GetHostController().GetNetwork().GetOptions().RouteTimeout),
|
|
}
|
|
}
|
|
|
|
type connectV3CircuitParams struct {
|
|
circuitId string
|
|
serviceId string
|
|
identityId string
|
|
sourceRouter *model.Router
|
|
clientId *identity.TokenId
|
|
logCtx logcontext.Context
|
|
deadline time.Time
|
|
}
|
|
|
|
func (self *connectV3CircuitParams) GetServiceId() string {
|
|
return self.serviceId
|
|
}
|
|
|
|
func (self *connectV3CircuitParams) GetSourceRouter() *model.Router {
|
|
return self.sourceRouter
|
|
}
|
|
|
|
func (self *connectV3CircuitParams) GetClientId() *identity.TokenId {
|
|
return self.clientId
|
|
}
|
|
|
|
func (self *connectV3CircuitParams) GetCircuitTags(t xt.CostedTerminator) map[string]string {
|
|
if t == nil {
|
|
return map[string]string{
|
|
"serviceId": self.serviceId,
|
|
"clientId": self.identityId,
|
|
}
|
|
}
|
|
return map[string]string{
|
|
"serviceId": self.serviceId,
|
|
"clientId": self.identityId,
|
|
"hostId": t.GetHostId(),
|
|
}
|
|
}
|
|
|
|
func (self *connectV3CircuitParams) GetLogContext() logcontext.Context {
|
|
return self.logCtx
|
|
}
|
|
|
|
func (self *connectV3CircuitParams) GetDeadline() time.Time {
|
|
return self.deadline
|
|
}
|
|
|
|
func (self *connectV3CircuitParams) GetCircuitId() string {
|
|
return self.circuitId
|
|
}
|