appmesh 1.3.8__py3-none-any.whl → 1.4.0__py3-none-any.whl

appmesh/app.py

@@ -166,6 +166,8 @@ class App(object):
         # Read-only attributes
         self.owner = App._get_str_item(data, "owner")
         """owner name"""
+        self.user = App._get_str_item(data, "pid_user")
+        """process user name"""
         self.pstree = App._get_str_item(data, "pstree")
         """process tree"""
         self.container_id = App._get_str_item(data, "container_id")

appmesh/tcp_client.py

@@ -162,7 +162,10 @@ class AppMeshClientTCP(AppMeshClient):
             raise ValueError(f"Server did not respond with socket transfer option: {self.HTTP_HEADER_KEY_X_RECV_FILE_SOCKET}")
 
         with open(local_file, "wb") as fp:
-            while chunk_data := self.tcp_transport.receive_message():
+            while True:
+                chunk_data = self.tcp_transport.receive_message()
+                if not chunk_data:
+                    break
                 fp.write(chunk_data)
 
         if apply_file_attributes:

appmesh/tcp_transport.py

@@ -3,6 +3,7 @@
 import os
 import socket
 import ssl
+import struct
 from typing import Optional, Tuple, Union
 
 
@@ -12,8 +13,9 @@ class TCPTransport:
     # Number of bytes used for the message length header
     # Must match the C++ service implementation which uses uint32_t (4 bytes)
     # Format: Big-endian unsigned 32-bit integer
