Fixed ec2 processing bug

nccgroup · Mar 4, 2019 · 1dda2d1 · 1dda2d1
1 parent 872b907
commit 1dda2d1
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/ScoutSuite/providers/aws/provider.py b/ScoutSuite/providers/aws/provider.py
@@ -67,13 +67,15 @@ def preprocessing(self, ip_ranges=None, ip_ranges_name_key=None):
         # self.parse_elb_policies()
 
         # Various data processing calls
-        self._check_ec2_zone_distribution()
-        self._add_security_group_name_to_ec2_grants()
-        self._add_last_snapshot_date_to_ec2_volumes()
+        if 'ec2' in self.service_list:
+            self._check_ec2_zone_distribution()
+            self._add_security_group_name_to_ec2_grants()
+            self._add_last_snapshot_date_to_ec2_volumes()
+            self._match_instances_and_roles()
+
         self._process_cloudtrail_trails(self.services['cloudtrail'])
         self._add_cidr_display_name(ip_ranges, ip_ranges_name_key)
         self._merge_route53_and_route53domains()
-        self._match_instances_and_roles()
         self._match_iam_policies_and_buckets()
 
         super(AWSProvider, self).preprocessing()