TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-07-28 19:33:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: grpc status in sentry and validation interceptors (#2012)

Browse Source
This commit is contained in:
Livio Amstutz 2021-07-13 15:42:41 +02:00 committed by GitHub
parent da181b9e8c
commit 87ef8f454a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
internal/api/grpc/server/middleware/sentry_interceptor.go
View File

@ -6,8 +6,7 @@ import (
"github.com/getsentry/sentry-go" "github.com/getsentry/sentry-go"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"github.com/caos/zitadel/internal/api/grpc/errors"
) )
func SentryHandler() grpc.UnaryServerInterceptor { func SentryHandler() grpc.UnaryServerInterceptor {
@ -18,8 +17,17 @@ func SentryHandler() grpc.UnaryServerInterceptor {
func sendErrToSentry(ctx context.Context, req interface{}, handler grpc.UnaryHandler) (interface{}, error) { func sendErrToSentry(ctx context.Context, req interface{}, handler grpc.UnaryHandler) (interface{}, error) {
resp, err := handler(ctx, req) resp, err := handler(ctx, req)
code, _, _, _ := errors.ExtractCaosError(err) code := status.Code(err)
if code == codes.Unknown || code == codes.Internal { switch code {
case codes.Canceled,
codes.Unknown,
codes.DeadlineExceeded,
codes.ResourceExhausted,
codes.Aborted,
codes.Unimplemented,
codes.Internal,
codes.Unavailable,
codes.DataLoss:
sentry.CaptureException(err) sentry.CaptureException(err)
} }
return resp, err return resp, err

4
internal/api/grpc/server/middleware/validation_interceptor.go
View File

@ -4,6 +4,8 @@ import (
"context" "context"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
_ "github.com/caos/zitadel/internal/statik" _ "github.com/caos/zitadel/internal/statik"
) )
@ -25,7 +27,7 @@ func validate(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo,
} }
err := validate.Validate() err := validate.Validate()
if err != nil { if err != nil {
return nil, err return nil, status.Error(codes.InvalidArgument, err.Error())
} }
return handler(ctx, req) return handler(ctx, req)
} }

2
internal/api/grpc/server/server.go
View File

@ -35,9 +35,9 @@ func CreateServer(verifier *authz.TokenVerifier, authConfig authz.Config, lang l
grpc_middleware.ChainUnaryServer( grpc_middleware.ChainUnaryServer(
middleware.DefaultTracingServer(), middleware.DefaultTracingServer(),
middleware.MetricsHandler(metricTypes, grpc_api.Probes...), middleware.MetricsHandler(metricTypes, grpc_api.Probes...),
middleware.SentryHandler(),
middleware.ErrorHandler(), middleware.ErrorHandler(),
middleware.AuthorizationInterceptor(verifier, authConfig), middleware.AuthorizationInterceptor(verifier, authConfig),
middleware.SentryHandler(),
middleware.TranslationHandler(lang), middleware.TranslationHandler(lang),
middleware.ValidationHandler(), middleware.ValidationHandler(),
middleware.ServiceHandler(), middleware.ServiceHandler(),