Skip to content

Commit

Permalink
Merge branch 'feature/511-ARN-standard-key' of https://github.com/ncc…
Browse files Browse the repository at this point in the history 
…group/ScoutSuite into feature/511-ARN-standard-key
  • Loading branch information
Viatcheslav Zhilin committed Jun 12, 2020
2 parents 32aa6ae + f7e8c6d commit 29ba27e
Show file tree
Hide file tree
Showing 11 changed files with 29 additions and 29 deletions.
4 changes: 2 additions & 2 deletions ScoutSuite/output/data/html/partials/aws/services.cloudformation.regions.id.stacks.html
View file
Expand Up @@ -9,7 +9,7 @@ <h4 class="list-group-item-heading">Description</h4>
</div>
<div class="list-group-item">
<h4 class="list-group-item-heading">Information</h4>
<div class="list-group-item-text item-margin">ARN: <span id="cloudformation.regions.{{region}}.stacks.{{@key}}.arn">{{arn}}</span></div>
<div class="list-group-item-text item-margin">ARN: <span id="cloudformation.regions.{{region}}.stacks.{{@key}}.arn"><samp>{{arn}}</samp></span></div>
<div class="list-group-item-text item-margin">Region: {{region}}</div>
<div class="list-group-item-text item-margin">Created on: {{CreationTime}}</div>
<div class="list-group-item-text item-margin" id="">Role:
Expand Down Expand Up @@ -52,4 +52,4 @@ <h4 class="list-group-item-heading">Capabilities {{> count_badge count=Capabilit

<script>
var single_cloudformation_stack_template = Handlebars.compile($("#single_cloudformation_stack-template").html());
</script>
</script>
6 changes: 3 additions & 3 deletions ScoutSuite/output/data/html/partials/aws/services.ec2.regions.id.vpcs.id.images.html
View file
Expand Up @@ -7,8 +7,8 @@ <h4 class="list-group-item-heading">{{name}}</h4>
<div class="list-group-item">
<h4 class="list-group-item-heading">Information</h4>
<ul>
<li class="list-group-item-text">ARN: {{arn}}</li>
<li class="list-group-item-text">ID: {{id}}</li>
<li class="list-group-item-text">ARN: <samp>{{arn}}</samp></li>
<li class="list-group-item-text">ID: <samp>{{id}}</samp></li>
<li class="list-group-item-text">Architecture: {{getValueAt 'services.ec2.regions' region 'images' id 'Architecture'}}</li>
<li class="list-group-item-text">Public: <span id="ec2.regions.{{region}}.images.{{id}}.image_is_public">{{getValueAt 'services.ec2.regions' region 'images' id 'Public'}}</span></li>
</ul>
Expand All @@ -25,4 +25,4 @@ <h4 class="list-group-item-heading">Information</h4>
</script>
<script>
var single_ec2__template = Handlebars.compile($("#single_ec2_image-template").html());
</script>
</script>
8 changes: 4 additions & 4 deletions ...tSuite/output/data/html/partials/aws/services.ec2.regions.id.vpcs.id.security_groups.html
View file
Expand Up @@ -6,9 +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">ID: {{id}}</div>
<div class="list-group-item-text">ARN: {{arn}}</div>
<div class="list-group-item-text">Region: {{region}}</div>
<div class="list-group-item-text">ID: <samp>{{id}}</samp></div>
<div class="list-group-item-text">ARN: <samp>{{arn}}</samp></div>
<div class="list-group-item-text">Region: <samp>{{region}}</samp></div>
<div class="list-group-item-text">VPC: {{getValueAt 'services.vpc.regions' region 'vpcs' vpc 'name'}} ({{vpc}})</div>
<div class="list-group-item-text">Description: <samp>{{description}}</samp></div>
</div>
Expand Down Expand Up @@ -46,4 +46,4 @@ <h4 class="list-group-item-heading">Usage</h4>

<script>
var single_ec2_security_group_template = Handlebars.compile($("#single_ec2_security_group-template").html());
</script>
</script>
2 changes: 1 addition & 1 deletion ScoutSuite/output/data/html/partials/aws/services.elb.regions.id.vpcs.id.elbs.html
View file
Expand Up @@ -7,7 +7,7 @@ <h4 class="list-group-item-heading">{{name}}</h4>
<div class="list-group-item">
<h4>Information</h4>
<ul>
<li class="list-group-item-text">ARN: {{arn}}</li>
<li class="list-group-item-text">ARN: <samp>{{arn}}</samp></li>
<li class="list-group-item-text">VPC: {{getValueAt 'services.elb.regions' region 'vpcs' vpc 'name'}} ({{vpc}})</li>
<li class="list-group-item-text">DNS: {{DNSName}}</li>
<li class="list-group-item-text">Scheme: {{Scheme}}</li>
Expand Down
2 changes: 1 addition & 1 deletion ScoutSuite/output/data/html/partials/aws/services.elbv2.regions.id.vpcs.id.elbs.html
View file
Expand Up @@ -7,7 +7,7 @@ <h4 class="list-group-item-heading">{{name}}</h4>
<div class="list-group-item">
<h4>Information</h4>
<ul>
<li class="list-group-item-text">ARN: {{arn}}</li>
<li class="list-group-item-text">ARN: <samp>{{arn}}</samp></li>
<li class="list-group-item-text">VPC: {{getValueAt 'services.elbv2.regions' region 'vpcs' vpc 'name'}} ({{vpc}})</li>
<li class="list-group-item-text">DNS: {{DNSName}}</li>
<li class="list-group-item-text"><span id="elbv2.regions.{{region}}.vpcs.{{vpc}}.lbs.{{@key}}.load_balancer_scheme">Scheme: {{Scheme}}</span></li>
Expand Down
16 changes: 8 additions & 8 deletions ScoutSuite/output/data/html/partials/aws/services.rds.regions.id.vpcs.id.instances.html
View file
Expand Up @@ -7,22 +7,22 @@ <h4 class="list-group-item-heading">{{name}}</h4>
<div class="list-group-item">
<h4>Information</h4>
<ul>
<li class="list-group-item-text">ARN: {{arn}}</li>
<li class="list-group-item-text">Region: {{region}}</li>
<li class="list-group-item-text">Engine: {{Engine}}</li>
<li class="list-group-item-text">Status: {{makeTitle DBInstanceStatus}}</li>
<li class="list-group-item-text">Is read replica: {{is_read_replica}}</li>
<li class="list-group-item-text">ARN: <samp>{{arn}}</samp></li>
<li class="list-group-item-text">Region: <samp>{{region}}</samp></li>
<li class="list-group-item-text">Engine: <samp>{{Engine}}</samp></li>
<li class="list-group-item-text">Created: {{format_date InstanceCreateTime}}</li>
<li class="list-group-item-text">Status: <samp>{{makeTitle DBInstanceStatus}}</samp></li>
<li class="list-group-item-text">Is read replica: <samp>{{is_read_replica}}</samp></li>
<li class="list-group-item-text">Auto Minor Version Upgrade: <span id="rds.regions.{{region}}.vpcs.{{vpc}}.instances.{{@key}}.AutoMinorVersionUpgrade">{{#if AutoMinorVersionUpgrade}} Enabled {{else}} Disabled {{/if}}</span></li>
<li class="list-group-item-text">Multi Availability Zones: <span id="rds.regions.{{region}}.vpcs.{{vpc}}.instances.{{@key}}.MultiAZ">{{#if MultiAZ}} Enabled {{else}} Disabled {{/if}}</span></li>
<li class="list-group-item-text">Instance Class: <span id="rds.regions.{{region}}.vpcs.{{vpc}}.instances.{{@key}}.DBInstanceClass">{{DBInstanceClass}}</span></li>
<li class="list-group-item-text">Created on: {{InstanceCreateTime}}</li>
<li class="list-group-item-text">Instance Class: <span id="rds.regions.{{region}}.vpcs.{{vpc}}.instances.{{@key}}.DBInstanceClass"><samp>{{DBInstanceClass}}</samp></span></li>
<li class="list-group-item-text">Backup retention period in days: <span id="rds.regions.{{region}}.vpcs.{{vpc}}.instances.{{@key}}.BackupRetentionPeriod">{{BackupRetentionPeriod}}</span>
<li class="list-group-item-text">Publicly accessible: <span id="rds.regions.{{region}}.vpcs.{{vpc}}.instances.{{@key}}.instance_publicly_accessible">{{PubliclyAccessible}}</span>
<li class="list-group-item-text">Enhanced Monitoring:
<span id="rds.regions.{{region}}.vpcs.{{vpc}}.instances.{{@key}}.EnhancedMonitoringResourceArn">{{#if EnhancedMonitoringResourceArn}} Enabled {{else}} Disabled {{/if}}</span>
</li>
<li class="list-group-item-text">Encrypted Storage: <span id="rds.regions.{{region}}.vpcs.{{vpc}}.instances.{{@key}}.StorageEncrypted">{{StorageEncrypted}}</span></li>
<li class="list-group-item-text">CA Certificate: <span id="rds.regions.{{region}}.vpcs.{{vpc}}.instances.{{@key}}.CACertificateIdentifier">{{CACertificateIdentifier}}</span></li>
<li class="list-group-item-text">CA Certificate: <span id="rds.regions.{{region}}.vpcs.{{vpc}}.instances.{{@key}}.CACertificateIdentifier"><samp>{{CACertificateIdentifier}}</samp></span></li>
</ul>
</div>
<div class="list-group-item">
Expand Down
2 changes: 1 addition & 1 deletion ScoutSuite/output/data/html/partials/aws/services.redshift.regions.id.parameter_groups.html
View file
Expand Up @@ -6,7 +6,7 @@ <h4 class="list-group-item-heading">{{name}}</h4>
</div>
<div class="list-group-item">
<h4 class="list-group-item-heading">Information</h4>
<div class="list-group-item-text item-margin">ARN: {{arn}}</div>
<div class="list-group-item-text item-margin">ARN: <samp>{{arn}}</samp></div>
<div class="list-group-item-text item-margin">Description: <samp>{{description}}</samp></div>
<div class="list-group-item-text item-margin">Group Family: <samp>{{family}}</samp></div>
<div class="list-group-item-text item-margin">Default Parameter Group: <samp>{{is_default}}</samp></div>
Expand Down
2 changes: 1 addition & 1 deletion ScoutSuite/output/data/html/partials/aws/services.redshift.regions.id.vpcs.id.clusters.html
View file
Expand Up @@ -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>
<ul>
<li class="list-group-item-text">ARN: {{arn}}</li>
<li class="list-group-item-text">ARN: <samp>{{arn}}</samp></li>
<li class="list-group-item-text">Node Type: {{NodeType}}</li>
<li class="list-group-item-text">Allow Version Upgrade: <span id="redshift.regions.{{region}}.vpcs.{{vpc}}.clusters.{{name}}.AllowVersionUpgrade">{{AllowVersionUpgrade}}</span><li>
<li class="list-group-item-text">Automated Snapshot Retention Period: {{AutomatedSnapshotRetentionPeriod}}</li>
Expand Down
2 changes: 1 addition & 1 deletion ScoutSuite/output/data/html/partials/aws/services.s3.buckets.html
View file
Expand Up @@ -6,7 +6,7 @@ <h4 class="list-group-item-heading">{{name}}</h4>
</div>
<div class="list-group-item">
<h4 class="list-group-item-heading">Information</h4>
<div class="list-group-item-text item-margin">ARN: {{arn}}</div>
<div class="list-group-item-text item-margin">ARN: <samp>{{arn}}</samp></div>
<div class="list-group-item-text item-margin">Region: {{region}}</div>
<div class="list-group-item-text item-margin">Creation date: {{CreationDate}}</div>
<div class="list-group-item-text item-margin">Logging: <span id="s3.buckets.{{@key}}.logging">{{has_logging? logging}}</span></div>
Expand Down
2 changes: 1 addition & 1 deletion ScoutSuite/output/data/html/partials/aws/services.ses.regions.id.identities.html
View file
Expand Up @@ -6,7 +6,7 @@ <h4 class="list-group-item-heading">{{name}}</h4>
</div>
<div class="list-group-item">
<h4 class="list-group-item-heading">Information</h4>
<div class="list-group-item-text item-margin">ARN: {{arn}}</div>
<div class="list-group-item-text item-margin">ARN: <samp>{{arn}}</samp></div>
</div>
<div class="list-group-item">
<h4 class="list-group-item-heading">DKIM Configuration</h4>
Expand Down
12 changes: 6 additions & 6 deletions ScoutSuite/output/data/html/partials/aws/services.vpc.regions.id.vpcs.html
View file
Expand Up @@ -6,12 +6,12 @@ <h4 class="list-group-item-heading">{{name}}</h4>
</div>
<div class="list-group-item">
<h4 class="list-group-item-heading">Information</h4>
<div class="list-group-item-text">ID: {{@key}}</div>
<div class="list-group-item-text">ARN: {{arn}}</div>
<div class="list-group-item-text">Region: {{region}}</div>
<div class="list-group-item-text">State: {{state}}</div>
<div class="list-group-item-text">CIDR Block: {{cidr_block}}</div>
<div class="list-group-item-text">Default: {{default}}</div>
<div class="list-group-item-text">ID: <samp>{{@key}}</samp></div>
<div class="list-group-item-text">ARN: <samp>{{arn}}</samp></div>
<div class="list-group-item-text">Region: <samp>{{region}}</samp></div>
<div class="list-group-item-text">State: <samp>{{state}}</samp></div>
<div class="list-group-item-text">CIDR Block: <samp>{{cidr_block}}</samp></div>
<div class="list-group-item-text">Default: <samp>{{default}}</samp></div>
</div>
<div class="list-group-item" style="padding-bottom: 0 !important;">
<div class="accordion">
Expand Down

0 comments on commit 29ba27e

Please sign in to comment.