benjamyn/any-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove master key from account

Browse Source
This commit is contained in:
mcrakhman 2023-04-03 13:19:12 +02:00
parent 357f1c935d
commit e9d1de7781
No known key found for this signature in database
GPG Key ID: DED12CFEF5B8396B
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
commonspace/object/accountdata/accountdata.go
View File

@ -8,15 +8,13 @@ import (
type AccountKeys struct { type AccountKeys struct {
PeerKey crypto.PrivKey PeerKey crypto.PrivKey
SignKey crypto.PrivKey SignKey crypto.PrivKey
MasterKey crypto.PrivKey
PeerId string PeerId string
} }
func New(peerKey, signKey, masterKey crypto.PrivKey) *AccountKeys { func New(peerKey, signKey crypto.PrivKey) *AccountKeys {
return &AccountKeys{ return &AccountKeys{
PeerKey: peerKey, PeerKey: peerKey,
SignKey: signKey, SignKey: signKey,
MasterKey: masterKey,
PeerId: peerKey.GetPublic().PeerId(), PeerId: peerKey.GetPublic().PeerId(),
} }
} }
@ -30,14 +28,9 @@ func NewRandom() (*AccountKeys, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
masterKey, _, err := crypto.GenerateEd25519Key(rand.Reader)
if err != nil {
return nil, err
}
return &AccountKeys{ return &AccountKeys{
PeerKey: peerKey, PeerKey: peerKey,
SignKey: signKey, SignKey: signKey,
MasterKey: masterKey,
PeerId: peerKey.GetPublic().PeerId(), PeerId: peerKey.GetPublic().PeerId(),
}, nil }, nil
} }

6
commonspace/object/acl/list/listutils.go
View File

@ -9,10 +9,14 @@ import (
func NewTestDerivedAcl(spaceId string, keys *accountdata.AccountKeys) (AclList, error) { func NewTestDerivedAcl(spaceId string, keys *accountdata.AccountKeys) (AclList, error) {
builder := NewAclRecordBuilder("", crypto.NewKeyStorage()) builder := NewAclRecordBuilder("", crypto.NewKeyStorage())
masterKey, _, err := crypto.GenerateRandomEd25519KeyPair()
if err != nil {
return nil, err
}
root, err := builder.BuildRoot(RootContent{ root, err := builder.BuildRoot(RootContent{
PrivKey: keys.SignKey, PrivKey: keys.SignKey,
SpaceId: spaceId, SpaceId: spaceId,
MasterKey: keys.MasterKey, MasterKey: masterKey,
}) })
if err != nil { if err != nil {
return nil, err return nil, err