dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-06-30 19:58:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #52339 from thaJeztah/search_cleans

Browse Source 
daemon/pkg/registry: minor cleanups
This commit is contained in:
Paweł Gronowski
2026-04-16 13:05:48 +02:00
committed by GitHub
parent 40ddab58cb b3bd13ad10
commit a713363783
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
daemon/pkg/registry/registry.go
View File

@@ -30,9 +30,8 @@ func hostCertsDir(hostnameAndPort string) string {
return filepath.Join(CertsDir(), hostnameAndPort)
}
// newTLSConfig constructs a client TLS configuration based on server defaults
// newTLSConfig constructs a client TLS configuration based on server defaults.
func newTLSConfig(ctx context.Context, hostname string, isSecure bool) (*tls.Config, error) {
// PreferredServerCipherSuites should have no effect
tlsConfig := tlsconfig.ServerDefault()
tlsConfig.InsecureSkipVerify = !isSecure
@@ -112,9 +111,9 @@ func loadTLSConfig(ctx context.Context, directory string, tlsConfig *tls.Config)
return nil
}
// Headers returns request modifiers with a User-Agent and metaHeaders
// Headers returns request modifiers with a User-Agent and metaHeaders.
func Headers(userAgent string, metaHeaders http.Header) []transport.RequestModifier {
modifiers := []transport.RequestModifier{}
var modifiers []transport.RequestModifier
if userAgent != "" {
modifiers = append(modifiers, transport.NewHeaderRequestModifier(http.Header{
"User-Agent": []string{userAgent},

9
daemon/pkg/registry/search_endpoint_v1.go
View File

@@ -177,14 +177,13 @@ func httpClient(tr http.RoundTripper) *http.Client {
}
func trustedLocation(req *http.Request) bool {
var (
trusteds = []string{"docker.com", "docker.io"}
hostname = strings.SplitN(req.Host, ":", 2)[0]
)
if req.URL.Scheme != "https" {
return false
}
var (
trusteds = []string{"docker.com", "docker.io"}
hostname, _, _ = strings.Cut(req.Host, ":")
)
for _, trusted := range trusteds {
if hostname == trusted || strings.HasSuffix(hostname, "."+trusted) {
return true