Skip to content

Feature/aws container services #1719

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
philipwubbleyou wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Feature/aws container services #1719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ce23ecd
Added new feature to cover AWS Container Services
kedarbhalerao1704 Nov 26, 2023
c8cd670
Fix critical bugs in ECS/ECR/EKS implementation
philipwubbleyou Nov 14, 2025
2cf2f2a
Fix ECS service and task ARN parsing bugs
philipwubbleyou Nov 14, 2025
44edcbf
Fix KeyError for optional ECS fields
philipwubbleyou Nov 14, 2025
8714030
Fix RDS snapshot error handling bugs
philipwubbleyou Nov 14, 2025
eadedbd
Changes scanning
philipwubbleyou Feb 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions ScoutSuite/output/data/html/partials/aws/services.ecr.regions.id.images.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<!-- ECR Image partial -->
<script id="services.ecr.regions.id.images.partial" type="text/x-handlebars-template">
<div id="resource-name" class="list-group-item active">
<h4 class="list-group-item-heading">{{name}}</h4>
</div>
<div class="list-group-item">
<h4>Information</h4>
<ul>
<li class="list-group-item-text">Image Digest: {{imageDigest}}</li>
<li class="list-group-item-text">Registry ID: {{registryId}}</li>
<li class="list-group-item-text">Image Scan Enabled: {{imageScanEnabled}}</li>
<li class="list-group-item-text">Scan Status Message: {{ScanStatusMessage}}</li>
<li class="list-group-item-text">High Severity Counts: {{HighSeverityCounts}}</li>
<li class="list-group-item-text">Medium Severity Counts: {{MediumSeverityCounts}}</li>
<li class="list-group-item-text">Informational Severity Counts: {{InformationalSeverityCounts}}</li>
<li class="list-group-item-text">Low Severity Counts: {{LowSeverityCounts}}</li>
<li class="list-group-item-text">Image Scan Findings Summary Completed: {{imageScanFindingsSummaryCompleted}}</li>
</ul>
</div>
</script>
<script>
Handlebars.registerPartial("services.ecr.regions.id.images", $("#services\\.ecr\\.regions\\.id\\.images\\.partial").html());
</script>
<!-- Single ECR Image template -->
<script id="single_ecr_image-template" type="text/x-handlebars-template">
{{> modal-template template='services.ecr.regions.id.images'}}
</script>
<script>
var single_ecr_image_template = Handlebars.compile($("#single_ecr_image-template").html());
</script>
28 changes: 28 additions & 0 deletions ScoutSuite/output/data/html/partials/aws/services.ecr.regions.id.repositories.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<!-- ECR Repositories partial -->
<script id="services.ecr.regions.id.repositories.partial" type="text/x-handlebars-template">
<div id="resource-name" class="list-group-item active">
<h4 class="list-group-item-heading">{{name}}</h4>
</div>
<div class="list-group-item">
<h4>Information</h4>
<ul>
<li class="list-group-item-text">Registry ID: {{id}}</li>
<li class="list-group-item-text">Created At: {{created_at}}</li>
<li class="list-group-item-text">Image Tag Immutablity status: {{imageTagMutability}}</li>
<li class="list-group-item-text">Scan on Push: {{Scan_on_Push}}</li>
<li class="list-group-item-text">Encryption Type: {{encryptionType}}</li>
<li class="list-group-item-text">Region: {{region}}</li>

</ul>
</div>
</script>
<script>
Handlebars.registerPartial("services.ecr.regions.id.repositories", $("#services\\.ecr\\.regions\\.id\\.repositories\\.partial").html());
</script>
<!-- Single ECR repository instance template -->
<script id="single_ecr_repository-template" type="text/x-handlebars-template">
{{> modal-template template='services.ecr.regions.id.repositories' }}
</script>
<script>
var single_ecr_repository_template = Handlebars.compile($("#single_ecr_repository-template").html());
</script>
61 changes: 61 additions & 0 deletions ScoutSuite/output/data/html/partials/aws/services.ecs.regions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<script id="services.ecs.regions.partial" type="text/x-handlebars-template">
<div class="list-group-item active">
<h4 class="list-group-item-heading">{{name}}</h4>
</div>
<div class="list-group-item">
<h4>Information</h4>
<ul>
<li class="list-group-item-text">ECS Clusters count: {{clusters_count}}</li>
<li class="list-group-item-text">ECS Services count: {{services_count}}</li>
<li class="list-group-item-text">ECS Tasks count: {{tasks_count}}</li>

