Improve partials

nccgroup · Apr 27, 2020 · 5c9b491 · 5c9b491
1 parent 7957b83
commit 5c9b491
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 21 deletions.
diff --git a/ScoutSuite/output/data/html/partials/gcp/services.cloudsql.projects.id.instances.html b/ScoutSuite/output/data/html/partials/gcp/services.cloudsql.projects.id.instances.html
@@ -7,7 +7,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">Project ID: <span id="cloudsql.projects.{{@../key}}.instances.{{@key}}.project_id"><samp>{{project_id}}</samp></span></div>
-        <div class="list-group-item-text item-margin">Instance Name: <span id="cloudsql.projects.{{@../key}}.instances.{{@key}}.name"><samp>{{name}}</samp></span></div>
         <div class="list-group-item-text item-margin">Automatic Backups: <span id="cloudsql.projects.{{@../key}}.instances.{{@key}}.automatic_backup_enabled">{{convert_bool_to_enabled automatic_backup_enabled}}</span></div>
         <div class="list-group-item-text item-margin">Last Backup: <span id="cloudsql.projects.{{@../key}}.instances.{{@key}}.last_backup_timestamp">{{format_date last_backup_timestamp}}</span></div>
         <div class="list-group-item-text item-margin">Logs: <span id="cloudsql.projects.{{@../key}}.instances.{{@key}}.log_enabled">{{convert_bool_to_enabled log_enabled}}</span></div>

diff --git a/ScoutSuite/output/data/html/partials/gcp/services.computeengine.projects.id.firewalls.html b/ScoutSuite/output/data/html/partials/gcp/services.computeengine.projects.id.firewalls.html
@@ -7,12 +7,12 @@ <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">Firewall name: <span id="computeengine.projects.{{@../key}}.firewalls.{{@key}}.name">{{name}}</span></div>
-        <div class="list-group-item-text item-margin">Description: <span id="computeengine.projects.{{@../key}}.firewalls.{{@key}}.description">{{description}}</span></div>
-        <div class="list-group-item-text item-margin">VPC network: <span id="computeengine.projects.{{@../key}}.firewalls.{{@key}}.network">{{network}}</span></div>
-        <div class="list-group-item-text item-margin">Project ID: <span id="computeengine.projects.{{@../key}}.firewalls.{{@key}}.project_id">{{project_id}}</span></div>
-        <div class="list-group-item-text item-margin">Creation Date: <span id="computeengine.projects.{{@../key}}.firewalls.{{@key}}.creation_timestamp">{{creation_timestamp}}</span></div>
-        <div class="list-group-item-text item-margin">Priority: <span id="computeengine.projects.{{@../key}}.firewalls.{{@key}}.priority">{{priority}}</span></div>
-        <div class="list-group-item-text item-margin">Disabled: <span id="computeengine.projects.{{@../key}}.firewalls.{{@key}}.disabled">{{disabled}}</span></div>
+        <div class="list-group-item-text item-margin">Project ID: <span id="computeengine.projects.{{@../key}}.instances.{{@key}}.project_id"><samp>{{project_id}}</samp></span></div>
+        <div class="list-group-item-text item-margin">Description: <span id="computeengine.projects.{{@../key}}.firewalls.{{@key}}.description"><samp>{{description}}</samp></span></div>
+        <div class="list-group-item-text item-margin">VPC network: <span id="computeengine.projects.{{@../key}}.firewalls.{{@key}}.network"><samp>{{network}}</samp></span></div>
+        <div class="list-group-item-text item-margin">Creation Date: <span id="computeengine.projects.{{@../key}}.firewalls.{{@key}}.creation_timestamp">{{format_date creation_timestamp}}</span></div>
+        <div class="list-group-item-text item-margin">Priority: <span id="computeengine.projects.{{@../key}}.firewalls.{{@key}}.priority"><samp>{{priority}}</samp></span></div>
+        <div class="list-group-item-text item-margin">Status: <span id="computeengine.projects.{{@../key}}.firewalls.{{@key}}.disabled">{{convert_bool_to_enabled disabled}}</span></div>
     </div>
     <div class="list-group-item">
         <h4 class="list-group-item-heading">Configuration</h4>

diff --git a/ScoutSuite/output/data/html/partials/gcp/services.computeengine.projects.id.networks.html b/ScoutSuite/output/data/html/partials/gcp/services.computeengine.projects.id.networks.html
@@ -7,10 +7,10 @@ <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="computeengine.projects.{{@../key}}.networks.{{@key}}.id">{{id}}</span></div>
-        <div class="list-group-item-text item-margin">Project ID: <span id="computeengine.projects.{{@../key}}.networks.{{@key}}.project_id">{{project_id}}</span></div>
         <div class="list-group-item-text item-margin">Name: <span id="computeengine.projects.{{@../key}}.networks.{{@key}}.name">{{name}}</span></div>
