appmesh 1.3.4__py3-none-any.whl → 1.3.5__py3-none-any.whl

appmesh/appmesh_client.py

@@ -29,9 +29,12 @@ DEFAULT_SSL_CA_PEM_FILE = "/opt/appmesh/ssl/ca.pem"
 DEFAULT_SSL_CLIENT_PEM_FILE = "/opt/appmesh/ssl/client.pem"
 DEFAULT_SSL_CLIENT_PEM_KEY_FILE = "/opt/appmesh/ssl/client-key.pem"
 
+# TLS-optimized chunk size (slightly less than maximum TLS record size)
+# leaves some room for TLS overhead (like headers) within the 16 KB limit.
+TCP_CHUNK_BLOCK_SIZE = 16 * 1024 - 256  # target to 16KB
+TCP_MESSAGE_HEADER_LENGTH = 4
 REST_TEXT_MESSAGE_JSON_KEY = "message"
 MESSAGE_ENCODING_UTF8 = "utf-8"
-TCP_MESSAGE_HEADER_LENGTH = 4
 
 HTTP_USER_AGENT = "appmesh/python"
 HTTP_USER_AGENT_TCP = "appmesh/python/tcp"
@@ -450,7 +453,7 @@ class AppMeshClient(metaclass=abc.ABCMeta):
                 the server's TLS certificate, or a string, in which case it must be a path to a CA bundle to use. Defaults to ``True``.
             rest_ssl_client_cert (tuple, optional): SSL client certificate and key pair. If String, path to ssl client cert file (.pem). If Tuple, ('cert', 'key') pair.
             rest_timeout (tuple, optional): HTTP timeout, Defaults to 60 seconds for connect timeout and 300 seconds for read timeout
-            jwt_token (str, optional): JWT token, provide correct token is same with login() & authenticate().
+            jwt_token (str, optional): JWT token, provide correct token is same with login() & authentication().
         """
 
         self.server_url = rest_url
@@ -1221,20 +1224,20 @@ class AppMeshClient(metaclass=abc.ABCMeta):
     ########################################
     # File management
     ########################################
-    def file_download(self, file_path: str, local_file: str, apply_file_attributes: bool = True) -> None:
+    def file_download(self, remote_file: str, local_file: str, apply_file_attributes: bool = True) -> None:
         """Copy a remote file to local. Optionally, the local file will have the same permission as the remote file.
 
         Args:
-            file_path (str): the remote file path.
+            remote_file (str): the remote file path.
             local_file (str): the local file path to be downloaded.
             apply_file_attributes (bool): whether to apply file attributes (permissions, owner, group) to the local file.
         """
-        resp = self._request_http(AppMeshClient.Method.GET, path="/appmesh/file/download", header={"File-Path": file_path})
+        resp = self._request_http(AppMeshClient.Method.GET, path="/appmesh/file/download", header={"File-Path": remote_file})
         resp.raise_for_status()
 
         # Write the file content locally
         with open(local_file, "wb") as fp:
-            for chunk in resp.iter_content(chunk_size=8192):  # 8 KB
+            for chunk in resp.iter_content(chunk_size=8 * 1024):  # 8 KB
                 if chunk:
                     fp.write(chunk)
 
@@ -1250,7 +1253,7 @@ class AppMeshClient(metaclass=abc.ABCMeta):
                 except PermissionError:
                     print(f"Warning: Unable to change owner/group of {local_file}. Operation requires elevated privileges.")
 
-    def file_upload(self, local_file: str, file_path: str, apply_file_attributes: bool = True) -> None:
+    def file_upload(self, local_file: str, remote_file: str, apply_file_attributes: bool = True) -> None:
         """Upload a local file to the remote server. Optionally, the remote file will have the same permission as the local file.
 
         Dependency:
@@ -1259,7 +1262,7 @@ class AppMeshClient(metaclass=abc.ABCMeta):
 
         Args:
             local_file (str): the local file path.
