Merge branch 'tkt_87_modify_get_workspace_v2' into 'dev'

Resolve "Cambiar get_workspace" Closes #87 See merge request faradaysec/faraday-cli!79
infobyte · Feb 26, 2024 · 6269af4 · 6269af4
2 parents e6f97bb + 98b77fc
commit 6269af4
Show file tree

Hide file tree

Showing 12 changed files with 97 additions and 61 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -85,6 +85,7 @@ black:
       - mkdir -p ~/.faraday/logs
       - cp tests/data/server.ini ~/.faraday/config
       - python3 ../tests/config/psql_config.py
+      - pip install 'importlib-metadata<5.0'
       - faraday-manage create-tables
       - faraday-manage create-superuser --username $FARADAY_USER --password $FARADAY_PASSWORD --email $FARADAY_EMAIL
       - faraday-server &

diff --git a/CHANGELOG/current/87.md b/CHANGELOG/current/87.md
@@ -0,0 +1 @@
+[FIX] Fix workspace activation. #87
diff --git a/faraday_cli/api_client/faraday_api.py b/faraday_cli/api_client/faraday_api.py
@@ -208,7 +208,9 @@ def get_workspaces(self, get_inactives=False):
             return response.body
         else:
             return [
-                workspace for workspace in response.body if workspace["active"]
+                workspace
+                for workspace in response.body["rows"]
+                if workspace["active"]
             ]
 
     @handle_errors

diff --git a/faraday_cli/extras/halo/halo.py b/faraday_cli/extras/halo/halo.py
@@ -440,9 +440,11 @@ def frame(self):
         text_frame = self.text_frame()
         return "{0} {1}".format(
             *[
-                (text_frame, frame)
-                if self._placement == "right"
-                else (frame, text_frame)
+                (
+                    (text_frame, frame)
+                    if self._placement == "right"
+                    else (frame, text_frame)
+                )
             ][0]
         )
 
@@ -602,9 +604,11 @@ def stop_and_persist(self, symbol=" ", text=None):
 
         output = "{0} {1}\n".format(
             *[
-                (text, symbol)
-                if self._placement == "right"
-                else (symbol, text)
+                (
+                    (text, symbol)
+                    if self._placement == "right"
+                    else (symbol, text)
+                )
             ][0]
         )
 

diff --git a/faraday_cli/shell/modules/agent.py b/faraday_cli/shell/modules/agent.py
@@ -265,7 +265,7 @@ def run_executor(self, args):
                                     default="",
                                     show_default=False,
                                 )
-                        if type(value) == str and value == "":
+                        if isinstance(value, str) and value == "":
                             continue
                         executor_params[parameter] = str(value)
                     executor_params = json.dumps(executor_params)

diff --git a/faraday_cli/shell/modules/executive_report.py b/faraday_cli/shell/modules/executive_report.py
@@ -58,9 +58,9 @@ def list_executive_reports_templates(self, args):
             tabulate(
                 data,
                 headers="keys",
-                tablefmt=self._cmd.TABLE_PRETTY_FORMAT
-                if args.pretty
-                else "simple",
+                tablefmt=(
+                    self._cmd.TABLE_PRETTY_FORMAT if args.pretty else "simple"
+                ),
             )
         )
 

diff --git a/faraday_cli/shell/modules/host.py b/faraday_cli/shell/modules/host.py
@@ -96,12 +96,17 @@ def get_data(workspace_name, port_number):
                                 "HOSTNAMES": "\n".join(
                                     x["value"]["hostnames"]
                                 ),
-                                "SERVICES": "-"
-                                if len(x["value"]["service_summaries"]) == 0
-                                else len(x["value"]["service_summaries"]),
-                                "VULNS": "-"
-                                if x["value"]["vulns"] == 0
-                                else x["value"]["vulns"],
+                                "SERVICES": (
+                                    "-"
+                                    if len(x["value"]["service_summaries"])
+                                    == 0
+                                    else len(x["value"]["service_summaries"])
+                                ),
+                                "VULNS": (
+                                    "-"
+                                    if x["value"]["vulns"] == 0
+                                    else x["value"]["vulns"]
+                                ),
                             }
                         )
                         for x in hosts["rows"]
