JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/uplink: expose restrict on api keys (#2189)

Browse Source
This commit is contained in:
JT Olio 2019-06-12 15:35:57 -06:00 committed by Stefan Benten
parent 474d9e7492
commit ff7a9030eb
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/uplink/cmd/share.go
View File

@ -79,11 +79,7 @@ func shareMain(cmd *cobra.Command, args []string) (err error) {
return err return err
} }
// TODO(jeff): we have to have the server side of things expecting macaroons key, err := libuplink.ParseAPIKey(cfg.Client.APIKey)
// before we can change libuplink to use macaroons because of all the tests.
// For now, just use the raw macaroon library.
key, err := macaroon.ParseAPIKey(cfg.Client.APIKey)
if err != nil { if err != nil {
return err return err
} }

23
lib/uplink/apikey.go
View File

@ -3,17 +3,34 @@
package uplink package uplink
import (
"storj.io/storj/pkg/macaroon"
)
// APIKey represents an access credential to certain resources // APIKey represents an access credential to certain resources
type APIKey struct { type APIKey struct {
key string key *macaroon.APIKey
} }
// Serialize serializes the API key to a string // Serialize serializes the API key to a string
func (a APIKey) Serialize() string { func (a APIKey) Serialize() string {
return a.key return a.key.Serialize()
} }
// ParseAPIKey parses an API key // ParseAPIKey parses an API key
func ParseAPIKey(val string) (APIKey, error) { func ParseAPIKey(val string) (APIKey, error) {
return APIKey{key: val}, nil k, err := macaroon.ParseAPIKey(val)
if err != nil {
return APIKey{}, err
}
return APIKey{key: k}, nil
}
// Restrict generates a new APIKey with the provided Caveat attached.
func (a APIKey) Restrict(caveat macaroon.Caveat) (APIKey, error) {
k, err := a.key.Restrict(caveat)
if err != nil {
return APIKey{}, err
}
return APIKey{key: k}, nil
} }