openstack/keystone
Code Issues Proposed changes

Use URIOpt instead of StrOpt for SAML config

Browse Source 
Change-Id: I6708b41501c8672bdb6315e43d3817cc9ceec010
Depends-On: I39d012b0b7ebeddf6067016487ac8258461dda30
This commit is contained in:
Dolph Mathews 2016-07-13 08:49:31 -04:00
parent dfac754aa5
commit a216ee34fd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
keystone/conf/saml.py
View File

@ -51,7 +51,7 @@ Absolute path to the private key file to use for SAML signing. The value cannot
contain a comma (`,`). contain a comma (`,`).
""")) """))
idp_entity_id = cfg.StrOpt( idp_entity_id = cfg.URIOpt(
'idp_entity_id', 'idp_entity_id',
max_length=1024, max_length=1024,
help=utils.fmt(""" help=utils.fmt("""
@ -61,7 +61,7 @@ provider metadata and must be a URI (a URL is recommended). For example:
`https://keystone.example.com/v3/OS-FEDERATION/saml2/idp`. `https://keystone.example.com/v3/OS-FEDERATION/saml2/idp`.
""")) """))
idp_sso_endpoint = cfg.StrOpt( idp_sso_endpoint = cfg.URIOpt(
'idp_sso_endpoint', 'idp_sso_endpoint',
help=utils.fmt(""" help=utils.fmt("""
This is the single sign-on (SSO) service location of the identity provider This is the single sign-on (SSO) service location of the identity provider
@ -91,7 +91,7 @@ idp_organization_display_name = cfg.StrOpt(
This is the name of the identity provider's organization to be displayed. This is the name of the identity provider's organization to be displayed.
""")) """))
idp_organization_url = cfg.StrOpt( idp_organization_url = cfg.URIOpt(
'idp_organization_url', 'idp_organization_url',
default='https://example.com/', default='https://example.com/',
help=utils.fmt(""" help=utils.fmt("""