From 069ae7b87df7665c620d95ea561b24e6ff346b1f Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Tue, 19 Jun 2018 23:07:56 -0400 Subject: [PATCH] Simplify logic --- builtin/credential/radius/path_login.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/builtin/credential/radius/path_login.go b/builtin/credential/radius/path_login.go index ed2553790a..66f5b19e7e 100644 --- a/builtin/credential/radius/path_login.go +++ b/builtin/credential/radius/path_login.go @@ -161,18 +161,14 @@ func (b *backend) RadiusLogin(ctx context.Context, req *logical.Request, usernam return nil, logical.ErrorResponse("access denied by the authentication server"), nil } - var policies []string + policies := cfg.UnregisteredUserPolicies + // Retrieve user entry from storage user, err := b.user(ctx, req.Storage, username) if err != nil { - return policies, logical.ErrorResponse("could not retrieve user entry from storage"), err + return nil, logical.ErrorResponse("could not retrieve user entry from storage"), err } - if user == nil { - // No user found, check if unregistered users are allowed (unregistered_user_policies not empty) - if len(policyutil.SanitizePolicies(cfg.UnregisteredUserPolicies, false)) > 0 { - policies = cfg.UnregisteredUserPolicies - } - } else { + if user != nil { policies = user.Policies }