aliyun-log-python-sdk 0.9.37__tar.gz → 0.9.39__tar.gz

{aliyun_log_python_sdk-0.9.37/aliyun_log_python_sdk.egg-info → aliyun_log_python_sdk-0.9.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aliyun-log-python-sdk
-Version: 0.9.37
+Version: 0.9.39
 Summary: Aliyun log service Python client SDK
 Home-page: https://github.com/aliyun/aliyun-log-python-sdk
 Author: Aliyun

{aliyun_log_python_sdk-0.9.37 → aliyun_log_python_sdk-0.9.39}/aliyun/log/__init__.py

@@ -48,7 +48,7 @@ from .logger_hanlder import SimpleLogHandler, QueuedLogHandler, LogFields, Uwsgi
 from .metering_mode_response import GetLogStoreMeteringModeResponse, \
     GetMetricStoreMeteringModeResponse, \
     UpdateLogStoreMeteringModeResponse, UpdateMetricStoreMeteringModeResponse
-
+from .object_response import PutObjectResponse, GetObjectResponse
 
 from .store_view import StoreView, StoreViewStore
 from .store_view_response import CreateStoreViewResponse, UpdateStoreViewResponse, DeleteStoreViewResponse, ListStoreViewsResponse, GetStoreViewResponse

{aliyun_log_python_sdk-0.9.37 → aliyun_log_python_sdk-0.9.39}/aliyun/log/auth.py

@@ -60,7 +60,7 @@ class AuthV1(AuthBase):
             logger.warning("failed to set locale time to C. skip it: {0}".format(ex))
         return datetime.utcnow().strftime('%a, %d %b %Y %H:%M:%S GMT')
 
-    def sign_request(self, method, resource, params, headers, body):
+    def sign_request(self, method, resource, params, headers, body, compute_content_hash=True):
         credentials = self.credentials_provider.get_credentials()
         if credentials.get_security_token():
             headers['x-acs-security-token'] = credentials.get_security_token()
@@ -68,13 +68,17 @@ class AuthV1(AuthBase):
         headers['x-log-signaturemethod'] = 'hmac-sha1'
         headers['Date'] = self._getGMT()
 
-        if body:
-            headers['Content-MD5'] = Util.cal_md5(body)
+        content_md5 = None
+        # we don't need content-md5 in signature if compute_content_hash is False
+        if body and compute_content_hash:
+            content_md5 = Util.cal_md5(body)
+            headers['Content-MD5'] = content_md5
+
         if not credentials.get_access_key_secret():
             return six.b('')
         content = method + '\n'
-        if 'Content-MD5' in headers:
-            content += headers['Content-MD5']
+        if content_md5 is not None:
+            content += content_md5
         content += '\n'
         if 'Content-Type' in headers:
             content += headers['Content-Type']
@@ -87,23 +91,27 @@ class AuthV1(AuthBase):
         headers['x-log-date'] = headers['Date']  # bypass some proxy doesn't allow "Date" in header issue.
 
 
+_EMPTY_CONTENT_SHA256 = 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+
 class AuthV4(AuthBase):
     def __init__(self, credentials_provider, region):
         AuthBase.__init__(self, credentials_provider)
         self._region = region
 
-    def sign_request(self, method, resource, params, headers, body):
+    def sign_request(self, method, resource, params, headers, body, compute_content_hash=True):
         current_time = datetime.utcnow().strftime("%Y%m%dT%H%M%SZ")
-        headers['Authorization'] = self._do_sign_request(method, resource, params, headers, body, current_time)
+        headers['Authorization'] = self._do_sign_request(method, resource, params, headers, body, current_time, compute_content_hash=compute_content_hash)
 
-    def _do_sign_request(self, method, resource, params, headers, body, current_time):
+    def _do_sign_request(self, method, resource, params, headers, body, current_time, compute_content_hash=True):
         credentials = self.credentials_provider.get_credentials()
 
         if credentials.get_security_token():
             headers['x-acs-security-token'] = credentials.get_security_token()
 
-        content_sha256 = sha256(body).hexdigest() \
-            if body else 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+        content_sha256 = _EMPTY_CONTENT_SHA256
+        if compute_content_hash and body: 
+            content_sha256 = sha256(body).hexdigest()
+
         headers['x-log-content-sha256'] = content_sha256
         headers['x-log-date'] = current_time
         current_date = current_time[:8]
@@ -111,7 +119,11 @@ class AuthV4(AuthBase):
         signed_headers = ''
         for original_key, value in headers.items():
             key = original_key.lower()
-            if key == 'content-type' or key == 'host' or key.startswith('x-log-') or key.startswith('x-acs-'):
+            if (
+                key == "content-type"
+                or key == "host"
+                or Util._is_extra_sign_header(key)
+            ):
                 canonical_headers[key] = value
         headers_to_string = ''
         for key, value in sorted(canonical_headers.items()):

{aliyun_log_python_sdk-0.9.37 → aliyun_log_python_sdk-0.9.39}/aliyun/log/logclient.py

@@ -10,9 +10,9 @@ import json
 import requests
 import six
 import time
-import zlib
 from datetime import datetime
 import logging
+import re
 
 from .store_view_response import ListStoreViewsResponse, CreateStoreViewResponse, UpdateStoreViewResponse, DeleteStoreViewResponse, GetStoreViewResponse
 from .credentials import StaticCredentialsProvider
@@ -76,7 +76,8 @@ from .compress import CompressType, Compressor
 from .metering_mode_response import GetLogStoreMeteringModeResponse, \
     GetMetricStoreMeteringModeResponse, UpdateLogStoreMeteringModeResponse, \
         UpdateMetricStoreMeteringModeResponse
-from .util import require_python3
+from .object_response import PutObjectResponse, GetObjectResponse
+from .util import require_python3, object_name_encode
 
 logger = logging.getLogger(__name__)
 
@@ -310,7 +311,7 @@ class LogClient(object):
                                'Request is failed. Http code is ' + str(resp_status) + exJson, requestId,
                                resp_status, resp_header, resp_body)
 
