luxolus
/
open-vault
2
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

don't ignore errors (#5087)

This commit is contained in:
Vishal Nayak 2018-08-10 22:32:10 -04:00 committed by GitHub
parent 68d27c7c38
commit 303b2f97ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vault/core.go
View File

@ -1070,10 +1070,11 @@ func (c *Core) sealInitCommon(ctx context.Context, req *logical.Request) (retErr
})
if !authResults.Allowed {
c.stateLock.RUnlock()
retErr = multierror.Append(retErr, authResults.Error)
if authResults.Error.ErrorOrNil() == nil || authResults.DeniedError {
return logical.ErrPermissionDenied
retErr = multierror.Append(retErr, logical.ErrPermissionDenied)
}
return authResults.Error
return retErr
}
if te != nil && te.NumUses == tokenRevocationPending {

5
vault/ha.go
View File

@ -235,10 +235,11 @@ func (c *Core) StepDown(httpCtx context.Context, req *logical.Request) (retErr e
})
if !authResults.Allowed {
c.stateLock.RUnlock()
retErr = multierror.Append(retErr, authResults.Error)
if authResults.Error.ErrorOrNil() == nil || authResults.DeniedError {
return logical.ErrPermissionDenied
retErr = multierror.Append(retErr, logical.ErrPermissionDenied)
}
return authResults.Error
return retErr
}
if te != nil && te.NumUses == tokenRevocationPending {

5
vault/request_handling.go
View File

@ -262,10 +262,11 @@ func (c *Core) checkToken(ctx context.Context, req *logical.Request, unauth bool
RootPrivsRequired: rootPath,
})
if !authResults.Allowed {
retErr := authResults.Error
if authResults.Error.ErrorOrNil() == nil || authResults.DeniedError {
return auth, te, logical.ErrPermissionDenied
retErr = multierror.Append(retErr, logical.ErrPermissionDenied)
}
return auth, te, authResults.Error
return auth, te, retErr
}
return auth, te, nil