Skip to content

Update resolve_authconfig to bring it in line with Docker client#507

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
shin- merged 1 commit into from
Feb 27, 2015
Merged

Update resolve_authconfig to bring it in line with Docker client #507

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
46 changes: 19 additions & 27 deletions docker/auth/auth.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,14 +26,6 @@
DOCKER_CONFIG_FILENAME = '.dockercfg'


def swap_protocol(url):
if url.startswith('http://'):
return url.replace('http://', 'https://', 1)
if url.startswith('https://'):
return url.replace('https://', 'http://', 1)
return url


def expand_registry_url(hostname, insecure=False):
if hostname.startswith('http:') or hostname.startswith('https:'):
return hostname
Expand DownExpand Up@@ -68,29 +60,29 @@ def resolve_repository_name(repo_name, insecure=False):


def resolve_authconfig(authconfig, registry=None):
"""Return the authentication data from the given auth configuration for a
specific registry. We'll do our best to infer the correct URL for the
registry, trying both http and https schemes. Returns an empty dictionnary
if no data exists."""
"""
Returns the authentication data from the given auth configuration for a
specific registry. As with the Docker client, legacy entries in the config
with full URLs are stripped down to hostnames before checking for a match.
Returns None if no match was found.
"""
# Default to the public index server
registry = registry or INDEX_URL

# If it's not the index server there are three cases:
#
# 1. this is a full config url -> it should be used as is
# 2. it could be a full url, but with the wrong protocol
# 3. it can be the hostname optionally with a port
#
# as there is only one auth entry which is fully qualified we need to start
# parsing and matching
if '/v1/' not in registry:
registry = os.path.join(registry, 'v1/')
if not registry.startswith('http:') and not registry.startswith('https:'):
registry = 'https://' + registry
registry = convert_to_hostname(registry) if registry else INDEX_URL

if registry in authconfig:
return authconfig[registry]
return authconfig.get(swap_protocol(registry), None)

for key, config in six.iteritems(authconfig):
if convert_to_hostname(key) == registry:
return config

return None


def convert_to_hostname(url):
url = url.replace('http://', '')
url = url.replace('https://', '')
return url.split('/', 1)[0]

@dnephindnephinFeb 26, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe use https://docs.python.org/2/library/urlparse.html#urlparse.urlparse instead ? It should be more robust to unexpected parts of the url.

It's available as six.moves.urllib.parse.urlparse

@aanandaanandFeb 26, 2015

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Arguably better, yes, but I wanted to stick close to the Docker client's behaviour. Not sure what's the stronger principle here!



