appmesh 1.6.7__py3-none-any.whl → 1.6.9__py3-none-any.whl

appmesh/client_http.py

@@ -7,7 +7,10 @@ import locale
 import logging
 import os
 import sys
+import threading
 import time
+import requests
+import http.cookiejar as cookiejar
 from datetime import datetime
 from enum import Enum, unique
 from http import HTTPStatus
@@ -16,8 +19,6 @@ from typing import Optional, Tuple, Union
 from urllib import parse
 import aniso8601
 import jwt
-import requests
-from requests.auth import _basic_auth_str
 from .app import App
 from .app_run import AppRun
 from .app_output import AppOutput
@@ -75,7 +76,7 @@ class AppMeshClient(metaclass=abc.ABCMeta):
         - wait_for_async_run()
         - run_app_sync()
         - run_task()
-        - cancle_task()
+        - cancel_task()
 
         # System Management
         - forward_to
@@ -192,7 +193,8 @@ class AppMeshClient(metaclass=abc.ABCMeta):
         rest_ssl_verify=DEFAULT_SSL_CA_CERT_PATH if os.path.exists(DEFAULT_SSL_CA_CERT_PATH) else False,
         rest_ssl_client_cert=(DEFAULT_SSL_CLIENT_CERT_PATH, DEFAULT_SSL_CLIENT_KEY_PATH) if os.path.exists(DEFAULT_SSL_CLIENT_CERT_PATH) else None,
         rest_timeout=(60, 300),
-        jwt_token=None,
+        jwt_token: Optional[str] = None,
+        rest_cookie_file: Optional[str] = None,
         auto_refresh_token=False,
     ):
         """Initialize an App Mesh HTTP client for interacting with the App Mesh server via secure HTTPS.
@@ -214,13 +216,14 @@ class AppMeshClient(metaclass=abc.ABCMeta):
             rest_timeout (tuple, optional): HTTP connection timeouts for API requests, as `(connect_timeout, read_timeout)`.
                 The default is `(60, 300)`, where `60` seconds is the maximum time to establish a connection and `300` seconds for the maximum read duration.
 
+            rest_cookie_file (str, optional): Path to a file for storing session cookies. If provided, cookies will be saved to and loaded from this file to maintain session state across client instances.
+
             jwt_token (str, optional): JWT token for API authentication, used in headers to authorize requests where required.
             auto_refresh_token (bool, optional): Enable automatic token refresh before expiration.
                 When enabled, a background timer will monitor token expiration and attempt to refresh
                 the token before it expires. This works with both native App Mesh tokens and Keycloak tokens.
         """
         self._ensure_logging_configured()
-        self.session = requests.Session()
         self.auth_server_url = rest_url
         self._jwt_token = jwt_token
         self.ssl_verify = rest_ssl_verify
@@ -228,6 +231,20 @@ class AppMeshClient(metaclass=abc.ABCMeta):
         self.rest_timeout = rest_timeout
         self._forward_to = None
 
+        # Session and cookie management
+        self._lock = threading.Lock()
+        self.session = requests.Session()
+        self.cookie_file = rest_cookie_file
+        if self.cookie_file:
+            self.session.cookies = cookiejar.MozillaCookieJar(self.cookie_file)
+            if os.path.exists(self.cookie_file):
+                self.session.cookies.load(ignore_discard=True, ignore_expires=True)
+            else:
+                os.makedirs(os.path.dirname(self.cookie_file), exist_ok=True)
+                self.session.cookies.save(ignore_discard=True, ignore_expires=True)
+                if os.name == "posix":
+                    os.chmod(self.cookie_file, 0o600)  # User read/write only
+
         # Token auto-refresh
         self._token_refresh_timer = None
         self._auto_refresh_token = auto_refresh_token
@@ -399,6 +416,11 @@ class AppMeshClient(metaclass=abc.ABCMeta):
             self._token_refresh_timer.cancel()
             self._token_refresh_timer = None
 
+        # handle session
+        with self._lock:
+            if self.cookie_file:
+                self.session.cookies.save(ignore_discard=True, ignore_expires=True)
+
     @property
     def forward_to(self) -> str:
         """Get the target host address for request forwarding in a cluster setup.
@@ -474,7 +496,7 @@ class AppMeshClient(metaclass=abc.ABCMeta):
             AppMeshClient.Method.POST,
             path="/appmesh/login",
             header={
-                self.HTTP_HEADER_KEY_AUTH: _basic_auth_str(user_name, user_pwd),
+                self.HTTP_HEADER_KEY_AUTH: "Basic " + base64.b64encode(f"{user_name}:{user_pwd}".encode()).decode(),
                 "X-Expire-Seconds": str(self._parse_duration(timeout_seconds)),
                 **({"X-Audience": audience} if audience else {}),
                 # **({"X-Totp-Code": totp_code} if totp_code else {}),
@@ -610,15 +632,17 @@ class AppMeshClient(metaclass=abc.ABCMeta):
             raise Exception(f"Token renewal failed: {str(e)}") from e
 
     def get_totp_secret(self) -> str:
-        """Generate TOTP secret for the current user and return MFA URI.
+        """
+        Generate TOTP secret for the current user and return a secret.
 
         Returns:
-            str: TOTP secret str
+            str: TOTP secret string
         """
         resp = self._request_http(method=AppMeshClient.Method.POST, path="/appmesh/totp/secret")
         if resp.status_code == HTTPStatus.OK:
             totp_uri = base64.b64decode(resp.json()["mfa_uri"]).decode()
             return self._parse_totp_uri(totp_uri).get("secret")
