coosld/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2026-02-26 12:57:44 +08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Merge pull request #7023 from ipfs/fix/improve-key-lookup

Browse Source 
feat: improve key lookup
This commit is contained in:
Steven Allen 2020-03-23 16:36:00 -07:00 committed by GitHub
commit 65e2ce74cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
core/coreapi/name.go
View File

@ -139,10 +139,16 @@ func (api *NameAPI) Resolve(ctx context.Context, name string, opts ...caopts.Nam
}
func keylookup(self ci.PrivKey, kstore keystore.Keystore, k string) (ci.PrivKey, error) {
////////////////////
// Lookup by name //
////////////////////
// First, lookup self.
if k == "self" {
return self, nil
}
// Then, look in the keystore.
res, err := kstore.Get(k)
if res != nil {
return res, nil
@ -157,20 +163,36 @@ func keylookup(self ci.PrivKey, kstore keystore.Keystore, k string) (ci.PrivKey,
return nil, err
}
//////////////////
// Lookup by ID //
//////////////////
targetPid, err := peer.Decode(k)
if err != nil {
return nil, keystore.ErrNoSuchKey
}
// First, check self.
pid, err := peer.IDFromPrivateKey(self)
if err != nil {
return nil, fmt.Errorf("failed to determine peer ID for private key: %w", err)
}
if pid == targetPid {
return self, nil
}
// Then, look in the keystore.
for _, key := range keys {
privKey, err := kstore.Get(key)
if err != nil {
return nil, err
}
pubKey := privKey.GetPublic()
pid, err := peer.IDFromPublicKey(pubKey)
pid, err := peer.IDFromPrivateKey(privKey)
if err != nil {
return nil, err
}
if pid.Pretty() == k {
if targetPid == pid {
return privKey, nil
}
}