Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev 2109-sts-kms #291

Open
wants to merge 3 commits into
base: dev-2109
Choose a base branch
from
Open

Dev 2109-sts-kms #291

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5705b07
Dev 2106 (#282)
zhuxiaolong37 Jun 29, 2021
54a942a
Merge branch 'dev-2109' of github.com:aliyun/aliyun-oss-python-sdk
zhuxiaolong37 Sep 8, 2021
cc1c401
Modifying the implementation of KMS encryption with STS
zhuxiaolong37 Sep 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions oss2/crypto.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ class AliKMSProvider(BaseCryptoProvider):

def __init__(self, access_key_id, access_key_secret, region, cmk_id, sts_token=None, passphrase=None,
cipher=utils.AESCTRCipher(), mat_desc=None):
from aliyunsdkcore.auth.credentials import StsTokenCredential

super(AliKMSProvider, self).__init__(cipher=cipher, mat_desc=mat_desc)
if not isinstance(cipher, utils.AESCTRCipher):
Expand All @@ -312,7 +313,8 @@ def __init__(self, access_key_id, access_key_secret, region, cmk_id, sts_token=N
self.custom_master_key_id = cmk_id
self.sts_token = sts_token
self.context = '{"x-passphrase":"' + passphrase + '"}' if passphrase else ''
self.kms_client = client.AcsClient(access_key_id, access_key_secret, region)
credential = StsTokenCredential(access_key_id, access_key_secret, sts_token)
self.kms_client = client.AcsClient(region_id=region, credential=credential)

def get_key(self):
plain_key, encrypted_key = self.__generate_data_key()
Expand Down Expand Up @@ -357,8 +359,6 @@ def __generate_data_key(self):
req.set_KeySpec('AES_256')
req.set_NumberOfBytes(32)
req.set_EncryptionContext(self.context)
if self.sts_token:
req.set_STSToken(self.sts_token)

resp = self.__do(req)

Expand All @@ -372,8 +372,6 @@ def __encrypt_data(self, data):
req.set_KeyId(self.custom_master_key_id)
req.set_Plaintext(data)
req.set_EncryptionContext(self.context)
if self.sts_token:
req.set_STSToken(self.sts_token)

resp = self.__do(req)

Expand All @@ -386,8 +384,6 @@ def __decrypt_data(self, data):
req.set_method(method_type.POST)
req.set_CiphertextBlob(data)
req.set_EncryptionContext(self.context)
if self.sts_token:
req.set_STSToken(self.sts_token)

resp = self.__do(req)
return resp['Plaintext']
Expand Down