-    def _send(self, method, project, body, resource, params, headers, respons_body_type='json'):
+    def _send(self, method, project, body, resource, params, headers, respons_body_type='json', compute_content_hash=True):
         if body:
             headers['Content-Length'] = str(len(body))
         else:
@@ -337,7 +338,7 @@ class LogClient(object):
                 params2 = copy(params)
                 if self._securityToken:
                     headers2["x-acs-security-token"] = self._securityToken
-                self._auth.sign_request(method, resource, params2, headers2, body)
+                self._auth.sign_request(method, resource, params2, headers2, body, compute_content_hash=compute_content_hash)
                 return self._sendRequest(method, url, params2, body, headers2, respons_body_type)
             except LogException as ex:
                 last_err = ex
@@ -6511,3 +6512,77 @@ class LogClient(object):
         resource = "/storeviews/" + store_view_name
         (resp, header) = self._send("DELETE", project_name, None, resource, params, {})
         return DeleteStoreViewResponse(header, resp)
+
+    def put_object(
+        self, project_name, logstore_name, object_name, content, headers=None
+    ):
+        """Put an object to the specified logstore.
+        Unsuccessful operation will cause an LogException.
+
+        :type project_name: string
+        :param project_name: the project name
+
+        :type logstore_name: string
+        :param logstore_name: the logstore name
+
+        :type object_name: string
+        :param object_name: the object name (only allow a-z A-Z 0-9 _ -)
+
+        :type content: bytes/string
+        :param content: the object content (can be empty)
+
+        :type headers: dict
+        :param headers: optional headers to send with the request.
+                        - x-log-meta-* headers will be attached to the object as metadata, and returned in the response when getting the object
+                        - Content-Type will be attached to the object as metadata, and returned in the response when getting the object
+                        - Content-MD5 will be attached to the object as metadata, and returned in the response when getting the object
+
+        :return: PutObjectResponse
+
+        :raise: LogException
+        """
+        encoded_object_name = object_name_encode(object_name)
+        if headers is None:
+            headers = {}
+        else:
+            headers = dict(headers)
+
+        if isinstance(content, six.text_type):
+            body = content.encode("utf-8")
+        elif isinstance(content, six.binary_type):
+            body = content
+        else:
+            raise LogException("InvalidParameter", "content must be bytes or string")
+
+        headers["x-log-bodyrawsize"] = str(len(body))
+        resource = "/logstores/" + logstore_name + "/objects/" + encoded_object_name
+
+        (resp, resp_header) = self._send(
+            "PUT", project_name, body, resource, {}, headers, compute_content_hash=False
+        )
+        return PutObjectResponse(resp_header, resp)
+
+    def get_object(self, project_name, logstore_name, object_name):
+        """Get an object from the specified logstore.
+        Unsuccessful operation will cause an LogException.
+
+        :type project_name: string
+        :param project_name: the project name
+
+        :type logstore_name: string
+        :param logstore_name: the logstore name
+
+        :type object_name: string
+        :param object_name: the object name
+
+        :return: GetObjectResponse
+
+        :raise: LogException
+        """
+        encoded_object_name = object_name_encode(object_name)
+        resource = "/logstores/" + logstore_name + "/objects/" + encoded_object_name
+
+        (resp, resp_header) = self._send(
+            "GET", project_name, None, resource, {}, {}, respons_body_type="raw"
+        )
+        return GetObjectResponse(resp_header, resp)

aliyun_log_python_sdk-0.9.39/aliyun/log/object_response.py

