mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-16 12:58:00 +00:00
0416153e8e
Add organizationID as query for ListUsers and clean up the deprecated Organisation attributes in other queries.
This PR removes the following fields from API requests (user service v2):
organisation from AddHumanUser (deprecated some time ago, organization still exists)
organization from GetUserByID
(cherry picked from commit 319ebe7898)
66 lines
2.0 KiB
Go
66 lines
2.0 KiB
Go
package middleware
|
|
|
|
import (
|
|
"context"
|
|
|
|
"google.golang.org/grpc"
|
|
"google.golang.org/grpc/codes"
|
|
"google.golang.org/grpc/status"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/authz"
|
|
grpc_util "github.com/zitadel/zitadel/internal/api/grpc"
|
|
"github.com/zitadel/zitadel/internal/api/http"
|
|
"github.com/zitadel/zitadel/internal/telemetry/tracing"
|
|
)
|
|
|
|
func AuthorizationInterceptor(verifier authz.APITokenVerifier, authConfig authz.Config) grpc.UnaryServerInterceptor {
|
|
return func(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
|
|
return authorize(ctx, req, info, handler, verifier, authConfig)
|
|
}
|
|
}
|
|
|
|
func authorize(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler, verifier authz.APITokenVerifier, authConfig authz.Config) (_ interface{}, err error) {
|
|
authOpt, needsToken := verifier.CheckAuthMethod(info.FullMethod)
|
|
if !needsToken {
|
|
return handler(ctx, req)
|
|
}
|
|
|
|
authCtx, span := tracing.NewServerInterceptorSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
authToken := grpc_util.GetAuthorizationHeader(authCtx)
|
|
if authToken == "" {
|
|
return nil, status.Error(codes.Unauthenticated, "auth header missing")
|
|
}
|
|
|
|
orgID, orgDomain := orgIDAndDomainFromRequest(authCtx, req)
|
|
ctxSetter, err := authz.CheckUserAuthorization(authCtx, req, authToken, orgID, orgDomain, verifier, authConfig, authOpt, info.FullMethod)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
span.End()
|
|
return handler(ctxSetter(ctx), req)
|
|
}
|
|
|
|
func orgIDAndDomainFromRequest(ctx context.Context, req interface{}) (id, domain string) {
|
|
orgID := grpc_util.GetHeader(ctx, http.ZitadelOrgID)
|
|
oz, ok := req.(OrganizationFromRequest)
|
|
if ok {
|
|
id = oz.OrganizationFromRequest().ID
|
|
domain = oz.OrganizationFromRequest().Domain
|
|
if id != "" || domain != "" {
|
|
return id, domain
|
|
}
|
|
}
|
|
return orgID, domain
|
|
}
|
|
|
|
type Organization struct {
|
|
ID string
|
|
Domain string
|
|
}
|
|
|
|
type OrganizationFromRequest interface {
|
|
OrganizationFromRequest() *Organization
|
|
}
|