Merge pull request #6009 from reasonerjt/fix-insecure-transport

Use secure transport to access HTTP endpoint
This commit is contained in:
Wenkai Yin 2018-10-11 10:23:12 +08:00 committed by GitHub
commit b4a9eae8cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions

View File

@ -89,7 +89,7 @@ func GetTargets(notaryEndpoint string, username string, fqRepo string) ([]Target
authorizer := &notaryAuthorizer{
token: t.Token,
}
tr := registry.NewTransport(registry.GetHTTPTransport(true), authorizer)
tr := registry.NewTransport(registry.GetHTTPTransport(), authorizer)
gun := data.GUN(fqRepo)
notaryRepo, err := client.NewFileCachedNotaryRepository(notaryCachePath, gun, notaryEndpoint, tr, mockRetriever, trustPin)
if err != nil {

View File

@ -72,7 +72,7 @@ func BuildBlobURL(endpoint, repository, digest string) string {
// GetTokenForRepo is used for job handler to get a token for clair.
func GetTokenForRepo(repository, secret, internalTokenServiceURL string) (string, error) {
credential := httpauth.NewSecretAuthorizer(secret)
t, err := auth.GetToken(internalTokenServiceURL, true, credential,
t, err := auth.GetToken(internalTokenServiceURL, false, credential,
[]*token.ResourceActions{{
Type: "repository",
Name: repository,

View File

@ -98,7 +98,7 @@ func (d *DefaultReplicator) Replicate(replication *Replication) error {
"repository": repository,
"tags": tags,
"src_registry_url": url,
"src_registry_insecure": true,
"src_registry_insecure": false,
// "src_token_service_url":"",
"dst_registry_url": target.URL,
"dst_registry_insecure": target.Insecure,