Merge "Only include response body if there's a response"
This commit is contained in:
commit
cd919f5d1f
|
@ -234,9 +234,10 @@ class IdentityServer(object):
|
||||||
raise ksm_exceptions.ServiceError(msg)
|
raise ksm_exceptions.ServiceError(msg)
|
||||||
except ksa_exceptions.HttpError as e:
|
except ksa_exceptions.HttpError as e:
|
||||||
self._LOG.error(
|
self._LOG.error(
|
||||||
'Bad response code while validating token: %s',
|
'Bad response code while validating token: %s %s',
|
||||||
e.http_status)
|
e.http_status, e.message)
|
||||||
self._LOG.warning('Identity response: %s', e.response.text)
|
if hasattr(e.response, 'text'):
|
||||||
|
self._LOG.warning('Identity response: %s', e.response.text)
|
||||||
msg = _('Failed to fetch token data from identity server')
|
msg = _('Failed to fetch token data from identity server')
|
||||||
raise ksm_exceptions.ServiceError(msg)
|
raise ksm_exceptions.ServiceError(msg)
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -98,6 +98,7 @@ VERSION_LIST_v3 = fixture.DiscoveryList(href=BASE_URI)
|
||||||
VERSION_LIST_v2 = fixture.DiscoveryList(v3=False, href=BASE_URI)
|
VERSION_LIST_v2 = fixture.DiscoveryList(v3=False, href=BASE_URI)
|
||||||
|
|
||||||
ERROR_TOKEN = '7ae290c2a06244c4b41692eb4e9225f2'
|
ERROR_TOKEN = '7ae290c2a06244c4b41692eb4e9225f2'
|
||||||
|
TIMEOUT_TOKEN = '4ed1c5e53beee59458adcf8261a8cae2'
|
||||||
|
|
||||||
|
|
||||||
def cleanup_revoked_file(filename):
|
def cleanup_revoked_file(filename):
|
||||||
|
@ -1083,6 +1084,12 @@ class CommonAuthTokenMiddlewareTest(object):
|
||||||
|
|
||||||
self.assertEqual(mock_obj.call_count, times_retry)
|
self.assertEqual(mock_obj.call_count, times_retry)
|
||||||
|
|
||||||
|
def test_request_timeout(self):
|
||||||
|
self.call_middleware(headers={'X-Auth-Token': TIMEOUT_TOKEN},
|
||||||
|
expected_status=503)
|
||||||
|
self.assertIsNone(self._get_cached_token(TIMEOUT_TOKEN))
|
||||||
|
self.assert_valid_last_url(TIMEOUT_TOKEN)
|
||||||
|
|
||||||
def test_nocatalog(self):
|
def test_nocatalog(self):
|
||||||
conf = {
|
conf = {
|
||||||
'include_service_catalog': 'False'
|
'include_service_catalog': 'False'
|
||||||
|
@ -1545,6 +1552,11 @@ def network_error_response(request, context):
|
||||||
raise ksa_exceptions.ConnectFailure("Network connection refused.")
|
raise ksa_exceptions.ConnectFailure("Network connection refused.")
|
||||||
|
|
||||||
|
|
||||||
|
def request_timeout_response(request, context):
|
||||||
|
raise ksa_exceptions.RequestTimeout(
|
||||||
|
"Request to https://host/token/path timed out")
|
||||||
|
|
||||||
|
|
||||||
class v2AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest,
|
class v2AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest,
|
||||||
CommonAuthTokenMiddlewareTest,
|
CommonAuthTokenMiddlewareTest,
|
||||||
testresources.ResourcedTestCase):
|
testresources.ResourcedTestCase):
|
||||||
|
@ -1618,6 +1630,9 @@ class v2AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest,
|
||||||
url = '%s/v2.0/tokens/%s' % (BASE_URI, ERROR_TOKEN)
|
url = '%s/v2.0/tokens/%s' % (BASE_URI, ERROR_TOKEN)
|
||||||
self.requests_mock.get(url, text=network_error_response)
|
self.requests_mock.get(url, text=network_error_response)
|
||||||
|
|
||||||
|
url = '%s/v2.0/tokens/%s' % (BASE_URI, TIMEOUT_TOKEN)
|
||||||
|
self.requests_mock.get(url, text=request_timeout_response)
|
||||||
|
|
||||||
self.set_middleware()
|
self.set_middleware()
|
||||||
|
|
||||||
def assert_unscoped_default_tenant_auto_scopes(self, token):
|
def assert_unscoped_default_tenant_auto_scopes(self, token):
|
||||||
|
@ -1824,6 +1839,8 @@ class v3AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest,
|
||||||
if token_id == ERROR_TOKEN:
|
if token_id == ERROR_TOKEN:
|
||||||
msg = "Network connection refused."
|
msg = "Network connection refused."
|
||||||
raise ksa_exceptions.ConnectFailure(msg)
|
raise ksa_exceptions.ConnectFailure(msg)
|
||||||
|
elif token_id == TIMEOUT_TOKEN:
|
||||||
|
request_timeout_response(request, context)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
response = self.examples.JSON_TOKEN_RESPONSES[token_id]
|
response = self.examples.JSON_TOKEN_RESPONSES[token_id]
|
||||||
|
@ -2372,6 +2389,8 @@ class v3CompositeAuthTests(BaseAuthTokenMiddlewareTest,
|
||||||
if token_id == ERROR_TOKEN:
|
if token_id == ERROR_TOKEN:
|
||||||
msg = "Network connection refused."
|
msg = "Network connection refused."
|
||||||
raise ksc_exceptions.ConnectionRefused(msg)
|
raise ksc_exceptions.ConnectionRefused(msg)
|
||||||
|
elif token_id == TIMEOUT_TOKEN:
|
||||||
|
request_timeout_response(request, context)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
response = self.examples.JSON_TOKEN_RESPONSES[token_id]
|
response = self.examples.JSON_TOKEN_RESPONSES[token_id]
|
||||||
|
|
Loading…
Reference in New Issue