-        <div class="list-group-item-text item-margin">Description: <span id="computeengine.projects.{{@../key}}.networks.{{@key}}.description">{{description}}</span></div>
-        <div class="list-group-item-text item-margin">Creation Date: <span id="computeengine.projects.{{@../key}}.networks.{{@key}}.creation_timestamp">{{creation_timestamp}}</span></div>
+        <div class="list-group-item-text item-margin">Project ID: <span id="computeengine.projects.{{@../key}}.networks.{{@key}}.project_id">{{project_id}}</span></div>
+        <div class="list-group-item-text item-margin">Description: <span id="computeengine.projects.{{@../key}}.networks.{{@key}}.description"><samp>{{description}}</samp></span></div>
+        <div class="list-group-item-text item-margin">Creation Date: <span id="computeengine.projects.{{@../key}}.networks.{{@key}}.creation_timestamp">{{format_date creation_timestamp}}</span></div>
     </div>
 </script>
 

diff --git a/...put/data/html/partials/gcp/services.computeengine.projects.id.regions.id.subnetworks.html b/...put/data/html/partials/gcp/services.computeengine.projects.id.regions.id.subnetworks.html
@@ -7,14 +7,14 @@ <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="computeengine.projects.{{@../../key}}.regions.{{@../key}}.subnetworks.{{@key}}.id">{{id}}</span></div>
-        <div class="list-group-item-text item-margin">Project ID: <span id="computeengine.projects.{{@../../key}}.regions.{{@../key}}.subnetworks.{{@key}}.project_id">{{project_id}}</span></div>
         <div class="list-group-item-text item-margin">Name: <span id="computeengine.projects.{{@../../key}}.regions.{{@../key}}.subnetworks.{{@key}}.name">{{name}}</span></div>
-        <div class="list-group-item-text item-margin">Subnetwork: <span id="computeengine.projects.{{@../../key}}.regions.{{@../key}}.subnetworks.{{@key}}.subnetwork">{{subnetwork}}</span></div>
-        <div class="list-group-item-text item-margin">Region: <span id="computeengine.projects.{{@../../key}}.regions.{{@../key}}.subnetworks.{{@key}}.region">{{region}}</span></div>
-        <div class="list-group-item-text item-margin">Gateway Address: <span id="computeengine.projects.{{@../../key}}.regions.{{@../key}}.subnetworks.{{@key}}.gateway_address">{{gateway_address}}</span></div>
-        <div class="list-group-item-text item-margin">IP Range: <span id="computeengine.projects.{{@../../key}}.regions.{{@../key}}.subnetworks.{{@key}}.ip_range">{{ip_range}}</span></div>
+        <div class="list-group-item-text item-margin">Project ID: <span id="computeengine.projects.{{@../../key}}.regions.{{@../key}}.subnetworks.{{@key}}.project_id">{{project_id}}</span></div>
+        <div class="list-group-item-text item-margin">Subnetwork: <span id="computeengine.projects.{{@../../key}}.regions.{{@../key}}.subnetworks.{{@key}}.subnetwork"><samp>{{subnetwork}}</samp></span></div>
+        <div class="list-group-item-text item-margin">Region: <span id="computeengine.projects.{{@../../key}}.regions.{{@../key}}.subnetworks.{{@key}}.region"><samp>{{region}}</samp></span></div>
+        <div class="list-group-item-text item-margin">Gateway Address: <span id="computeengine.projects.{{@../../key}}.regions.{{@../key}}.subnetworks.{{@key}}.gateway_address"><samp>{{gateway_address}}</samp></span></div>
+        <div class="list-group-item-text item-margin">IP Range: <span id="computeengine.projects.{{@../../key}}.regions.{{@../key}}.subnetworks.{{@key}}.ip_range"><samp>{{ip_range}}</samp></span></div>
         <div class="list-group-item-text item-margin">Private Google Access: <span id="computeengine.projects.{{@../../key}}.regions.{{@../key}}.subnetworks.{{@key}}.private_ip_google_access_disabled">{{convert_bool_to_enabled private_ip_google_access}}</span></div>
-        <div class="list-group-item-text item-margin">Creation Date: <span id="computeengine.projects.{{@../../key}}.regions.{{@../key}}.subnetworks.{{@key}}.creation_timestamp">{{creation_timestamp}}</span></div>
+        <div class="list-group-item-text item-margin">Creation Date: <span id="computeengine.projects.{{@../../key}}.regions.{{@../key}}.subnetworks.{{@key}}.creation_timestamp">{{format_date creation_timestamp}}</span></div>
     </div>
 </script>
 

