char
/
dendrite
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix perspective fetching

main
Neil Alexander 2020-09-29 17:34:48 +01:00
parent d63d7c5640
commit beaf4cc00f
No known key found for this signature in database
GPG Key ID: A02A2019A2BB0944
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
serverkeyapi/internal/api.go
View File

@ -201,6 +201,10 @@ func (s *ServerKeyAPI) handleFetcherKeys(
// Now let's look at the results that we got from this fetcher. // Now let's look at the results that we got from this fetcher.
for req, res := range fetcherResults { for req, res := range fetcherResults {
if req.ServerName == s.ServerName {
continue
}
if prev, ok := results[req]; ok { if prev, ok := results[req]; ok {
// We've already got a previous entry for this request // We've already got a previous entry for this request
// so let's see if the newly retrieved one contains a more // so let's see if the newly retrieved one contains a more
@ -208,31 +212,24 @@ func (s *ServerKeyAPI) handleFetcherKeys(
if res.ValidUntilTS > prev.ValidUntilTS { if res.ValidUntilTS > prev.ValidUntilTS {
// This key is newer than the one we had so let's store // This key is newer than the one we had so let's store
// it in the database. // it in the database.
if req.ServerName != s.ServerName { storeResults[req] = res
storeResults[req] = res
}
} }
} else { } else {
// We didn't already have a previous entry for this request // We didn't already have a previous entry for this request
// so store it in the database anyway for now. // so store it in the database anyway for now.
if req.ServerName != s.ServerName { storeResults[req] = res
storeResults[req] = res
}
} }
// Update the results map with this new result. If nothing // Update the results map with this new result. If nothing
// else, we can try verifying against this key. // else, we can try verifying against this key.
results[req] = res results[req] = res
// If the key is valid right now then we can remove it from the // Remove it from the request list so we won't re-fetch it.
// request list as we won't need to re-fetch it. delete(requests, req)
if res.WasValidAt(now, true) {
delete(requests, req)
}
} }
// Store the keys from our store map. // Store the keys from our store map.
if err = s.OurKeyRing.KeyDatabase.StoreKeys(ctx, storeResults); err != nil { if err = s.OurKeyRing.KeyDatabase.StoreKeys(context.Background(), storeResults); err != nil {
logrus.WithError(err).WithFields(logrus.Fields{ logrus.WithError(err).WithFields(logrus.Fields{
"fetcher_name": fetcher.FetcherName(), "fetcher_name": fetcher.FetcherName(),
"database_name": s.OurKeyRing.KeyDatabase.FetcherName(), "database_name": s.OurKeyRing.KeyDatabase.FetcherName(),
@ -243,7 +240,7 @@ func (s *ServerKeyAPI) handleFetcherKeys(
if len(storeResults) > 0 { if len(storeResults) > 0 {
logrus.WithFields(logrus.Fields{ logrus.WithFields(logrus.Fields{
"fetcher_name": fetcher.FetcherName(), "fetcher_name": fetcher.FetcherName(),
}).Infof("Updated %d of %d key(s) in database", len(storeResults), len(results)) }).Infof("Updated %d of %d key(s) in database (%d keys remaining)", len(storeResults), len(results), len(requests))
} }
return nil return nil