appmesh 1.4.4__py3-none-any.whl → 1.4.6__py3-none-any.whl

appmesh/http_client.py

@@ -8,9 +8,9 @@ from datetime import datetime
 from enum import Enum, unique
 from http import HTTPStatus
 from typing import Optional, Tuple, Union
-from urllib import parse
 import aniso8601
 import requests
+import urllib
 from .app import App
 from .app_run import AppRun
 from .app_output import AppOutput
@@ -279,27 +279,46 @@ class AppMeshClient(metaclass=abc.ABCMeta):
         if resp.status_code == HTTPStatus.OK:
             if "Access-Token" in resp.json():
                 self.jwt_token = resp.json()["Access-Token"]
-        elif resp.status_code == HTTPStatus.UNAUTHORIZED and "Totp-Challenge" in resp.json():
+        elif resp.status_code == HTTPStatus.PRECONDITION_REQUIRED and "Totp-Challenge" in resp.json():
             challenge = resp.json()["Totp-Challenge"]
-            resp = self._request_http(
-                AppMeshClient.Method.POST,
-                path="/appmesh/totp/validate",
-                header={
-                    "Username": base64.b64encode(user_name.encode()).decode(),
-                    "Totp-Challenge": base64.b64encode(challenge.encode()).decode(),
-                    "Totp": totp_code,
-                    "Expire-Seconds": self._parse_duration(timeout_seconds),
-                },
-            )
-            if resp.status_code == HTTPStatus.OK:
-                if "Access-Token" in resp.json():
-                    self.jwt_token = resp.json()["Access-Token"]
-            else:
-                raise Exception(resp.text)
+            self.validate_totp(user_name, challenge, totp_code, timeout_seconds)
         else:
             raise Exception(resp.text)
         return self.jwt_token
 
+    def validate_totp(self, username: str, challenge: str, code: str, timeout: Union[int, str] = DURATION_ONE_WEEK_ISO) -> str:
+        """Validate TOTP challenge and obtain a new JWT token.
+
+        Args:
+            username (str): Username to validate
+            challenge (str): Challenge string from server
+            code (str): TOTP code to validate
+            timeout (Union[int, str], optional): Token expiry timeout. 
+                Accepts ISO 8601 duration format (e.g., 'P1Y2M3DT4H5M6S', 'P1W') or seconds.
+                Defaults to DURATION_ONE_WEEK_ISO.
+
+        Returns:
+            str: New JWT token if validation succeeds
+
+        Raises:
+            Exception: If validation fails or server returns error
+        """
+        resp = self._request_http(
+            AppMeshClient.Method.POST,
+            path="/appmesh/totp/validate",
+            header={
+                "Username": base64.b64encode(username.encode()).decode(),
+                "Totp": code,
+                "Totp-Challenge": base64.b64encode(challenge.encode()).decode(),
+                "Expire-Seconds": self._parse_duration(timeout),
+            },
+        )
+        if resp.status_code == HTTPStatus.OK:
+            if "Access-Token" in resp.json():
+                self.jwt_token = resp.json()["Access-Token"]
+                return self.jwt_token
+        raise Exception(resp.text)
+
     def logoff(self) -> bool:
         """Log out of the current session from the server.
 
@@ -377,7 +396,7 @@ class AppMeshClient(metaclass=abc.ABCMeta):
             return self._parse_totp_uri(totp_uri).get("secret")
         raise Exception(resp.text)
 
-    def setup_totp(self, totp_code: str) -> bool:
+    def setup_totp(self, totp_code: str) -> str:
         """Set up 2FA for the current user.
 
         Args:
