akashcli 4.6.2__tar.gz → 4.6.4__tar.gz

{akashcli-4.6.2 → akashcli-4.6.4}/PKG-INFO

@@ -1,11 +1,10 @@
 Metadata-Version: 2.4
 Name: akashcli
-Version: 4.6.2
+Version: 4.6.4
 Summary: Akash CLI — secure remote shell relay, file vault, and device management
-License: MIT
+License-Expression: MIT
 Keywords: akash,cli,relay,remote-shell,vault
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Environment :: Console
 Classifier: Topic :: Utilities

akashcli-4.6.4/akashcli/__init__.py

@@ -0,0 +1,7 @@
+try:
+    from importlib.metadata import version
+    __version__ = version("akashcli")
+except Exception:
+    __version__ = "4.6.4"
+
+AKASH_VERSION = __version__

{akashcli-4.6.2 → akashcli-4.6.4}/akashcli/_net.py

@@ -112,6 +112,8 @@ def ws_connect(url: str, **kwargs):
 
     sock_timeout = kwargs.pop("_sock_timeout", 15)
     sock = make_socket(host, port, timeout=sock_timeout)
+    # Remove socket timeout so the WebSocket connection remains open permanently
+    sock.settimeout(None)
 
     # legacy=True: allow calling connect() outside of a `with` block.
     # websockets ≥ 13 requires context manager usage by default;

{akashcli-4.6.2 → akashcli-4.6.4}/akashcli/cli.py

@@ -141,6 +141,13 @@ def _upload_with_progress(client: AkashClient, tmp_path: str, password=None) ->
 # `app`       — primary commands (backup / restore / pull / run / shell …)
 # `cloud_app` — file management (akash cloud upload/files/stream/delete/manage/bulk)
 
