containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1328 from sstosh/search-token 

libimage: search: add IdentityToken option for authentication
This commit is contained in:
OpenShift Merge Robot 2023-02-16 03:13:56 -05:00 committed by GitHub
parent ab6871fff1 805f356d65
commit 208c104171
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/libimage/search.go
View File

@ -65,6 +65,9 @@ type SearchOptions struct {
// "username[:password]". Cannot be used in combination with // "username[:password]". Cannot be used in combination with
// Username/Password. // Username/Password.
Credentials string Credentials string
// IdentityToken is used to authenticate the user and get
// an access token for the registry.
IdentityToken string `json:"identitytoken,omitempty"`
// InsecureSkipTLSVerify allows to skip TLS verification. // InsecureSkipTLSVerify allows to skip TLS verification.
InsecureSkipTLSVerify types.OptionalBool InsecureSkipTLSVerify types.OptionalBool
// ListTags returns the search result with available tags // ListTags returns the search result with available tags
@ -216,7 +219,7 @@ func (r *Runtime) searchImageInRegistry(ctx context.Context, term, registry stri
sys.DockerCertPath = options.CertDirPath sys.DockerCertPath = options.CertDirPath
} }
authConf := &types.DockerAuthConfig{} authConf := &types.DockerAuthConfig{IdentityToken: options.IdentityToken}
if options.Username != "" { if options.Username != "" {
if options.Credentials != "" { if options.Credentials != "" {
return nil, errors.New("username/password cannot be used with credentials") return nil, errors.New("username/password cannot be used with credentials")
@ -235,7 +238,11 @@ func (r *Runtime) searchImageInRegistry(ctx context.Context, term, registry stri
authConf.Password = split[1] authConf.Password = split[1]
} }
} }
sys.DockerAuthConfig = authConf // We should set the authConf unless a token was set. That's especially
// useful for Podman's remote API.
if options.IdentityToken != "" {
sys.DockerAuthConfig = authConf
}
if options.ListTags { if options.ListTags {
results, err := searchRepositoryTags(ctx, sys, registry, term, options) results, err := searchRepositoryTags(ctx, sys, registry, term, options)