Merge pull request nccgroup#1545 from ncc-akis/bugfix/fix_sqldb_ad_ad…

…min_assessment Ensure correct SQL DB AD Admin check
zeedo · Jun 30, 2023 · afecedf · afecedf
2 parents cb7299d + 7619c30
commit afecedf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/ScoutSuite/providers/azure/facade/sqldatabase.py b/ScoutSuite/providers/azure/facade/sqldatabase.py
@@ -56,8 +56,8 @@ async def get_database_replication_links(self, resource_group_name, server_name,
         try:
             client = self.get_client(subscription_id)
             return await run_concurrently(
-                lambda: client.replication_links.list_by_database(
-                    resource_group_name, server_name, database_name)
+                lambda: list(client.replication_links.list_by_database(
+                    resource_group_name, server_name, database_name))
             )
         except Exception as e:
             print_exception(f'Failed to retrieve database replication links: {e}')
@@ -67,7 +67,7 @@ async def get_server_azure_ad_administrators(self, resource_group_name, server_n
         try:
             client = self.get_client(subscription_id)
             return await run_concurrently(
-                lambda: client.server_azure_ad_administrators.list_by_server(resource_group_name, server_name)
+                lambda: list(client.server_azure_ad_administrators.list_by_server(resource_group_name, server_name))
             )
         except Exception as e:
             print_exception(f'Failed to retrieve server azure ad administrators: {e}')

diff --git a/ScoutSuite/providers/azure/resources/sqldatabase/replication_links.py b/ScoutSuite/providers/azure/resources/sqldatabase/replication_links.py
@@ -18,7 +18,7 @@ async def fetch_all(self):
         self._parse_links(links)
 
     def _parse_links(self, links):
-        links_count = len(list(links))
+        links_count = len(links)
         self.update({
             'replication_configured': links_count > 0
         })
diff --git a/ScoutSuite/providers/azure/rules/findings/sqldatabase-servers-no-ad-admin-configured.json b/ScoutSuite/providers/azure/rules/findings/sqldatabase-servers-no-ad-admin-configured.json
@@ -28,7 +28,7 @@
         "and",
         [
             "sqldatabase.subscriptions.id.servers.id.ad_admin",
-            "null",
+            "empty",
             ""
         ]
     ],
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,7 @@ @@
             "and",
             [
                 "sqldatabase.subscriptions.id.servers.id.ad_admin",
-                "null",
+                "empty",
                 ""
             ]
         ],
@@ Expand Down @@