mantis_api_client 5.2.3__tar.gz → 5.3.0__tar.gz

{mantis_api_client-5.2.3 → mantis_api_client-5.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mantis_api_client
-Version: 5.2.3
+Version: 5.3.0
 Summary: M&NTIS Platform client API
 License: MIT
 Author: AMOSSYS
@@ -14,11 +14,11 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: alive-progress (>=3.1.5,<4.0.0)
 Requires-Dist: argcomplete (>=1.12.1,<1.13.0)
 Requires-Dist: colorama (>=0.4.4,<0.5.0)
-Requires-Dist: cr-api-client (>=5.0.18,<6.0.0)
+Requires-Dist: cr-api-client (>=5.0.22,<6.0.0)
 Requires-Dist: mantis-authz (>=0.2.3,<1.0.0)
 Requires-Dist: mantis-catalog (>=0.1.2,<0.2.0)
 Requires-Dist: mantis-logger (>=0.2.0,<0.3.0)
-Requires-Dist: mantis-models (>=3.2.2,<4.0.0)
+Requires-Dist: mantis-models (>=3.4.0,<4.0.0)
 Requires-Dist: omegaconf (>=2.2.2,<3.0.0)
 Requires-Dist: pydantic (>=2.10.3,<3.0.0)
 Requires-Dist: requests (>=2.24.0,<3.0.0)

{mantis_api_client-5.2.3 → mantis_api_client-5.3.0}/mantis_api_client/cli_parser/account_parser.py

@@ -18,10 +18,12 @@ import requests
 from mantis_authz import jwt
 from rich.console import Console
 from rich.prompt import Prompt
+from rich.tree import Tree
 
+import mantis_api_client
 import mantis_api_client.dataset_api as dataset_api
-import mantis_api_client.oidc
 import mantis_api_client.scenario_api as scenario_api
+from mantis_api_client import user_api
 from mantis_api_client.config import mantis_api_client_config
 from mantis_api_client.oidc import get_oidc_client
 from mantis_api_client.utils import colored
@@ -100,12 +102,14 @@ def status_handler(args: Any) -> None:  # noqa: C901
     try:
         scenario_api_version = scenario_api.get_version()
         scenario_vers = Version(str_vers=scenario_api_version)
+        cyber_range_version = scenario_api.get_cyberrange_version()
     except requests.exceptions.ConnectionError:
         exit_code = 1
         print("    [-] API status: " + colored("not running !", "white", "on_red"))
     else:
         print("    [+] API status: " + colored("OK", "grey", "on_green"))
         print("    [+] version: {}".format(scenario_api_version))
+        print("    [+] Cyber Range version: {}".format(cyber_range_version))
         if scenario_vers.major != client_vers.major:
             exit_code = 1
             print(
@@ -144,7 +148,7 @@ def info_handler(args: Any) -> None:  # noqa: C901
 
     # Handle case where the user pertains to an organization
     if user_groups is not None:
-        default_group = get_oidc_client().get_default_group()
+        default_group = get_oidc_client().get_default_workspace()
         groups_comma_sep = ", ".join(user_groups)
         if default_group:
             # mark default group bold
@@ -166,6 +170,7 @@ def info_handler(args: Any) -> None:  # noqa: C901
 # 'login_handler' handler
 #
 def login_handler(args: Any) -> None:
+    oidc_client = get_oidc_client()
     # Parameters
     oidc_domain = args.domain
     username = args.username
@@ -188,7 +193,6 @@ def login_handler(args: Any) -> None:
             "groups",
             "profile",
             "email",
-            "dataset:read",
             "scenario:run",
         ]
     )
@@ -199,11 +203,11 @@ def login_handler(args: Any) -> None:
         thread = _init_create_callback_request_handler_thread(code_placeholder)
         thread.start()
     if username and password:
