From 5c7776b12e375d0482282e33f4a2ef91a8435b0f Mon Sep 17 00:00:00 2001 From: Abin Simon Date: Fri, 29 Apr 2022 15:10:19 +0530 Subject: [PATCH 1/2] Set sentry scheme to http if no scheme available --- pkg/sentry/register/register.go | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkg/sentry/register/register.go b/pkg/sentry/register/register.go index 45d4bee..bf9f756 100644 --- a/pkg/sentry/register/register.go +++ b/pkg/sentry/register/register.go @@ -233,16 +233,9 @@ func prepareConfig(config *Config) error { return fmt.Errorf("invalid scheme %s", config.Scheme) } - if config.Scheme == "" && strings.HasPrefix(config.Addr, "localhost") { - config.Scheme = schemeHTTP - } - - if config.Scheme == "" && strings.Index(config.Addr, "rafay.local") > 0 { - config.Scheme = schemeHTTP - } - if config.Scheme == "" { - return fmt.Errorf("empty Schema not allowed") + _log.Debug("scheme not defined, defaulting to http") + config.Scheme = schemeHTTP } switch config.Mode { From f9ec22a0bab03fd7e48994ed9cf5c439a80a9a2d Mon Sep 17 00:00:00 2001 From: Abin Simon Date: Fri, 29 Apr 2022 15:10:36 +0530 Subject: [PATCH 2/2] Invalidate casbin cache after every update --- pkg/service/authz.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkg/service/authz.go b/pkg/service/authz.go index 08106fa..92b030e 100644 --- a/pkg/service/authz.go +++ b/pkg/service/authz.go @@ -33,6 +33,7 @@ type authzService struct { } func NewAuthzService(db *bun.DB, en *casbin.CachedEnforcer) AuthzService { + // en.EnableCache(false) // disables caching in casbin return &authzService{ db: db, enforcer: en, @@ -257,6 +258,7 @@ func (s *authzService) CreatePolicies(ctx context.Context, p *authzpbv1.Policies if err != nil { return nil, status.Errorf(codes.Internal, err.Error()) } + s.enforcer.InvalidateCache() return &authzpbv1.BoolReply{Res: res}, nil } @@ -266,6 +268,7 @@ func (s *authzService) DeletePolicies(ctx context.Context, p *authzpbv1.Policy) if err != nil { return nil, status.Errorf(codes.Internal, err.Error()) } + s.enforcer.InvalidateCache() return &authzpbv1.BoolReply{Res: res}, nil } @@ -289,6 +292,7 @@ func (s *authzService) CreateUserGroups(ctx context.Context, p *authzpbv1.UserGr return nil, status.Errorf(codes.Internal, err.Error()) } + s.enforcer.InvalidateCache() return &authzpbv1.BoolReply{Res: res}, nil } @@ -299,6 +303,7 @@ func (s *authzService) DeleteUserGroups(ctx context.Context, p *authzpbv1.UserGr return nil, status.Errorf(codes.Internal, err.Error()) } + s.enforcer.InvalidateCache() return &authzpbv1.BoolReply{Res: res}, nil } @@ -323,6 +328,7 @@ func (s *authzService) CreateRolePermissionMappings(ctx context.Context, p *auth return nil, status.Errorf(codes.Internal, err.Error()) } + s.enforcer.InvalidateCache() return &authzpbv1.BoolReply{Res: res}, nil } @@ -332,5 +338,6 @@ func (s *authzService) DeleteRolePermissionMappings(ctx context.Context, p *auth return nil, status.Errorf(codes.Internal, err.Error()) } + s.enforcer.InvalidateCache() return &authzpbv1.BoolReply{Res: res}, nil }