nccgroup · x4v13r64 · Mar 22, 2020 · Jun 21, 2019 · Jun 22, 2019 · Aug 20, 2019
diff --git a/.coveragerc b/.coveragerc
diff --git a/.flake8 b/.flake8
@@ -0,0 +1,23 @@
+[flake8]
+select =
+    E901,
+    E999,
+    F821,
+    F822,
+    F823
+statistics = True
+show-source = True
+max-line-length = 127
+max-complexity = 10
+exclude =
+    .git,
+    __pycache__,
+    docs/source/conf.py,
+    old,
+    build,
+    dist,
+    venv
+
+[pycodestyle]
+max_line_length = 127
+ignore = E501
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/.gitignore b/.gitignore
diff --git a/.travis.yml b/.travis.yml
@@ -6,25 +6,30 @@ sudo: false
 python:
   - "3.5"
   - "3.6"
+  - "3.7"
+  - "3.8"
 
 matrix:
   include:
     - python: "3.7"
       dist: xenial    # required for Python 3.7 (travis-ci/travis-ci#9069)
       sudo: required  # required for Python 3.7 (travis-ci/travis-ci#9069)
+    - python: "3.8"
+      dist: bionic
+      sudo: required
 
 install:
   - pip install -U setuptools
   - pip install -r requirements.txt
   - pip install flake8
   - pip install coveralls
   - pip install codecov
+  - pip install autopep8
 
 before_script:
   # Stop the build if there are Python syntax errors or undefined names
-  - flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
-  # Exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-  - flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+  - flake8 .
+  - autopep8 --diff --recursive --max-line-length 127 .
 
 # Command to run tests
 script:

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/Dockerfile b/Dockerfile
diff --git a/LICENSE b/LICENSE
diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/README.md b/README.md
diff --git a/ScoutSuite/__init__.py b/ScoutSuite/__init__.py
@@ -1,5 +1,5 @@
 __author__ = 'NCC Group'
-__version__ = '5.7.0'
+__version__ = '5.8.0'
 
 ERRORS_LIST = []
 

diff --git a/ScoutSuite/__main__.py b/ScoutSuite/__main__.py
@@ -57,6 +57,7 @@ def run_from_cli():
                    report_name=args.get('report_name'), report_dir=args.get('report_dir'),
                    timestamp=args.get('timestamp'),
                    services=args.get('services'), skipped_services=args.get('skipped_services'),
+                   list_services=args.get('list_services'),
                    result_format=args.get('result_format'),
                    database_name=args.get('database_name'),
                    host_ip=args.get('host_ip'),
