f97df5cb6f
Previously, we weren't doing any validation on the roles attribute of a trust except to validate that it was an array. A hasty glance, however, would lead you to believe that it was validating an array of parameter_types.id_string[1] and so we translated that to the new role object validation. However, id_string doesn't include some valid role names like _member_. This patch updates the role name schema to match parameter_types.name, which is the same as the schema for the main role object. [1] http://git.openstack.org/cgit/openstack/keystone/tree/keystone/trust/schema.py?id=62f9e57cd81dc98c5816da9fa483d385b4c1a66c#n41 Change-Id: I83aafc7a96e81a9b6b1056b39cd8c5d23676c014 Closes-bug: #1734871
61 lines
1.9 KiB
Python
61 lines
1.9 KiB
Python
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
from keystone.common import validation
|
|
from keystone.common.validation import parameter_types
|
|
|
|
_role_properties = {
|
|
'type': 'array',
|
|
'items': {
|
|
'type': 'object',
|
|
'properties': {
|
|
'id': parameter_types.id_string,
|
|
'name': parameter_types.name
|
|
},
|
|
'minProperties': 1,
|
|
'maxProperties': 1,
|
|
'additionalProperties': False
|
|
}
|
|
}
|
|
|
|
_trust_properties = {
|
|
# NOTE(lbragstad): These are set as external_id_string because they have
|
|
# the ability to be read as LDAP user identifiers, which could be something
|
|
# other than uuid.
|
|
'trustor_user_id': parameter_types.external_id_string,
|
|
'trustee_user_id': parameter_types.external_id_string,
|
|
'impersonation': parameter_types.boolean,
|
|
'project_id': validation.nullable(parameter_types.id_string),
|
|
'remaining_uses': {
|
|
'type': ['integer', 'null'],
|
|
'minimum': 1
|
|
},
|
|
'expires_at': {
|
|
'type': ['null', 'string']
|
|
},
|
|
'allow_redelegation': {
|
|
'type': ['boolean', 'null']
|
|
},
|
|
'redelegation_count': {
|
|
'type': ['integer', 'null'],
|
|
'minimum': 0
|
|
},
|
|
'roles': _role_properties
|
|
}
|
|
|
|
trust_create = {
|
|
'type': 'object',
|
|
'properties': _trust_properties,
|
|
'required': ['trustor_user_id', 'trustee_user_id', 'impersonation'],
|
|
'additionalProperties': True
|
|
}
|