@@ -426,13 +445,13 @@ class AppMeshClient(metaclass=abc.ABCMeta):
             dict: eextract parameters
         """
         parsed_info = {}
-        parsed_uri = parse.urlparse(totp_uri)
+        parsed_uri = urllib.parse.urlparse(totp_uri)
 
         # Extract label from the path
         parsed_info["label"] = parsed_uri.path[1:]  # Remove the leading slash
 
         # Extract parameters from the query string
-        query_params = parse.parse_qs(parsed_uri.query)
+        query_params = urllib.parse.parse_qs(parsed_uri.query)
         for key, value in query_params.items():
             parsed_info[key] = value[0]
         return parsed_info
@@ -934,7 +953,7 @@ class AppMeshClient(metaclass=abc.ABCMeta):
 
         with open(file=local_file, mode="rb") as fp:
             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}
+            header = {"File-Path": urllib.parse.quote(remote_file), "Content-Type": encoder.content_type}
 
             # Include file attributes (permissions, owner, group) if requested
             if apply_file_attributes:
@@ -1101,7 +1120,7 @@ class AppMeshClient(metaclass=abc.ABCMeta):
         Returns:
             requests.Response: HTTP response
         """
-        rest_url = parse.urljoin(self.server_url, path)
+        rest_url = urllib.parse.urljoin(self.server_url, path)
 
         header = {} if header is None else header
         if self.jwt_token:
@@ -1110,7 +1129,7 @@ class AppMeshClient(metaclass=abc.ABCMeta):
             if ":" in self.forward_to:
                 header[self.HTTP_HEADER_KEY_X_TARGET_HOST] = self.forward_to
             else:
-                header[self.HTTP_HEADER_KEY_X_TARGET_HOST] = self.forward_to + ":" + str(parse.urlsplit(self.server_url).port)
+                header[self.HTTP_HEADER_KEY_X_TARGET_HOST] = self.forward_to + ":" + str(urllib.parse.urlsplit(self.server_url).port)
         header[self.HTTP_HEADER_KEY_USER_AGENT] = self.HTTP_USER_AGENT
 
         if method is AppMeshClient.Method.GET:

{appmesh-1.4.4.dist-info → appmesh-1.4.6.dist-info}/METADATA

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

{appmesh-1.4.4.dist-info → appmesh-1.4.6.dist-info}/RECORD

@@ -3,11 +3,11 @@ 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=9ISKGZ3k3kkbQvSsPfRfkOLqD9xhbqNOM7ork9F4w9c,1712
 appmesh/appmesh_client.py,sha256=0ltkqHZUq094gKneYmC0bEZCP0X9kHTp9fccKdWFWP0,339
-appmesh/http_client.py,sha256=wd-H4vyHlLSCy1N8znHMf3-Zwgs7ow6-voWUludtMdA,44364
+appmesh/http_client.py,sha256=qM0es3dM4PM95ymNqdTAuIvTD9-Xy6jPKhDW-Sn7ehg,45180
 appmesh/tcp_client.py,sha256=RkHl5s8jE333BJOgxJqJ_fvjbdRQza7ciV49vLT6YO4,10923
 appmesh/tcp_messages.py,sha256=w1Kehz_aX4X2CYAUsy9mFVJRhxnLQwwc6L58W4YkQqs,969
 appmesh/tcp_transport.py,sha256=UMGby2oKV4k7lyXZUMSOe2Je34fb1w7nTkxEpatKLKg,7256
-appmesh-1.4.4.dist-info/METADATA,sha256=lV4XJMIWhe2jKNV5NOv_q6SFdVrzN1BZLoVrvEd90Is,11501
-appmesh-1.4.4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-appmesh-1.4.4.dist-info/top_level.txt,sha256=-y0MNQOGJxUzLdHZ6E_Rfv5_LNCkV-GTmOBME_b6pg8,8
-appmesh-1.4.4.dist-info/RECORD,,
+appmesh-1.4.6.dist-info/METADATA,sha256=x8wWJAFfIPR3PU4nGmmZDezdmmeoCLFmkE-nrOM1lPY,11501
+appmesh-1.4.6.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+appmesh-1.4.6.dist-info/top_level.txt,sha256=-y0MNQOGJxUzLdHZ6E_Rfv5_LNCkV-GTmOBME_b6pg8,8
+appmesh-1.4.6.dist-info/RECORD,,