Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-06-27 07:15:03 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3025 from ywk253100/170808_bug_fix

Browse Source 
Fix bug: can not display signed or not correctly
This commit is contained in:
Wenkai Yin 2017-08-10 17:11:27 +08:00 committed by GitHub
commit ec5c5514b5
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ui/api/repository.go
View File

@ -377,11 +377,11 @@ func assemble(client *registry.Repository, repository string,
tags []string, username string) []*tagResp {
var err error
signatures := map[string]*notary.Target{}
signatures := map[string][]notary.Target{}
if config.WithNotary() {
signatures, err = getSignatures(username, repository)
if err != nil {
signatures = map[string]*notary.Target{}
signatures = map[string][]notary.Target{}
log.Errorf("failed to get signatures of %s: %v", repository, err)
}
}
@ -410,9 +410,11 @@ func assemble(client *registry.Repository, repository string,
// signature, compare both digest and tag
if config.WithNotary() {
if signature, ok := signatures[item.Digest]; ok {
if item.Name == signature.Tag {
item.Signature = signature
if sigs, ok := signatures[item.Digest]; ok {
for _, sig := range sigs {
if item.Name == sig.Tag {
item.Signature = &sig
}
}
}
}
@ -769,20 +771,20 @@ func (ra *RepositoryAPI) ScanAll() {
ra.Ctx.ResponseWriter.WriteHeader(http.StatusAccepted)
}
func getSignatures(username, repository string) (map[string]*notary.Target, error) {
func getSignatures(username, repository string) (map[string][]notary.Target, error) {
targets, err := notary.GetInternalTargets(config.InternalNotaryEndpoint(),
username, repository)
if err != nil {
return nil, err
}
signatures := map[string]*notary.Target{}
signatures := map[string][]notary.Target{}
for _, tgt := range targets {
digest, err := notary.DigestFromTarget(tgt)
if err != nil {
return nil, err
}
signatures[digest] = &tgt
signatures[digest] = append(signatures[digest], tgt)
}
return signatures, nil