+
         raise Exception(resp.text)
 
     def setup_totp(self, totp_code: str) -> str:
@@ -1238,7 +1262,7 @@ class AppMeshClient(metaclass=abc.ABCMeta):
 
         return resp.text
 
-    def cancle_task(self, app_name: str) -> bool:
+    def cancel_task(self, app_name: str) -> bool:
         """Client cancle a running task to a App Mesh application.
 
         Args:

{appmesh-1.6.7.dist-info → appmesh-1.6.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: appmesh
-Version: 1.6.7
+Version: 1.6.9
 Summary: Client SDK for App Mesh
 Home-page: https://github.com/laoshanxi/app-mesh
 Author: laoshanxi
@@ -145,7 +145,6 @@ Refer to the [Installation doc](https://app-mesh.readthedocs.io/en/latest/Instal
 - [log4cpp](http://log4cpp.sourceforge.net)
 - [Crypto++](https://www.cryptopp.com)
 - [ldap-cpp](https://github.com/AndreyBarmaley/ldap-cpp)
-- [OATH Toolkit](http://www.nongnu.org/oath-toolkit/liboath-api)
 
 [language.url]:   https://isocpp.org/
 [language.badge]: https://img.shields.io/badge/language-C++-blue.svg

{appmesh-1.6.7.dist-info → appmesh-1.6.9.dist-info}/RECORD

@@ -3,14 +3,14 @@ appmesh/app.py,sha256=crD4DRFZJuHtZMfSsz7C-EwvjPmGZbFXYXvA_wCdvdI,10734
 appmesh/app_output.py,sha256=vfn322AyixblI8DbXds08h6L_ybObiaRSifsA1-Xcoo,1035
 appmesh/app_run.py,sha256=aYq852a29OThIi32Xtx5s0sTXZ97T0lHD5WXH8yfPoc,2018
 appmesh/appmesh_client.py,sha256=ywB2222PtJUffdfdxZcBfdhZs1KYyc7JvzMxwuK2qyI,378
-appmesh/client_http.py,sha256=dzNZvMztm0POLHNS8iNHo1iuJprjvQP0kii1UWOH-XA,57529
+appmesh/client_http.py,sha256=OiYM4CXn21S4e_jx71X5_31krLes6UuHHueEYk6UIu4,58690
 appmesh/client_http_oauth.py,sha256=1d51o0JX_xtB8d2bEuM7_XJHcwMnhcjkbIq7GE1Zxm8,6120
 appmesh/client_tcp.py,sha256=aq6UUzytZA4ibE9WQMMWdo1uW8sHETEhJjsbM6IYSno,11457
 appmesh/server_http.py,sha256=rBIYO9rbR-r3x1Jcry440Sp--IM-OWKRaOhNpGdkxh8,4299
 appmesh/server_tcp.py,sha256=-CU5tw97WJmDcUNsNPWqpdZ0wxRzRD6kUP3XyNZUTHc,1444
 appmesh/tcp_messages.py,sha256=H9S_iCy0IuufY2v50_SUgRvcyQmJsySG65tBe_xb3Ko,1878
 appmesh/tcp_transport.py,sha256=0hRSp5fpL9wKB05JIyIRIuyBC8w1IdokryhMDHqtN4M,8946
-appmesh-1.6.7.dist-info/METADATA,sha256=9c0FJtxDPsRIu2CL3K4A7IkAAKLalRm0cpdbBk_j-6A,11828
-appmesh-1.6.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-appmesh-1.6.7.dist-info/top_level.txt,sha256=-y0MNQOGJxUzLdHZ6E_Rfv5_LNCkV-GTmOBME_b6pg8,8
-appmesh-1.6.7.dist-info/RECORD,,
+appmesh-1.6.9.dist-info/METADATA,sha256=aT2BPT5BM_5FkkFKhR-h_NBWMQMeVBP3-Wo2QwA-j6Y,11763
+appmesh-1.6.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+appmesh-1.6.9.dist-info/top_level.txt,sha256=-y0MNQOGJxUzLdHZ6E_Rfv5_LNCkV-GTmOBME_b6pg8,8
+appmesh-1.6.9.dist-info/RECORD,,