def encode_auth(auth_info):
Expand Down
3 changes: 1 addition & 2 deletions docker/client.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -627,8 +627,7 @@ def login(self, username, password=None, email=None, registry=None,
elif not self._auth_configs:
self._auth_configs = auth.load_config()

registry = auth.expand_registry_url(registry, insecure_registry) \
if registry else auth.INDEX_URL
registry = registry or auth.INDEX_URL

authcfg = auth.resolve_authconfig(self._auth_configs, registry)
# If we found an existing auth config for this registry and username
Expand Down
12 changes: 11 additions & 1 deletion tests/utils_test.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,7 +104,8 @@ def test_create_host_config(self):
def test_resolve_authconfig(self):
auth_config = {
'https://index.docker.io/v1/': {'auth': 'indexuser'},
'http://my.registry.net/v1/': {'auth': 'privateuser'}
'my.registry.net': {'auth': 'privateuser'},
'http://legacy.registry.url/v1/': {'auth': 'legacyauth'}
}
# hostname only
self.assertEqual(
Expand DownExpand Up@@ -154,6 +155,15 @@ def test_resolve_authconfig(self):
resolve_authconfig(auth_config, 'http://my.registry.net/v1/'),
{'auth': 'privateuser'}
)
# legacy entry in config
self.assertEqual(
resolve_authconfig(auth_config, 'legacy.registry.url'),
{'auth': 'legacyauth'}
)
# no matching entry
self.assertTrue(
resolve_authconfig(auth_config, 'does.not.exist') is None
)


if __name__ == '__main__':
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Update resolve_authconfig to bring it in line with Docker client by aanand · Pull Request #507 · docker/docker-py · GitHub
Skip to content
Update resolve_authconfig to bring it in line with Docker client#507

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

shin-
merged 1 commit into

from

Feb 27, 2015
 Merged


Update resolve_authconfig to bring it in line with Docker client
#507
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


46 changes: 19 additions & 27 deletions
docker/auth/auth.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,14 +26,6 @@
DOCKER_CONFIG_FILENAME = '.dockercfg'


def swap_protocol(url):
 if url.startswith('http://'):
 return url.replace('http://', 'https://', 1)
 if url.startswith('https://'):
 return url.replace('https://', 'http://', 1)
 return url


def expand_registry_url(hostname, insecure=False):
 if hostname.startswith('http:') or hostname.startswith('https:'):
 return hostname
Expand DownExpand Up@@ -68,29 +60,29 @@ def resolve_repository_name(repo_name, insecure=False):


def resolve_authconfig(authconfig, registry=None):
 """Return the authentication data from the given auth configuration for a
 specific registry. We'll do our best to infer the correct URL for the
 registry, trying both http and https schemes. Returns an empty dictionnary
 if no data exists."""
 """
 Returns the authentication data from the given auth configuration for a
 specific registry. As with the Docker client, legacy entries in the config
 with full URLs are stripped down to hostnames before checking for a match.
 Returns None if no match was found.
 """
 # Default to the public index server
 registry = registry or INDEX_URL

 # If it's not the index server there are three cases:
 #
 # 1. this is a full config url -> it should be used as is
 # 2. it could be a full url, but with the wrong protocol
 # 3. it can be the hostname optionally with a port
 #
 # as there is only one auth entry which is fully qualified we need to start
 # parsing and matching
 if '/v1/' not in registry:
 registry = os.path.join(registry, 'v1/')
 if not registry.startswith('http:') and not registry.startswith('https:'):
 registry = 'https://' + registry
 registry = convert_to_hostname(registry) if registry else INDEX_URL

 if registry in authconfig:
 return authconfig[registry]
 return authconfig.get(swap_protocol(registry), None)

 for key, config in six.iteritems(authconfig):
 if convert_to_hostname(key) == registry:
 return config

 return None


def convert_to_hostname(url):
 url = url.replace('http://', '')
 url = url.replace('https://', '')
 return url.split('/', 1)[0]
@dnephindnephinFeb 26, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe use https://docs.python.org/2/library/urlparse.html#urlparse.urlparse instead ? It should be more robust to unexpected parts of the url.
It's available as six.moves.urllib.parse.urlparse
@aanandaanandFeb 26, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Arguably better, yes, but I wanted to stick close to the Docker client's behaviour. Not sure what's the stronger principle here!


def encode_auth(auth_info):
Expand Down

3 changes: 1 addition & 2 deletions
docker/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -627,8 +627,7 @@ def login(self, username, password=None, email=None, registry=None,
 elif not self._auth_configs:
 self._auth_configs = auth.load_config()

 registry = auth.expand_registry_url(registry, insecure_registry) \
 if registry else auth.INDEX_URL
 registry = registry or auth.INDEX_URL

 authcfg = auth.resolve_authconfig(self._auth_configs, registry)
 # If we found an existing auth config for this registry and username
Expand Down

12 changes: 11 additions & 1 deletion
tests/utils_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,7 +104,8 @@ def test_create_host_config(self):
 def test_resolve_authconfig(self):
 auth_config = {
 'https://index.docker.io/v1/': {'auth': 'indexuser'},
 'http://my.registry.net/v1/': {'auth': 'privateuser'}
 'my.registry.net': {'auth': 'privateuser'},
 'http://legacy.registry.url/v1/': {'auth': 'legacyauth'}
 }
 # hostname only
 self.assertEqual(
Expand DownExpand Up@@ -154,6 +155,15 @@ def test_resolve_authconfig(self):
 resolve_authconfig(auth_config, 'http://my.registry.net/v1/'),
 {'auth': 'privateuser'}
 )
 # legacy entry in config
 self.assertEqual(
 resolve_authconfig(auth_config, 'legacy.registry.url'),
 {'auth': 'legacyauth'}
 )
 # no matching entry
 self.assertTrue(
 resolve_authconfig(auth_config, 'does.not.exist') is None
 )


if __name__ == '__main__':
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Update resolve_authconfig to bring it in line with Docker client by aanand · Pull Request #507 · docker/docker-py · GitHub
Skip to content
Update resolve_authconfig to bring it in line with Docker client#507

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

shin-
merged 1 commit into

from

Feb 27, 2015
 Merged


Update resolve_authconfig to bring it in line with Docker client
#507
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


46 changes: 19 additions & 27 deletions
docker/auth/auth.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,14 +26,6 @@
DOCKER_CONFIG_FILENAME = '.dockercfg'


def swap_protocol(url):
 if url.startswith('http://'):
 return url.replace('http://', 'https://', 1)
 if url.startswith('https://'):
 return url.replace('https://', 'http://', 1)
 return url


def expand_registry_url(hostname, insecure=False):
 if hostname.startswith('http:') or hostname.startswith('https:'):
 return hostname
Expand DownExpand Up@@ -68,29 +60,29 @@ def resolve_repository_name(repo_name, insecure=False):


def resolve_authconfig(authconfig, registry=None):
 """Return the authentication data from the given auth configuration for a
 specific registry. We'll do our best to infer the correct URL for the
 registry, trying both http and https schemes. Returns an empty dictionnary
 if no data exists."""
 """
 Returns the authentication data from the given auth configuration for a
 specific registry. As with the Docker client, legacy entries in the config
 with full URLs are stripped down to hostnames before checking for a match.
 Returns None if no match was found.
 """
 # Default to the public index server
 registry = registry or INDEX_URL

 # If it's not the index server there are three cases:
 #
 # 1. this is a full config url -> it should be used as is
 # 2. it could be a full url, but with the wrong protocol
 # 3. it can be the hostname optionally with a port
 #
 # as there is only one auth entry which is fully qualified we need to start
 # parsing and matching
 if '/v1/' not in registry:
 registry = os.path.join(registry, 'v1/')
 if not registry.startswith('http:') and not registry.startswith('https:'):
 registry = 'https://' + registry
 registry = convert_to_hostname(registry) if registry else INDEX_URL

 if registry in authconfig:
 return authconfig[registry]
 return authconfig.get(swap_protocol(registry), None)

 for key, config in six.iteritems(authconfig):
 if convert_to_hostname(key) == registry:
 return config

 return None


def convert_to_hostname(url):
 url = url.replace('http://', '')
 url = url.replace('https://', '')
 return url.split('/', 1)[0]
@dnephindnephinFeb 26, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe use https://docs.python.org/2/library/urlparse.html#urlparse.urlparse instead ? It should be more robust to unexpected parts of the url.
It's available as six.moves.urllib.parse.urlparse
@aanandaanandFeb 26, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Arguably better, yes, but I wanted to stick close to the Docker client's behaviour. Not sure what's the stronger principle here!


def encode_auth(auth_info):
Expand Down

3 changes: 1 addition & 2 deletions
docker/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -627,8 +627,7 @@ def login(self, username, password=None, email=None, registry=None,
 elif not self._auth_configs:
 self._auth_configs = auth.load_config()

 registry = auth.expand_registry_url(registry, insecure_registry) \
 if registry else auth.INDEX_URL
 registry = registry or auth.INDEX_URL

 authcfg = auth.resolve_authconfig(self._auth_configs, registry)
 # If we found an existing auth config for this registry and username
Expand Down

12 changes: 11 additions & 1 deletion
tests/utils_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,7 +104,8 @@ def test_create_host_config(self):
 def test_resolve_authconfig(self):
 auth_config = {
 'https://index.docker.io/v1/': {'auth': 'indexuser'},
 'http://my.registry.net/v1/': {'auth': 'privateuser'}
 'my.registry.net': {'auth': 'privateuser'},
 'http://legacy.registry.url/v1/': {'auth': 'legacyauth'}
 }
 # hostname only
 self.assertEqual(
Expand DownExpand Up@@ -154,6 +155,15 @@ def test_resolve_authconfig(self):
 resolve_authconfig(auth_config, 'http://my.registry.net/v1/'),
 {'auth': 'privateuser'}
 )
 # legacy entry in config
 self.assertEqual(
 resolve_authconfig(auth_config, 'legacy.registry.url'),
 {'auth': 'legacyauth'}
 )
 # no matching entry
 self.assertTrue(
 resolve_authconfig(auth_config, 'does.not.exist') is None
 )


if __name__ == '__main__':
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Update resolve_authconfig to bring it in line with Docker client by aanand · Pull Request #507 · docker/docker-py · GitHub
Skip to content
Update resolve_authconfig to bring it in line with Docker client#507

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

shin-
merged 1 commit into

from

Feb 27, 2015
 Merged


Update resolve_authconfig to bring it in line with Docker client
#507
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


46 changes: 19 additions & 27 deletions
docker/auth/auth.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,14 +26,6 @@
DOCKER_CONFIG_FILENAME = '.dockercfg'


def swap_protocol(url):
 if url.startswith('http://'):
 return url.replace('http://', 'https://', 1)
 if url.startswith('https://'):
 return url.replace('https://', 'http://', 1)
 return url


def expand_registry_url(hostname, insecure=False):
 if hostname.startswith('http:') or hostname.startswith('https:'):
 return hostname
Expand DownExpand Up@@ -68,29 +60,29 @@ def resolve_repository_name(repo_name, insecure=False):


def resolve_authconfig(authconfig, registry=None):
 """Return the authentication data from the given auth configuration for a
 specific registry. We'll do our best to infer the correct URL for the
 registry, trying both http and https schemes. Returns an empty dictionnary
 if no data exists."""
 """
 Returns the authentication data from the given auth configuration for a
 specific registry. As with the Docker client, legacy entries in the config
 with full URLs are stripped down to hostnames before checking for a match.
 Returns None if no match was found.
 """
 # Default to the public index server
 registry = registry or INDEX_URL

 # If it's not the index server there are three cases:
 #
 # 1. this is a full config url -> it should be used as is
 # 2. it could be a full url, but with the wrong protocol
 # 3. it can be the hostname optionally with a port
 #
 # as there is only one auth entry which is fully qualified we need to start
 # parsing and matching
 if '/v1/' not in registry:
 registry = os.path.join(registry, 'v1/')
 if not registry.startswith('http:') and not registry.startswith('https:'):
 registry = 'https://' + registry
 registry = convert_to_hostname(registry) if registry else INDEX_URL

 if registry in authconfig:
 return authconfig[registry]
 return authconfig.get(swap_protocol(registry), None)

 for key, config in six.iteritems(authconfig):
 if convert_to_hostname(key) == registry:
 return config

 return None


def convert_to_hostname(url):
 url = url.replace('http://', '')
 url = url.replace('https://', '')
 return url.split('/', 1)[0]
@dnephindnephinFeb 26, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe use https://docs.python.org/2/library/urlparse.html#urlparse.urlparse instead ? It should be more robust to unexpected parts of the url.
It's available as six.moves.urllib.parse.urlparse
@aanandaanandFeb 26, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Arguably better, yes, but I wanted to stick close to the Docker client's behaviour. Not sure what's the stronger principle here!


def encode_auth(auth_info):
Expand Down

3 changes: 1 addition & 2 deletions
docker/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -627,8 +627,7 @@ def login(self, username, password=None, email=None, registry=None,
 elif not self._auth_configs:
 self._auth_configs = auth.load_config()

 registry = auth.expand_registry_url(registry, insecure_registry) \
 if registry else auth.INDEX_URL
 registry = registry or auth.INDEX_URL

 authcfg = auth.resolve_authconfig(self._auth_configs, registry)
 # If we found an existing auth config for this registry and username
Expand Down

12 changes: 11 additions & 1 deletion
tests/utils_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,7 +104,8 @@ def test_create_host_config(self):
 def test_resolve_authconfig(self):
 auth_config = {
 'https://index.docker.io/v1/': {'auth': 'indexuser'},
 'http://my.registry.net/v1/': {'auth': 'privateuser'}
 'my.registry.net': {'auth': 'privateuser'},
 'http://legacy.registry.url/v1/': {'auth': 'legacyauth'}
 }
 # hostname only
 self.assertEqual(
Expand DownExpand Up@@ -154,6 +155,15 @@ def test_resolve_authconfig(self):
 resolve_authconfig(auth_config, 'http://my.registry.net/v1/'),
 {'auth': 'privateuser'}
 )
 # legacy entry in config
 self.assertEqual(
 resolve_authconfig(auth_config, 'legacy.registry.url'),
 {'auth': 'legacyauth'}
 )
 # no matching entry
 self.assertTrue(
 resolve_authconfig(auth_config, 'does.not.exist') is None
 )


if __name__ == '__main__':
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Update resolve_authconfig to bring it in line with Docker client by aanand · Pull Request #507 · docker/docker-py · GitHub
Skip to content
Update resolve_authconfig to bring it in line with Docker client#507

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

shin-
merged 1 commit into

from

Feb 27, 2015
 Merged


Update resolve_authconfig to bring it in line with Docker client
#507
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


46 changes: 19 additions & 27 deletions
docker/auth/auth.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,14 +26,6 @@
DOCKER_CONFIG_FILENAME = '.dockercfg'


def swap_protocol(url):
 if url.startswith('http://'):
 return url.replace('http://', 'https://', 1)
 if url.startswith('https://'):
 return url.replace('https://', 'http://', 1)
 return url


def expand_registry_url(hostname, insecure=False):
 if hostname.startswith('http:') or hostname.startswith('https:'):
 return hostname
Expand DownExpand Up@@ -68,29 +60,29 @@ def resolve_repository_name(repo_name, insecure=False):


def resolve_authconfig(authconfig, registry=None):
 """Return the authentication data from the given auth configuration for a
 specific registry. We'll do our best to infer the correct URL for the
 registry, trying both http and https schemes. Returns an empty dictionnary
 if no data exists."""
 """
 Returns the authentication data from the given auth configuration for a
 specific registry. As with the Docker client, legacy entries in the config
 with full URLs are stripped down to hostnames before checking for a match.
 Returns None if no match was found.
 """
 # Default to the public index server
 registry = registry or INDEX_URL

 # If it's not the index server there are three cases:
 #
 # 1. this is a full config url -> it should be used as is
 # 2. it could be a full url, but with the wrong protocol
 # 3. it can be the hostname optionally with a port
 #
 # as there is only one auth entry which is fully qualified we need to start
 # parsing and matching
 if '/v1/' not in registry:
 registry = os.path.join(registry, 'v1/')
 if not registry.startswith('http:') and not registry.startswith('https:'):
 registry = 'https://' + registry
 registry = convert_to_hostname(registry) if registry else INDEX_URL

 if registry in authconfig:
 return authconfig[registry]
 return authconfig.get(swap_protocol(registry), None)

 for key, config in six.iteritems(authconfig):
 if convert_to_hostname(key) == registry:
 return config

 return None


def convert_to_hostname(url):
 url = url.replace('http://', '')
 url = url.replace('https://', '')
 return url.split('/', 1)[0]
@dnephindnephinFeb 26, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe use https://docs.python.org/2/library/urlparse.html#urlparse.urlparse instead ? It should be more robust to unexpected parts of the url.
It's available as six.moves.urllib.parse.urlparse
@aanandaanandFeb 26, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Arguably better, yes, but I wanted to stick close to the Docker client's behaviour. Not sure what's the stronger principle here!


def encode_auth(auth_info):
Expand Down

3 changes: 1 addition & 2 deletions
docker/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -627,8 +627,7 @@ def login(self, username, password=None, email=None, registry=None,
 elif not self._auth_configs:
 self._auth_configs = auth.load_config()

 registry = auth.expand_registry_url(registry, insecure_registry) \
 if registry else auth.INDEX_URL
 registry = registry or auth.INDEX_URL

 authcfg = auth.resolve_authconfig(self._auth_configs, registry)
 # If we found an existing auth config for this registry and username
Expand Down

12 changes: 11 additions & 1 deletion
tests/utils_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,7 +104,8 @@ def test_create_host_config(self):
 def test_resolve_authconfig(self):
 auth_config = {
 'https://index.docker.io/v1/': {'auth': 'indexuser'},
 'http://my.registry.net/v1/': {'auth': 'privateuser'}
 'my.registry.net': {'auth': 'privateuser'},
 'http://legacy.registry.url/v1/': {'auth': 'legacyauth'}
 }
 # hostname only
 self.assertEqual(
Expand DownExpand Up@@ -154,6 +155,15 @@ def test_resolve_authconfig(self):
 resolve_authconfig(auth_config, 'http://my.registry.net/v1/'),
 {'auth': 'privateuser'}
 )
 # legacy entry in config
 self.assertEqual(
 resolve_authconfig(auth_config, 'legacy.registry.url'),
 {'auth': 'legacyauth'}
 )
 # no matching entry
 self.assertTrue(
 resolve_authconfig(auth_config, 'does.not.exist') is None
 )


if __name__ == '__main__':
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Update resolve_authconfig to bring it in line with Docker client by aanand · Pull Request #507 · docker/docker-py · GitHub
Skip to content
Update resolve_authconfig to bring it in line with Docker client#507

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

shin-
merged 1 commit into

from

Feb 27, 2015
 Merged


Update resolve_authconfig to bring it in line with Docker client
#507
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


46 changes: 19 additions & 27 deletions
docker/auth/auth.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,14 +26,6 @@
DOCKER_CONFIG_FILENAME = '.dockercfg'


def swap_protocol(url):
 if url.startswith('http://'):
 return url.replace('http://', 'https://', 1)
 if url.startswith('https://'):
 return url.replace('https://', 'http://', 1)
 return url


def expand_registry_url(hostname, insecure=False):
 if hostname.startswith('http:') or hostname.startswith('https:'):
 return hostname
Expand DownExpand Up@@ -68,29 +60,29 @@ def resolve_repository_name(repo_name, insecure=False):


def resolve_authconfig(authconfig, registry=None):
 """Return the authentication data from the given auth configuration for a
 specific registry. We'll do our best to infer the correct URL for the
 registry, trying both http and https schemes. Returns an empty dictionnary
 if no data exists."""
 """
 Returns the authentication data from the given auth configuration for a
 specific registry. As with the Docker client, legacy entries in the config
 with full URLs are stripped down to hostnames before checking for a match.
 Returns None if no match was found.
 """
 # Default to the public index server
 registry = registry or INDEX_URL

 # If it's not the index server there are three cases:
 #
 # 1. this is a full config url -> it should be used as is
 # 2. it could be a full url, but with the wrong protocol
 # 3. it can be the hostname optionally with a port
 #
 # as there is only one auth entry which is fully qualified we need to start
 # parsing and matching
 if '/v1/' not in registry:
 registry = os.path.join(registry, 'v1/')
 if not registry.startswith('http:') and not registry.startswith('https:'):
 registry = 'https://' + registry
 registry = convert_to_hostname(registry) if registry else INDEX_URL

 if registry in authconfig:
 return authconfig[registry]
 return authconfig.get(swap_protocol(registry), None)

 for key, config in six.iteritems(authconfig):
 if convert_to_hostname(key) == registry:
 return config

 return None


def convert_to_hostname(url):
 url = url.replace('http://', '')
 url = url.replace('https://', '')
 return url.split('/', 1)[0]
@dnephindnephinFeb 26, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe use https://docs.python.org/2/library/urlparse.html#urlparse.urlparse instead ? It should be more robust to unexpected parts of the url.
It's available as six.moves.urllib.parse.urlparse
@aanandaanandFeb 26, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Arguably better, yes, but I wanted to stick close to the Docker client's behaviour. Not sure what's the stronger principle here!


def encode_auth(auth_info):
Expand Down

3 changes: 1 addition & 2 deletions
docker/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -627,8 +627,7 @@ def login(self, username, password=None, email=None, registry=None,
 elif not self._auth_configs:
 self._auth_configs = auth.load_config()

 registry = auth.expand_registry_url(registry, insecure_registry) \
 if registry else auth.INDEX_URL
 registry = registry or auth.INDEX_URL

 authcfg = auth.resolve_authconfig(self._auth_configs, registry)
 # If we found an existing auth config for this registry and username
Expand Down

12 changes: 11 additions & 1 deletion
tests/utils_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,7 +104,8 @@ def test_create_host_config(self):
 def test_resolve_authconfig(self):
 auth_config = {
 'https://index.docker.io/v1/': {'auth': 'indexuser'},
 'http://my.registry.net/v1/': {'auth': 'privateuser'}
 'my.registry.net': {'auth': 'privateuser'},
 'http://legacy.registry.url/v1/': {'auth': 'legacyauth'}
 }
 # hostname only
 self.assertEqual(
Expand DownExpand Up@@ -154,6 +155,15 @@ def test_resolve_authconfig(self):
 resolve_authconfig(auth_config, 'http://my.registry.net/v1/'),
 {'auth': 'privateuser'}
 )
 # legacy entry in config
 self.assertEqual(
 resolve_authconfig(auth_config, 'legacy.registry.url'),
 {'auth': 'legacyauth'}
 )
 # no matching entry
 self.assertTrue(
 resolve_authconfig(auth_config, 'does.not.exist') is None
 )


if __name__ == '__main__':
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Update resolve_authconfig to bring it in line with Docker client by aanand · Pull Request #507 · docker/docker-py · GitHub
Skip to content
Update resolve_authconfig to bring it in line with Docker client#507

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

shin-
merged 1 commit into

from

Feb 27, 2015
 Merged


Update resolve_authconfig to bring it in line with Docker client
#507
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


46 changes: 19 additions & 27 deletions
docker/auth/auth.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,14 +26,6 @@
DOCKER_CONFIG_FILENAME = '.dockercfg'


def swap_protocol(url):
 if url.startswith('http://'):
 return url.replace('http://', 'https://', 1)
 if url.startswith('https://'):
 return url.replace('https://', 'http://', 1)
 return url


def expand_registry_url(hostname, insecure=False):
 if hostname.startswith('http:') or hostname.startswith('https:'):
 return hostname
Expand DownExpand Up@@ -68,29 +60,29 @@ def resolve_repository_name(repo_name, insecure=False):


def resolve_authconfig(authconfig, registry=None):
 """Return the authentication data from the given auth configuration for a
 specific registry. We'll do our best to infer the correct URL for the
 registry, trying both http and https schemes. Returns an empty dictionnary
 if no data exists."""
 """
 Returns the authentication data from the given auth configuration for a
 specific registry. As with the Docker client, legacy entries in the config
 with full URLs are stripped down to hostnames before checking for a match.
 Returns None if no match was found.
 """
 # Default to the public index server
 registry = registry or INDEX_URL

 # If it's not the index server there are three cases:
 #
 # 1. this is a full config url -> it should be used as is
 # 2. it could be a full url, but with the wrong protocol
 # 3. it can be the hostname optionally with a port
 #
 # as there is only one auth entry which is fully qualified we need to start
 # parsing and matching
 if '/v1/' not in registry:
 registry = os.path.join(registry, 'v1/')
 if not registry.startswith('http:') and not registry.startswith('https:'):
 registry = 'https://' + registry
 registry = convert_to_hostname(registry) if registry else INDEX_URL

 if registry in authconfig:
 return authconfig[registry]
 return authconfig.get(swap_protocol(registry), None)

 for key, config in six.iteritems(authconfig):
 if convert_to_hostname(key) == registry:
 return config

 return None


def convert_to_hostname(url):
 url = url.replace('http://', '')
 url = url.replace('https://', '')
 return url.split('/', 1)[0]
@dnephindnephinFeb 26, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe use https://docs.python.org/2/library/urlparse.html#urlparse.urlparse instead ? It should be more robust to unexpected parts of the url.
It's available as six.moves.urllib.parse.urlparse
@aanandaanandFeb 26, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Arguably better, yes, but I wanted to stick close to the Docker client's behaviour. Not sure what's the stronger principle here!


def encode_auth(auth_info):
Expand Down

3 changes: 1 addition & 2 deletions
docker/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -627,8 +627,7 @@ def login(self, username, password=None, email=None, registry=None,
 elif not self._auth_configs:
 self._auth_configs = auth.load_config()

 registry = auth.expand_registry_url(registry, insecure_registry) \
 if registry else auth.INDEX_URL
 registry = registry or auth.INDEX_URL

 authcfg = auth.resolve_authconfig(self._auth_configs, registry)
 # If we found an existing auth config for this registry and username
Expand Down

12 changes: 11 additions & 1 deletion
tests/utils_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,7 +104,8 @@ def test_create_host_config(self):
 def test_resolve_authconfig(self):
 auth_config = {
 'https://index.docker.io/v1/': {'auth': 'indexuser'},
 'http://my.registry.net/v1/': {'auth': 'privateuser'}
 'my.registry.net': {'auth': 'privateuser'},
 'http://legacy.registry.url/v1/': {'auth': 'legacyauth'}
 }
 # hostname only
 self.assertEqual(
Expand DownExpand Up@@ -154,6 +155,15 @@ def test_resolve_authconfig(self):
 resolve_authconfig(auth_config, 'http://my.registry.net/v1/'),
 {'auth': 'privateuser'}
 )
 # legacy entry in config
 self.assertEqual(
 resolve_authconfig(auth_config, 'legacy.registry.url'),
 {'auth': 'legacyauth'}
 )
 # no matching entry
 self.assertTrue(
 resolve_authconfig(auth_config, 'does.not.exist') is None
 )


if __name__ == '__main__':
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Update resolve_authconfig to bring it in line with Docker client by aanand · Pull Request #507 · docker/docker-py · GitHub
Skip to content
Update resolve_authconfig to bring it in line with Docker client#507

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

shin-
merged 1 commit into

from

Feb 27, 2015
 Merged


Update resolve_authconfig to bring it in line with Docker client
#507
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


46 changes: 19 additions & 27 deletions
docker/auth/auth.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,14 +26,6 @@
DOCKER_CONFIG_FILENAME = '.dockercfg'


def swap_protocol(url):
 if url.startswith('http://'):
 return url.replace('http://', 'https://', 1)
 if url.startswith('https://'):
 return url.replace('https://', 'http://', 1)
 return url


def expand_registry_url(hostname, insecure=False):
 if hostname.startswith('http:') or hostname.startswith('https:'):
 return hostname
Expand DownExpand Up@@ -68,29 +60,29 @@ def resolve_repository_name(repo_name, insecure=False):


def resolve_authconfig(authconfig, registry=None):
 """Return the authentication data from the given auth configuration for a
 specific registry. We'll do our best to infer the correct URL for the
 registry, trying both http and https schemes. Returns an empty dictionnary
 if no data exists."""
 """
 Returns the authentication data from the given auth configuration for a
 specific registry. As with the Docker client, legacy entries in the config
 with full URLs are stripped down to hostnames before checking for a match.
 Returns None if no match was found.
 """
 # Default to the public index server
 registry = registry or INDEX_URL

 # If it's not the index server there are three cases:
 #
 # 1. this is a full config url -> it should be used as is
 # 2. it could be a full url, but with the wrong protocol
 # 3. it can be the hostname optionally with a port
 #
 # as there is only one auth entry which is fully qualified we need to start
 # parsing and matching
 if '/v1/' not in registry:
 registry = os.path.join(registry, 'v1/')
 if not registry.startswith('http:') and not registry.startswith('https:'):
 registry = 'https://' + registry
 registry = convert_to_hostname(registry) if registry else INDEX_URL

 if registry in authconfig:
 return authconfig[registry]
 return authconfig.get(swap_protocol(registry), None)

 for key, config in six.iteritems(authconfig):
 if convert_to_hostname(key) == registry:
 return config

 return None


def convert_to_hostname(url):
 url = url.replace('http://', '')
 url = url.replace('https://', '')
 return url.split('/', 1)[0]
@dnephindnephinFeb 26, 2015

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe use https://docs.python.org/2/library/urlparse.html#urlparse.urlparse instead ? It should be more robust to unexpected parts of the url.
It's available as six.moves.urllib.parse.urlparse
@aanandaanandFeb 26, 2015

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Arguably better, yes, but I wanted to stick close to the Docker client's behaviour. Not sure what's the stronger principle here!


def encode_auth(auth_info):
Expand Down

3 changes: 1 addition & 2 deletions
docker/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -627,8 +627,7 @@ def login(self, username, password=None, email=None, registry=None,
 elif not self._auth_configs:
 self._auth_configs = auth.load_config()

 registry = auth.expand_registry_url(registry, insecure_registry) \
 if registry else auth.INDEX_URL
 registry = registry or auth.INDEX_URL

 authcfg = auth.resolve_authconfig(self._auth_configs, registry)
 # If we found an existing auth config for this registry and username
Expand Down

12 changes: 11 additions & 1 deletion
tests/utils_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,7 +104,8 @@ def test_create_host_config(self):
 def test_resolve_authconfig(self):
 auth_config = {
 'https://index.docker.io/v1/': {'auth': 'indexuser'},
 'http://my.registry.net/v1/': {'auth': 'privateuser'}
 'my.registry.net': {'auth': 'privateuser'},
 'http://legacy.registry.url/v1/': {'auth': 'legacyauth'}
 }
 # hostname only
 self.assertEqual(
Expand DownExpand Up@@ -154,6 +155,15 @@ def test_resolve_authconfig(self):
 resolve_authconfig(auth_config, 'http://my.registry.net/v1/'),
 {'auth': 'privateuser'}
 )
 # legacy entry in config
 self.assertEqual(
 resolve_authconfig(auth_config, 'legacy.registry.url'),
 {'auth': 'legacyauth'}
 )
 # no matching entry
 self.assertTrue(
 resolve_authconfig(auth_config, 'does.not.exist') is None
 )


if __name__ == '__main__':
Expand Down