@@ -204,9 +209,11 @@ def get_host_vulns(workspace_name, ip):
                     tabulate(
                         host_data,
                         headers="keys",
-                        tablefmt=self._cmd.TABLE_PRETTY_FORMAT
-                        if args.pretty
-                        else "simple",
+                        tablefmt=(
+                            self._cmd.TABLE_PRETTY_FORMAT
+                            if args.pretty
+                            else "simple"
+                        ),
                     )
                 )
                 if host["services"] > 0:
@@ -221,9 +228,9 @@ def get_host_vulns(workspace_name, ip):
                                 "PORT": x["port"],
                                 "VERSION": x["version"],
                                 "STATUS": x["status"],
-                                "VULNS": "-"
-                                if x["vulns"] == 0
-                                else x["vulns"],
+                                "VULNS": (
+                                    "-" if x["vulns"] == 0 else x["vulns"]
+                                ),
                             }
                         )
                         for x in services
@@ -233,9 +240,11 @@ def get_host_vulns(workspace_name, ip):
                         tabulate(
                             services_data,
                             headers="keys",
-                            tablefmt=self._cmd.TABLE_PRETTY_FORMAT
-                            if args.pretty
-                            else "simple",
+                            tablefmt=(
+                                self._cmd.TABLE_PRETTY_FORMAT
+                                if args.pretty
+                                else "simple"
+                            ),
                         )
                     )
                 if host["vulns"] > 0:
@@ -263,9 +272,11 @@ def get_host_vulns(workspace_name, ip):
                         tabulate(
                             vulns_data,
                             headers="keys",
-                            tablefmt=self._cmd.TABLE_PRETTY_FORMAT
-                            if args.pretty
-                            else "simple",
+                            tablefmt=(
+                                self._cmd.TABLE_PRETTY_FORMAT
+                                if args.pretty
+                                else "simple"
+                            ),
                         )
                     )
 

diff --git a/faraday_cli/shell/modules/stats.py b/faraday_cli/shell/modules/stats.py
@@ -70,9 +70,9 @@ def gather_vulns_stats(vulns):
                     counters[host_identifier] += 1
                 data = list(map(lambda x: [x], counters.values()))
                 termgraph_data = termgraph.TERMGRAPH_DATA_TEMPLATE.copy()
-                termgraph_data[
-                    "title"
-                ] = f"Vulnerability stats [{workspace_name}]"
+                termgraph_data["title"] = (
+                    f"Vulnerability stats [{workspace_name}]"
+                )
                 termgraph_data["data"] = data
                 termgraph_data["labels"] = [x for x in counters.keys()]
                 termgraph_data["categories"] = ["vulns"]

diff --git a/faraday_cli/shell/modules/workspace.py b/faraday_cli/shell/modules/workspace.py
@@ -101,24 +101,32 @@ def get_workspace(workspace_name):
                         "ACTIVE": workspace["active"],
                         "PUBLIC": workspace["public"],
                         "READONLY": workspace["readonly"],
-                        "HOSTS": "-"
-                        if workspace["stats"]["hosts"] == 0
-                        else workspace["stats"]["hosts"],
-                        "SERVICES": "-"
-                        if workspace["stats"]["services"] == 0
-                        else workspace["stats"]["services"],
-                        "VULNS": "-"
-                        if workspace["stats"]["total_vulns"] == 0
-                        else workspace["stats"]["total_vulns"],
+                        "HOSTS": (
+                            "-"
+                            if workspace["stats"]["hosts"] == 0
+                            else workspace["stats"]["hosts"]
+                        ),
+                        "SERVICES": (
+                            "-"
+                            if workspace["stats"]["services"] == 0
+                            else workspace["stats"]["services"]
+                        ),
+                        "VULNS": (
+                            "-"
+                            if workspace["stats"]["total_vulns"] == 0
+                            else workspace["stats"]["total_vulns"]
+                        ),
                     }
                 ]
                 self._cmd.print_output(
                     tabulate(
                         data,
                         headers="keys",
-                        tablefmt=self._cmd.TABLE_PRETTY_FORMAT
-                        if args.pretty
-                        else "simple",
+                        tablefmt=(
+                            self._cmd.TABLE_PRETTY_FORMAT
+                            if args.pretty
+                            else "simple"
+                        ),
                     )
                 )
 
