由温仰发起的CORE-V3 SDK自动发布, BUILD_ID=114, 版本号：2.5.4

发布日志：
1, disable [publicKeyId] auth type in Windows because 'pycrypto' is not supported

Author: Qingtang-SDK

aliyun-python-sdk-core-v3/ChangeLog.txt

@@ -1,3 +1,6 @@
+2017-12-14 Version: 2.5.4
+1, disable [publicKeyId] auth type in Windows because 'pycrypto' is not supported
+
 2017-12-12 Version: 2.5.3
 1, remove bad smell codes
 2, bugfix: the invoke-type metric will lost while send rpc request with common api

aliyun-python-sdk-core-v3/aliyunsdkcore/__init__.py

@@ -1 +1 @@
-__version__ = "2.5.3"
+__version__ = "2.5.4"

aliyun-python-sdk-core-v3/aliyunsdkcore/acs_exception/error_code.py

@@ -35,4 +35,5 @@
 SDK_INVALID_CREDENTIAL = 'SDK.InvalidCredential'
 SDK_INVALID_SESSION_EXPIRATION = 'SDK.InvalidSessionExpiration'
 SDK_GET_SESSION_CREDENTIAL_FAILED = 'SDK.GetSessionCredentialFailed'
-SDK_INVALID_PARAMS = 'SDK.InvalidParams'
+SDK_INVALID_PARAMS = 'SDK.InvalidParams'
+SDK_NOT_SUPPORT = 'SDK.NotSupport'

aliyun-python-sdk-core-v3/aliyunsdkcore/auth/algorithm/sha_hmac256.py

@@ -18,24 +18,33 @@
 # coding=utf-8
 
 import base64
-from Crypto.Signature import PKCS1_v1_5
-from Crypto.Hash import SHA256
-from Crypto.PublicKey import RSA
+import platform
+from aliyunsdkcore.acs_exception import exceptions
+from aliyunsdkcore.acs_exception import error_code
+
 
 
 def get_sign_string(source, access_secret):
-    if isinstance(access_secret, str):
-        access_secret = bytearray(access_secret, "utf-8")
-    secret = base64.decodebytes(access_secret)
-    key = RSA.importKey(secret)
-    if isinstance(source, str):
-        source = bytearray(source, "utf-8")
-    h = SHA256.new(source)
-    signer = PKCS1_v1_5.new(key)
-    signed_bytes = signer.sign(h)
-    signed_base64 = base64.encodebytes(signed_bytes)
-    signature = str(signed_base64, "utf-8").replace('\n', '')
-    return signature
+    if platform.system() != "Windows":
+        from Crypto.Signature import PKCS1_v1_5
+        from Crypto.Hash import SHA256
+        from Crypto.PublicKey import RSA
+        if isinstance(access_secret, str):
+            access_secret = bytearray(access_secret, "utf-8")
+        secret = base64.decodebytes(access_secret)
+        key = RSA.importKey(secret)
+        if isinstance(source, str):
+            source = bytearray(source, "utf-8")
+        h = SHA256.new(source)
+        signer = PKCS1_v1_5.new(key)
+        signed_bytes = signer.sign(h)
+        signed_base64 = base64.encodebytes(signed_bytes)
+        signature = str(signed_base64, "utf-8").replace('\n', '')
+        return signature
+    else:
+        message = "uth type [publicKeyId] is disabled in Windows because 'pycrypto' is not supported," \
+                  " we will resolve this soon"
+        raise exceptions.ClientException(error_code.SDK_NOT_SUPPORT, message)
 
 
 def get_signer_name():

aliyun-python-sdk-core-v3/setup.py

@@ -20,6 +20,8 @@
 
 from setuptools import setup, find_packages
 import os
+import platform
+import logging
 
 """
 setup module for core.
@@ -44,6 +46,14 @@
 finally:
     desc_file.close()
 
+requires = []
+if platform.system() != "Windows":
+    requires.append("pycrypto>=2.6.1")
+else:
+    logging.warning(
+        "auth type [publicKeyId] is disabled because 'pycrypto' not support windows, we will resolve this soon")
+
+
 setup(
     name=NAME,
     version=VERSION,