@@ -101,7 +102,7 @@ def run(provider,
         # General
         report_name=None, report_dir=None,
         timestamp=False,
-        services=[], skipped_services=[],
+        services=[], skipped_services=[], list_services=None,
         result_format='json',
         database_name=None, host_ip='127.0.0.1', host_port=8000,
         max_workers=10,
@@ -153,7 +154,7 @@ async def _run(provider,
                # General
                report_name, report_dir,
                timestamp,
-               services, skipped_services,
+               services, skipped_services, list_services,
                result_format,
                database_name, host_ip, host_port,
                regions,
@@ -204,7 +205,6 @@ async def _run(provider,
     except Exception as e:
         print_exception('Authentication failure: {}'.format(e))
         return 101
-
     # Create a cloud provider object
     cloud_provider = get_provider(provider=provider,
                                   # AWS
@@ -238,6 +238,13 @@ async def _run(provider,
         Server.init(database_file, host_ip, host_port)
         return
 
+    # If this command, run and exit
+    if list_services:
+        available_services = [x for x in dir(cloud_provider.services) if
+                              not (x.startswith('_') or x in ['credentials', 'fetch'])]
+        print_info('The available services are: "{}"'.format('", "'.join(available_services)))
+        return 0
+
     # Complete run, including pulling data from provider
     if not fetch_local:
 
@@ -284,6 +291,7 @@ async def _run(provider,
     print_info('Applying display filters')
     filter_rules = Ruleset(cloud_provider=cloud_provider.provider_code,
                            environment_name=cloud_provider.environment,
+                           filename='filters.json',
                            rule_type='filters',
                            account_id=cloud_provider.account_id)
     processing_engine = ProcessingEngine(filter_rules)

diff --git a/ScoutSuite/core/__init__.py b/ScoutSuite/core/__init__.py
diff --git a/ScoutSuite/core/cli_parser.py b/ScoutSuite/core/cli_parser.py
@@ -183,7 +183,7 @@ def _init_azure_parser(self):
         # Service Principal credentials in an auth file
         azure_auth_modes.add_argument('--file-auth',
                                       action='store',
-                                      type=argparse.FileType('r'),
+                                      type=argparse.FileType('rb'),
                                       dest='file_auth',
                                       metavar="FILE",
                                       help='Run Scout with the specified credential file')
@@ -333,6 +333,11 @@ def _init_common_args_parser(self):
                             default=[],
                             nargs='+',
                             help='Name of in-scope services, defaults to all.')
+        parser.add_argument('--list-services',
+                            dest='list_services',
+                            default=False,
+                            action='store_true',
+                            help='List available services.')
         parser.add_argument('--skip',
                             dest='skipped_services',
                             default=[],

diff --git a/ScoutSuite/core/conditions.py b/ScoutSuite/core/conditions.py
diff --git a/ScoutSuite/core/console.py b/ScoutSuite/core/console.py
diff --git a/ScoutSuite/core/exceptions.py b/ScoutSuite/core/exceptions.py
diff --git a/ScoutSuite/core/fs.py b/ScoutSuite/core/fs.py
diff --git a/ScoutSuite/core/processingengine.py b/ScoutSuite/core/processingengine.py
diff --git a/ScoutSuite/core/rule.py b/ScoutSuite/core/rule.py
diff --git a/ScoutSuite/core/rule_definition.py b/ScoutSuite/core/rule_definition.py
diff --git a/ScoutSuite/core/ruleset.py b/ScoutSuite/core/ruleset.py
diff --git a/ScoutSuite/core/server.py b/ScoutSuite/core/server.py
@@ -25,7 +25,7 @@ def __init__(self, filename):
     @cherrypy.tools.json_out()
     def summary(self):
         """
-        Returns the stripped down data of the results that doesn't scale up when using a lot of ressources,
+        Returns the stripped down data of the results that doesn't scale up when using a lot of resources,
         used to render the summary.
         Should be the first call from the server.
         Can be found at GET /api/summary
@@ -48,8 +48,8 @@ def summary(self):
     @cherrypy.tools.json_out()
     def data(self, key=None):
         """
-        Return the data at the requested key. Doesn't returns nested dictionnaries and lists.
-        If one of the value is a dictionnary, it will return {'type': 'dict', 'keys': <Array of all the keys>}
+        Return the data at the requested key. Doesn't returns nested dictionaries and lists.
+        If one of the value is a dictionary, it will return {'type': 'dict', 'keys': <Array of all the keys>}
         If one of the value is a list, it will return {'type': 'list', 'count': <number of elements in the list>}
 
         Can be found at GET /api/data?key=<KEY>
@@ -85,9 +85,9 @@ def full(self, key=None):
     @cherrypy.tools.json_out()
     def page(self, key=None, page=None, pagesize=None):
         """
-        Return a page of the data at the requested key. Doesn't returns nested dictionnaries and lists.
+        Return a page of the data at the requested key. Doesn't returns nested dictionaries and lists.
         For example, if you set pagesize=10 and page=2, it should return element 10-19
-        If one of the value is a dictionnary, it will return {'type': 'dict', 'keys': <Array of all the keys>}
+        If one of the value is a dictionary, it will return {'type': 'dict', 'keys': <Array of all the keys>}
         If one of the value is a list, it will return {'type': 'list', 'count': <number of elements in the list>}
 
         Can be found at GET /api/page?key=<KEY>&page=<PAGE>&pagesize=<PAGESIZE>
@@ -138,9 +138,9 @@ def init(database_filename, host, port):
     @staticmethod
     def get_item(data, key):
         """
-        Get a specific informations from its key.
+        Get a specific information from its key.
 
-        :param data:                    The dictionnary in which the information is stored.
+        :param data:                    The dictionary in which the information is stored.
         :param host:                    The key where the information is located.
         :return:                        The nested data at the requested location.
         """
@@ -158,10 +158,10 @@ def get_item(data, key):
     @staticmethod
     def strip_nested_data(data):
         """
-        Strip nested lists and dictionnaries from the provided object to reduce its size.
+        Strip nested lists and dictionaries from the provided object to reduce its size.
 
         :param data:                    The object to strip.
-        :return:                        The input data stripped of its nested lists and dictionnaries.
+        :return:                        The input data stripped of its nested lists and dictionaries.
         """
         if not isinstance(data, dict):
             return data

diff --git a/ScoutSuite/core/utils.py b/ScoutSuite/core/utils.py
diff --git a/ScoutSuite/data/aws/ip-ranges/aws-in-ec2.json b/ScoutSuite/data/aws/ip-ranges/aws-in-ec2.json
diff --git a/ScoutSuite/data/aws/ip-ranges/aws-in-us.json b/ScoutSuite/data/aws/ip-ranges/aws-in-us.json
diff --git a/ScoutSuite/data/aws/ip-ranges/aws.json b/ScoutSuite/data/aws/ip-ranges/aws.json
diff --git a/ScoutSuite/data/icmp_message_types.json b/ScoutSuite/data/icmp_message_types.json
diff --git a/ScoutSuite/data/protocols.json b/ScoutSuite/data/protocols.json
diff --git a/ScoutSuite/output/__init__.py b/ScoutSuite/output/__init__.py
diff --git a/ScoutSuite/output/data/html/conditionals/json_format.html b/ScoutSuite/output/data/html/conditionals/json_format.html
diff --git a/ScoutSuite/output/data/html/conditionals/sqlite_format.html b/ScoutSuite/output/data/html/conditionals/sqlite_format.html
diff --git a/ScoutSuite/output/data/html/partials/about_scoutsuite.html b/ScoutSuite/output/data/html/partials/about_scoutsuite.html
diff --git a/ScoutSuite/output/data/html/partials/accordion.html b/ScoutSuite/output/data/html/partials/accordion.html
diff --git a/ScoutSuite/output/data/html/partials/accordion_policy.html b/ScoutSuite/output/data/html/partials/accordion_policy.html
diff --git a/ScoutSuite/output/data/html/partials/aliyun/left_menu_for_aliyun_region.html b/ScoutSuite/output/data/html/partials/aliyun/left_menu_for_aliyun_region.html
diff --git a/ScoutSuite/output/data/html/partials/aliyun/services.actiontrail.trails.html b/ScoutSuite/output/data/html/partials/aliyun/services.actiontrail.trails.html
diff --git a/ScoutSuite/output/data/html/partials/aliyun/services.ecs.regions.id.instances.html b/ScoutSuite/output/data/html/partials/aliyun/services.ecs.regions.id.instances.html
diff --git a/ScoutSuite/output/data/html/partials/aliyun/services.kms.regions.id.keys.html b/ScoutSuite/output/data/html/partials/aliyun/services.kms.regions.id.keys.html
diff --git a/ScoutSuite/output/data/html/partials/aliyun/services.oss.buckets.html b/ScoutSuite/output/data/html/partials/aliyun/services.oss.buckets.html
diff --git a/ScoutSuite/output/data/html/partials/aliyun/services.ram.groups.html b/ScoutSuite/output/data/html/partials/aliyun/services.ram.groups.html
diff --git a/ScoutSuite/output/data/html/partials/aliyun/services.ram.policies.html b/ScoutSuite/output/data/html/partials/aliyun/services.ram.policies.html
diff --git a/ScoutSuite/output/data/html/partials/aliyun/services.ram.roles.html b/ScoutSuite/output/data/html/partials/aliyun/services.ram.roles.html
diff --git a/ScoutSuite/output/data/html/partials/aliyun/services.ram.users.html b/ScoutSuite/output/data/html/partials/aliyun/services.ram.users.html
diff --git a/ScoutSuite/output/data/html/partials/aliyun/services.rds.regions.id.instances.html b/ScoutSuite/output/data/html/partials/aliyun/services.rds.regions.id.instances.html
diff --git a/ScoutSuite/output/data/html/partials/aliyun/services.vpc.regions.id.vpcs.html b/ScoutSuite/output/data/html/partials/aliyun/services.vpc.regions.id.vpcs.html
diff --git a/ScoutSuite/output/data/html/partials/aws/left_menu_for_region.html b/ScoutSuite/output/data/html/partials/aws/left_menu_for_region.html
diff --git a/ScoutSuite/output/data/html/partials/aws/left_menu_for_vpc.html b/ScoutSuite/output/data/html/partials/aws/left_menu_for_vpc.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.acm.regions.id.certificates.html b/ScoutSuite/output/data/html/partials/aws/services.acm.regions.id.certificates.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.awslambda.regions.id.functions.html b/ScoutSuite/output/data/html/partials/aws/services.awslambda.regions.id.functions.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.cloudformation.regions.id.stacks.html b/ScoutSuite/output/data/html/partials/aws/services.cloudformation.regions.id.stacks.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.cloudtrail.regions.html b/ScoutSuite/output/data/html/partials/aws/services.cloudtrail.regions.html
@@ -12,6 +12,7 @@ <h4>Information</h4>
             {{#ifPositive trails_count}}true{{else}}false{{/ifPositive}}
           </span>
         </li>
+      </ul>
     </div>
     <div class="list-group-item">
       <div class="accordion">

diff --git a/ScoutSuite/output/data/html/partials/aws/services.cloudtrail.regions.id.trails.html b/ScoutSuite/output/data/html/partials/aws/services.cloudtrail.regions.id.trails.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.cloudwatch.regions.id.alarms.html b/ScoutSuite/output/data/html/partials/aws/services.cloudwatch.regions.id.alarms.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.config.regions.html b/ScoutSuite/output/data/html/partials/aws/services.config.regions.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.config.regions.id.recorders.html b/ScoutSuite/output/data/html/partials/aws/services.config.regions.id.recorders.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.config.regions.id.rules.html b/ScoutSuite/output/data/html/partials/aws/services.config.regions.id.rules.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.ec2.regions.id.snapshots.html b/ScoutSuite/output/data/html/partials/aws/services.ec2.regions.id.snapshots.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.ec2.regions.id.volumes.html b/ScoutSuite/output/data/html/partials/aws/services.ec2.regions.id.volumes.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.ec2.regions.id.vpcs.id.images.html b/ScoutSuite/output/data/html/partials/aws/services.ec2.regions.id.vpcs.id.images.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.ec2.regions.id.vpcs.id.instances.html b/ScoutSuite/output/data/html/partials/aws/services.ec2.regions.id.vpcs.id.instances.html
@@ -6,17 +6,17 @@ <h4 class="list-group-item-heading">{{name}}</h4>
         <div class="list-group-item">
             <h4>Information</h4>
             <ul>
-                <li class="list-group-item-text">Region: {{region}}</li>
-                <li class="list-group-item-text">VPC: {{getValueAt 'services.ec2.regions' region 'vpcs' vpc 'name'}} ({{vpc}})</li>
-                <li class="list-group-item-text">ID: {{id}}</li>
-                <li class="list-group-item-text">Reservation ID: {{reservation_id}}</li>
+                <li class="list-group-item-text">ID: <samp>{{id}}</samp></li>
+                <li class="list-group-item-text">Region: <samp>{{region}}</samp></li>
+                <li class="list-group-item-text">VPC: <samp>{{getValueAt 'services.ec2.regions' region 'vpcs' vpc 'name'}} ({{vpc}})</samp></li>
+                <li class="list-group-item-text">Reservation ID: <samp>{{reservation_id}}</samp></li>
                 <li class="list-group-item-text">Monitoring: <span id="ec2.regions.{{region}}.vpcs.{{vpc}}.instances.{{@key}}.monitoring_disabled">{{convert_bool_to_enabled monitoring_enabled}}</span></li>
-                <li class="list-group-item-text">A
10000
ccess Key name: {{KeyName}}</li>
-                <li class="list-group-item-text">State: {{makeTitle State.Name}}</li>
+                <li class="list-group-item-text">Access Key Name: <samp>{{KeyName}}</samp></li>
+                <li class="list-group-item-text">State: <samp>{{makeTitle State.Name}}</samp></li>
                 <li class="list-group-item-text">Instance Type:
-                    <span id="services.ec2.regions.vpcs.instances-unscannable-instance-types-{{id}}"> {{InstanceType}}<span>
+                    <span id="services.ec2.regions.vpcs.instances-unscannable-instance-types-{{id}}"> <samp>{{InstanceType}}</samp></span>
                 </li>
-                <li class="list-group-item-text">Up since: {{LaunchTime}}</li>
+                <li class="list-group-item-text">Up Since: {{format_date LaunchTime}}</li>
             </ul>
         </div>
         <div class="list-group-item" style="padding-bottom: 0 !important;">
@@ -25,13 +25,23 @@ <h4>Network interfaces</h4>
                 {{> network_interface region = ../region vpc = ../vpc network_interface = @../key}}
             {{/each}}
         </div>
+        {{#if metadata_options}}
+        <div class="list-group-item">
+            <h4>Metadata Options</h4>
+            <ul id="ec2.regions.{{region}}.vpcs.{{vpc}}.instances.{{@key}}.metadata_options">
+                <li>Endpoint: <samp>{{metadata_options.HttpEndpoint}}</samp></li>
+                <li>HTTP Tokens: <samp>{{metadata_options.HttpTokens}}</samp></li>
+            </ul>
+        </div>
+        {{/if}}
         {{#if user_data}}
         <div class="list-group-item" style="padding-bottom: 0 !important;">
             <h4>User data</h4>
             <div>
                 <code>{{#each (split_lines user_data)}}   {{this}}<br>{{/each}}</code>
             </div>
             {{#if user_data_secrets}}
+            <br>
             <h5 id="ec2.regions.{{region}}.vpcs.{{vpc}}.instances.{{@key}}.potential_secrets">Potential Secrets</h5>
             <ul>
                 {{#each user_data_secrets}}

diff --git a/...tSuite/output/data/html/partials/aws/services.ec2.regions.id.vpcs.id.security_groups.html b/...tSuite/output/data/html/partials/aws/services.ec2.regions.id.vpcs.id.security_groups.html
@@ -6,10 +6,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">ID: {{id}}</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">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: {{description}}</div>
+        <div class="list-group-item-text">Description: <samp>{{description}}</samp></div>
     </div>
 
     {{#each rules}}

diff --git a/...utput/data/html/partials/aws/services.ec2.regions.vpcs.security_groups.resource_list.html b/...utput/data/html/partials/aws/services.ec2.regions.vpcs.security_groups.resource_list.html
diff --git a/...te/output/data/html/partials/aws/services.ec2.regions.vpcs.security_groups.rule_list.html b/...te/output/data/html/partials/aws/services.ec2.regions.vpcs.security_groups.rule_list.html
diff --git a/...Suite/output/data/html/partials/aws/services.elasticache.regions.id.parameter_groups.html b/...Suite/output/data/html/partials/aws/services.elasticache.regions.id.parameter_groups.html
diff --git a/...tSuite/output/data/html/partials/aws/services.elasticache.regions.id.security_groups.html b/...tSuite/output/data/html/partials/aws/services.elasticache.regions.id.security_groups.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.elasticache.regions.id.subnet_groups.html b/ScoutSuite/output/data/html/partials/aws/services.elasticache.regions.id.subnet_groups.html
diff --git a/...Suite/output/data/html/partials/aws/services.elasticache.regions.id.vpcs.id.clusters.html b/...Suite/output/data/html/partials/aws/services.elasticache.regions.id.vpcs.id.clusters.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.elb.regions.id.elb_policies.html b/ScoutSuite/output/data/html/partials/aws/services.elb.regions.id.elb_policies.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.elb.regions.id.vpcs.id.elbs.html b/ScoutSuite/output/data/html/partials/aws/services.elb.regions.id.vpcs.id.elbs.html
diff --git a/.../output/data/html/partials/aws/services.elb.regions.id.vpcs.id.elbs.linked_resources.html b/.../output/data/html/partials/aws/services.elb.regions.id.vpcs.id.elbs.linked_resources.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.elb.regions.id.vpcs.id.elbs.listener.html b/ScoutSuite/output/data/html/partials/aws/services.elb.regions.id.vpcs.id.elbs.listener.html
diff --git a/...uite/output/data/html/partials/aws/services.elb.regions.id.vpcsid.elbs.linked_policy.html b/...uite/output/data/html/partials/aws/services.elb.regions.id.vpcsid.elbs.linked_policy.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.elbv2.regions.id.vpcs.id.lbs.html b/ScoutSuite/output/data/html/partials/aws/services.elbv2.regions.id.vpcs.id.lbs.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.emr.regions.id.vpcs.id.clusters.html b/ScoutSuite/output/data/html/partials/aws/services.emr.regions.id.vpcs.id.clusters.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.iam.credential_reports.html b/ScoutSuite/output/data/html/partials/aws/services.iam.credential_reports.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.iam.groups.html b/ScoutSuite/output/data/html/partials/aws/services.iam.groups.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.iam.inline_policies.html b/ScoutSuite/output/data/html/partials/aws/services.iam.inline_policies.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.iam.managed_policies.html b/ScoutSuite/output/data/html/partials/aws/services.iam.managed_policies.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.iam.managed_policies_list.html b/ScoutSuite/output/data/html/partials/aws/services.iam.managed_policies_list.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.iam.roles.html b/ScoutSuite/output/data/html/partials/aws/services.iam.roles.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.iam.users.html b/ScoutSuite/output/data/html/partials/aws/services.iam.users.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.kms.regions.id.keys.html b/ScoutSuite/output/data/html/partials/aws/services.kms.regions.id.keys.html
@@ -0,0 +1,52 @@
+
+<!-- Key partial -->
+<script id="services.kms.regions.id.keys.partial" type="text/x-handlebars-template">
+  {{#unless scout2_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">ID: <span id="kms.regions.{{region}}.keys.{{@key}}.id"><samp>{{id}}</samp></span></li>
+        <li class="list-group-item-text">ARN: <span id="kms.regions.{{region}}.keys.{{@key}}.arn"><samp>{{arn}}</samp></span></li>
+        <li class="list-group-item-text">Description: <span id="kms.regions.{{region}}.keys.{{@key}}.description"><samp>{{value_or_none description}}</samp></span></li>
+        <li class="list-group-item-text">Creation Date: <span id="kms.regions.{{region}}.keys.{{@key}}.creation_date">{{format_date creation_date}}</span></li>
+        <li class="list-group-item-text">Status: <span id="kms.regions.{{region}}.keys.{{@key}}.key_enabled">{{convert_bool_to_enabled key_enabled}}</span></li>
+        <li class="list-group-item-text">Rotation: <span id="kms.regions.{{region}}.keys.{{@key}}.rotation_enabled">{{convert_bool_to_enabled rotation_enabled}}</span></li>
+        <li class="list-group-item-text">Origin: <span id="kms.regions.{{region}}.keys.{{@key}}.origin"><samp>{{value_or_none origin}}</samp></span></li>
+        <li class="list-group-item-text">Key Manager: <span id="kms.regions.{{region}}.keys.{{@key}}.key_manager"><samp>{{value_or_none key_manager}}</samp></span></li>
+      </ul>
+    </div>
+    <div class="list-group-item">
+      {{#if aliases.length}}
+      <h4 class="list-group-item-heading accordion-heading">Aliases</h4>
+      <ul>
+        {{#each this.aliases}}
+        <li><samp>{{name}}</samp></li>
+        {{/each}}
+      </ul>
+      {{else}}
+      <h4 class="list-group-item-heading accordion-heading text-secondary">Aliases</h4>
+      {{/if}}
+    </div>
+    <div class="list-group-item">
+    {{#if policy}}
+      {{> accordion_policy name = 'Key Policy' document = policy policy_path = (concat 'kms.regions' region 'keys' @key 'policy')}}
+    {{else}}
+      <h4 class="list-group-item-heading accordion-heading text-secondary">Key Policy</h4>
+    {{/if}}
+    </div>
+  {{/unless}}
+</script>
+<script>
+  Handlebars.registerPartial("services.kms.regions.id.keys", $("#services\\.kms\\.regions\\.id\\.keys\\.partial").html());
+</script>
+
+<!-- Single KMS instance template -->
+<script id="single_kms_key-template" type="text/x-handlebars-template">
+    {{> modal-template template='services.kms.regions.id.keys' }}
+</script>
+<script>
+    var single_kms_key_template = Handlebars.compile($("#single_kms_key-template").html());
+</script>
diff --git a/ScoutSuite/output/data/html/partials/aws/services.rds.regions.id.parameter_groups.html b/ScoutSuite/output/data/html/partials/aws/services.rds.regions.id.parameter_groups.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.rds.regions.id.security_groups.html b/ScoutSuite/output/data/html/partials/aws/services.rds.regions.id.security_groups.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.rds.regions.id.vpcs.id.instances.html b/ScoutSuite/output/data/html/partials/aws/services.rds.regions.id.vpcs.id.instances.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.rds.regions.id.vpcs.id.snapshots.html b/ScoutSuite/output/data/html/partials/aws/services.rds.regions.id.vpcs.id.snapshots.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.rds.regions.id.vpcs.id.subnet_groups.html b/ScoutSuite/output/data/html/partials/aws/services.rds.regions.id.vpcs.id.subnet_groups.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.redshift.regions.id.parameter_groups.html b/ScoutSuite/output/data/html/partials/aws/services.redshift.regions.id.parameter_groups.html
@@ -1,26 +1,27 @@
-    <!-- Redshift parameter group partial -->
+<!-- Redshift parameter group partial -->
 
-    <script id="services.redshift.regions.id.parameter_groups.partial" type="text/x-handlebars-template">
-        <div class="list-group-item active">
-          <h4 class="list-group-item-heading">{{resource_key}}</h4>
-        </div>
-        <div class="list-group-item">
-          <h4 class="list-group-item-heading">Information</h4>
-          <div class="list-group-item-text item-margin">Description: {{Description}}</div>
-          <div class="list-group-item-text item-margin">Group Family: {{ParameterGroupFamily}}</div>
-        </div>
-        <div class="list-group-item">
-          <h4 class="list-group-item-heading">Parameters</h4>
-          <ul>
+<script id="services.redshift.regions.id.parameter_groups.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 class="list-group-item-heading">Information</h4>
+        <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>
+    </div>
+    <div class="list-group-item">
+        <h4 class="list-group-item-heading">Parameters</h4>
+        <ul>
             {{#each parameters}}
-              <li class="list-group-item-text">{{@key}}:
-                <span id="redshift.regions.{{../region}}.parameter_groups.{{@../key}}.{{@key}}">{{value}}</span>
-              </li>
+            <li class="list-group-item-text"><samp>{{@key}}</samp>:
+                <span id="redshift.regions.{{../region}}.parameter_groups.{{@../key}}.{{@key}}"><samp>{{value}}</samp></span>
+            </li>
             {{/each}}
-          </ul>
-        </div>
-    </script>
-    <script>
-        Handlebars.registerPartial("services.redshift.regions.id.parameter_groups", $("#services\\.redshift\\.regions\\.id\\.parameter_groups\\.partial").html());
-    </script>
+        </ul>
+    </div>
+</script>
+<script>
+    Handlebars.registerPartial("services.redshift.regions.id.parameter_groups", $("#services\\.redshift\\.regions\\.id\\.parameter_groups\\.partial").html());
+</script>
 
diff --git a/ScoutSuite/output/data/html/partials/aws/services.redshift.regions.id.vpcs.id.clusters.html b/ScoutSuite/output/data/html/partials/aws/services.redshift.regions.id.vpcs.id.clusters.html
diff --git a/...e/output/data/html/partials/aws/services.redshift.regions.id.vpcs.id.security_groups.html b/...e/output/data/html/partials/aws/services.redshift.regions.id.vpcs.id.security_groups.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.redshift.regions.vpcs.cluster_nodes.html b/ScoutSuite/output/data/html/partials/aws/services.redshift.regions.vpcs.cluster_nodes.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.route53.regions.id.domains.html b/ScoutSuite/output/data/html/partials/aws/services.route53.regions.id.domains.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.route53.regions.id.hosted_zones.html b/ScoutSuite/output/data/html/partials/aws/services.route53.regions.id.hosted_zones.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.s3.acls.html b/ScoutSuite/output/data/html/partials/aws/services.s3.acls.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.s3.bucket_iam_policies.html b/ScoutSuite/output/data/html/partials/aws/services.s3.bucket_iam_policies.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.s3.buckets.html b/ScoutSuite/output/data/html/partials/aws/services.s3.buckets.html
diff --git a/ScoutSuite/output/data/html/partials/aws/services.s3.buckets.objects.html b/ScoutSuite/output/data/html/partials/aws/services.s3.buckets.objects.html
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,7 @@ <h4>Information</h4> @@
                 {{#ifPositive trails_count}}true{{else}}false{{/ifPositive}}
               </span>
             </li>
+          </ul>
         </div>
         <div class="list-group-item">
           <div class="accordion">
@@ Expand Down @@