@@ -236,9 +244,11 @@ def get_workspaces():
                             "NAME": x["name"],
                             "HOSTS": x["stats"]["hosts"],
                             "SERVICES": x["stats"]["services"],
-                            "VULNS": "-"
-                            if x["stats"]["total_vulns"] == 0
-                            else x["stats"]["total_vulns"],
+                            "VULNS": (
+                                "-"
+                                if x["stats"]["total_vulns"] == 0
+                                else x["stats"]["total_vulns"]
+                            ),
                             "ACTIVE": x["active"],
                             "PUBLIC": x["public"],
                             "READONLY": x["readonly"],
@@ -250,9 +260,11 @@ def get_workspaces():
                     tabulate(
                         data,
                         headers="keys",
-                        tablefmt=self._cmd.TABLE_PRETTY_FORMAT
-                        if args.pretty
-                        else "simple",
+                        tablefmt=(
+                            self._cmd.TABLE_PRETTY_FORMAT
+                            if args.pretty
+                            else "simple"
+                        ),
                     )
                 )
 
@@ -400,7 +412,7 @@ def activities_vulns_parser(activity_data):
                     )
                 data.append(
                     [
-                        "\n".join(item) if type(item) == list else item
+                        "\n".join(item) if isinstance(item, list) else item
                         for item in workspace_data.values()
                     ]
                 )

diff --git a/faraday_cli/shell/shell.py b/faraday_cli/shell/shell.py
@@ -403,11 +403,13 @@ def do_status(self, args):
                 "USER": user if user else "-",
                 "VALID TOKEN": "\U00002714" if valid_token else "\U0000274c",
                 "WORKSPACE": active_config.workspace,
-                "CLI VERSION": __version__
-                if not self.update_available
-                else style(
-                    f"{__version__} (latest: {self.latest_version})",
-                    fg=COLORS.RED,
+                "CLI VERSION": (
+                    __version__
+                    if not self.update_available
+                    else style(
+                        f"{__version__} (latest: {self.latest_version})",
+                        fg=COLORS.RED,
+                    )
                 ),
             }
         ]
@@ -416,9 +418,9 @@ def do_status(self, args):
                 tabulate(
                     data,
                     headers="keys",
-                    tablefmt=self.TABLE_PRETTY_FORMAT
-                    if args.pretty
-                    else "simple",
+                    tablefmt=(
+                        self.TABLE_PRETTY_FORMAT if args.pretty else "simple"
+                    ),
                 ),
                 fg=COLORS.GREEN,
             )

diff --git a/faraday_cli/shell/utils.py b/faraday_cli/shell/utils.py
@@ -34,7 +34,10 @@
 
 
 def validate_url(value):
-    valid_url = url(value)
+    if sys.version_info < (3, 8):
+        valid_url = url(value)
+    else:
+        valid_url = url(value, simple_host=True)
     if valid_url:
         return value
     else:

diff --git a/hooks/hook-faraday_plugins.plugins.repo.py b/hooks/hook-faraday_plugins.plugins.repo.py
@@ -1,4 +1,4 @@
-from PyInstaller.utils.hooks import collect_all, collect_submodules
+from PyInstaller.utils.hooks import collect_all
 
 datas, binaries, hiddenimports = collect_all(
     "faraday_plugins", include_py_files=True