-            file_path (str): the target remote file to be uploaded.
+            remote_file (str): the target remote file to be uploaded.
             apply_file_attributes (bool): whether to upload file attributes (permissions, owner, group) along with the file.
         """
         if not os.path.exists(local_file):
@@ -1268,13 +1271,13 @@ class AppMeshClient(metaclass=abc.ABCMeta):
         from requests_toolbelt import MultipartEncoder
 
         with open(file=local_file, mode="rb") as fp:
-            encoder = MultipartEncoder(fields={"filename": os.path.basename(file_path), "file": ("filename", fp, "application/octet-stream")})
-            header = {"File-Path": file_path, "Content-Type": encoder.content_type}
+            encoder = MultipartEncoder(fields={"filename": os.path.basename(remote_file), "file": ("filename", fp, "application/octet-stream")})
+            header = {"File-Path": remote_file, "Content-Type": encoder.content_type}
 
             # Include file attributes (permissions, owner, group) if requested
             if apply_file_attributes:
                 file_stat = os.stat(local_file)
-                header["File-Mode"] = str(file_stat.st_mode)
+                header["File-Mode"] = str(file_stat.st_mode & 0o777)  # Mask to keep only permission bits
                 header["File-User"] = str(file_stat.st_uid)
                 header["File-Group"] = str(file_stat.st_gid)
 
@@ -1486,13 +1489,13 @@ class AppMeshClientTCP(AppMeshClient):
             rest_ssl_verify (str, optional): (optional) SSL CA certification. Either a boolean, in which case it controls whether we verify
                 the server's TLS certificate, or a string, in which case it must be a path to a CA bundle to use. Defaults to ``True``.
             rest_ssl_client_cert (tuple, optional): SSL client certificate and key pair . If String, path to ssl client cert file (.pem). If Tuple, ('cert', 'key') pair.
-            jwt_token (str, optional): JWT token, provide correct token is same with login() & authenticate().
+            jwt_token (str, optional): JWT token, provide correct token is same with login() & authentication().
 
             tcp_address (tuple, optional): TCP connect address.
         """
-        super().__init__(rest_ssl_verify=rest_ssl_verify, rest_ssl_client_cert=rest_ssl_client_cert, jwt_token=jwt_token)
         self.tcp_address = tcp_address
         self.__socket_client = None
+        super().__init__(rest_ssl_verify=rest_ssl_verify, rest_ssl_client_cert=rest_ssl_client_cert, jwt_token=jwt_token)
 
     def __del__(self) -> None:
         """De-construction"""
@@ -1501,15 +1504,31 @@ class AppMeshClientTCP(AppMeshClient):
     def __connect_socket(self) -> None:
         """Establish tcp connection"""
         context = ssl.create_default_context(ssl.Purpose.SERVER_AUTH)
+        # Set minimum TLS version
         if hasattr(context, "minimum_version"):
             context.minimum_version = ssl.TLSVersion.TLSv1_2
         else:
             context.options |= ssl.OP_NO_TLSv1 | ssl.OP_NO_TLSv1_1
-        if self.ssl_verify:
-            context.verify_mode = ssl.CERT_REQUIRED
-        if isinstance(self.ssl_verify, str):
-            # Load server-side certificate authority (CA) certificates
-            context.load_verify_locations(self.ssl_verify)
+        # Configure SSL verification
+        if not self.ssl_verify:
+            context.verify_mode = ssl.CERT_NONE
+        else:
+            context.verify_mode = ssl.CERT_REQUIRED  # Require certificate verification
+            context.load_default_certs()  # Load system's default CA certificates
+            if isinstance(self.ssl_verify, str):
+                if os.path.isfile(self.ssl_verify):
+                    # Add custom CA certificate file
+                    try:
+                        context.load_verify_locations(cafile=self.ssl_verify)
+                    except ssl.SSLError:
+                        # If loading fails, try using just the default CAs
+                        context = ssl.create_default_context(ssl.Purpose.SERVER_AUTH)
+                elif os.path.isdir(self.ssl_verify):
+                    # Load CA certificates from directory
+                    context.load_verify_locations(capath=self.ssl_verify)
+                else:
+                    raise ValueError(f"ssl_verify path '{self.ssl_verify}' is neither a file nor a directory")
+
         if self.ssl_client_cert is not None:
             # Load client-side certificate and private key
             context.load_cert_chain(certfile=self.ssl_client_cert[0], keyfile=self.ssl_client_cert[1])
@@ -1657,15 +1676,15 @@ class AppMeshClientTCP(AppMeshClient):
     ########################################
     # File management
     ########################################
-    def file_download(self, file_path: str, local_file: str, apply_file_attributes: bool = True) -> None:
+    def file_download(self, remote_file: str, local_file: str, apply_file_attributes: bool = True) -> None:
         """Copy a remote file to local, the local file will have the same permission as the remote file
 
         Args:
-            file_path (str): the remote file path.
+            remote_file (str): the remote file path.
             local_file (str): the local file path to be downloaded.
             apply_file_attributes (bool): whether to apply file attributes (permissions, owner, group) to the local file.
         """
-        header = {"File-Path": file_path}
+        header = {"File-Path": remote_file}
         header[HTTP_HEADER_KEY_X_RECV_FILE_SOCKET] = "true"
         resp = self._request_http(AppMeshClient.Method.GET, path="/appmesh/file/download", header=header)
 
