Skip to content

fix(aws): use BuildableClient insead of xhttp.Client #9436

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

Merged
merged 2 commits into from
Sep 30, 2025
Merged

fix(aws): use BuildableClient insead of xhttp.Client #9436

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce29bea
fix: use BuildableClient insead of xhttp.Client
DmitriyLewen Sep 4, 2025
00244dd
refactor: update comment
DmitriyLewen Sep 4, 2025
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
14 changes: 11 additions & 3 deletions pkg/fanal/image/registry/ecr/ecr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ package ecr
import (
"context"
"encoding/base64"
"net/http"
"regexp"
"strings"

"github.com/aws/aws-sdk-go-v2/aws"
awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http"
"github.com/aws/aws-sdk-go-v2/config"
"github.com/aws/aws-sdk-go-v2/credentials"
"github.com/aws/aws-sdk-go-v2/service/ecr"
Expand All @@ -15,7 +17,6 @@ import (
"github.com/aquasecurity/trivy/pkg/fanal/image/registry/intf"
"github.com/aquasecurity/trivy/pkg/fanal/types"
"github.com/aquasecurity/trivy/pkg/log"
xhttp "github.com/aquasecurity/trivy/pkg/x/http"
)

type ecrAPI interface {
Expand All @@ -30,6 +31,13 @@ type ECRClient struct {
}

func getSession(domain, region string, option types.RegistryOptions) (aws.Config, error) {
// Use BuildableClient to configure a custom Transport.
// See: https://docs.aws.amazon.com/sdk-for-go/v2/developer-guide/configure-http.html
// This is required because the xhttp.Client can cause issues when accessing IMDS.
// cf. https://github.com/aquasecurity/trivy/discussions/9429
client := awshttp.NewBuildableClient().WithTransportOptions(func(transport *http.Transport) {
transport.TLSClientConfig.InsecureSkipVerify = option.Insecure
})
// create custom credential information if option is valid
if option.AWSSecretKey != "" && option.AWSAccessKey != "" && option.AWSRegion != "" {
if region != option.AWSRegion {
Expand All @@ -38,14 +46,14 @@ func getSession(domain, region string, option types.RegistryOptions) (aws.Config
return config.LoadDefaultConfig(
context.TODO(),
config.WithRegion(region),
config.WithHTTPClient(xhttp.Client()),
config.WithHTTPClient(client),
config.WithCredentialsProvider(credentials.NewStaticCredentialsProvider(option.AWSAccessKey, option.AWSSecretKey, option.AWSSessionToken)),
)
}
return config.LoadDefaultConfig(
context.TODO(),
config.WithRegion(region),
config.WithHTTPClient(xhttp.Client()),
config.WithHTTPClient(client),
)
}

Expand Down
Loading