TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 101 Pull requests 5 Projects Releases 1 Activity Actions

container: Marhal public key in short format for APE #954

Merged
fyrchik merged 1 commit from fyrchik/frostfs-node:fix-ape-key into master 2024-02-02 17:51:41 +00:00
Conversation 0 Commits 1 Files changed 2 +6 -4
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit d7741e3aa4 - Show all commits

7
pkg/services/container/ape.go
View file

@ -6,6 +6,7 @@ import (
"crypto/ecdsa"
"crypto/elliptic"
"crypto/sha256"
"encoding/hex"
"errors"
"fmt"
"strings"
@ -133,7 +134,7 @@ func (ac *apeChecker) List(ctx context.Context, req *container.ListRequest) (*co
}
reqProps := map[string]string{
nativeschema.PropertyKeyActorPublicKey: pk.String(),
nativeschema.PropertyKeyActorPublicKey: hex.EncodeToString(pk.Bytes()),
nativeschema.PropertyKeyActorRole: role,
}
@ -178,7 +179,7 @@ func (ac *apeChecker) Put(ctx context.Context, req *container.PutRequest) (*cont
}
reqProps := map[string]string{
nativeschema.PropertyKeyActorPublicKey: pk.String(),
nativeschema.PropertyKeyActorPublicKey: hex.EncodeToString(pk.Bytes()),
nativeschema.PropertyKeyActorRole: role,
}
@ -391,7 +392,7 @@ func (ac *apeChecker) getRequestProps(mh *session.RequestMetaHeader, vh *session
return nil, err
}
return map[string]string{
nativeschema.PropertyKeyActorPublicKey: pk.String(),
nativeschema.PropertyKeyActorPublicKey: hex.EncodeToString(pk.Bytes()),
nativeschema.PropertyKeyActorRole: role,
}, nil
}

3
pkg/services/container/ape_test.go
View file

@ -3,6 +3,7 @@ package container
import (
"context"
"crypto/ecdsa"
"encoding/hex"
"errors"
"fmt"
"testing"
@ -524,7 +525,7 @@ func testDenyListContainersForPK(t *testing.T) {
{
Object: chain.ObjectRequest,
Key: nativeschema.PropertyKeyActorPublicKey,
Value: pk.PublicKey().String(),
Value: hex.EncodeToString(pk.PublicKey().Bytes()),
Op: chain.CondStringEquals,
},
},