Skip to content
This repository has been archived by the owner on Nov 1, 2022. It is now read-only.

Improve handling of registry challenge requests #1672

Merged
merged 2 commits into from
Jan 17, 2019
Merged

Improve handling of registry challenge requests #1672

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae71afd
Close response body of registry challenges request
Jan 17, 2019
edbc092
Add timeout to request
Jan 17, 2019
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
7 changes: 6 additions & 1 deletion registry/client_factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package registry

import (
"context"
"net/http"
"net/url"
"sync"
"time"

"github.com/docker/distribution/registry/client/auth"
"github.com/docker/distribution/registry/client/auth/challenge"
Expand Down Expand Up @@ -81,12 +83,15 @@ func (f *RemoteClientFactory) ClientFor(repo image.CanonicalName, creds Credenti
if err != nil {
return nil, err
}
ctx, cancel := context.WithTimeout(req.Context(), 30*time.Second)
defer cancel()
res, err := (&http.Client{
Transport: tx,
}).Do(req)
}).Do(req.WithContext(ctx))
if err != nil {
return nil, err
}
defer res.Body.Close()
if err = manager.AddResponse(res); err != nil {
return nil, err
}
Expand Down