@@ -1695,7 +1714,7 @@ class AppMeshClientTCP(AppMeshClient):
                 except PermissionError:
                     print(f"Warning: Unable to change owner/group of {local_file}. Operation requires elevated privileges.")
 
-    def file_upload(self, local_file: str, file_path: str, apply_file_attributes: bool = True) -> None:
+    def file_upload(self, local_file: str, remote_file: str, apply_file_attributes: bool = True) -> None:
         """Upload a local file to the remote server, the remote file will have the same permission as the local file
 
         Dependency:
@@ -1704,19 +1723,19 @@ class AppMeshClientTCP(AppMeshClient):
 
         Args:
             local_file (str): the local file path.
-            file_path (str): the target remote file to be uploaded.
+            remote_file (str): the target remote file to be uploaded.
             apply_file_attributes (bool): whether to upload file attributes (permissions, owner, group) along with the file.
         """
         if not os.path.exists(local_file):
             raise FileNotFoundError(f"Local file not found: {local_file}")
 
         with open(file=local_file, mode="rb") as fp:
-            header = {"File-Path": file_path, "Content-Type": "text/plain"}
+            header = {"File-Path": remote_file, "Content-Type": "text/plain"}
             header[HTTP_HEADER_KEY_X_SEND_FILE_SOCKET] = "true"
 
             if apply_file_attributes:
                 file_stat = os.stat(local_file)
-                header["File-Mode"] = str(file_stat.st_mode)
+                header["File-Mode"] = str(file_stat.st_mode & 0o777)  # Mask to keep only permission bits
                 header["File-User"] = str(file_stat.st_uid)
                 header["File-Group"] = str(file_stat.st_gid)
 
@@ -1727,9 +1746,7 @@ class AppMeshClientTCP(AppMeshClient):
             if HTTP_HEADER_KEY_X_SEND_FILE_SOCKET not in resp.headers:
                 raise ValueError(f"Server did not respond with socket transfer option: {HTTP_HEADER_KEY_X_SEND_FILE_SOCKET}")
 
-            # TLS-optimized chunk size (slightly less than maximum TLS record size)
-            # leaves some room for TLS overhead (like headers) within the 16 KB limit.
-            chunk_size = 16 * 1024 - 512  # target to 16KB
+            chunk_size = TCP_CHUNK_BLOCK_SIZE
             while True:
                 chunk_data = fp.read(chunk_size)
                 if not chunk_data:

{appmesh-1.3.4.dist-info → appmesh-1.3.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: appmesh
-Version: 1.3.4
+Version: 1.3.5
 Summary: Client SDK for App Mesh
 Home-page: https://github.com/laoshanxi/app-mesh
 Author: laoshanxi

appmesh-1.3.5.dist-info/RECORD

@@ -0,0 +1,6 @@
+appmesh/__init__.py,sha256=xRdXeFHEieRauuJZElbEBASgXG0ZzU1a5_0isAhM7Gw,11
+appmesh/appmesh_client.py,sha256=bduPEDpI36XQyK_U9y3EvpZvO9CbpDeAB5402yf9qhU,69329
+appmesh-1.3.5.dist-info/METADATA,sha256=VSkQis_Azjvw2FwjrK8qjOvYKw2WRNB37J2tYm_KEbw,11191
+appmesh-1.3.5.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+appmesh-1.3.5.dist-info/top_level.txt,sha256=-y0MNQOGJxUzLdHZ6E_Rfv5_LNCkV-GTmOBME_b6pg8,8
+appmesh-1.3.5.dist-info/RECORD,,

{appmesh-1.3.4.dist-info → appmesh-1.3.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (75.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

appmesh-1.3.4.dist-info/RECORD

@@ -1,6 +0,0 @@
-appmesh/__init__.py,sha256=xRdXeFHEieRauuJZElbEBASgXG0ZzU1a5_0isAhM7Gw,11
-appmesh/appmesh_client.py,sha256=6lnfsR6SAhF66jWBPIVPbC43LPhyAL3amBHxSx30Cu4,68327
-appmesh-1.3.4.dist-info/METADATA,sha256=TZjYqpu2P33ZcN7ue8uTAMobwavbud7_zr9Eo2si7NY,11191
-appmesh-1.3.4.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-appmesh-1.3.4.dist-info/top_level.txt,sha256=-y0MNQOGJxUzLdHZ6E_Rfv5_LNCkV-GTmOBME_b6pg8,8
-appmesh-1.3.4.dist-info/RECORD,,