Skip to content

增加aksk校验 #190

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

Merged
merged 1 commit into from
Dec 7, 2021
Merged

增加aksk校验 #190

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 17 additions & 9 deletions qcloud_cos/cos_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,14 @@ def __init__(self, Appid=None, Region=None, SecretId=None, SecretKey=None, Token

# 兼容(SecretId,SecretKey)以及(AccessId,AccessKey)
if (SecretId and SecretKey):
self._secret_id = to_unicode(SecretId)
self._secret_key = to_unicode(SecretKey)
self._secret_id = self.convert_secret_value(SecretId)
self._secret_key = self.convert_secret_value(SecretKey)
elif (Secret_id and Secret_key):
self._secret_id = to_unicode(Secret_id)
self._secret_key = to_unicode(Secret_key)
self._secret_id = self.convert_secret_value(Secret_id)
self._secret_key = self.convert_secret_value(Secret_key)
elif (Access_id and Access_key):
self._secret_id = to_unicode(Access_id)
self._secret_key = to_unicode(Access_key)
self._secret_id = self.convert_secret_value(Access_id)
self._secret_key = self.convert_secret_value(Access_key)
else:
raise CosClientError('SecretId and SecretKey is Required!')

Expand Down Expand Up @@ -179,14 +179,22 @@ def set_credential(self, SecretId, SecretKey, Token=None):
:param SecretKey(string): 秘钥SecretKey.
:param Token(string): 临时秘钥使用的token.
"""
self._secret_id = to_unicode(SecretId)
self._secret_key = to_unicode(SecretKey)
self._token = to_unicode(Token)
self._secret_id = self.convert_secret_value(SecretId)
self._secret_key = self.convert_secret_value(SecretKey)
self._token = self.convert_secret_value(Token)

def set_copy_part_threshold_size(self, size):
if size > 0:
self._copy_part_threshold_size = size

def convert_secret_value(self, value):
value = to_unicode(value)

if value.endswith(' ') or value.startswith(' '):
raise CosClientError('secret_id and secret_key cannot contain spaces at the beginning and end')

return value


class CosS3Client(object):
"""cos客户端类，封装相应请求"""
Expand Down