Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(docker): add support for mTLS authentication when connecting to registry #4649

Merged
merged 6 commits into from
Jun 28, 2023
Merged

feat(docker): add support for mTLS authentication when connecting to registry #4649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5355091
feat: add support for mTLS authentication when connecting to registry
Jun 14, 2023
71e4e24
feat: add support for mTLS authentication when connecting to registry…
Jun 20, 2023
7b1f409
feat: add support for mTLS authentication when connecting to registry
Jun 26, 2023
5bb6f95
feat: add support for mTLS authentication when connecting to registry
Jun 28, 2023
308fe7e
Merge branch 'main' into manveer94/main
knqyf263 Jun 28, 2023
eada8f6
wrap errors
knqyf263 Jun 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkg/fanal/types/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@ type RegistryOptions struct {
// SSL/TLS
Insecure bool

// For internal use. Needed for mTLS authentication.
ClientCert []byte
ClientKey []byte
knqyf263 marked this conversation as resolved.
Show resolved Hide resolved

// Architecture
Platform Platform

Expand Down
29 changes: 23 additions & 6 deletions pkg/remote/remote.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@ type Descriptor = remote.Descriptor
// Get is a wrapper of google/go-containerregistry/pkg/v1/remote.Get
// so that it can try multiple authentication methods.
func Get(ctx context.Context, ref name.Reference, option types.RegistryOptions) (*Descriptor, error) {
transport := httpTransport(option.Insecure)
transport, err := httpTransport(option)
if err != nil {
return nil, xerrors.Errorf("failed to create http transport: %w", err)
}

var errs error
// Try each authentication method until it succeeds
Expand Down Expand Up @@ -68,7 +71,10 @@ func Get(ctx context.Context, ref name.Reference, option types.RegistryOptions)
// Image is a wrapper of google/go-containerregistry/pkg/v1/remote.Image
// so that it can try multiple authentication methods.
func Image(ctx context.Context, ref name.Reference, option types.RegistryOptions) (v1.Image, error) {
transport := httpTransport(option.Insecure)
transport, err := httpTransport(option)
if err != nil {
return nil, xerrors.Errorf("failed to create http transport: %w", err)
}

var errs error
// Try each authentication method until it succeeds
Expand All @@ -92,7 +98,10 @@ func Image(ctx context.Context, ref name.Reference, option types.RegistryOptions
// Referrers is a wrapper of google/go-containerregistry/pkg/v1/remote.Referrers
// so that it can try multiple authentication methods.
func Referrers(ctx context.Context, d name.Digest, option types.RegistryOptions) (v1.ImageIndex, error) {
transport := httpTransport(option.Insecure)
transport, err := httpTransport(option)
if err != nil {
return nil, xerrors.Errorf("failed to create http transport: %w", err)
}

var errs error
// Try each authentication method until it succeeds
Expand All @@ -113,15 +122,23 @@ func Referrers(ctx context.Context, d name.Digest, option types.RegistryOptions)
return nil, errs
}

func httpTransport(insecure bool) *http.Transport {
func httpTransport(option types.RegistryOptions) (*http.Transport, error) {
d := &net.Dialer{
Timeout: 10 * time.Minute,
}
tr := http.DefaultTransport.(*http.Transport).Clone()
tr.DialContext = d.DialContext
tr.TLSClientConfig = &tls.Config{InsecureSkipVerify: insecure}
tr.TLSClientConfig = &tls.Config{InsecureSkipVerify: option.Insecure}

if len(option.ClientCert) != 0 && len(option.ClientKey) != 0 {
cert, err := tls.X509KeyPair(option.ClientCert, option.ClientKey)
if err != nil {
return nil, err
}
tr.TLSClientConfig.Certificates = []tls.Certificate{cert}
}

return tr
return tr, nil
}

func authOptions(ctx context.Context, ref name.Reference, option types.RegistryOptions) []remote.Option {
Expand Down