Skip to content

Don't fallback to HTTP unless insecure_registry is specified when pushing/pulling #298

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 1 commit into from
Sep 8, 2014
Merged

Don't fallback to HTTP unless insecure_registry is specified when pushing/pulling #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 12 additions & 6 deletions docker/auth/auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,22 @@ def swap_protocol(url):
return url


def expand_registry_url(hostname):
def expand_registry_url(hostname, insecure=False):
if hostname.startswith('http:') or hostname.startswith('https:'):
if '/' not in hostname[9:]:
hostname = hostname + '/v1/'
return hostname
if utils.ping('https://' + hostname + '/v1/_ping'):
return 'https://' + hostname + '/v1/'
return 'http://' + hostname + '/v1/'
elif insecure:
return 'http://' + hostname + '/v1/'
else:
raise errors.DockerException(
"HTTPS endpoint unresponsive and insecure mode isn't enabled."
)


def resolve_repository_name(repo_name):
def resolve_repository_name(repo_name, insecure=False):
if '://' in repo_name:
raise errors.InvalidRepository(
'Repository name cannot contain a scheme ({0})'.format(repo_name))
Expand All @@ -56,11 +61,12 @@ def resolve_repository_name(repo_name):
raise errors.InvalidRepository(
'Invalid repository name ({0})'.format(repo_name))

if 'index.docker.io' in parts[0]:
if 'index.docker.io' in parts[0] or 'registry.hub.docker.com' in parts[0]:
raise errors.InvalidRepository(
'Invalid repository name, try "{0}" instead'.format(parts[1]))
'Invalid repository name, try "{0}" instead'.format(parts[1])
)

return expand_registry_url(parts[0]), parts[1]
return expand_registry_url(parts[0], insecure), parts[1]


def resolve_authconfig(authconfig, registry=None):
Expand Down
14 changes: 10 additions & 4 deletions docker/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,10 +713,13 @@ def port(self, container, private_port):

return h_ports

def pull(self, repository, tag=None, stream=False):
def pull(self, repository, tag=None, stream=False,
insecure_registry=False):
if not tag:
repository, tag = utils.parse_repository_tag(repository)
registry, repo_name = auth.resolve_repository_name(repository)
registry, repo_name = auth.resolve_repository_name(
repository, insecure=insecure_registry
)
if repo_name.count(":") == 1:
repository, tag = repository.rsplit(":", 1)

Expand Down Expand Up @@ -747,10 +750,13 @@ def pull(self, repository, tag=None, stream=False):
else:
return self._result(response)

def push(self, repository, tag=None, stream=False):
def push(self, repository, tag=None, stream=False,
insecure_registry=False):
if not tag:
repository, tag = utils.parse_repository_tag(repository)
registry, repo_name = auth.resolve_repository_name(repository)
registry, repo_name = auth.resolve_repository_name(
repository, insecure=insecure_registry
)
u = self._url("/images/{0}/push".format(repository))
params = {
'tag': tag
Expand Down