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

Merge pull request #196 from OpenKMIP/feat/enforce-server-opp-policy 

Add server persistence for operation policy names
This commit is contained in:
Peter Hamilton 2016-10-14 11:09:10 -04:00 committed by GitHub
parent 843c75d830 4d6ba8a964
commit 30e1a6c095
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -603,6 +603,8 @@ class KmipEngine(object):
for e in enums.CryptographicUsageMask:
if e.value & attribute_value.value:
value.append(e)
elif attribute_name == 'Operation Policy Name':
field = 'operation_policy_name'
if field:
existing_value = getattr(managed_object, field)

12
kmip/tests/unit/services/server/test_engine.py
View File

@ -1505,6 +1505,10 @@ class TestKmipEngine(testtools.TestCase):
enums.CryptographicUsageMask.ENCRYPT,
enums.CryptographicUsageMask.DECRYPT
]
),
attribute_factory.create_attribute(
enums.AttributeType.OPERATION_POLICY_NAME,
'test'
)
]
)
@ -1552,6 +1556,7 @@ class TestKmipEngine(testtools.TestCase):
enums.CryptographicUsageMask.DECRYPT,
symmetric_key.cryptographic_usage_masks
)
self.assertEqual('test', symmetric_key.operation_policy_name)
self.assertEqual(uid, e._id_placeholder)
@ -1822,6 +1827,7 @@ class TestKmipEngine(testtools.TestCase):
enums.CryptographicUsageMask.ENCRYPT,
public_key.cryptographic_usage_masks
)
self.assertEqual('default', public_key.operation_policy_name)
# Retrieve the stored private key and verify all attributes were set
# appropriately.
@ -1846,6 +1852,7 @@ class TestKmipEngine(testtools.TestCase):
enums.CryptographicUsageMask.DECRYPT,
private_key.cryptographic_usage_masks
)
self.assertEqual('default', private_key.operation_policy_name)
self.assertEqual(private_id, e._id_placeholder)
@ -2442,6 +2449,10 @@ class TestKmipEngine(testtools.TestCase):
enums.CryptographicUsageMask.ENCRYPT,
enums.CryptographicUsageMask.DECRYPT
]
),
attribute_factory.create_attribute(
enums.AttributeType.OPERATION_POLICY_NAME,
'test'
)
]
)
@ -2507,6 +2518,7 @@ class TestKmipEngine(testtools.TestCase):
enums.CryptographicUsageMask.DECRYPT,
symmetric_key.cryptographic_usage_masks
)
self.assertEqual('test', symmetric_key.operation_policy_name)
self.assertEqual(uid, e._id_placeholder)