forked from ethersphere/bee
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Persist grantee list on swarm * accesslogic refactor * Refactor grantee list tests Co-authored-by: Roland Seres <[email protected]>
- Loading branch information
Showing
9 changed files
with
352 additions
and
131 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,44 +1,134 @@ | ||
| package dynamicaccess | ||
|
|
||
| import ( | ||
| "context" | ||
| "crypto/ecdsa" | ||
| "crypto/elliptic" | ||
| "fmt" | ||
|
|
||
| "github.com/ethersphere/bee/pkg/file" | ||
| "github.com/ethersphere/bee/pkg/storer" | ||
| "github.com/ethersphere/bee/pkg/swarm" | ||
| ) | ||
|
|
||
| const ( | ||
| publicKeyLen = 65 | ||
| ) | ||
|
|
||
| type GranteeList interface { | ||
| Add(topic string, addList []*ecdsa.PublicKey) error | ||
| Remove(topic string, removeList []*ecdsa.PublicKey) error | ||
| Get(topic string) []*ecdsa.PublicKey | ||
| Add(addList []*ecdsa.PublicKey) error | ||
| Remove(removeList []*ecdsa.PublicKey) error | ||
| Get() []*ecdsa.PublicKey | ||
| Save() (swarm.Address, error) | ||
| } | ||
|
|
||
| type GranteeListStruct struct { | ||
| grantees map[string][]*ecdsa.PublicKey | ||
| grantees []byte | ||
| loadSave file.LoadSaver | ||
| putter storer.PutterSession | ||
| } | ||
|
|
||
| var _ GranteeList = (*GranteeListStruct)(nil) | ||
|
|
||
| func (g *GranteeListStruct) Get() []*ecdsa.PublicKey { | ||
| return g.deserialize(g.grantees) | ||
| } | ||
|
|
||
| func (g *GranteeListStruct) serialize(publicKeys []*ecdsa.PublicKey) []byte { | ||
| b := make([]byte, 0, len(publicKeys)*publicKeyLen) | ||
| for _, key := range publicKeys { | ||
| b = append(b, g.serializePublicKey(key)...) | ||
| } | ||
| return b | ||
| } | ||
|
|
||
| func (g *GranteeListStruct) serializePublicKey(pub *ecdsa.PublicKey) []byte { | ||
| return elliptic.Marshal(pub.Curve, pub.X, pub.Y) | ||
| } | ||
|
|
||
| func (g *GranteeListStruct) Get(topic string) []*ecdsa.PublicKey { | ||
| grantees := g.grantees[topic] | ||
| keys := make([]*ecdsa.PublicKey, len(grantees)) | ||
| copy(keys, grantees) | ||
| return keys | ||
| func (g *GranteeListStruct) deserialize(data []byte) []*ecdsa.PublicKey { | ||
| if len(data) == 0 { | ||
| return nil | ||
| } | ||
|
|
||
| p := make([]*ecdsa.PublicKey, 0, len(data)/publicKeyLen) | ||
| for i := 0; i < len(data); i += publicKeyLen { | ||
| pubKey := g.deserializeBytes(data[i : i+publicKeyLen]) | ||
| if pubKey == nil { | ||
| return nil | ||
| } | ||
| p = append(p, pubKey) | ||
| } | ||
| return p | ||
| } | ||
|
|
||
| func (g *GranteeListStruct) Add(topic string, addList []*ecdsa.PublicKey) error { | ||
| g.grantees[topic] = append(g.grantees[topic], addList...) | ||
| func (g *GranteeListStruct) deserializeBytes(data []byte) *ecdsa.PublicKey { | ||
| curve := elliptic.P256() | ||
| x, y := elliptic.Unmarshal(curve, data) | ||
| return &ecdsa.PublicKey{Curve: curve, X: x, Y: y} | ||
| } | ||
|
|
||
| func (g *GranteeListStruct) Add(addList []*ecdsa.PublicKey) error { | ||
| if len(addList) == 0 { | ||
| return fmt.Errorf("no public key provided") | ||
| } | ||
|
|
||
| data := g.serialize(addList) | ||
| g.grantees = append(g.grantees, data...) | ||
| return nil | ||
| } | ||
|
|
||
| func (g *GranteeListStruct) Remove(topic string, removeList []*ecdsa.PublicKey) error { | ||
| for _, remove := range removeList { | ||
| for i, grantee := range g.grantees[topic] { | ||
| if *grantee == *remove { | ||
| g.grantees[topic][i] = g.grantees[topic][len(g.grantees[topic])-1] | ||
| g.grantees[topic] = g.grantees[topic][:len(g.grantees[topic])-1] | ||
| func (g *GranteeListStruct) Save() (swarm.Address, error) { | ||
| refBytes, err := g.loadSave.Save(context.Background(), g.grantees) | ||
| if err != nil { | ||
| return swarm.ZeroAddress, fmt.Errorf("grantee save error: %w", err) | ||
| } | ||
| address := swarm.NewAddress(refBytes) | ||
| err = g.putter.Done(address) | ||
| if err != nil { | ||
| return swarm.ZeroAddress, err | ||
| } | ||
| return address, nil | ||
| } | ||
|
|
||
| func (g *GranteeListStruct) Remove(keysToRemove []*ecdsa.PublicKey) error { | ||
| if len(keysToRemove) == 0 { | ||
| return fmt.Errorf("nothing to remove") | ||
| } | ||
| grantees := g.deserialize(g.grantees) | ||
| if grantees == nil { | ||
| return fmt.Errorf("no grantee found") | ||
| } | ||
|
|
||
| for _, remove := range keysToRemove { | ||
| for i, grantee := range grantees { | ||
| if grantee.Equal(remove) { | ||
| grantees[i] = grantees[len(grantees)-1] | ||
| grantees = grantees[:len(grantees)-1] | ||
| } | ||
| } | ||
| } | ||
|
|
||
| g.grantees = g.serialize(grantees) | ||
| return nil | ||
| } | ||
|
|
||
| func NewGrantee() *GranteeListStruct { | ||
| return &GranteeListStruct{grantees: make(map[string][]*ecdsa.PublicKey)} | ||
| func NewGranteeList(ls file.LoadSaver, putter storer.PutterSession, reference swarm.Address) GranteeList { | ||
| var ( | ||
| data []byte | ||
| err error | ||
| ) | ||
| if swarm.ZeroAddress.Equal(reference) || swarm.EmptyAddress.Equal(reference) { | ||
| data = []byte{} | ||
| } else { | ||
| data, err = ls.Load(context.Background(), reference.Bytes()) | ||
| } | ||
| if err != nil { | ||
| return nil | ||
| } | ||
|
|
||
| return &GranteeListStruct{ | ||
| grantees: data, | ||
| loadSave: ls, | ||
| putter: putter, | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.