Merge pull request #30979 from TerryHowe/oras-v2-login-for-v4

fix: OAuth username password login for v4
pull/12837/merge
Robert Sirchia 3 months ago committed by GitHub
commit ba0fbdeb57
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -230,16 +230,16 @@ func (c *Client) Login(host string, options ...LoginOption) error {
return err
}
reg.PlainHTTP = c.plainHTTP
cred := auth.Credential{Username: c.username, Password: c.password}
c.authorizer.ForceAttemptOAuth2 = true
reg.Client = c.authorizer
ctx := context.Background()
cred, err := c.authorizer.Credential(ctx, host)
if err != nil {
return fmt.Errorf("fetching credentials for %q: %w", host, err)
}
if err := reg.Ping(ctx); err != nil {
return fmt.Errorf("authenticating to %q: %w", host, err)
c.authorizer.ForceAttemptOAuth2 = false
if err := reg.Ping(ctx); err != nil {
return fmt.Errorf("authenticating to %q: %w", host, err)
}
}
key := credentials.ServerAddressFromRegistry(host)

Loading…
Cancel
Save