diff --git a/ScoutSuite/output/data/html/partials/gcp/services.computeengine.projects.id.snapshots.html b/ScoutSuite/output/data/html/partials/gcp/services.computeengine.projects.id.snapshots.html
@@ -7,8 +7,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">Name: <span id="computeengine.projects.{{@../key}}.snapshots.{{@key}}.name">{{name}}</span></div>
-        <div class="list-group-item-text item-margin">Description: <span id="computeengine.projects.{{@../key}}.snapshots.{{@key}}.description">{{description}}</span></div>
-        <div class="list-group-item-text item-margin">Creation Date: <span id="computeengine.projects.{{@../key}}.snapshots.{{@key}}.creation_timestamp">{{creation_timestamp}}</span></div>
+        <div class="list-group-item-text item-margin">Project ID: <span id="computeengine.projects.{{project}}.groups.{{@key}}.project_id"><samp>{{project}}</samp></span></div>
+        <div class="list-group-item-text item-margin">Description: <span id="computeengine.projects.{{@../key}}.snapshots.{{@key}}.description"><samp>{{description}}</samp></span></div>
+        <div class="list-group-item-text item-margin">Creation Date: <span id="computeengine.projects.{{@../key}}.snapshots.{{@key}}.creation_timestamp">{{format_date creation_timestamp}}</span></div>
         <div class="list-group-item-text item-margin">Status: <span id="computeengine.projects.{{@../key}}.snapshots.{{@key}}.status">{{status}}</span></div>
     </div>
 </script>

diff --git a/.../output/data/html/partials/gcp/services.computeengine.projects.id.zones.id.instances.html b/.../output/data/html/partials/gcp/services.computeengine.projects.id.zones.id.instances.html
@@ -7,9 +7,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">Instance Name: <span id="computeengine.projects.{{@../../key}}.zones.{{@../key}}.instances.{{@key}}.name">{{name}}</span></div>
-        <div class="list-group-item-text item-margin">Description: <span id="computeengine.projects.{{@../../key}}.zones.{{@../key}}.instances.{{@key}}.description">{{description}}</span></div>
         <div class="list-group-item-text item-margin">Project ID: <span id="computeengine.projects.{{@../../key}}.zones.{{@../key}}.instances.{{@key}}.project_id">{{project_id}}</span></div>
-        <div class="list-group-item-text item-margin">Creation Date: <span id="computeengine.projects.{{@../../key}}.zones.{{@../key}}.instances.{{@key}}.creation_timestamp">{{creation_timestamp}}</span></div>
+        <div class="list-group-item-text item-margin">Description: <span id="computeengine.projects.{{@../../key}}.zones.{{@../key}}.instances.{{@key}}.description"><samp>{{description}}</samp></span></div>
+        <div class="list-group-item-text item-margin">Creation Date: <span id="computeengine.projects.{{@../../key}}.zones.{{@../key}}.instances.{{@key}}.creation_timestamp">{{format_date creation_timestamp}}</span></div>
         <div class="list-group-item-text item-margin">Status: <span id="computeengine.projects.{{@../../key}}.zones.{{@../key}}.instances.{{@key}}.status">{{status}}</span></div>
         <div class="list-group-item-text item-margin">Deletion Protection: <span id="computeengine.projects.{{@../../key}}.zones.{{@../key}}.instances.{{@key}}.deletion_protection_enabled">{{convert_bool_to_enabled deletion_protection_enabled}}</span></div>
         <div class="list-group-item-text item-margin">Block Project SSH Keys: <span id="computeengine.projects.{{@../../key}}.zones.{{@../key}}.instances.{{@key}}.block_project_ssh_keys_disabled">{{convert_bool_to_enabled block_project_ssh_keys_enabled}}</span></div>

diff --git a/ScoutSuite/output/data/html/partials/gcp/services.iam.projects.id.bindings.html b/ScoutSuite/output/data/html/partials/gcp/services.iam.projects.id.bindings.html
@@ -7,6 +7,7 @@ <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">Role Name: <span id="iam.projects.{{@../key}}.bindings.{{@key}}.name"><samp>{{name}}</samp></span></div>
+        <div class="list-group-item-text item-margin">Project ID: <span id="iam.projects.{{project}}.users.{{@key}}.project_id"><samp>{{project}}</samp></span></div>
     </div>
     <div class="list-group-item">
         <h4 class="list-group-item-heading">Bindings</h4>