+
+def _version_callback(value: bool):
+    if value:
+        from . import __version__
+        print("akashcli v" + __version__)
+        raise typer.Exit(0)
+
 app = typer.Typer(
     invoke_without_command=True,
     rich_markup_mode=None,
@@ -150,6 +157,9 @@ app = typer.Typer(
 
 @app.callback(invoke_without_command=True)
 def _main(ctx: typer.Context,
+          version: bool = typer.Option(False, "--version", "-v", is_eager=True, expose_value=False,
+                                       callback=lambda v: (print("akashcli v1.5.0"), raise_exit()) if v else None,
+                                       help="Show version and exit."),
           help: bool = typer.Option(False, "--help", "-h", is_eager=True, expose_value=False,
                                     callback=lambda v: (_print_help(), raise_exit()) if v else None,
                                     help="Show this message and exit.")):
@@ -256,6 +266,24 @@ def login(
 
 # ── akash whoami ─────────────────────────────────────────────────────────────
 
+
+@app.command()
+def version(url: Optional[str] = typer.Option(None, "--url", help="Server URL to check")):
+    """Show akash CLI version and connected server version."""
+    from . import __version__
+    ver_tag = "v" + __version__
+    print(f"\n  {_C}◈{_RS}  {_W}akashcli{_RS}  {_cy(ver_tag)}")
+    try:
+        _, base = _resolve_client(url, require_key=False)
+        resp = httpx.get(f"{base}/health", timeout=3.0)
+        if resp.status_code == 200:
+            s_ver = resp.json().get("version", "unknown")
+            srv_tag = "(" + s_ver + ")"
+            print(f"  {_DM}server   {_RS}{_cy(base)}  {_dim(srv_tag)}")
+    except Exception:
+        pass
+    print()
+
 @app.command()
 def whoami():
     """Show current account and storage usage."""
@@ -842,41 +870,10 @@ def pull(
             except KeyError:
                 pass
 
-            for member in tar.getmembers():
-                name = member.name
-                if name in ("MANIFEST.json", "manifest_meta.json", "akash.pkgs") or not member.isfile():
-                    continue
-
-                dest = None
-                if name.startswith("home/"):
-                    dest = home / name[len("home/"):]
-                elif name.startswith("abs/"):
-                    dest = Path(name[len("abs"):])
-                elif name.startswith("extra/"):
-                    dest = home / name[len("extra/"):]
-                else:
-                    skipped_list.append(name)
-                    continue
-
-                if dry_run:
-                    restored_list.append(str(dest))
-                    continue
-
-                try:
-                    dest.parent.mkdir(parents=True, exist_ok=True)
-                    file_data = tar.extractfile(member)
-                    if file_data is None:
-                        skipped_list.append(str(dest))
-                        continue
-                    dest.write_bytes(file_data.read())
-                    try:
-                        os.chmod(dest, member.mode)
-                    except OSError:
-                        pass
-                    restored_list.append(str(dest))
-                except (PermissionError, OSError) as e:
-                    skipped_list.append(f"{dest} ({e})")
-
+            from .restore import validate_and_extract_members
+            restored_list, skipped_list = validate_and_extract_members(
+                tar, target_home=home, dry_run=dry_run
+            )
     except Exception as e:
         _err(f"extraction failed: {e}")
         raise typer.Exit(1)
@@ -1250,7 +1247,8 @@ def shell(
 
 @app.command()
 def devices(
-    revoke: Optional[str] = typer.Option(None,  "--revoke", "-r", help="Revoke (unenroll) a device by label"),
+    revoke:    Optional[str] = typer.Option(None,  "--revoke", "-r",    help="Revoke (unenroll) a device by label"),
+    authorize: Optional[str] = typer.Option(None,  "--authorize", "-a", help="Grant server execution access to device"),
     raw:    bool          = typer.Option(False, "--json",          help="Raw JSON output"),
 ):
     """List enrolled devices — or revoke one.
@@ -1292,6 +1290,20 @@ def devices(
 
     _hdrs = {"x-api-key": api_key, "Origin": "https://akash.cli"}
 
+    if authorize:
+        try:
+            import httpx as _hx
+            resp = _hx.post(
+                f"{base}/api/exec/devices/{authorize}/authorize",
+                headers=_hdrs, timeout=10,
+            )
+            resp.raise_for_status()
+            _ok(f"authorized {_ye(authorize)} for server execution")
+        except Exception as e:
+            _err(f"authorize failed: {e}")
+            raise typer.Exit(1)
+        return
+
     if revoke:
         try:
             import httpx as _hx

{akashcli-4.6.2 → akashcli-4.6.4}/akashcli/exec.py

@@ -93,10 +93,21 @@ def _get_machine_key() -> bytes:
     return key
 
 
+def _get_ed25519_key():
+    from cryptography.hazmat.primitives.asymmetric import ed25519 as _ed25519
+    raw = _get_machine_key()
+    return _ed25519.Ed25519PrivateKey.from_private_bytes(raw)
+
+def _get_public_key_b64() -> str:
+    from cryptography.hazmat.primitives.serialization import Encoding, PublicFormat
+    pub = _get_ed25519_key().public_key()
+    raw = pub.public_bytes(Encoding.Raw, PublicFormat.Raw)
+    return base64.b64encode(raw).decode("utf-8")
+
 def _sign_challenge(challenge: str) -> str:
-    key = _get_machine_key()
-    sig = _hmac.new(key, challenge.encode(), hashlib.sha256).digest()
-    return base64.b64encode(sig).decode()
+    priv = _get_ed25519_key()
+    sig = priv.sign(challenge.encode("utf-8"))
+    return base64.b64encode(sig).decode("utf-8")
 
 
 def _device_id() -> str:
@@ -235,14 +246,6 @@ def _session_info() -> dict:
 # ── Authentication ────────────────────────────────────────────────────────────
 
 def acquire_exec_token(api_key: str, base_url: str, controller: bool = False) -> str:
-    """
-    Obtain a short-lived exec JWT.
-
-    controller=True  — skip device fingerprint enrollment (used by relay
-                       connect / run / shell).  Just authenticates as owner.
-    controller=False — full challenge/sign/enroll flow (used by akash serve).
-    """
-    # Patch socket DNS for this host — bypasses Android stale DNS cache
     from urllib.parse import urlparse as _up
     _patch_dns(_up(base_url).hostname or "")
 
@@ -251,22 +254,27 @@ def acquire_exec_token(api_key: str, base_url: str, controller: bool = False) ->
         return token
 
     with httpx.Client(base_url=base_url, timeout=10) as client:
-        if controller:
-            # Controller path: no device fingerprint needed — just owner auth.
-            return _auth_key_only(client, api_key, base_url)
-
-        ch = client.post("/api/exec/challenge",
-                         headers={"x-api-key": api_key, "Origin": "https://akash.cli"})
-        if ch.status_code == 404:
-            return _auth_key_only(client, api_key, base_url)
+        ch = client.post(
+            "/api/exec/challenge",
+            headers={"x-api-key": api_key, "Origin": "https://akash.cli"}
+        )
         ch.raise_for_status()
         nonce = ch.json()["nonce"]
 
         sig = _sign_challenge(nonce)
-        ar = client.post("/api/exec/auth",
-                         headers={"x-api-key": api_key, "Origin": "https://akash.cli"},
-                         json={"nonce": nonce, "signature": sig,
-                               "device_id": _device_id(), "label": _device_label()})
+        pub_key = _get_public_key_b64()
+        label = _device_label()
+
+        ar = client.post(
+            "/api/exec/auth",
+            headers={"x-api-key": api_key, "Origin": "https://akash.cli"},
+            json={
+                "nonce": nonce,
+                "signature": sig,
+                "public_key": pub_key,
+                "label": label,
+            }
+        )
         if ar.status_code == 403:
             raise PermissionError(ar.json().get("detail", "Access denied."))
         ar.raise_for_status()