tyler.durden
/
PyKMIP
mirror of https://github.com/OpenKMIP/PyKMIP.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a bug with how the server retrieves attributes under KMIP 2.0 

This change fixes a bug in the server attribute handling logic
that manifests when attributes are deprecated and removed in KMIP
2.0. Now these attributes are effectively ignored for KMIP 2.0
messages, complying with the KMIP 2.0 specification.
This commit is contained in:
Peter Hamilton 2019-06-18 10:39:56 -04:00 committed by Peter Hamilton
parent 4ebaa6f501
commit f1b57d21fc
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kmip/services/server/engine.py
View File

@ -593,10 +593,14 @@ class KmipEngine(object):
for attribute_name in attr_names: for attribute_name in attr_names:
object_type = managed_object._object_type object_type = managed_object._object_type
# TODO (ph) Create the policy once and just pass these calls the
# KMIP version for the current request.
if not self._attribute_policy.is_attribute_supported( if not self._attribute_policy.is_attribute_supported(
attribute_name attribute_name
): ):
continue continue
if self._attribute_policy.is_attribute_deprecated(attribute_name):
continue
if self._attribute_policy.is_attribute_applicable_to_object_type( if self._attribute_policy.is_attribute_applicable_to_object_type(
attribute_name, attribute_name,

3
kmip/services/server/policy.py
View File

@ -521,7 +521,8 @@ class AttributePolicy(object):
enums.ObjectType.SECRET_DATA, enums.ObjectType.SECRET_DATA,
enums.ObjectType.OPAQUE_DATA enums.ObjectType.OPAQUE_DATA
), ),
contents.ProtocolVersion(1, 0) contents.ProtocolVersion(1, 0),
contents.ProtocolVersion(2, 0)
), ),
'Cryptographic Usage Mask': AttributeRuleSet( 'Cryptographic Usage Mask': AttributeRuleSet(
True, True,