Fixed bug when empty/no tags + resource group name processing and par…

…tial view for: - Appservice: web_apps - Keyvault: vaults - Network: application_security_groups, network_interfaces, security_groups, virtual_networks, watchers - SQLdatabase: servers, databases - Storageaccounts: storage_accounts - Virtualmachines: instances Useful reference: https://docs.microsoft.com/en-us/azure/azure-resource-manager/management/move-support-resources
nccgroup · Jun 11, 2020 · 06d282f · 06d282f
1 parent 3080dea
commit 06d282f
Show file tree

Hide file tree

Showing 21 changed files with 93 additions and 55 deletions.
diff --git a/...tSuite/output/data/html/partials/azure/services.appservice.subscriptions.id.web_apps.html b/...tSuite/output/data/html/partials/azure/services.appservice.subscriptions.id.web_apps.html
@@ -6,16 +6,6 @@ <h4 class="list-group-item-heading">{{name}}</h4>
     <div class="list-group-item">
         <h4 class="list-group-item-heading">Information</h4>
         <div class="list-group-item-text item-margin">Name: <span id="appservice.subscriptions.{{subscription}}.web_apps.{{@key}}.name"><samp>{{value_or_none name}}</samp></span></div>
-        <div class="list-group-item-text item-margin">Tags: 
-            {{#each tags}}
-                <div
-                    style="border-radius: 5px; -webkit-border-radius: 5px; float: center; background-color: #c2c2d6; padding: 0.1px; text-align: center; display: inline-flex;">
-                    <samp>{{value_or_none this}}</samp>
-                </div>&nbsp;&nbsp;
-            {{else}}
-                <div style="display: inline-flex;"><samp>None</samp></div>
-            {{/each}}
-        </div>
         <div class="list-group-item-text item-margin">Location: <span id="appservice.subscriptions.{{subscription}}.web_apps.{{@key}}.location"><samp>{{value_or_none location}}</samp></span></div>
         <div class="list-group-item-text item-margin">State: <span id="appservice.subscriptions.{{subscription}}.web_apps.{{@key}}.state"><samp>{{value_or_none state}}</samp></span></div>
         <div class="list-group-item-text item-margin">Usage State: <span id="appservice.subscriptions.{{subscription}}.web_apps.{{@key}}.usage_state"><samp>{{value_or_none usage_state}}</samp></span></div>
@@ -37,6 +27,17 @@ <h4 class="list-group-item-heading">Information</h4>
         <div class="list-group-item-text item-margin">Traffic Manager Host Names: <span id="appservice.subscriptions.{{subscription}}.web_apps.{{@key}}.traffic_manager_host_names"><samp>{{value_or_none traffic_manager_host_names}}</samp></span></div>
         <div class="list-group-item-text item-margin">Programming Language: <span id="appservice.subscriptions.{{subscription}}.web_apps.{{@key}}.programming_language"><samp>{{value_or_none programming_language}}</samp></span></div>
         <div class="list-group-item-text item-margin">Programming Language Version: <span id="appservice.subscriptions.{{subscription}}.web_apps.{{@key}}.programming_language_version"><samp>{{value_or_none programming_language_version}}</samp></span></div>
+        <div class="list-group-item-text item-margin">Tags:
+            {{#each tags}}
+                <div
+                    style="border-radius: 5px; -webkit-border-radius: 5px; float: center; background-color: #c2c2d6; padding: 0.1px; text-align: center; display: inline-flex;">
+                    <samp>{{value_or_none this}}</samp>
+                </div>&nbsp;&nbsp;
+            {{else}}
+                <div style="display: inline-flex;"><samp>None</samp></div>
+            {{/each}}
+        </div>
+        <div class="list-group-item-text item-margin">Resource group: <span id="appservice.subscriptions.{{subscription}}.web_apps.{{@key}}.resource_group_name"><samp>{{value_or_none resource_group_name}}</samp></span></div>
         <h4 class="list-group-item-heading accordion-heading">
         <span id="appservice.subscriptions.{{subscription}}.web_apps.{{@key}}.identity">Identities</span>
         </h4>

diff --git a/ScoutSuite/output/data/html/partials/azure/services.keyvault.subscriptions.id.vaults.html b/ScoutSuite/output/data/html/partials/azure/services.keyvault.subscriptions.id.vaults.html
@@ -6,7 +6,9 @@ <h4 class="list-group-item-heading">{{name}}</h4>
     <div class="list-group-item">
         <h4 class="list-group-item-heading">Information</h4>
         <div class="list-group-item-text item-margin">ID: <span id="keyvault.subscriptions.{{@../key}}.vaults.{{@key}}.id"><samp>{{ id }}</samp></span></div>
-        <div class="list-group-item-text item-margin">Tags: 
+        <div class="list-group-item-text item-margin">Location: <span id="keyvault.subscriptions.{{@../key}}.vaults.{{@key}}.location"><samp>{{value_or_none location}}</samp></span></div>
+        <div class="list-group-item-text item-margin">Public Access: <span id="keyvault.subscriptions.{{@../key}}.vaults.{{@key}}.public_access_allowed">{{ convert_bool_to_enabled public_access_allowed }}</span></div>
+        <div class="list-group-item-text item-margin">Tags:
             {{#each tags}}
                 <div
                     style="border-radius: 5px; -webkit-border-radius: 5px; float: center; background-color: #c2c2d6; padding: 0.1px; text-align: center; display: inline-flex;">
@@ -16,8 +18,7 @@ <h4 class="list-group-item-heading">Information</h4>
                 <div style="display: inline-flex;"><samp>None</samp></div>
             {{/each}}
         </div>
-        <div class="list-group-item-text item-margin">Location: <span id="keyvault.subscriptions.{{@../key}}.vaults.{{@key}}.location"><samp>{{value_or_none location}}</samp></span></div>
-        <div class="list-group-item-text item-margin">Public Access: <span id="keyvault.subscriptions.{{@../key}}.vaults.{{@key}}.public_access_allowed">{{ convert_bool_to_enabled public_access_allowed }}</span></div>
+        <div class="list-group-item-text item-margin">Resource group: <span id="keyvault.subscriptions.{{@../key}}.vaults.{{@key}}.resource_group_name"><samp>{{value_or_none resource_group_name}}</samp></span></div>
     </div>
 </script>
 

diff --git a/...ta/html/partials/azure/services.network.subscriptions.id.application_security_groups.html b/...ta/html/partials/azure/services.network.subscriptions.id.application_security_groups.html
@@ -7,18 +7,19 @@ <h4 class="list-group-item-heading">{{name}}</h4>
     <div class="list-group-item">
         <h4 class="list-group-item-heading">Information</h4>
         <div class="list-group-item-text item-margin">Name: <span id="network.subscriptions.{{@../key}}.application_security_groups.{{@key}}.name"><samp>{{value_or_none name}}</samp></span></div>
-        <div class="list-group-item-text item-margin">Tags: 
+        <div class="list-group-item-text item-margin">Location: <span id="network.subscriptions.{{@../key}}.application_security_groups.{{@key}}.location"><samp>{{value_or_none location}}</samp></span></div>
+        <div class="list-group-item-text item-margin">Provisioning State: <span id="network.subscriptions.{{@../key}}.application_security_groups.{{@key}}.provisioning_state"><samp>{{value_or_none provisioning_state}}</samp></span></div>
+        <div class="list-group-item-text item-margin">Tags:
             {{#each tags}}
-                <div
-                    style="border-radius: 5px; -webkit-border-radius: 5px; float: center; background-color: #c2c2d6; padding: 0.1px; text-align: center; display: inline-flex;">
-                    <samp>{{value_or_none this}}</samp>
-                </div>&nbsp;&nbsp;
+            <div
+                style="border-radius: 5px; -webkit-border-radius: 5px; float: center; background-color: #c2c2d6; padding: 0.1px; text-align: center; display: inline-flex;">
+                <samp>{{value_or_none this}}</samp>
+            </div>&nbsp;&nbsp;
             {{else}}
                 <div style="display: inline-flex;"><samp>None</samp></div>
             {{/each}}
         </div>
-        <div class="list-group-item-text item-margin">Location: <span id="network.subscriptions.{{@../key}}.application_security_groups.{{@key}}.location"><samp>{{value_or_none location}}</samp></span></div>
-        <div class="list-group-item-text item-margin">Provisioning State: <span id="network.subscriptions.{{@../key}}.application_security_groups.{{@key}}.provisioning_state"><samp>{{value_or_none provisioning_state}}</samp></span></div>
+        <div class="list-group-item-text item-margin">Resource group: <span id="network.subscriptions.{{@../key}}.application_security_groups.{{@key}}.resource_group_name"><samp>{{value_or_none resource_group_name}}</samp></span></div>
     </div>
     <div class="list-group-item">
         <h4 class="list-group-item-heading">Attached Network Interfaces</h4>

diff --git a/...output/data/html/partials/azure/services.network.subscriptions.id.network_interfaces.html b/...output/data/html/partials/azure/services.network.subscriptions.id.network_interfaces.html
@@ -28,6 +28,7 @@ <h4 class="list-group-item-heading">Information</h4>
                 <div style="display: inline-flex;"><samp>None</samp></div>
             {{/each}}
         </div>
+        <div class="list-group-item-text item-margin">Resource group: <span id="network.subscriptions.{{@../key}}.network_interfaces.{{@key}}.resource_group_name"><samp>{{value_or_none resource_group_name}}</samp></span></div>
     </div>
     <div class="list-group-item">
         <h4 class="list-group-item-heading">IP Configuration</h4>

diff --git a/...te/output/data/html/partials/azure/services.network.subscriptions.id.security_groups.html b/...te/output/data/html/partials/azure/services.network.subscriptions.id.security_groups.html
@@ -7,18 +7,19 @@ <h4 class="list-group-item-heading">{{name}}</h4>
     <div class="list-group-item">
         <h4 class="list-group-item-heading">Information</h4>
         <div class="list-group-item-text item-margin">Name: <span id="network.subscriptions.{{@../key}}.security_groups.{{@key}}.name">{{name}}</span></div>
-        <div class="list-group-item-text item-margin">Tags: 
+        <div class="list-group-item-text item-margin">Location: <span id="network.subscriptions.{{@../key}}.security_groups.{{@key}}.location">{{ location }}</span></div>
+        <div class="list-group-item-text item-margin">State: <span id="network.subscriptions.{{@../key}}.security_groups.{{@key}}.provisioning_state">{{ provisioning_state }}</span></div>
+        <div class="list-group-item-text item-margin">Tags:
             {{#each tags}}
-                <div
-                    style="border-radius: 5px; -webkit-border-radius: 5px; float: center; background-color: #c2c2d6; padding: 0.1px; text-align: center; display: inline-flex;">
-                    <samp>{{value_or_none this}}</samp>
-                </div>&nbsp;&nbsp;
+            <div
+                style="border-radius: 5px; -webkit-border-radius: 5px; float: center; background-color: #c2c2d6; padding: 0.1px; text-align: center; display: inline-flex;">
+                <samp>{{value_or_none this}}</samp>
+            </div>&nbsp;&nbsp;
             {{else}}
                 <div style="display: inline-flex;"><samp>None</samp></div>
             {{/each}}
         </div>
-        <div class="list-group-item-text item-margin">Location: <span id="network.subscriptions.{{@../key}}.security_groups.{{@key}}.location">{{ location }}</span></div>
-        <div class="list-group-item-text item-margin">State: <span id="network.subscriptions.{{@../key}}.security_groups.{{@key}}.provisioning_state">{{ provisioning_state }}</span></div>
+        <div class="list-group-item-text item-margin">Resource group: <span id="network.subscriptions.{{@../key}}.security_groups.{{@key}}.resource_group_name"><samp>{{value_or_none resource_group_name}}</samp></span></div>
         {{!--
         <div class="list-group-item-text item-margin">
             <span id="network.subscriptions.{{@../key}}.security_groups.{{@key}}.ExposedPorts">Exposed Ports:</span>

diff --git a/...e/output/data/html/partials/azure/services.network.subscriptions.id.virtual_networks.html b/...e/output/data/html/partials/azure/services.network.subscriptions.id.virtual_networks.html
@@ -27,6 +27,7 @@ <h4 class="list-group-item-heading">Information</h4>
                 <div style="display: inline-flex;"><samp>None</samp></div>
             {{/each}}
         </div>
+        <div class="list-group-item-text item-margin">Resource group: <span id="network.subscriptions.{{@../key}}.virtual_networks.{{@key}}.resource_group_name"><samp>{{value_or_none resource_group_name}}</samp></span></div>
     </div>
     <div class="list-group-item">
         <h4 class="list-group-item-heading">Subnets</h4>

diff --git a/ScoutSuite/output/data/html/partials/azure/services.network.subscriptions.id.watchers.html b/ScoutSuite/output/data/html/partials/azure/services.network.subscriptions.id.watchers.html
@@ -19,6 +19,7 @@ <h4 class="list-group-item-heading">Information</h4>
                 <div style="display: inline-flex;"><samp>None</samp></div>
             {{/each}}
         </div>
+        <div class="list-group-item-text item-margin">Resource group: <span id="network.subscriptions.{{@../key}}.watchers.{{@key}}.resource_group_name"><samp>{{value_or_none resource_group_name}}</samp></span></div>
     </div>
 </script>
 

diff --git a/...tSuite/output/data/html/partials/azure/services.sqldatabase.subscriptions.id.servers.html b/...tSuite/output/data/html/partials/azure/services.sqldatabase.subscriptions.id.servers.html
@@ -7,23 +7,24 @@ <h4 class="list-group-item-heading">{{name}}</h4>
     <div class="list-group-item">
         <h4 class="list-group-item-heading">Information</h4>
         <div class="list-group-item-text item-margin">SQL Server Name: <span id="sqldatabase.subscriptions.{{@../key}}.servers.{{@key}}.name">{{name}}</span></div>
-        <div class="list-group-item-text item-margin">Tags:
-            {{#each tags}}
-                <div style="border-radius: 5px; -webkit-border-radius: 5px; float: center; background-color: #c2c2d6; padding: 0.1px; text-align: center; display: inline-flex;">
-                    <samp>{{value_or_none this}}</samp>
-                </div>&nbsp;&nbsp;
-            {{else}}
-                <div style="display: inline-flex;"><samp>None</samp></div>
-            {{/each}}
-        </div>
-
         <div class="list-group-item-text item-margin">Azure Active Directory Admin: <span id="sqldatabase.subscriptions.{{@../key}}.servers.{{@key}}.ad_admin"><samp>{{value_or_none ad_admin.login}}</samp></span></div>
         <div class="list-group-item-text item-margin">Auditing: <span id="sqldatabase.subscriptions.{{@../key}}.servers.{{@key}}.server_auditing_disabled">{{ convert_bool_to_enabled auditing.auditing_enabled }}</span></div>
         <div class="list-group-item-text item-margin">Auditing retention period: <span id="sqldatabase.subscriptions.{{@../key}}.servers.{{@key}}.server_low_auditing_retention">{{ auditing.retention_days }}</span></div>
         <div class="list-group-item-text item-margin">Threat detection: <span id="sqldatabase.subscriptions.{{@../key}}.servers.{{@key}}.server_threat_detection_disabled">{{ convert_bool_to_enabled threat_detection.threat_detection_enabled }}</span></div>
         <div class="list-group-item-text item-margin">Threat detection alerts: <span id="sqldatabase.subscriptions.{{@../key}}.servers.{{@key}}.server_threat_detection_alerts_disabled">{{ convert_bool_to_enabled threat_detection.alerts_enabled }}</span></div>
         <div class="list-group-item-text item-margin">Send threat detection alerts: <span id="sqldatabase.subscriptions.{{@../key}}.servers.{{@key}}.server_send_threat_detection_alerts_disabled">{{ convert_bool_to_enabled threat_detection.send_alerts_enabled }}</span></div>
         <div class="list-group-item-text item-margin">Threat detection retention period: <span id="sqldatabase.subscriptions.{{@../key}}.servers.{{@key}}.server_low_threat_detection_retention">{{ threat_detection.retention_days }}</span></div>
+        <div class="list-group-item-text item-margin">Tags:
+            {{#each tags}}
+            <div
+                style="border-radius: 5px; -webkit-border-radius: 5px; float: center; background-color: #c2c2d6; padding: 0.1px; text-align: center; display: inline-flex;">
+                <samp>{{value_or_none this}}</samp>
+            </div>&nbsp;&nbsp;
+            {{else}}
+            <div style="display: inline-flex;"><samp>None</samp></div>
+            {{/each}}
+        </div>
+        <div class="list-group-item-text item-margin">Resource group: <span id="sqldatabase.subscriptions.{{@../key}}.servers.{{@key}}.resource_group_name"><samp>{{value_or_none resource_group_name}}</samp></span></div>
     </div>
 
     <div class="list-group-item">
@@ -32,16 +33,6 @@ <h4 class="list-group-item-heading">SQL Databases</h4>
         {{#each databases}}
             <div class="list-group-item">
                 <div class="list-group-item-text item-margin"><b>Database name: </b>{{@key}}</div>
-                <div class="list-group-item-text item-margin">Tags: 
-                    {{#each tags}}
-                        <div
-                            style="border-radius: 5px; -webkit-border-radius: 5px; float: center; background-color: #c2c2d6; padding: 0.1px; text-align: center; display: inline-flex;">
-                            <samp>{{value_or_none this}}</samp>
-                        </div>&nbsp;&nbsp;
-                    {{else}}
-                        <div style="display: inline-flex;"><samp>None</samp></div>
-                    {{/each}}
-                </div>
                 <div class="list-group-item-text item-margin">
                     <div class="list-group-item-text item-margin">Auditing: <span id="sqldatabase.servers.{{@../key}}.databases.{{@key}}.db_auditing_disabled">{{ convert_bool_to_enabled auditing.auditing_enabled }}</span></div>
                     <div class="list-group-item-text item-margin">Auditing retention period: <span id="sqldatabase.servers.{{@../key}}.databases.{{@key}}.db_low_auditing_retention">{{ auditing.retention_days }}</span></div>
@@ -51,6 +42,17 @@ <h4 class="list-group-item-heading">SQL Databases</h4>
                     <div class="list-group-item-text item-margin">Threat detection retention period: <span id="sqldatabase.servers.{{@../key}}.databases.{{@key}}.db_low_threat_detection_retention">{{ threat_detection.retention_days }}</span></div>
                     <div class="list-group-item-text item-margin">Transparent data encryption: <span id="sqldatabase.servers.{{@../key}}.databases.{{@key}}.transparent_data_encryption_enabled">{{ convert_bool_to_enabled transparent_data_encryption_enabled }}</span></div>
                     <div class="list-group-item-text item-margin">Geo-replication configured: <span id="sqldatabase.servers.{{@../key}}.databases.{{@key}}.replication_configured"><samp>{{ replication_configured }}</samp></span></div>
+                    <div class="list-group-item-text item-margin">Tags:
+                        {{#each tags}}
+                        <div
+                            style="border-radius: 5px; -webkit-border-radius: 5px; float: center; background-color: #c2c2d6; padding: 0.1px; text-align: center; display: inline-flex;">
+                            <samp>{{value_or_none this}}</samp>
+                        </div>&nbsp;&nbsp;
+                        {{else}}
+                        <div style="display: inline-flex;"><samp>None</samp></div>
+                        {{/each}}
+                    </div>
+                    <div class="list-group-item-text item-margin">Resource group: <span id="sqldatabase.servers.{{@../key}}.databases.{{@key}}.resource_group_name"><samp>{{value_or_none resource_group_name}}</samp></span></div>
                 </div>
             </div>
         {{/each}}

diff --git a/.../data/html/partials/azure/services.storageaccounts.subscriptions.id.storage_accounts.html b/.../data/html/partials/azure/services.storageaccounts.subscriptions.id.storage_accounts.html
@@ -28,6 +28,7 @@ <h4 class="list-group-item-heading">Information</h4>
                 <div style="display: inline-flex;"><samp>None</samp></div>
             {{/each}}
         </div>
+        <div class="list-group-item-text item-margin">Resource group: <span id="storageaccounts.subscriptions.{{@../key}}.storage_accounts.{{@key}}.resource_group_name"><samp>{{value_or_none resource_group_name}}</samp></span></div>
     </div>
 
     <div class="list-group-item">