mirror of
https://github.com/zitadel/zitadel.git
synced 2025-07-14 05:28:32 +00:00

# Which Problems Are Solved Actions v2 is not a feature flag anymore, include functionality on executions is not used and json tags of proto messages are handled incorrectly. # How the Problems Are Solved - Remove actions from the feature flags on system and instance level - Remove include type on executions, only in the API, later maybe in the handling logic as well - Use protojson in request and response handling of actions v2 # Additional Changes - Correct integration tests for request and response handling - Use json.RawMessage for events, so that the event payload is not base64 encoded - Added separate context for async webhook calls, that executions are not cancelled when called async # Additional Context Related to #9759 Closes #9710 --------- Co-authored-by: Livio Spring <livio.a@gmail.com>
151 lines
4.1 KiB
Go
151 lines
4.1 KiB
Go
package middleware
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
|
|
"google.golang.org/grpc"
|
|
"google.golang.org/protobuf/encoding/protojson"
|
|
"google.golang.org/protobuf/proto"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/authz"
|
|
"github.com/zitadel/zitadel/internal/execution"
|
|
"github.com/zitadel/zitadel/internal/query"
|
|
"github.com/zitadel/zitadel/internal/telemetry/tracing"
|
|
)
|
|
|
|
func ExecutionHandler(queries *query.Queries) grpc.UnaryServerInterceptor {
|
|
return func(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
|
|
requestTargets, responseTargets := execution.QueryExecutionTargetsForRequestAndResponse(ctx, queries, info.FullMethod)
|
|
|
|
// call targets otherwise return req
|
|
handledReq, err := executeTargetsForRequest(ctx, requestTargets, info.FullMethod, req)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
response, err := handler(ctx, handledReq)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return executeTargetsForResponse(ctx, responseTargets, info.FullMethod, handledReq, response)
|
|
}
|
|
}
|
|
|
|
func executeTargetsForRequest(ctx context.Context, targets []execution.Target, fullMethod string, req interface{}) (_ interface{}, err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
// if no targets are found, return without any calls
|
|
if len(targets) == 0 {
|
|
return req, nil
|
|
}
|
|
|
|
ctxData := authz.GetCtxData(ctx)
|
|
info := &ContextInfoRequest{
|
|
FullMethod: fullMethod,
|
|
InstanceID: authz.GetInstance(ctx).InstanceID(),
|
|
ProjectID: ctxData.ProjectID,
|
|
OrgID: ctxData.OrgID,
|
|
UserID: ctxData.UserID,
|
|
Request: Message{req.(proto.Message)},
|
|
}
|
|
|
|
return execution.CallTargets(ctx, targets, info)
|
|
}
|
|
|
|
func executeTargetsForResponse(ctx context.Context, targets []execution.Target, fullMethod string, req, resp interface{}) (_ interface{}, err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
// if no targets are found, return without any calls
|
|
if len(targets) == 0 {
|
|
return resp, nil
|
|
}
|
|
|
|
ctxData := authz.GetCtxData(ctx)
|
|
info := &ContextInfoResponse{
|
|
FullMethod: fullMethod,
|
|
InstanceID: authz.GetInstance(ctx).InstanceID(),
|
|
ProjectID: ctxData.ProjectID,
|
|
OrgID: ctxData.OrgID,
|
|
UserID: ctxData.UserID,
|
|
Request: Message{req.(proto.Message)},
|
|
Response: Message{resp.(proto.Message)},
|
|
}
|
|
|
|
return execution.CallTargets(ctx, targets, info)
|
|
}
|
|
|
|
var _ execution.ContextInfo = &ContextInfoRequest{}
|
|
|
|
type ContextInfoRequest struct {
|
|
FullMethod string `json:"fullMethod,omitempty"`
|
|
InstanceID string `json:"instanceID,omitempty"`
|
|
OrgID string `json:"orgID,omitempty"`
|
|
ProjectID string `json:"projectID,omitempty"`
|
|
UserID string `json:"userID,omitempty"`
|
|
Request Message `json:"request,omitempty"`
|
|
}
|
|
|
|
type Message struct {
|
|
proto.Message
|
|
}
|
|
|
|
func (r *Message) MarshalJSON() ([]byte, error) {
|
|
data, err := protojson.Marshal(r.Message)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return data, nil
|
|
}
|
|
|
|
func (r *Message) UnmarshalJSON(data []byte) error {
|
|
return protojson.Unmarshal(data, r.Message)
|
|
}
|
|
|
|
func (c *ContextInfoRequest) GetHTTPRequestBody() []byte {
|
|
data, err := json.Marshal(c)
|
|
if err != nil {
|
|
return nil
|
|
}
|
|
return data
|
|
}
|
|
|
|
func (c *ContextInfoRequest) SetHTTPResponseBody(resp []byte) error {
|
|
return json.Unmarshal(resp, &c.Request)
|
|
}
|
|
|
|
func (c *ContextInfoRequest) GetContent() interface{} {
|
|
return c.Request.Message
|
|
}
|
|
|
|
var _ execution.ContextInfo = &ContextInfoResponse{}
|
|
|
|
type ContextInfoResponse struct {
|
|
FullMethod string `json:"fullMethod,omitempty"`
|
|
InstanceID string `json:"instanceID,omitempty"`
|
|
OrgID string `json:"orgID,omitempty"`
|
|
ProjectID string `json:"projectID,omitempty"`
|
|
UserID string `json:"userID,omitempty"`
|
|
Request Message `json:"request,omitempty"`
|
|
Response Message `json:"response,omitempty"`
|
|
}
|
|
|
|
func (c *ContextInfoResponse) GetHTTPRequestBody() []byte {
|
|
data, err := json.Marshal(c)
|
|
if err != nil {
|
|
return nil
|
|
}
|
|
return data
|
|
}
|
|
|
|
func (c *ContextInfoResponse) SetHTTPResponseBody(resp []byte) error {
|
|
return json.Unmarshal(resp, &c.Response)
|
|
}
|
|
|
|
func (c *ContextInfoResponse) GetContent() interface{} {
|
|
return c.Response.Message
|
|
}
|