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

make caveat nonces random (#1964)

Browse Source
This commit is contained in:
Jeff Wendling 2019-05-14 21:08:52 +00:00 committed by paul cannon
parent 15e74c8c3d
commit 791ec89c5e
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,7 +88,11 @@ func shareMain(cmd *cobra.Command, args []string) (err error) {
return err return err
} }
caveat := macaroon.NewCaveat() caveat, err := macaroon.NewCaveat()
if err != nil {
return err
}
caveat.DisallowDeletes = shareCfg.DisallowDeletes || shareCfg.Readonly caveat.DisallowDeletes = shareCfg.DisallowDeletes || shareCfg.Readonly
caveat.DisallowLists = shareCfg.DisallowLists || shareCfg.Writeonly caveat.DisallowLists = shareCfg.DisallowLists || shareCfg.Writeonly
caveat.DisallowReads = shareCfg.DisallowReads || shareCfg.Writeonly caveat.DisallowReads = shareCfg.DisallowReads || shareCfg.Writeonly

9
pkg/macaroon/caveat.go
View File

@ -4,14 +4,13 @@
package macaroon package macaroon
import ( import (
"encoding/binary" "crypto/rand"
"time"
) )
// NewCaveat returns a Caveat with a nonce initialized to the current timestamp // NewCaveat returns a Caveat with a nonce initialized to the current timestamp
// in nanoseconds. // in nanoseconds.
func NewCaveat() Caveat { func NewCaveat() (Caveat, error) {
var buf [8]byte var buf [8]byte
binary.BigEndian.PutUint64(buf[:], uint64(time.Now().UnixNano())) _, err := rand.Read(buf[:])
return Caveat{Nonce: buf[:]} return Caveat{Nonce: buf[:]}, err
} }