tyler.durden/PyKMIP
1
0
Fork 0
mirror of https://github.com/OpenKMIP/PyKMIP.git synced 2025-07-16 18:44:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #262 from OpenKMIP/bug/fix-pie-client-get

Browse Source 
Fixing stringent uid value checks in the ProxyKmipClient
This commit is contained in:
Peter Hamilton 2017-04-12 18:31:38 -04:00 committed by GitHub
commit 19560b92b7
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kmip/pie/client.py
View File

@ -391,7 +391,7 @@ class ProxyKmipClient(api.KmipClient):
message = result.result_message.value message = result.result_message.value
raise exceptions.KmipOperationFailure(status, reason, message) raise exceptions.KmipOperationFailure(status, reason, message)
def get(self, uid): def get(self, uid=None):
""" """
Get a managed object from a KMIP appliance. Get a managed object from a KMIP appliance.
@ -407,8 +407,9 @@ class ProxyKmipClient(api.KmipClient):
TypeError: if the input argument is invalid TypeError: if the input argument is invalid
""" """
# Check input # Check input
if not isinstance(uid, six.string_types): if uid is not None:
raise TypeError("uid must be a string") if not isinstance(uid, six.string_types):
raise TypeError("uid must be a string")
# Verify that operations can be given at this time # Verify that operations can be given at this time
if not self._is_open: if not self._is_open:
@ -541,7 +542,7 @@ class ProxyKmipClient(api.KmipClient):
message = result.result_message.value message = result.result_message.value
raise exceptions.KmipOperationFailure(status, reason, message) raise exceptions.KmipOperationFailure(status, reason, message)
def destroy(self, uid): def destroy(self, uid=None):
""" """
Destroy a managed object stored by a KMIP appliance. Destroy a managed object stored by a KMIP appliance.
@ -557,8 +558,9 @@ class ProxyKmipClient(api.KmipClient):
TypeError: if the input argument is invalid TypeError: if the input argument is invalid
""" """
# Check input # Check input
if not isinstance(uid, six.string_types): if uid is not None:
raise TypeError("uid must be a string") if not isinstance(uid, six.string_types):
raise TypeError("uid must be a string")
# Verify that operations can be given at this time # Verify that operations can be given at this time
if not self._is_open: if not self._is_open:

2
kmip/services/kmip_client.py
View File

@ -357,7 +357,7 @@ class KMIPProxy(KMIP):
revocation_message=message, revocation_message=message,
credential=credential) credential=credential)
def destroy(self, uuid, credential=None): def destroy(self, uuid=None, credential=None):
return self._destroy(unique_identifier=uuid, return self._destroy(unique_identifier=uuid,
credential=credential) credential=credential)