mirror of
https://github.com/goharbor/harbor
synced 2024-09-21 15:17:47 +00:00
Merge pull request #6009 from reasonerjt/fix-insecure-transport
Use secure transport to access HTTP endpoint
This commit is contained in:
commit
b4a9eae8cc
|
@ -89,7 +89,7 @@ func GetTargets(notaryEndpoint string, username string, fqRepo string) ([]Target
|
||||||
authorizer := ¬aryAuthorizer{
|
authorizer := ¬aryAuthorizer{
|
||||||
token: t.Token,
|
token: t.Token,
|
||||||
}
|
}
|
||||||
tr := registry.NewTransport(registry.GetHTTPTransport(true), authorizer)
|
tr := registry.NewTransport(registry.GetHTTPTransport(), authorizer)
|
||||||
gun := data.GUN(fqRepo)
|
gun := data.GUN(fqRepo)
|
||||||
notaryRepo, err := client.NewFileCachedNotaryRepository(notaryCachePath, gun, notaryEndpoint, tr, mockRetriever, trustPin)
|
notaryRepo, err := client.NewFileCachedNotaryRepository(notaryCachePath, gun, notaryEndpoint, tr, mockRetriever, trustPin)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -72,7 +72,7 @@ func BuildBlobURL(endpoint, repository, digest string) string {
|
||||||
// GetTokenForRepo is used for job handler to get a token for clair.
|
// GetTokenForRepo is used for job handler to get a token for clair.
|
||||||
func GetTokenForRepo(repository, secret, internalTokenServiceURL string) (string, error) {
|
func GetTokenForRepo(repository, secret, internalTokenServiceURL string) (string, error) {
|
||||||
credential := httpauth.NewSecretAuthorizer(secret)
|
credential := httpauth.NewSecretAuthorizer(secret)
|
||||||
t, err := auth.GetToken(internalTokenServiceURL, true, credential,
|
t, err := auth.GetToken(internalTokenServiceURL, false, credential,
|
||||||
[]*token.ResourceActions{{
|
[]*token.ResourceActions{{
|
||||||
Type: "repository",
|
Type: "repository",
|
||||||
Name: repository,
|
Name: repository,
|
||||||
|
|
|
@ -98,7 +98,7 @@ func (d *DefaultReplicator) Replicate(replication *Replication) error {
|
||||||
"repository": repository,
|
"repository": repository,
|
||||||
"tags": tags,
|
"tags": tags,
|
||||||
"src_registry_url": url,
|
"src_registry_url": url,
|
||||||
"src_registry_insecure": true,
|
"src_registry_insecure": false,
|
||||||
// "src_token_service_url":"",
|
// "src_token_service_url":"",
|
||||||
"dst_registry_url": target.URL,
|
"dst_registry_url": target.URL,
|
||||||
"dst_registry_insecure": target.Insecure,
|
"dst_registry_insecure": target.Insecure,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user