TrueCloudLab/frostfs-node
21
1
Fork 27
Code Issues 107 Pull requests 2 Projects Releases 1 Activity Actions

[#1563] tree: Wrap only ChainRouterError erros with ObjectAccessDenied
All checks were successful
Vulncheck / Vulncheck (pull_request) Successful in 3m25s
Details
Pre-commit hooks / Pre-commit (pull_request) Successful in 4m26s
Details
Tests and linters / gopls check (pull_request) Successful in 4m32s
Details
Tests and linters / Tests with -race (pull_request) Successful in 7m7s
Details
Tests and linters / Run gofumpt (pull_request) Successful in 8m50s
Details
DCO action / DCO (pull_request) Successful in 9m21s
Details
Build / Build Components (pull_request) Successful in 10m18s
Details
Tests and linters / Tests (pull_request) Successful in 10m40s
Details
Tests and linters / Staticcheck (pull_request) Successful in 10m52s
Details
Tests and linters / Lint (pull_request) Successful in 11m20s
Details

Browse source 
* Such wrapping helps to differentiate logical check errors and server internal
  errors.

Signed-off-by: Airat Arifullin <a.arifullin@yadro.com>
This commit is contained in:
Airat Arifullin 2024-12-16 14:17:37 +03:00
parent 25ed595354
commit 7e3f2fca47
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkg/services/tree/signature.go
View file

@ -9,6 +9,7 @@ import (
"fmt" "fmt"
core "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container" core "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/container"
checkercore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/common/ape"
"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/api/refs" "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/api/refs"
"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer" "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer"
apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
@ -70,6 +71,12 @@ func (s *Service) verifyClient(ctx context.Context, req message, cid cidSDK.ID,
} }
func apeErr(err error) error { func apeErr(err error) error {
var chRouterErr *checkercore.ChainRouterError
if !errors.As(err, &chRouterErr) {
errServerInternal := &apistatus.ServerInternal{}
apistatus.WriteInternalServerErr(errServerInternal, err)
return errServerInternal
}
errAccessDenied := &apistatus.ObjectAccessDenied{} errAccessDenied := &apistatus.ObjectAccessDenied{}
errAccessDenied.WriteReason(err.Error()) errAccessDenied.WriteReason(err.Error())
return errAccessDenied return errAccessDenied