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

storagenode: getting signee cert always asked the kademlia network (#1823)

Browse Source
This commit is contained in:
Egon Elbre 2019-04-24 11:13:48 +03:00 committed by GitHub
parent cd4a3e06d8
commit 7ba1a2bc53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
storagenode/trust/service.go
View File

@ -32,7 +32,7 @@ type Pool struct {
// satelliteInfoCache caches identity information about a satellite
type satelliteInfoCache struct {
once sync.Once
mu sync.Mutex
identity *identity.PeerIdentity
}
@ -97,9 +97,6 @@ func (pool *Pool) VerifyUplinkID(ctx context.Context, id storj.NodeID) error {
// GetSignee gets the corresponding signee for verifying signatures.
// It ignores passed in ctx cancellation to avoid miscaching between concurrent requests.
func (pool *Pool) GetSignee(ctx context.Context, id storj.NodeID) (signing.Signee, error) {
// creating a new context here to avoid request context canceling fetching peer identity
nestedContext := context.Background()
// lookup peer identity with id
pool.mu.RLock()
info, ok := pool.trustedSatellites[id]
@ -123,17 +120,19 @@ func (pool *Pool) GetSignee(ctx context.Context, id storj.NodeID) (signing.Signe
}
}
identity, err := pool.kademlia.FetchPeerIdentity(nestedContext, id)
if err != nil {
if err == context.Canceled {
return nil, err
}
return nil, Error.Wrap(err)
}
info.mu.Lock()
defer info.mu.Unlock()
info.once.Do(func() {
if info.identity == nil {
identity, err := pool.kademlia.FetchPeerIdentity(ctx, id)
if err != nil {
if err == context.Canceled {
return nil, err
}
return nil, Error.Wrap(err)
}
info.identity = identity
})
}
return signing.SigneeFromPeerIdentity(info.identity), nil
}

14
storagenode/trust/service_test.go
View File

@ -33,17 +33,13 @@ func TestGetSignee(t *testing.T) {
var group errgroup.Group
group.Go(func() error {
cert, err := trust.GetSignee(canceledContext, planet.Satellites[0].ID())
if err != context.Canceled {
_, err := trust.GetSignee(canceledContext, planet.Satellites[0].ID())
if err == context.Canceled {
return nil
}
if err != nil {
return err
}
if cert != nil {
return errors.New("got certificate")
}
return nil
// if the other goroutine races us,
// then we might get the certificate from the cache, however we shouldn't get an error
return err
})
group.Go(func() error {