tyler.durden/PyKMIP
1
0
Fork 0
mirror of https://github.com/OpenKMIP/PyKMIP.git synced 2025-04-08 19:25:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix AttributeError in client Rekey results with missing payloads

Browse Source 
This change fixes a bug in the KMIPProxy client's support for the
Rekey operation. Specifically, if the operation fails and does not
return a payload, the client will still try to reference the
payload object when checking for TemplateAttribute data. This
causes an AttributeError since the payload is None. This change
fixes this and adds a unit test that covers this specific case.

Fixes #474
This commit is contained in:
Peter Hamilton 2018-12-06 16:01:09 -05:00 committed by Peter Hamilton
parent 8fd7eb5ab6
commit 4828e0d845
2 changed files with 50 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kmip/services/kmip_client.py
View File

@ -405,8 +405,9 @@ class KMIPProxy(object):
if payload:
result['unique_identifier'] = payload.unique_identifier
if payload.template_attribute is not None:
result['template_attribute'] = payload.template_attribute
if payload.template_attribute is not None:
result['template_attribute'] = payload.template_attribute
result['result_status'] = batch_item.result_status.value
try:

48
kmip/tests/unit/services/test_kmip_client.py
View File

@ -929,9 +929,55 @@ class TestKMIPClient(TestCase):
self.assertEqual(None, result.get('result_reason'))
self.assertEqual(None, result.get('result_message'))
@mock.patch('kmip.services.kmip_client.KMIPProxy._build_request_message')
@mock.patch(
'kmip.services.kmip_client.KMIPProxy._build_request_message'
'kmip.services.kmip_client.KMIPProxy._send_and_receive_message'
)
def test_rekey_with_no_payload(self, send_mock, build_mock):
"""
Test that the client correctly handles responses with no payload data.
"""
batch_item = ResponseBatchItem(
operation=Operation(OperationEnum.REKEY),
result_status=ResultStatus(ResultStatusEnum.OPERATION_FAILED),
result_reason=ResultReason(ResultReasonEnum.PERMISSION_DENIED),
result_message=ResultMessage("Permission denied."),
response_payload=None
)
response = ResponseMessage(batch_items=[batch_item])
build_mock.return_value = None
send_mock.return_value = response
result = self.client.rekey(
uuid='1',
offset=0,
template_attribute=objects.TemplateAttribute(
attributes=[
objects.Attribute(
attribute_name=objects.Attribute.AttributeName(
'Activation Date'
),
attribute_value=primitives.DateTime(
value=1136113200,
tag=enums.Tags.ACTIVATION_DATE
)
)
]
)
)
self.assertEqual(
ResultStatusEnum.OPERATION_FAILED,
result.get('result_status')
)
self.assertEqual(
ResultReasonEnum.PERMISSION_DENIED,
result.get('result_reason')
)
self.assertEqual("Permission denied.", result.get('result_message'))
@mock.patch('kmip.services.kmip_client.KMIPProxy._build_request_message')
@mock.patch(
'kmip.services.kmip_client.KMIPProxy._send_and_receive_message'
)