openstack
/
cinder
Code Issues Proposed changes

Make sure that versions are applied as relative URLs 

When urljoining a base_url with a version, the path in the base_url will
be dropped if the version string starts with a "/". This will lead to
issues when the base_url looks like "https://HOSTIP/volume/" like in the
devstack tls-proxy setup.

Change-Id: Ia2060066330d8e7dd40f37392db4d6b7b9a6fa8e
Partial-Bug: 1713732
This commit is contained in:
Jens Harbott 2017-08-30 12:24:32 +00:00
parent 4e3076a73e
commit 6bb387ec14
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cinder/api/views/versions.py
View File

@ -69,7 +69,8 @@ class ViewBuilder(object):
def _generate_href(self, version='v3', path=None):
"""Create a URL that refers to a specific version_number."""
base_url = self._get_base_url_without_version()
href = urllib.parse.urljoin(base_url, version).rstrip('/') + '/'
rel_version = version.lstrip('/')
href = urllib.parse.urljoin(base_url, rel_version).rstrip('/') + '/'
if path:
href += path.lstrip('/')
return href

16
cinder/tests/unit/api/views/test_versions.py
View File

@ -26,7 +26,7 @@ class FakeRequest(object):
self.application_url = application_url
URL_BASE = 'http://localhost/'
URL_BASE = 'http://localhost/volume/'
FAKE_HREF = URL_BASE + 'v1/'
FAKE_VERSIONS = {
@ -69,7 +69,7 @@ FAKE_LINKS = [
class ViewBuilderTestCase(test.TestCase):
def _get_builder(self):
request = FakeRequest('fake')
request = FakeRequest(URL_BASE)
return versions.get_view_builder(request)
def test_build_versions(self):
@ -110,13 +110,9 @@ class ViewBuilderTestCase(test.TestCase):
def test_generate_href_defaults(self):
self.mock_object(versions.ViewBuilder,
'_get_base_url_without_version',
return_value=URL_BASE)
result = self._get_builder()._generate_href()
self.assertEqual('http://localhost/v3/', result)
self.assertEqual(URL_BASE + 'v3/', result)
@ddt.data(
('v2', None, URL_BASE + 'v2/'),
@ -127,10 +123,6 @@ class ViewBuilderTestCase(test.TestCase):
@ddt.unpack
def test_generate_href_no_path(self, version, path, expected):
self.mock_object(versions.ViewBuilder,
'_get_base_url_without_version',
return_value=URL_BASE)
result = self._get_builder()._generate_href(version=version,
path=path)
@ -139,7 +131,9 @@ class ViewBuilderTestCase(test.TestCase):
@ddt.data(
('http://1.1.1.1/', 'http://1.1.1.1/'),
('http://localhost/', 'http://localhost/'),
('http://localhost/volume/', 'http://localhost/volume/'),
('http://1.1.1.1/v1/', 'http://1.1.1.1/'),
('http://1.1.1.1/volume/v1/', 'http://1.1.1.1/volume/'),
('http://1.1.1.1/v1', 'http://1.1.1.1/'),
('http://1.1.1.1/v11', 'http://1.1.1.1/'),
)