Skip to content
Snippets Groups Projects

[renovate] Update golangci/golangci-lint Docker tag to v1.55.1

Merged Ghost User requested to merge renovate/golangci-golangci-lint-1.x into master
2 files
+ 81
14
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -3,6 +3,7 @@ package server
import (
"context"
"encoding/base64"
"errors"
"time"
apb "code.fbi.h-da.de/danet/gosdn/api/go/gosdn/rbac"
@@ -16,6 +17,7 @@ import (
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
"google.golang.org/grpc/status"
"google.golang.org/protobuf/reflect/protoreflect"
)
// AuthServer holds a JWTManager and represents a AuthServiceServer.
@@ -39,14 +41,33 @@ func NewAuthServer(
}
}
func (s AuthServer) checkForValidationErrors(request protoreflect.ProtoMessage) error {
err := s.protoValidator.Validate(request)
if err != nil {
var valErr *protovalidate.ValidationError
if ok := errors.As(err, &valErr); ok {
protoErr := valErr.ToProto()
grpcError, _ := status.New(codes.Aborted, "Validation failed").WithDetails(protoErr)
return grpcError.Err()
}
return status.Errorf(codes.Aborted, "%v", err)
}
return nil
}
// Login logs a user in.
func (s AuthServer) Login(ctx context.Context, request *apb.LoginRequest) (*apb.LoginResponse, error) {
labels := prometheus.Labels{"service": "auth", "rpc": "post"}
start := metrics.StartHook(labels, grpcRequestsTotal)
defer metrics.FinishHook(labels, start, grpcRequestDurationSecondsTotal, grpcRequestDurationSeconds)
if err := s.protoValidator.Validate(request); err != nil {
return nil, status.Errorf(codes.Aborted, "%v", err)
err := s.checkForValidationErrors(request)
if err != nil {
return nil, err
}
user := rbac.User{
@@ -55,7 +76,7 @@ func (s AuthServer) Login(ctx context.Context, request *apb.LoginRequest) (*apb.
}
// validation of credentials
err := s.isValidUser(user)
err = s.isValidUser(user)
if err != nil {
return nil, err
}
@@ -90,11 +111,12 @@ func (s AuthServer) Logout(ctx context.Context, request *apb.LogoutRequest) (*ap
start := metrics.StartHook(labels, grpcRequestsTotal)
defer metrics.FinishHook(labels, start, grpcRequestDurationSecondsTotal, grpcRequestDurationSeconds)
if err := s.protoValidator.Validate(request); err != nil {
return nil, status.Errorf(codes.Aborted, "%v", err)
err := s.checkForValidationErrors(request)
if err != nil {
return nil, err
}
err := s.handleLogout(ctx, request.Username)
err = s.handleLogout(ctx, request.Username)
if err != nil {
return nil, err
}
Loading