-        token = get_oidc_client().token(
+        token = oidc_client.token(
             oidc_domain, username, password, redirect_uri=redirect_uri, scope=scope
         )
     else:
-        auth_url = get_oidc_client().auth_url(
+        auth_url = oidc_client.auth_url(
             oidc_domain,
             redirect_uri=redirect_uri,
             scope=scope,
@@ -234,29 +238,54 @@ def login_handler(args: Any) -> None:
             redirect_uri=redirect_uri,
         )
     print("Access granted")
-
-    claims = jwt.get_unverified_claims(token["access_token"])
-    selected_group = args.group
-    claimed_groups = claims.get("groups")
+    oidc_client.configure_profile(oidc_domain, token["refresh_token"])
 
     # Handle case where the user does not pertain to an organization
-    if claimed_groups is None:
-        selected_group = None
-    else:
-        # Handle case where the user pertains to only one organization
-        if claimed_groups and len(claimed_groups) == 1 and selected_group is None:
-            selected_group = claimed_groups[0]
-
-        if selected_group not in claimed_groups:
-            if selected_group:
-                print(f"You are not member of group '{selected_group}'")
-            selected_group = Prompt.ask(
-                "Select a group to activate", choices=claimed_groups
-            )
-        print(f"Group `{selected_group}` activated")
+    subject_workspaces = user_api.fetch_current_workspaces()
+    subject_organizations = user_api.fetch_current_seats()
+    subject_orgs_wss = [
+        (sub_org, sub_ws)
+        for sub_org in subject_organizations
+        for sub_ws in subject_workspaces
+        if sub_ws["organization_id"] == sub_org["id"]
+    ]
+    selected_idx: int | None = None
+    if args.workspace:
+        for i, (_, ws) in enumerate(subject_orgs_wss):
+            if args.workspace == ws["id"]:
+                selected_idx = i
+    console = Console()
+    if selected_idx is None:
+        match len(subject_orgs_wss):
+            case 0:
+                return
+            case 1:
+                selected_idx = 0
+            case _:
+                i = 1
+                root = Tree(":file_folder:[yellow]Workspace memberships")
+                for org in subject_organizations:
+                    org_branch = root.add(f"Organization [magenta]{org['name']}")
+                    for ws in subject_workspaces:
+                        if ws["organization_id"] != org["id"]:
+                            continue
+                        org_branch.add(rf"[bold green]{i}[/bold green]. {ws['name']}")
+                        i += 1
+                console.print(root)
+                selected_idx = (
+                    int(
+                        Prompt.ask(
+                            "Select a default workspace",
+                            choices=[str(k + 1) for k in range(len(subject_orgs_wss))],
+                        )
+                    )
+                    - 1
+                )
+    selected_ws = subject_orgs_wss[selected_idx][1]
+    console.print(f"Workspace [b green]{selected_ws['name']}[/b green] activated")
 
-    get_oidc_client().configure_profile(
-        oidc_domain, token["refresh_token"], selected_group
+    oidc_client.configure_profile(
+        oidc_domain, token["refresh_token"], selected_ws["id"]
     )
 
 
@@ -360,9 +389,9 @@ def add_account_parser(root_parser: argparse.ArgumentParser, subparsers: Any) ->
         help="Read your M&ntis cluster SSO password from a file",
     )
     parser_login.add_argument(
-        "-g",
-        "--group",
-        help="Select the group name that will be used for contextual commands like `mantis scenario run`",
+        "-w",
+        "--workspace",
+        help="Pass the workspace that will be used as default for workspace-aware commands",
     )
     parser_login.set_defaults(func=login_handler)
 

{mantis_api_client-5.2.3 → mantis_api_client-5.3.0}/mantis_api_client/cli_parser/attack_parser.py

@@ -11,7 +11,6 @@ from pydantic.json import pydantic_encoder
 from ruamel.yaml import YAML
 
 from mantis_api_client import scenario_api
-from mantis_api_client import user_api
 from mantis_api_client.oidc import get_oidc_client
 from mantis_api_client.utils import colored
 from mantis_api_client.utils import wait_lab
@@ -85,20 +84,19 @@ def _attack_create_or_run_lab(args: Any, do_run: bool = True):
     scenario_profile = args.scenario_profile
     lab_config_path = args.lab_config_path
 
-    if not args.group_name:
+    if not args.workspace_id:
         try:
-            group_name = get_oidc_client().get_default_group(raise_exc=True)
+            workspace_id = get_oidc_client().get_default_workspace(raise_exc=True)
         except Exception as e:
             print(colored(f"Error when fetching attacks: '{e}'", "red"))
             sys.exit(1)
     else:
-        group_name = args.group_name
+        workspace_id = args.workspace_id
 
     # Retrieve associated group id
-    if group_name is None:
+    if workspace_id is None:
         print(colored("Your subscription level does not permit to launch labs", "red"))
         sys.exit(1)
-    group_id = user_api.get_organization_id_from_group_name(group_name)
 
     # Safety checks
     try:
@@ -151,23 +149,20 @@ def _attack_create_or_run_lab(args: Any, do_run: bool = True):
                 attack,
                 scenario_profile,
                 lab_config,
-                group_name,
-                group_id,
+                workspace_id,
             )
         else:
             lab_id = scenario_api.create_lab_attack(
                 attack,
                 scenario_profile,
                 lab_config,
-                group_name,
-                group_id,
+                workspace_id,
             )
 
-        print(f"[+] Scenario lab ID: {lab_id}")
+        print(f"[+] Lab ID: {lab_id}")
 
         if do_run:
             wait_lab(lab_id)
-            print("[+] Scenario ended")
 
     except Exception as e:
         print(colored(f"Error when running attack {attack_name}: '{e}'", "red"))
@@ -251,8 +246,8 @@ def add_attack_parser(root_parser: argparse.ArgumentParser, subparsers: Any) ->
         help="Allows to define the unit scenario to create_lab for a unit attack",
     )
     parser_attack_create_lab.add_argument(
-        "--group_name",
-        dest="group_name",
+        "--workspace_id",
+        dest="workspace_id",
         help="The group name that have ownership on lab",
     )
     parser_attack_create_lab.add_argument(
@@ -285,8 +280,8 @@ def add_attack_parser(root_parser: argparse.ArgumentParser, subparsers: Any) ->
         help="Allows to define the unit scenario to run for a unit attack",
     )
     parser_attack_run_lab.add_argument(
-        "--group_name",
-        dest="group_name",
+        "--workspace_id",
+        dest="workspace_id",
         help="The group name that have ownership on lab",
     )
     parser_attack_run_lab.add_argument(