</ul>
</div>
<div class="list-group-item">
<div class="accordion">
<h4 class="list-group-item-heading accordion-heading">Clusters
{{> count_badge target=(concat '#services.ecs.regions' name 'clusters') count=clusters_count}}
</h4>
<div id="services.ecs.regions.{{name}}.clusters" class="accordion-body">
<div class="accordion-inner">
<ul class="no-bullet">
{{#each this.clusters}}
<li><a href="javascript:showObject('services.ecs.regions.{{../name}}.clusters.{{@key}}')">{{name}}</a></li>
{{/each}}
</ul>
</div>
</div>
</div>
<div class="accordion">
<h4 class="list-group-item-heading accordion-heading">Services
{{> count_badge target=(concat '#services.ecs.regions' name 'services') count=services_count}}
</h4>
<div id="services.ecs.regions.{{name}}.services" class="accordion-body">
<div class="accordion-inner">
<ul class="no-bullet">
{{#each this.services}}
<li><a href="javascript:showObject('services.ecs.regions.{{../name}}.services.{{@key}}')">{{name}}</a></li>
{{/each}}
</ul>
</div>
</div>
</div>
<div class="accordion">
<h4 class="list-group-item-heading accordion-heading">Tasks
{{> count_badge target=(concat '#services.ecs.regions' name 'tasks') count=tasks_count}}
</h4>
<div id="services.ecs.regions.{{arn}}.tasks" class="accordion-body">
<div class="accordion-inner">
<ul class="no-bullet">
{{#each this.tasks}}
<li><a href="javascript:showObject('services.ecs.regions.{{../name}}.tasks.{{@key}}')">{{arn}}</a></li>
{{/each}}
</ul>
</div>
</div>
</div>
</div>
</script>
<script>
Handlebars.registerPartial("services.ecs.regions", $("#services\\.ecs\\.regions\\.partial").html());
</script>
27 changes: 27 additions & 0 deletions ScoutSuite/output/data/html/partials/aws/services.ecs.regions.id.clusters.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<!-- ECS Cluster partial -->
<script id="services.ecs.regions.id.clusters.partial" type="text/x-handlebars-template">
<div id="resource-name" class="list-group-item active">
<h4 class="list-group-item-heading">{{name}}</h4>
</div>
<div class="list-group-item">
<h4>Information</h4>
<ul>
<li class="list-group-item-text">Status: {{status}}</li>
<li class="list-group-item-text">Registered Container Instances Count: {{registered_container_instances_count}}</li>
<li class="list-group-item-text">Running Tasks Count: {{running_tasks_count}}</li>
<li class="list-group-item-text">Pending Tasks Count: {{pending_tasks_count}}</li>
<li class="list-group-item-text">Active Services Count: {{active_services_count}}</li>
<li class="list-group-item-text">Container Insights: {{containerInsights}}</li>
</ul>
</div>
</script>
<script>
Handlebars.registerPartial("services.ecs.regions.id.clusters", $("#services\\.ecs\\.regions\\.id\\.clusters\\.partial").html());
</script>
<!-- Single ECS cluster instance template -->
<script id="single_ecs_cluster-template" type="text/x-handlebars-template">
{{> modal-template template='services.ecs.regions.id.clusters' }}
</script>
<script>
var single_ecs_cluster_template = Handlebars.compile($("#single_ecs_cluster-template").html());
</script>
32 changes: 32 additions & 0 deletions ScoutSuite/output/data/html/partials/aws/services.ecs.regions.id.services.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<!-- Service partial -->
<script id="services.ecs.regions.id.services.partial" type="text/x-handlebars-template">
<!-- {{#unless scout_link}} -->
<div id="resource-name" class="list-group-item active">
<h4 class="list-group-item-heading">{{name}}</h4>
</div>
<div class="list-group-item">
<h4>Information</h4>
<ul>
<!-- <li class="list-group-item-text">Service ARN: <samp>{{arn}}</samp></li> -->
<li class="list-group-item-text">Service Name: {{name}}</li>
<li class="list-group-item-text">Cluster Name: {{cluster_name}}</li>
<li class="list-group-item-text">Desired Count: {{desired_count}}</li>
<li class="list-group-item-text">Running Count: {{running_count}}</li>
<li class="list-group-item-text">Pending Count: {{pending_count}}</li>
<li class="list-group-item-text">Scheduling Strategy: {{scheduling_strategy}}</li>
<!-- <li class="list-group-item-text">Stable: {{#if is_stable}}Yes{{else}}No{{/if}}</li> -->
<li class="list-group-item-text">Launch Type: {{launch_type}}</li>
</ul>
</div>
<!-- {{/unless}} -->
</script>
<script>
Handlebars.registerPartial("services.ecs.regions.id.services", $("#services\\.ecs\\.regions\\.id\\.services\\.partial").html());
</script>
<!-- Single ECS service template -->
<script id="single_ecs_service-template" type="text/x-handlebars-template">
{{> modal-template template='services.ecs.regions.id.services'}}
</script>
<script>
var single_ecs_service_template = Handlebars.compile($("#single_ecs_service-template").html());
</script>
34 changes: 34 additions & 0 deletions ScoutSuite/output/data/html/partials/aws/services.ecs.regions.id.tasks.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<!-- ECS Task partial -->
<script id="services.ecs.regions.id.tasks.partial" type="text/x-handlebars-template">
<div id="resource-name" class="list-group-item active">
<h4 class="list-group-item-heading">{{arn}}</h4>
</div>
<div class="list-group-item">
<h4>Information</h4>
<ul>
<li class="list-group-item-text">Task Definition ARN: {{taskDefinitionArn}}</li>
<li class="list-group-item-text">Cluster ARN: {{cluster_arn}}</li>
<li class="list-group-item-text">Launch Type: {{task_launchType}}</li>
<li class="list-group-item-text">Status: {{last_status}}</li>
<li class="list-group-item-text">Health Status: {{healthStatus}}</li>
<li class="list-group-item-text">Desired Status: {{desiredStatus}}</li>
<li class="list-group-item-text">Region: {{region}}</li>
<li class="list-group-item-text">Availiblity Zone: {{availabilityZone}}</li>
<li class="list-group-item-text">Container Instance ARN : {{containerInstanceArn}}</li>
<li class="list-group-item-text">Container ARN : {{containerArn}}</li>
<li class="list-group-item-text">Container Name : {{container_name}}</li>
<li class="list-group-item-text">Image Name : {{container_image_name}}</li>
<li class="list-group-item-text">Container Last Status : {{container_lastStatus}}</li>
</ul>
</div>
</script>
<script>
Handlebars.registerPartial("services.ecs.regions.id.tasks", $("#services\\.ecs\\.regions\\.id\\.tasks\\.partial").html());
</script>
<!-- Single ECS task instance template -->
<script id="single_ecs_task-template" type="text/x-handlebars-template">
{{> modal-template template='services.ecs.regions.id.tasks' }}
</script>
<script>
var single_ecs_task_template = Handlebars.compile($("#single_ecs_task-template").html());
</script>
32 changes: 32 additions & 0 deletions ScoutSuite/output/data/html/partials/aws/services.eks.regions.id.clusters.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<!-- EKS Cluster partial -->
<script id="services.eks.regions.id.clusters.partial" type="text/x-handlebars-template">
<div id="resource-name" class="list-group-item active">
<h4 class="list-group-item-heading">{{name}}</h4>
</div>
<div class="list-group-item">
<h4>Information</h4>
<ul>
<li class="list-group-item-text">Status: {{status}}</li>
<li class="list-group-item-text">ARN: {{arn}}</li>
<li class="list-group-item-text">Endpoint: {{endpoint}}</li>
<li class="list-group-item-text">Kubernetes Cluster Version: {{version}}</li>
<li class="list-group-item-text">Created At: {{created_at}}</li>
<li class="list-group-item-text">Endpoint Public Access enabled: {{endpointPublicAccess}}</li>
<li class="list-group-item-text">Endpoint Private Access enabled: {{endpointPrivateAccess}}</li>
<li class="list-group-item-text">Cluster Security group: {{cluster_sg_group}}</li>
<li class="list-group-item-text">Cluster VPC: {{cluster_vpc}}</li>
<li class="list-group-item-text">Region: {{region}}</li>
<li class="list-group-item-text">Logging: {{logging}}</li>
</ul>
</div>
</script>
<script>
Handlebars.registerPartial("services.eks.regions.id.clusters", $("#services\\.eks\\.regions\\.id\\.clusters\\.partial").html());
</script>
<!-- Single EKS cluster instance template -->
<script id="single_eks_cluster-template" type="text/x-handlebars-template">
{{> modal-template template='services.eks.regions.id.clusters' }}
</script>
<script>
var single_eks_cluster_template = Handlebars.compile($("#single_eks_cluster-template").html());
</script>
37 changes: 37 additions & 0 deletions ScoutSuite/output/data/html/partials/aws/services.eks.regions.id.nodegroups.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<!-- EKS Nodegroup partial -->
<script id="services.eks.regions.id.nodegroups.partial" type="text/x-handlebars-template">
<div id="resource-name" class="list-group-item active">
<h4 class="list-group-item-heading">{{name}}</h4>
</div>
<div class="list-group-item">
<h4>Information</h4>
<ul>
<li class="list-group-item-text">ARN: {{nodegroupArn}}</li>
<li class="list-group-item-text">Cluster Name: {{clusterName}}</li>
<li class="list-group-item-text">Version: {{Nodegroup_version}}</li>
<li class="list-group-item-text">Minimum Size: {{MinSize}}</li>
<li class="list-group-item-text">Maximum Size: {{MaxSize}}</li>
<li class="list-group-item-text">Desired Size: {{desiredSize}}</li>
<li class="list-group-item-text">Node Security Group: {{Node_sg}}</li>
<li class="list-group-item-text">Created At: {{created_at}}</li>
<li class="list-group-item-text">Modified At: {{modified_at}}</li>
<li class="list-group-item-text">Status: {{status}}</li>
<li class="list-group-item-text">Capacity Type: {{capacityType}}</li>
<li class="list-group-item-text">Region: {{region}}</li>
<li class="list-group-item-text">Instance Types: {{instanceTypes}}</li>
<li class="list-group-item-text">AMI Type: {{amiType}}</li>
<li class="list-group-item-text">Disk Size: {{diskSize}}</li>
<li class="list-group-item-text">Node Role: {{nodeRole}}</li>
</ul>
</div>
</script>
<script>
Handlebars.registerPartial("services.eks.regions.id.nodegroups", $("#services\\.eks\\.regions\\.id\\.nodegroups\\.partial").html());
</script>
<!-- Single EKS Nodegroup template -->
<script id="single_eks_nodegroup-template" type="text/x-handlebars-template">
{{> modal-template template='services.eks.regions.id.nodegroups'}}
</script>
<script>
var single_eks_nodegroup_template = Handlebars.compile($("#single_eks_nodegroup-template").html());
</script>
19 changes: 7 additions & 12 deletions ScoutSuite/providers/aws/facade/base.py
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
from ScoutSuite.providers.aws.facade.directconnect import DirectConnectFacade
from ScoutSuite.providers.aws.facade.dynamodb import DynamoDBFacade
from ScoutSuite.providers.aws.facade.ec2 import EC2Facade
from ScoutSuite.providers.aws.facade.ecs import ECSFacade
from ScoutSuite.providers.aws.facade.ecr import ECRFacade
from ScoutSuite.providers.aws.facade.efs import EFSFacade
from ScoutSuite.providers.aws.facade.eks import EKSFacade
from ScoutSuite.providers.aws.facade.elasticache import ElastiCacheFacade
from ScoutSuite.providers.aws.facade.elb import ELBFacade
from ScoutSuite.providers.aws.facade.elbv2 import ELBv2Facade
Expand Down Expand Up @@ -272,6 +275,10 @@ def _instantiate_facades(self):
self.sqs = SQSFacade(self.session)
self.secretsmanager = SecretsManagerFacade(self.session)
self.emr = EMRFacade(self.session)
# Container services (now part of open-source)
self.ecr = ECRFacade(self.session)
self.ecs = ECSFacade(self.session)
self.eks = EKSFacade(self.session)

# Instantiate facades for proprietary services
try:
Expand All @@ -282,18 +289,6 @@ def _instantiate_facades(self):
self.docdb = DocDBFacade(self.session)
except NameError:
pass
try:
self.ecs = ECSFacade(self.session)
except NameError:
pass
try:
self.ecr = ECRFacade(self.session)
except NameError:
pass
try:
self.eks = EKSFacade(self.session)
except NameError:
pass
try:
self.guardduty = GuardDutyFacade(self.session)
except NameError:
Expand Down
Loading