openstack/keystone
Code Issues Proposed changes

Merge "Replace the content type with correct one"

Browse Source
This commit is contained in:
Jenkins
2016-08-19 19:28:57 +00:00
committed by Gerrit Code Review
parent 45a181928f 72b274defc
commit c4d4c5bca8
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
keystone/oauth1/controllers.py
View File

@@ -260,7 +260,7 @@ class OAuthControllerV3(controller.V3Controller):
expiry_bit = '&oauth_expires_at=%s' % token_ref['expires_at']
result += expiry_bit
headers = [('Content-Type', 'application/x-www-urlformencoded')]
headers = [('Content-Type', 'application/x-www-form-urlencoded')]
response = wsgi.render_response(
result,
status=(http_client.CREATED,
@@ -341,7 +341,7 @@ class OAuthControllerV3(controller.V3Controller):
expiry_bit = '&oauth_expires_at=%s' % (token_ref['expires_at'])
result += expiry_bit
headers = [('Content-Type', 'application/x-www-urlformencoded')]
headers = [('Content-Type', 'application/x-www-form-urlencoded')]
response = wsgi.render_response(
result,
status=(http_client.CREATED,

22
keystone/tests/unit/test_v3_oauth1.py
View File

@@ -268,7 +268,7 @@ class OAuthFlowTests(OAuth1Tests):
self.project_id)
content = self.post(
url, headers=headers,
response_content_type='application/x-www-urlformencoded')
response_content_type='application/x-www-form-urlencoded')
credentials = _urllib_parse_qs_text_keys(content.result)
request_key = credentials['oauth_token'][0]
request_secret = credentials['oauth_token_secret'][0]
@@ -287,7 +287,7 @@ class OAuthFlowTests(OAuth1Tests):
self.request_token)
content = self.post(
url, headers=headers,
response_content_type='application/x-www-urlformencoded')
response_content_type='application/x-www-form-urlencoded')
credentials = _urllib_parse_qs_text_keys(content.result)
access_key = credentials['oauth_token'][0]
access_secret = credentials['oauth_token_secret'][0]
@@ -544,7 +544,7 @@ class AuthTokenTests(object):
self.project_id)
content = self.post(
url, headers=headers,
response_content_type='application/x-www-urlformencoded')
response_content_type='application/x-www-form-urlencoded')
credentials = _urllib_parse_qs_text_keys(content.result)
request_key = credentials['oauth_token'][0]
request_secret = credentials['oauth_token_secret'][0]
@@ -647,7 +647,7 @@ class MaliciousOAuth1Tests(OAuth1Tests):
url, headers = self._create_request_token(consumer, self.project_id)
self.post(
url, headers=headers,
response_content_type='application/x-www-urlformencoded')
response_content_type='application/x-www-form-urlencoded')
url = self._authorize_request_token(uuid.uuid4().hex)
body = {'roles': [{'id': self.role_id}]}
self.put(url, body=body, expected_status=http_client.NOT_FOUND)
@@ -678,7 +678,7 @@ class MaliciousOAuth1Tests(OAuth1Tests):
url, headers = self._create_request_token(consumer, self.project_id)
content = self.post(
url, headers=headers,
response_content_type='application/x-www-urlformencoded')
response_content_type='application/x-www-form-urlencoded')
credentials = _urllib_parse_qs_text_keys(content.result)
request_key = credentials['oauth_token'][0]
request_secret = credentials['oauth_token_secret'][0]
@@ -704,7 +704,7 @@ class MaliciousOAuth1Tests(OAuth1Tests):
url, headers = self._create_request_token(consumer, self.project_id)
content = self.post(
url, headers=headers,
response_content_type='application/x-www-urlformencoded')
response_content_type='application/x-www-form-urlencoded')
credentials = _urllib_parse_qs_text_keys(content.result)
request_key = credentials['oauth_token'][0]
@@ -728,7 +728,7 @@ class MaliciousOAuth1Tests(OAuth1Tests):
self.project_id)
content = self.post(
url, headers=headers,
response_content_type='application/x-www-urlformencoded')
response_content_type='application/x-www-form-urlencoded')
credentials = _urllib_parse_qs_text_keys(content.result)
request_key = credentials['oauth_token'][0]
request_secret = credentials['oauth_token_secret'][0]
@@ -751,7 +751,7 @@ class MaliciousOAuth1Tests(OAuth1Tests):
self.project_id)
content = self.post(
url, headers=headers,
response_content_type='application/x-www-urlformencoded')
response_content_type='application/x-www-form-urlencoded')
credentials = _urllib_parse_qs_text_keys(content.result)
request_key = credentials['oauth_token'][0]
request_secret = credentials['oauth_token_secret'][0]
@@ -768,7 +768,7 @@ class MaliciousOAuth1Tests(OAuth1Tests):
self.request_token)
content = self.post(
url, headers=headers,
response_content_type='application/x-www-urlformencoded')
response_content_type='application/x-www-form-urlencoded')
credentials = _urllib_parse_qs_text_keys(content.result)
access_key = credentials['oauth_token'][0]
access_secret = credentials['oauth_token_secret'][0]
@@ -852,7 +852,7 @@ class OAuthNotificationTests(OAuth1Tests,
self.project_id)
content = self.post(
url, headers=headers,
response_content_type='application/x-www-urlformencoded')
response_content_type='application/x-www-form-urlencoded')
credentials = _urllib_parse_qs_text_keys(content.result)
request_key = credentials['oauth_token'][0]
request_secret = credentials['oauth_token_secret'][0]
@@ -881,7 +881,7 @@ class OAuthNotificationTests(OAuth1Tests,
self.request_token)
content = self.post(
url, headers=headers,
response_content_type='application/x-www-urlformencoded')
response_content_type='application/x-www-form-urlencoded')
credentials = _urllib_parse_qs_text_keys(content.result)
access_key = credentials['oauth_token'][0]
access_secret = credentials['oauth_token_secret'][0]

6
releasenotes/notes/oauth1-headers-content-type-9a9245d9bbec8f8e.yaml Normal file
View File

@@ -0,0 +1,6 @@
---
other:
- >
The response's content type for creating request token or access token
is changed to `application/x-www-form-urlencoded`, the old value
`application/x-www-urlformencoded` is invalid and will no longer be used.