catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

KMS encryption under Python 3 (#826)

Browse source 
This upgrades the KMS encrypt and decrypt endpoints to work
under both Python 2 and 3
This commit is contained in:
Jack Danger 2017-02-09 19:36:24 -08:00 • committed by Steve Pulec
commit 53fbd7dca0
2 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
moto/kms/responses.py
View file

@ -3,6 +3,7 @@ from __future__ import unicode_literals
import base64
import json
import re
import six
from boto.exception import JSONResponseError
from boto.kms.exceptions import AlreadyExistsException, NotFoundException
@ -220,11 +221,14 @@ class KmsResponse(BaseResponse):
decode it in decrypt().
"""
value = self.parameters.get("Plaintext")
return json.dumps({"CiphertextBlob": base64.b64encode(value).encode("utf-8")})
if isinstance(value, six.text_type):
value = value.encode('utf-8')
return json.dumps({"CiphertextBlob": base64.b64encode(value).decode("utf-8")})
def decrypt(self):
value = self.parameters.get("CiphertextBlob")
return json.dumps({"Plaintext": base64.b64decode(value).encode("utf-8")})
print("value 3", value)
return json.dumps({"Plaintext": base64.b64decode(value).decode("utf-8")})
def _assert_valid_key_id(key_id):