Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

EntityFetcher: require fingerprint (#1374) 

EntityFetcher no longer supports key ids. This isn't required anymore as
its only user (`SignRequest.Sign()`) now passes fingerprints.
This commit is contained in:
Alexandre Viau 2021-08-10 09:35:43 -04:00 committed by GitHub
parent 3891d3fe51
commit e2bad19a87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/jsonsign/sign.go
View File

@ -36,7 +36,7 @@ import (
) )
type EntityFetcher interface { type EntityFetcher interface {
FetchEntity(keyID string) (*openpgp.Entity, error) FetchEntity(fingerprint string) (*openpgp.Entity, error)
} }
type FileEntityFetcher struct { type FileEntityFetcher struct {
@ -54,10 +54,10 @@ type CachingEntityFetcher struct {
m map[string]*openpgp.Entity m map[string]*openpgp.Entity
} }
func (ce *CachingEntityFetcher) FetchEntity(keyID string) (*openpgp.Entity, error) { func (ce *CachingEntityFetcher) FetchEntity(fingerprint string) (*openpgp.Entity, error) {
ce.lk.Lock() ce.lk.Lock()
if ce.m != nil { if ce.m != nil {
e := ce.m[keyID] e := ce.m[fingerprint]
if e != nil { if e != nil {
ce.lk.Unlock() ce.lk.Unlock()
return e, nil return e, nil
@ -65,20 +65,20 @@ func (ce *CachingEntityFetcher) FetchEntity(keyID string) (*openpgp.Entity, erro
} }
ce.lk.Unlock() ce.lk.Unlock()
e, err := ce.Fetcher.FetchEntity(keyID) e, err := ce.Fetcher.FetchEntity(fingerprint)
if err == nil { if err == nil {
ce.lk.Lock() ce.lk.Lock()
defer ce.lk.Unlock() defer ce.lk.Unlock()
if ce.m == nil { if ce.m == nil {
ce.m = make(map[string]*openpgp.Entity) ce.m = make(map[string]*openpgp.Entity)
} }
ce.m[keyID] = e ce.m[fingerprint] = e
} }
return e, err return e, err
} }
func (fe *FileEntityFetcher) FetchEntity(keyID string) (*openpgp.Entity, error) { func (fe *FileEntityFetcher) FetchEntity(fingerprint string) (*openpgp.Entity, error) {
f, err := wkfs.Open(fe.File) f, err := wkfs.Open(fe.File)
if err != nil { if err != nil {
return nil, fmt.Errorf("jsonsign: FetchEntity: %v", err) return nil, fmt.Errorf("jsonsign: FetchEntity: %v", err)
@ -90,7 +90,7 @@ func (fe *FileEntityFetcher) FetchEntity(keyID string) (*openpgp.Entity, error)
} }
for _, e := range el { for _, e := range el {
pubk := &e.PrivateKey.PublicKey pubk := &e.PrivateKey.PublicKey
if pubk.KeyIdString() != keyID { if fingerprintString(pubk) != fingerprint {
continue continue
} }
if e.PrivateKey.Encrypted { if e.PrivateKey.Encrypted {
@ -101,7 +101,7 @@ func (fe *FileEntityFetcher) FetchEntity(keyID string) (*openpgp.Entity, error)
} }
return e, nil return e, nil
} }
return nil, fmt.Errorf("jsonsign: entity for keyid %q not found in %q", keyID, fe.File) return nil, fmt.Errorf("jsonsign: entity for fingerprint %q not found in %q", fingerprint, fe.File)
} }
type SignRequest struct { type SignRequest struct {
@ -190,7 +190,7 @@ func (sr *SignRequest) Sign(ctx context.Context) (signedJSON string, err error)
secring.Close() // just opened to see if it's readable secring.Close() // just opened to see if it's readable
entityFetcher = &FileEntityFetcher{File: file} entityFetcher = &FileEntityFetcher{File: file}
} }
signer, err := entityFetcher.FetchEntity(pubk.KeyIdString()) signer, err := entityFetcher.FetchEntity(fingerprintString(pubk))
if err != nil { if err != nil {
return "", err return "", err
} }

10
pkg/schema/sign.go
View File

@ -96,12 +96,10 @@ func NewSigner(pubKeyRef blob.Ref, armoredPubKey io.Reader, privateKeySource int
return uint32(len(armoredPubKeyString)), ioutil.NopCloser(strings.NewReader(armoredPubKeyString)) return uint32(len(armoredPubKeyString)), ioutil.NopCloser(strings.NewReader(armoredPubKeyString))
}, },
}, },
EntityFetcher: entityFetcherFunc(func(wantKeyId string) (*openpgp.Entity, error) { EntityFetcher: entityFetcherFunc(func(wantFingerprint string) (*openpgp.Entity, error) {
if fingerprint != wantKeyId && if fingerprint != wantFingerprint {
privateKey.PrivateKey.KeyIdString() != wantKeyId && return nil, fmt.Errorf("jsonsign code unexpectedly requested fingerprint %q; only have %q",
privateKey.PrivateKey.KeyIdShortString() != wantKeyId { wantFingerprint, fingerprint)
return nil, fmt.Errorf("jsonsign code unexpectedly requested keyID %q; only have %q",
wantKeyId, fingerprint)
} }
return privateKey, nil return privateKey, nil
}), }),