mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
696130c949
This fix tries to address the issue in 28884 where
it is possible to mask the secret ID by name.
The reason was that searching a secret is based on name.
However, searching a secret should be done based on:
- Full ID
- Full Name
- Partial ID (prefix)
This fix addresses the issue by changing related implementation
in `getCliRequestedSecretIDs()`
An integration test has been added to cover the changes.
This fix fixes 28884
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit 3638ca4d14
)
Signed-off-by: Victor Vieux <vieux@docker.com>
75 lines
1.7 KiB
Go
75 lines
1.7 KiB
Go
package secret
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/api/types/filters"
|
|
"github.com/docker/docker/api/types/swarm"
|
|
"github.com/docker/docker/client"
|
|
"golang.org/x/net/context"
|
|
)
|
|
|
|
func getSecretsByNameOrIDPrefixes(ctx context.Context, client client.APIClient, terms []string) ([]swarm.Secret, error) {
|
|
args := filters.NewArgs()
|
|
for _, n := range terms {
|
|
args.Add("names", n)
|
|
args.Add("id", n)
|
|
}
|
|
|
|
return client.SecretList(ctx, types.SecretListOptions{
|
|
Filters: args,
|
|
})
|
|
}
|
|
|
|
func getCliRequestedSecretIDs(ctx context.Context, client client.APIClient, terms []string) ([]string, error) {
|
|
secrets, err := getSecretsByNameOrIDPrefixes(ctx, client, terms)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if len(secrets) > 0 {
|
|
found := make(map[string]struct{})
|
|
next:
|
|
for _, term := range terms {
|
|
// attempt to lookup secret by full ID
|
|
for _, s := range secrets {
|
|
if s.ID == term {
|
|
found[s.ID] = struct{}{}
|
|
continue next
|
|
}
|
|
}
|
|
// attempt to lookup secret by full name
|
|
for _, s := range secrets {
|
|
if s.Spec.Annotations.Name == term {
|
|
found[s.ID] = struct{}{}
|
|
continue next
|
|
}
|
|
}
|
|
// attempt to lookup secret by partial ID (prefix)
|
|
// return error if more than one matches found (ambiguous)
|
|
n := 0
|
|
for _, s := range secrets {
|
|
if strings.HasPrefix(s.ID, term) {
|
|
found[s.ID] = struct{}{}
|
|
n++
|
|
}
|
|
}
|
|
if n > 1 {
|
|
return nil, fmt.Errorf("secret %s is ambiguous (%d matches found)", term, n)
|
|
}
|
|
}
|
|
|
|
// We already collected all the IDs found.
|
|
// Now we will remove duplicates by converting the map to slice
|
|
ids := []string{}
|
|
for id := range found {
|
|
ids = append(ids, id)
|
|
}
|
|
|
|
return ids, nil
|
|
}
|
|
|
|
return terms, nil
|
|
}
|