@@ -0,0 +1,82 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+# Copyright (C) Alibaba Cloud Computing
+# All rights reserved.
+
+from .logresponse import LogResponse
+from .util import Util
+
+__all__ = ['PutObjectResponse', 'GetObjectResponse']
+
+
+class PutObjectResponse(LogResponse):
+    """ The response of the put_object API from log.
+
+    :type header: dict
+    :param header: PutObjectResponse HTTP response header
+
+    :type resp: string
+    :param resp: PutObjectResponse HTTP response body
+    """
+
+    def __init__(self, header, resp=''):
+        LogResponse.__init__(self, header, resp)
+
+    def get_etag(self):
+        """ Get the ETag of the uploaded object.
+
+        :return: string, ETag value
+        """
+        return Util.h_v_td(self.headers, 'ETag', None)
+
+    def log_print(self):
+        print('PutObjectResponse:')
+        print('headers:', self.get_all_headers())
+
+
+class GetObjectResponse(LogResponse):
+    """ The response of the get_object API from log.
+
+    :type header: dict
+    :param header: GetObjectResponse HTTP response header
+
+    :type resp: bytes
+    :param resp: GetObjectResponse HTTP response body (object content)
+    """
+
+    def __init__(self, header, resp):
+        LogResponse.__init__(self, header, resp)
+
+    def get_etag(self):
+        """ Get the ETag of the object.
+
+        :return: string, ETag value, may be None if not set
+        """
+        return Util.h_v_td(self.headers, 'ETag', None)
+
+    def get_content_type(self):
+        """ Get the content type of the object.
+
+        :return: string, content type
+        """
+        return Util.h_v_td(self.headers, 'Content-Type', '')
+
+    def get_headers(self):
+        """ Get all headers of the response.
+
+        :return: dict, all response headers
+        """
+        return self.headers
+
+    def get_body(self):
+        """ Get the object content.
+
+        :return: bytes, object content
+        """
+        return self.body
+
+    def log_print(self):
+        print('GetObjectResponse:')
+        print('headers:', self.get_all_headers())
+

{aliyun_log_python_sdk-0.9.37 → aliyun_log_python_sdk-0.9.39}/aliyun/log/util.py

@@ -40,6 +40,7 @@ def base64_decodestring(s):
             s = s.encode('utf8')
         return base64.decodebytes(s).decode('utf8')
 
+_EXCLUDE_SIGN_HEADER_PREFIX = 'x-log-meta-'
 
 class Util(object):
     @staticmethod
@@ -90,10 +91,18 @@ class Util(object):
     def canonicalized_log_headers(headers):
         content = ''
         for key in sorted(six.iterkeys(headers)):
-            if key[:6].lower() in ('x-log-', 'x-acs-'):  # x-log- header
+            if Util._is_extra_sign_header(key):
                 content += key + ':' + str(headers[key]) + "\n"
         return content
 
+    @staticmethod
+    def _is_extra_sign_header(key):
+        lower_key = key.lower()
+        return lower_key.startswith("x-acs-") or (
+            lower_key.startswith("x-log-")
+            and not lower_key.startswith(_EXCLUDE_SIGN_HEADER_PREFIX)
+        )
+
     @staticmethod
     def url_encode(params):
         for key, value in params.items():  # urllib.urlencode accept 8-bit str
@@ -322,4 +331,14 @@ def require_python3(func):
         if not six.PY3:
             raise RuntimeError("Function '{func_name}' requires Python 3 to run.".format(func_name=func.__name__))
         return func(*args, **kwargs)
-    return wrapper
+    return wrapper
+
+
+if six.PY2:
+    from urllib import quote as urlquote
+else:
+    from urllib.parse import quote as urlquote
+    urlquote
+
+def object_name_encode(object_name):
+    return urlquote(object_name)

{aliyun_log_python_sdk-0.9.37 → aliyun_log_python_sdk-0.9.39}/aliyun/log/version.py

@@ -1,4 +1,4 @@
-__version__ = '0.9.37'
+__version__ = '0.9.39'
 
 import sys
 OS_VERSION = str(sys.platform)

{aliyun_log_python_sdk-0.9.37 → aliyun_log_python_sdk-0.9.39/aliyun_log_python_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aliyun-log-python-sdk
-Version: 0.9.37
+Version: 0.9.39
 Summary: Aliyun log service Python client SDK
 Home-page: https://github.com/aliyun/aliyun-log-python-sdk
 Author: Aliyun

{aliyun_log_python_sdk-0.9.37 → aliyun_log_python_sdk-0.9.39}/aliyun_log_python_sdk.egg-info/SOURCES.txt

@@ -59,6 +59,7 @@ aliyun/log/logtail_pipeline_config_response.py
 aliyun/log/machine_group_detail.py
 aliyun/log/machinegroup_response.py
 aliyun/log/metering_mode_response.py
+aliyun/log/object_response.py
 aliyun/log/odps_sink.py
 aliyun/log/oss_sink.py
 aliyun/log/pluralize.py