@@ -25,6 +26,7 @@ <h5  id="iam.projects.{{@../key}}.bindings.{{@key}}.groups" class="list-group-it
             <ul>
                 {{#each members.groups}}
                 <li><samp>{{this}}</samp></li>
+                <li><a href="javascript:showObject('services.iam.groups.{{this.id}}')">{{this}}</a></li>
                 {{else}}
                 <li><samp>None</samp></li>
                 {{/each}}

diff --git a/ScoutSuite/output/data/html/partials/gcp/services.iam.projects.id.groups.html b/ScoutSuite/output/data/html/partials/gcp/services.iam.projects.id.groups.html
@@ -7,6 +7,7 @@ <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">Group: <span id="iam.projects.{{@../key}}.groups.{{@key}}.name">{{name}}</span></div>
+        <div class="list-group-item-text item-margin">Project ID: <span id="iam.projects.{{project}}.groups.{{@key}}.project_id"><samp>{{project}}</samp></span></div>
     </div>
     <div class="list-group-item">
         <h4 class="list-group-item-heading">Bindings:</h4>

diff --git a/ScoutSuite/output/data/html/partials/gcp/services.iam.projects.id.service_accounts.html b/ScoutSuite/output/data/html/partials/gcp/services.iam.projects.id.service_accounts.html
@@ -7,7 +7,7 @@ <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="iam.projects.{{@../key}}.service_accounts.{{@key}}.id"><samp>{{id}}</samp></span></div>
-        <div class="list-group-item-text item-margin">Project: <span id="iam.projects.{{@../key}}.service_accounts.{{@key}}.project_id"><samp>{{project_id}}</samp></span></div>
+        <div class="list-group-item-text item-margin">Project ID: <span id="iam.projects.{{@../key}}.service_accounts.{{@key}}.project_id"><samp>{{project_id}}</samp></span></div>
         <div class="list-group-item-text item-margin">Email: <span id="iam.projects.{{@../key}}.service_accounts.{{@key}}.email"><samp>{{email}}</samp></span></div>
         <div class="list-group-item-text item-margin">Display Name: <span id="iam.projects.{{@../key}}.service_accounts.{{@key}}.display_name"><samp>{{display_name}}</samp></span></div>
         <div class="list-group-item-text item-margin">Default Service Account: <span id="iam.projects.{{@../key}}.service_accounts.{{@key}}.default_service_account"><samp>{{default_service_account}}</samp></span></div>

diff --git a/ScoutSuite/output/data/html/partials/gcp/services.iam.projects.id.users.html b/ScoutSuite/output/data/html/partials/gcp/services.iam.projects.id.users.html
@@ -7,6 +7,7 @@ <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">User: <span id="iam.projects.{{@../key}}.users.{{@key}}.name">{{name}}</span></div>
+        <div class="list-group-item-text item-margin">Project ID: <span id="iam.projects.{{project}}.users.{{@key}}.project_id"><samp>{{project}}</samp></span></div>
     </div>
     <div class="list-group-item">
         <h4 class="list-group-item-heading">Bindings:</h4>

diff --git a/ScoutSuite/output/data/html/partials/gcp/services.kms.projects.id.keyrings.html b/ScoutSuite/output/data/html/partials/gcp/services.kms.projects.id.keyrings.html
@@ -7,6 +7,7 @@ <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="kms.projects.{{@../key}}.keyrings.{{@key}}.name">{{name}}</span></div>
+        <div class="list-group-item-text item-margin">Project ID: <span id="kms.projects.{{project}}.keyrings.{{@key}}.project_id"><samp>{{project}}</samp></span></div>
         <div class="list-group-item-text item-margin">Location: <span id="kms.projects.{{@../key}}.keyrings.{{@key}}.location"><samp>{{location}}</samp></span></div>
     </div>
     <div class="list-group-item">

diff --git a/ScoutSuite/output/data/html/partials/gcp/services.stackdriverlogging.projects.id.sinks.html b/ScoutSuite/output/data/html/partials/gcp/services.stackdriverlogging.projects.id.sinks.html
@@ -7,6 +7,7 @@ <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">Sink Name: <span id="stackdriverlogging.projects.{{@../key}}.sinks.{{@key}}.name">{{name}}</span></div>
+        <div class="list-group-item-text item-margin">Project ID: <span id="stackdriverlogging.projects.{{project}}.keyrings.{{@key}}.project_id"><samp>{{project}}</samp></span></div>
         <div class="list-group-item-text item-margin">Filter: <span id="stackdriverlogging.projects.{{@../key}}.sinks.{{@key}}.filter"><code>{{filter}}</code></span></div>
         <div class="list-group-item-text item-margin">Destination: <span id="stackdriverlogging.projects.{{@../key}}.sinks.{{@key}}.destination"><samp>{{destination}}</samp></span></div>
     </div>