-    TCP_HEADER_LENGTH = 4
-    MAX_MESSAGE_SIZE = 300 * 1024 * 1024  # 300 MiB message size limit
+    TCP_MESSAGE_HEADER_LENGTH = 8
+    TCP_MESSAGE_MAGIC = 0x07C707F8  # Magic number
+    TCP_MAX_BLOCK_SIZE = 1024 * 1024 * 100  # 100 MB message size limit
 
     def __init__(self, address: Tuple[str, int], ssl_verify: Union[bool, str], ssl_client_cert: Union[str, Tuple[str, str]]):
         """Construct an TCPTransport object to send and recieve TCP data.
@@ -114,15 +116,19 @@ class TCPTransport:
     def send_message(self, data) -> None:
         """Send a message with a prefixed header indicating its length"""
         length = len(data)
-        self._socket.sendall(length.to_bytes(self.TCP_HEADER_LENGTH, byteorder="big", signed=False))
+        # Pack the header into 8 bytes using big-endian format
+        self._socket.sendall(struct.pack("!II", self.TCP_MESSAGE_MAGIC, length))
         if length > 0:
             self._socket.sendall(data)
 
     def receive_message(self) -> Optional[bytearray]:
-        """Receive a message with a prefixed header indicating its length"""
-        length = int.from_bytes(self._recvall(self.TCP_HEADER_LENGTH), byteorder="big", signed=False)
-        if length > self.MAX_MESSAGE_SIZE:
-            raise ValueError(f"Message size {length} exceeds maximum allowed {self.MAX_MESSAGE_SIZE}")
+        """Receive a message with a prefixed header indicating its length and validate it"""
+        # Unpack the data (big-endian format)
+        magic, length = struct.unpack("!II", self._recvall(self.TCP_MESSAGE_HEADER_LENGTH))
+        if magic != self.TCP_MESSAGE_MAGIC:
+            raise ValueError(f"Invalid message: incorrect magic number 0x{magic:X}.")
+        if length > self.TCP_MAX_BLOCK_SIZE:
+            raise ValueError(f"Message size {length} exceeds the maximum allowed size of {self.TCP_MAX_BLOCK_SIZE} bytes.")
         if length > 0:
             return self._recvall(length)
         return None

{appmesh-1.3.8.dist-info → appmesh-1.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: appmesh
-Version: 1.3.8
+Version: 1.4.0
 Summary: Client SDK for App Mesh
 Home-page: https://github.com/laoshanxi/app-mesh
 Author: laoshanxi
@@ -14,7 +14,7 @@ Requires-Python: >=3
 Description-Content-Type: text/markdown
 Requires-Dist: requests
 Requires-Dist: msgpack
-Requires-Dist: requests-toolbelt
+Requires-Dist: requests_toolbelt
 Requires-Dist: aniso8601
 
 [![language.badge]][language.url] [![standard.badge]][standard.url] [![release.badge]][release.url] [![pypi.badge]][pypi.url] [![unittest.badge]][unittest.url] [![docker.badge]][docker.url] [![cockpit.badge]][cockpit.url]
@@ -119,7 +119,6 @@ Refer to the [Installation doc](https://app-mesh.readthedocs.io/en/latest/Instal
 - [MessagePack](https://msgpack.org/)
 - [boostorg/boost](https://github.com/boostorg/boost)
 - [ACE_TAO/ACE](https://github.com/DOCGroup/ACE_TAO)
-- [curlpp](https://github.com/jpbarrette/curlpp)
 - [Thalhammer/jwt-cpp](https://github.com/Thalhammer/jwt-cpp)
 - [nlohmann/json](https://json.nlohmann.me)
 - [yaml-cpp](https://github.com/jbeder/yaml-cpp)

appmesh-1.4.0.dist-info/RECORD

@@ -0,0 +1,13 @@
+appmesh/__init__.py,sha256=vgiSdMzlzDwgHxBMDoFaKWb77g2nJVciRf4z_ssAlwE,431
+appmesh/app.py,sha256=9Q-SOOej-MH13BU5Dv2iTa-p-sECCJQp6ZX9DjWWmwE,10526
+appmesh/app_output.py,sha256=JK_TMKgjvaw4n_ys_vmN5S4MyWVZpmD7NlKz_UyMIM8,1015
+appmesh/app_run.py,sha256=D4j_SaA16_RtZ2-Ey6X4HIyngvLdfFHgyzYurDT1ATc,1753
+appmesh/appmesh_client.py,sha256=0ltkqHZUq094gKneYmC0bEZCP0X9kHTp9fccKdWFWP0,339
+appmesh/http_client.py,sha256=miO52kW8d9s0tGn42SxbOPtVNu9ZL8HDFCoCCMXm_EA,47484
+appmesh/tcp_client.py,sha256=UsdD_APVPRy5CtgX1_hJyljols8cmCBoEiWlKH2gYOM,10933
+appmesh/tcp_messages.py,sha256=w1Kehz_aX4X2CYAUsy9mFVJRhxnLQwwc6L58W4YkQqs,969
+appmesh/tcp_transport.py,sha256=UMGby2oKV4k7lyXZUMSOe2Je34fb1w7nTkxEpatKLKg,7256
+appmesh-1.4.0.dist-info/METADATA,sha256=3xIB3lw5lIKSBRILRydR3hcCH4QFJVPbGGn5IpY6IsU,11142
+appmesh-1.4.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+appmesh-1.4.0.dist-info/top_level.txt,sha256=-y0MNQOGJxUzLdHZ6E_Rfv5_LNCkV-GTmOBME_b6pg8,8
+appmesh-1.4.0.dist-info/RECORD,,

{appmesh-1.3.8.dist-info → appmesh-1.4.0.dist-info}/WHEEL

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

appmesh-1.3.8.dist-info/RECORD

@@ -1,13 +0,0 @@
-appmesh/__init__.py,sha256=vgiSdMzlzDwgHxBMDoFaKWb77g2nJVciRf4z_ssAlwE,431
-appmesh/app.py,sha256=trPD1i7PFv7DTuy33Hr8-AC36r3h3XIBejdB3cUU8C8,10438
-appmesh/app_output.py,sha256=JK_TMKgjvaw4n_ys_vmN5S4MyWVZpmD7NlKz_UyMIM8,1015
-appmesh/app_run.py,sha256=D4j_SaA16_RtZ2-Ey6X4HIyngvLdfFHgyzYurDT1ATc,1753
-appmesh/appmesh_client.py,sha256=0ltkqHZUq094gKneYmC0bEZCP0X9kHTp9fccKdWFWP0,339
-appmesh/http_client.py,sha256=miO52kW8d9s0tGn42SxbOPtVNu9ZL8HDFCoCCMXm_EA,47484
-appmesh/tcp_client.py,sha256=cbnx_YbBMBbJeR5DY7u5jmlgHcYqbjzffirSiJ-zT1o,10852
-appmesh/tcp_messages.py,sha256=w1Kehz_aX4X2CYAUsy9mFVJRhxnLQwwc6L58W4YkQqs,969
-appmesh/tcp_transport.py,sha256=YlKMaE-oaKLmGuBdWIyKz3YH4ZPMgJWHBZYbINtUoYM,6934
-appmesh-1.3.8.dist-info/METADATA,sha256=GCrx58vUH1DvcQfLWXjG-pVJowoD7ykM6ZehOZVTGMI,11191
-appmesh-1.3.8.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-appmesh-1.3.8.dist-info/top_level.txt,sha256=-y0MNQOGJxUzLdHZ6E_Rfv5_LNCkV-GTmOBME_b6pg8,8
-appmesh-1.3.8.dist-info/RECORD,,