openstack
/
keystone
Code Issues Proposed changes

Merge "Add import i18n to federation/controllers.py"

This commit is contained in:
Jenkins 2014-11-22 18:10:44 +00:00 committed by Gerrit Code Review
parent fbbca67dad ea5e166abf
commit 527924b23f
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
keystone/contrib/federation/controllers.py
View File

@ -23,6 +23,7 @@ from keystone.contrib.federation import idp as keystone_idp
from keystone.contrib.federation import schema
from keystone.contrib.federation import utils
from keystone import exception
from keystone.i18n import _
from keystone.models import token_model

26
keystone/tests/test_v3_federation.py
View File

@ -1865,6 +1865,32 @@ class SAMLGenerationTests(FederationTests):
token_id = resp.headers.get('X-Subject-Token')
return token_id
def _fetch_domain_scoped_token(self):
auth_data = self.build_authentication_request(
user_id=self.user['id'],
password=self.user['password'],
user_domain_id=self.domain['id'])
resp = self.v3_authenticate_token(auth_data)
token_id = resp.headers.get('X-Subject-Token')
return token_id
def test_not_project_scoped_token(self):
"""Test that the SAML generation fails when passing tokens
not scoped by project.
"""
self.config_fixture.config(group='saml', idp_entity_id=self.ISSUER)
region_id = self._create_region_with_url()
token_id = self._fetch_domain_scoped_token()
body = self._create_generate_saml_request(token_id, region_id)
with mock.patch.object(keystone_idp, '_sign_assertion',
return_value=self.signed_assertion):
# NOTE(rodrigods): currently, sending a request using a domain
# scoped token returns 500 due bug #1395117
self.post(self.SAML_GENERATION_ROUTE, body=body,
expected_status=500)
def test_generate_saml_route(self):
"""Test that the SAML generation endpoint produces XML.