aws_recon 0.2.21 → 0.2.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f284896f9397e44d7662775c85b1f4363bcbc284420a248bc936b80ddef6d5e8
-  data.tar.gz: 572b909d6d5bce44d908f70204e3d511cbfae1d5ed8574a99ffe0d7559f836b3
+  metadata.gz: e94ce0b14c283d62b106df80e56dc8340c4acc37970381cf95294d337d55ceda
+  data.tar.gz: 8e4fb54d9907493f94dfe4a3d73afcb396d8c101c309e8acacac6b527076be81
 SHA512:
-  metadata.gz: dc68e292ca1d346e8313117d6f93ebe0587fdf61b735b445ec6b90bd6d4c5c4d2a0165f2a47d6bcf57cb046b7a8e1dee769120f0ff569fe613f3930afdad9dac
-  data.tar.gz: 3f67fa10f1286a1eb9f5d5a1d56bc2ccb6dc5b6a9e7a9324b991e1f468f2fd41000081d1aa9f20a723ae17471b3e3a41463bc870e8e94dcd6e21bfb02fdcb0e6
+  metadata.gz: '0283ab12e7885d2462f24038648b5a326978a88465a92869fb8dcd617dde52789383d48a343c017050fc1c321ce72c40466a116b8d2bf3adc861fea2c4307e35'
+  data.tar.gz: e325e70dee2f236d77c0bb72e257a80b14900d26ed3347aa316e9b0e89fec7dbfa82e3fca010ae95959692114ccd58a0b7a8addc93fc573eac193ca5ea0c4ccc

data/lib/aws_recon/collectors/codepipeline.rb

@@ -8,20 +8,37 @@ class CodePipeline < Mapper
     #
     # list_pipelines
     #
-    @client.list_pipelines.each_with_index do |response, page|
-      log(response.context.operation_name, page)
+    begin
+      @client.list_pipelines.each_with_index do |response, page|
+        log(response.context.operation_name, page)
 
-      # get_pipeline
-      response.pipelines.each do |pipeline|
-        resp = @client.get_pipeline(name: pipeline.name)
-        struct = OpenStruct.new(resp.pipeline.to_h)
-        struct.type = 'pipeline'
-        struct.arn = resp.metadata.pipeline_arn
+        # get_pipeline
+        response.pipelines.each do |pipeline|
+          resp = @client.get_pipeline(name: pipeline.name)
+          struct = OpenStruct.new(resp.pipeline.to_h)
+          struct.type = 'pipeline'
+          struct.arn = resp.metadata.pipeline_arn
 
-        resources.push(struct.to_h)
+          resources.push(struct.to_h)
+        end
+      end
+    rescue Aws::CodePipeline::Errors::ServiceError => e
+      log_error(e.code)
+
+      unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
+        raise e
       end
     end
 
     resources
   end
+
+  private
+
+  # not an error
+  def suppressed_errors
+    %w[
+      AccessDeniedException
+    ]
+  end
 end

data/lib/aws_recon/collectors/dms.rb

@@ -14,7 +14,7 @@ class DatabaseMigrationService < Mapper
       response.replication_instances.each do |instance|
         struct = OpenStruct.new(instance.to_h)
         struct.type = 'replication_instance'
-        struct.arb = "arn:aws:#{@service}:#{@region}::replication_instance/#{instance.replication_instance_identifier}"
+        struct.arn = "arn:aws:#{@service}:#{@region}::replication_instance/#{instance.replication_instance_identifier}"
 
         resources.push(struct.to_h)
       end

data/lib/aws_recon/collectors/dynamodb.rb

@@ -29,6 +29,7 @@ class DynamoDB < Mapper
         struct = OpenStruct.new(@client.describe_table({ table_name: table_name }).table.to_h)
         struct.type = 'table'
         struct.arn = struct.table_arn
+        struct.continuous_backups_description = @client.describe_continuous_backups({ table_name: table_name }).continuous_backups_description.to_h
 
         resources.push(struct.to_h)
       end

data/lib/aws_recon/collectors/ecr.rb

@@ -19,7 +19,11 @@ class ECR < Mapper
                         .get_repository_policy({ repository_name: repo.repository_name }).policy_text.parse_policy
 
       rescue Aws::ECR::Errors::ServiceError => e
-        raise e unless suppressed_errors.include?(e.code)
+        log_error(e.code)
+
+        unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
+          raise e
+        end
       ensure
         resources.push(struct.to_h)
       end

data/lib/aws_recon/collectors/ecs.rb

@@ -8,24 +8,24 @@ class ECS < Mapper
     resources = []
 
     #
-    # describe_clusters
+    # list_clusters
     #
-    @client.describe_clusters.each_with_index do |response, page|
+    @client.list_clusters.each_with_index do |response, page|
       log(response.context.operation_name, page)
 
-      response.clusters.each do |cluster|
-        struct = OpenStruct.new(cluster.to_h)
+      response.cluster_arns.each do |cluster|
+        struct = OpenStruct.new(@client.describe_clusters({ clusters: [cluster] }).clusters.first.to_h)
         struct.type = 'cluster'
-        struct.arn = cluster.cluster_arn
+        struct.arn = cluster
         struct.tasks = []
 
         # list_tasks
-        @client.list_tasks({ cluster: cluster.cluster_arn }).each_with_index do |response, page|
+        @client.list_tasks({ cluster: cluster }).each_with_index do |response, page|
           log(response.context.operation_name, 'list_tasks', page)
 
           # describe_tasks
           response.task_arns.each do |task_arn|
-            @client.describe_tasks({ cluster: cluster.cluster_arn, tasks: [task_arn] }).tasks.each do |task|
+            @client.describe_tasks({ cluster: cluster, tasks: [task_arn] }).tasks.each do |task|
               struct.tasks.push(task)
             end
           end

data/lib/aws_recon/collectors/emr.rb

@@ -0,0 +1,39 @@
+class EMR < Mapper
+  #
+  # Returns an array of resources.
+  #
+  def collect
+    resources = []
+
+    #
+    # get_block_public_access_configuration
+    #
+    @client.get_block_public_access_configuration.each do |response|
+      log(response.context.operation_name)
+
+      struct = OpenStruct.new(response.block_public_access_configuration.to_h)
+      struct.type = 'configuration'
+
+      resources.push(struct.to_h)
+    end
+
+    #
+    # list_clusters
+    #
+    @client.list_clusters.each_with_index do |response, page|
+      log(response.context.operation_name, page)
+
+      response.clusters.each do |cluster|
+        log(response.context.operation_name, cluster.id)
+
+        struct = OpenStruct.new(@client.describe_cluster({ cluster_id: cluster.id }).cluster.to_h)
+        struct.type = 'cluster'
+        struct.arn = cluster.cluster_arn
+
+        resources.push(struct.to_h)
+      end
+    end
+
+    resources
+  end
+end

data/lib/aws_recon/collectors/iam.rb

@@ -89,14 +89,22 @@ class IAM < Mapper
     #
     # get_account_password_policy
     #
-    @client.get_account_password_policy.each do |response|
-      log(response.context.operation_name)
+    begin
+      @client.get_account_password_policy.each do |response|
+        log(response.context.operation_name)
 
-      struct = OpenStruct.new(response.password_policy.to_h)
-      struct.type = 'password_policy'
-      struct.arn = "arn:aws:iam::#{@account}:account_password_policy/global"
+        struct = OpenStruct.new(response.password_policy.to_h)
+        struct.type = 'password_policy'
+        struct.arn = "arn:aws:iam::#{@account}:account_password_policy/global"
 
-      resources.push(struct.to_h)
+        resources.push(struct.to_h)
+      end
+    rescue Aws::IAM::Errors::ServiceError => e
+      log_error(e.code)
+
+      unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
+        raise e
+      end
     end
 
     #
@@ -178,7 +186,10 @@ class IAM < Mapper
       end
     rescue Aws::IAM::Errors::ServiceError => e
       log_error(e.code)
-      raise e unless suppressed_errors.include?(e.code)
+
+      unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
+        raise e
+      end
     end
 
     resources
@@ -190,6 +201,7 @@ class IAM < Mapper
   def suppressed_errors
     %w[
       ReportNotPresent
+      NoSuchEntity
     ]
   end
 end

data/lib/aws_recon/collectors/kms.rb

@@ -29,7 +29,10 @@ class KMS < Mapper
                                     .key_rotation_enabled
         rescue Aws::KMS::Errors::ServiceError => e
           log_error(e.code)
-          raise e unless suppressed_errors.include?(e.code)
+
+          unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
+            raise e
+          end
         end
 
         # list_grants

data/lib/aws_recon/collectors/organizations.rb

@@ -34,18 +34,35 @@ class Organizations < Mapper
     #
     # list_policies
     #
-    @client.list_policies({ filter: 'SERVICE_CONTROL_POLICY' }).each_with_index do |response, page|
-      log(response.context.operation_name, page)
+    begin
+      @client.list_policies({ filter: 'SERVICE_CONTROL_POLICY' }).each_with_index do |response, page|
+        log(response.context.operation_name, page)
 
-      response.policies.each do |policy|
-        struct = OpenStruct.new(policy.to_h)
-        struct.type = 'service_control_policy'
-        struct.content = @client.describe_policy({ policy_id: policy.id }).policy.content.parse_policy
+        response.policies.each do |policy|
+          struct = OpenStruct.new(policy.to_h)
+          struct.type = 'service_control_policy'
+          struct.content = @client.describe_policy({ policy_id: policy.id }).policy.content.parse_policy
 
-        resources.push(struct.to_h)
+          resources.push(struct.to_h)
+        end
+      end
+    rescue Aws::Organizations::Errors::ServiceError => e
+      log_error(e.code)
+
+      unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
+        raise e
       end
     end
 
     resources
   end
+
+  private
+
+  # not an error
+  def suppressed_errors
+    %w[
+      AccessDeniedException
+    ]
+  end
 end

data/lib/aws_recon/collectors/rds.rb

@@ -38,6 +38,8 @@ class RDS < Mapper
         struct.arn = instance.db_instance_arn
         struct.parent_id = instance.db_cluster_identifier
 
+        # TODO: describe_db_snapshots here (with public flag)
+
         resources.push(struct.to_h)
       end
     end

data/lib/aws_recon/collectors/redshift.rb

@@ -15,6 +15,7 @@ class Redshift < Mapper
         struct = OpenStruct.new(cluster.to_h)
         struct.type = 'cluster'
         struct.arn = cluster.cluster_identifier
+        struct.logging_status = @client.describe_logging_status({ cluster_identifier: cluster.cluster_identifier }).to_h
 
         resources.push(struct.to_h)
       end

data/lib/aws_recon/collectors/s3.rb

@@ -61,7 +61,11 @@ class S3 < Mapper
                            end
 
         rescue Aws::S3::Errors::ServiceError => e
-          raise e unless suppressed_errors.include?(e.code)
+          log_error(e.code)
+
+          unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
+            raise e
+          end
         end
 
         resources.push(struct.to_h)

data/lib/aws_recon/collectors/securityhub.rb

@@ -8,16 +8,33 @@ class SecurityHub < Mapper
     #
     # describe_hub
     #
-    @client.describe_hub.each do |response|
-      log(response.context.operation_name)
+    begin
+      @client.describe_hub.each do |response|
+        log(response.context.operation_name)
 
-      struct = OpenStruct.new(response.to_h)
-      struct.type = 'hub'
-      struct.arn = response.hub_arn
+        struct = OpenStruct.new(response.to_h)
+        struct.type = 'hub'
+        struct.arn = response.hub_arn
 
-      resources.push(struct.to_h)
+        resources.push(struct.to_h)
+      end
+    rescue Aws::SecurityHub::Errors::ServiceError => e
+      log_error(e.code)
+
+      unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
+        raise e
+      end
     end
 
     resources
   end
+
+  private
+
+  # not an error
+  def suppressed_errors
+    %w[
+      InvalidAccessException
+    ]
+  end
 end

data/lib/aws_recon/collectors/servicequotas.rb

@@ -27,7 +27,10 @@ class ServiceQuotas < Mapper
       end
     rescue Aws::ServiceQuotas::Errors::ServiceError => e
       log_error(e.code, service)
-      raise e unless suppressed_errors.include?(e.code)
+
+      unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
+        raise e
+      end
     end
 
     resources

data/lib/aws_recon/collectors/shield.rb

@@ -51,7 +51,10 @@ class Shield < Mapper
     resources
   rescue Aws::Shield::Errors::ServiceError => e
     log_error(e.code)
-    raise e unless suppressed_errors.include?(e.code)
+
+    unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
+      raise e
+    end
 
     [] # no access or service isn't enabled
   end

data/lib/aws_recon/collectors/sqs.rb

@@ -18,7 +18,7 @@ class SQS < Mapper
         struct = OpenStruct.new(@client.get_queue_attributes({ queue_url: queue, attribute_names: ['All'] }).attributes.to_h)
         struct.type = 'queue'
         struct.arn = struct.QueueArn
-        struct.policy = struct.delete_field('Policy').parse_policy
+        struct.policy = struct.Policy ? struct.delete_field('Policy').parse_policy : nil
 
         resources.push(struct.to_h)
       end

data/lib/aws_recon/collectors/support.rb

@@ -27,7 +27,10 @@ class Support < Mapper
     resources
   rescue Aws::Support::Errors::ServiceError => e
     log_error(e.code)
-    raise e unless suppressed_errors.include?(e.code)
+
+    unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
+      raise e
+    end
 
     [] # no Support subscription
   end
@@ -37,6 +40,7 @@ class Support < Mapper
   # not an error
   def suppressed_errors
     %w[
+      AccessDeniedException
       SubscriptionRequiredException
     ]
   end

data/lib/aws_recon/options.rb

@@ -20,6 +20,7 @@ class Parser
     :skip_credential_report,
     :stream_output,
     :verbose,
+    :quit_on_exception,
     :debug
   )
 
@@ -47,6 +48,7 @@ class Parser
       false,
       false,
       false,
+      false,
       false
     )
 
@@ -135,6 +137,11 @@ class Parser
         args.verbose = true unless args.stream_output
       end
 
+      # re-raise exceptions
+      opts.on('-q', '--quit-on-exception', 'Stop collection if an API error is encountered (default: false)') do
+        args.quit_on_exception = true
+      end
+
       # debug
       opts.on('-d', '--debug', 'Output debug with wire trace info') do
         unless args.stream_output

data/lib/aws_recon/services.yaml

@@ -12,8 +12,13 @@
   alias: config
 - name: CodeBuild
   alias: codebuild
+  excluded_regions:
+    - af-south-1
 - name: CodePipeline
   alias: codepipeline
+  excluded_regions:
+    - af-south-1
+    - me-south-1
 - name: AutoScaling
   alias: autoscaling
 - name: CloudTrail
@@ -39,6 +44,13 @@
     - ap-southeast-1
 - name: ElastiCache
   alias: elasticache
+- name: EMR
+  alias: emr
+  excluded_regions:
+    - ap-east-1
+    - af-south-1
+    - eu-south-1
+    - me-south-1
 - name: IAM
   global: true
   alias: iam
@@ -87,12 +99,17 @@
     - eu-north-1
     - eu-west-3
     - us-west-1
+    - ap-east-1
+    - af-south-1
+    - eu-south-1
 - name: CloudWatch
   alias: cloudwatch
 - name: CloudWatchLogs
   alias: cloudwatchlogs
 - name: Kafka
   alias: kafka
+  excluded_regions:
+    - af-south-1
 - name: SecretsManager
   alias: sm
 - name: SecurityHub
@@ -118,6 +135,10 @@
     - eu-north-1
     - us-west-1
     - sa-east-1
+    - ap-east-1
+    - af-south-1
+    - eu-south-1
+    - me-south-1
 - name: WorkSpaces
   alias: workspaces
   excluded_regions:
@@ -126,12 +147,21 @@
     - eu-west-3
     - us-east-2
     - us-west-1
+    - ap-east-1
+    - af-south-1
+    - eu-south-1
+    - me-south-1
 - name: SageMaker
   alias: sagemaker
 - name: ServiceQuotas
   alias: servicequotas
 - name: Transfer
   alias: transfer
+  excluded_regions:
+    - ap-east-1
+    - af-south-1
+    - eu-south-1
+    - me-south-1
 - name: DirectConnect
   alias: dc
 - name: DirectoryService

data/lib/aws_recon/version.rb

@@ -1,3 +1,3 @@
 module AwsRecon
-  VERSION = "0.2.21"
+  VERSION = "0.2.26"
 end

data/readme.md

@@ -7,9 +7,9 @@ A multi-threaded AWS inventory collection tool.
 
 The [creators](https://darkbit.io) of this tool have a recurring need to be able to efficiently collect a large amount of AWS resource attributes and metadata to help clients understand their cloud security posture.
 
-There are a handful of tools (e.g. [AWS Config](https://aws.amazon.com/config), [CloudMapper](https://github.com/duo-labs/cloudmapper), [CloudSploit](https://github.com/cloudsploit/scans), [Prowler](https://github.com/toniblyx/prowler)) that do some form of resource collection to support other functions. But we found we needed broader coverage and more details at a per-service level. We also needed a consistent and structured format that allowed for integration with our other systems and tooling.
+Existing tools (e.g. [AWS Config](https://aws.amazon.com/config)) that do some form of resource collection lack the coverage and specificity we needed. We also needed a tool that produced consistent output that was easily consumed by other tools/systems.
 
-Enter AWS Recon, multi-threaded AWS inventory collection tool written in plain Ruby. Though most AWS tooling tends to be dominated by Python, the [Ruby SDK](https://aws.amazon.com/sdk-for-ruby/) is quite mature and capable. The maintainers of the Ruby SDK have done a fantastic job making it easy to handle automatic retries, paging of large responses, and threading huge numbers of requests.
+Enter AWS Recon, multi-threaded AWS inventory collection tool written in plain Ruby. Though Python tends to dominate the AWS tooling landscape, the [Ruby SDK](https://aws.amazon.com/sdk-for-ruby/) has a few convenient advantages over the [other](https://aws.amazon.com/sdk-for-node-js/) [AWS](https://aws.amazon.com/sdk-for-python/) [SDKs](https://aws.amazon.com/sdk-for-go/) we tested. Specifically, easy handling of automatic retries, paging of large responses, and - with some help - threading huge numbers of requests.
 
 ## Project Goals
 
@@ -23,24 +23,44 @@ Enter AWS Recon, multi-threaded AWS inventory collection tool written in plain R
 
 ### Requirements
 
-Ruby 2.5.x or 2.6.x (developed and tested with 2.6.5)
+AWS Recon needs AWS account role or credentials with `ReadOnlyAccess`. Full `AdministratorAccess` is over-privileged, but will work as well. The `SecurityAudit` policy is **not** sufficient as it omits access to many services.
+
+#### Running via Docker
+
+Use Docker version 19.x or above to run the pre-built image without having to install anything.
+
+#### Running locally via Ruby
+
+If you already have Ruby installed (2.5.x or 2.6.x), you may want to install the Ruby gem.
 
 ### Installation
 
-AWS Recon can be run locally by installing the Ruby gem, or via a Docker container.
+AWS Recon can be run locally via a Docker container or by installing the Ruby gem.
+
+To run via a Docker a container, pass the necessary AWS credentials into the Docker `run` command. For example:
+
+```
+$ docker run -t --rm \
+  -e AWS_REGION \
+  -e AWS_ACCESS_KEY_ID \
+  -e AWS_SECRET_ACCESS_KEY \
+  -e AWS_SESSION_TOKEN \
+  -v $(pwd)/output.json:/recon/output.json \
+  darkbitio/aws_recon:latest \
+  aws_recon -v -s EC2 -r global,us-east-1,us-east-2
+```
 
 To run locally, first install the gem:
 
 ```
 $ gem install aws_recon
-Fetching aws_recon-0.2.8.gem
-Fetching aws-sdk-resources-3.76.0.gem
+Fetching aws_recon-0.2.26.gem
 Fetching aws-sdk-3.0.1.gem
-Fetching parallel-1.19.2.gem
+Fetching parallel-1.20.1.gem
 ...
 Successfully installed aws-sdk-3.0.1
-Successfully installed parallel-1.19.2
-Successfully installed aws_recon-0.2.8
+Successfully installed parallel-1.20.1
+Successfully installed aws_recon-0.2.26
 ```
 
 Or add it to your Gemfile using `bundle`:
@@ -51,27 +71,13 @@ Fetching gem metadata from https://rubygems.org/
 Resolving dependencies...
 ...
 Using aws-sdk 3.0.1
-Using parallel 1.19.2
-Using aws_recon 0.2.8
-```
-
-To run via a Docker a container, pass the necessary AWS credentials into the Docker `run` command. For example:
-
-```
-$ docker run -t --rm \
-  -e AWS_REGION \
-  -e AWS_ACCESS_KEY_ID \
-  -e AWS_SECRET_ACCESS_KEY \
-  -e AWS_SESSION_TOKEN \
-  -v $(pwd)/output.json:/recon/output.json \
-  darkbitio/aws_recon:latest \
-  aws_recon -v -s EC2 -r global,us-east-1,us-east-2
+Using parallel-1.20.1
+Using aws_recon 0.2.26
 ```
 
-
 ## Usage
 
-AWS Recon will leverage any AWS credentials currently available to the environment it runs in. If you are collecting from multiple accounts, you may want to leverage something like [aws-vault](https://github.com/99designs/aws-vault) to manage different credentials. 
+AWS Recon will leverage any AWS credentials (see [requirements](#requirements)) currently available to the environment it runs in. If you are collecting from multiple accounts, you may want to leverage something like [aws-vault](https://github.com/99designs/aws-vault) to manage different credentials.
 
 ```
 $ aws-vault exec profile -- aws_recon
@@ -95,7 +101,7 @@ $ aws-vault exec <vault_profile> -- docker run -t --rm \
   aws_recon -j -s EC2 -r global,us-east-1,us-east-2
 ```
 
-To run from a Docker container using `aws-vault` managed credentials and output to a file, you will need to satisfy a couple of requirements. First, Docker needs access to bind mount the path you specify (or a parent path above). Second, you need to create an empty file to save the output into (e.g. `output.json`). This is because we are only mounting that one file into the Docker container at run time. For example:
+To run from a Docker container using `aws-vault` managed credentials and output to a file, you will need to satisfy a couple of requirements. First, Docker needs access to bind mount the path you specify (or a parent path above). Second, you need to create an empty file to save the output into (e.g. `output.json`). This is because only that one file is mounted into the Docker container at run time. For example:
 
 Create an empty file.
 
@@ -167,14 +173,33 @@ $ AWS_PROFILE=<profile> aws_recon -s S3,EC2 -r global,us-east-1,us-east-2 -f cus
 
 #### Errors
 
-An exception will be raised on `AccessDeniedException` errors. This typically means your user/role doesn't have the necessary permissions to get/list/describe for that service. These exceptions are raised so troubleshooting access issues is easier.
+API exceptions related to permissions are silently ignored in most cases. These errors are usually due to one of these cases:
+
+- using a role without sufficient permissions
+- querying an account with SCPs in place that prevent usage of certain services
+- trying to query a service that isn't enabled/available in your region/account
+
+In `verbose` mode, you will see exception logs in the output:
+
+```
+t2.us-east-1.EC2.describe_subnets.0
+t4.us-east-1.SSM.describe_instance_information.0
+t6.us-east-1.SecurityHub.InvalidAccessException   <-----
+t2.us-east-1.EC2.describe_addresses.0
+t4.us-east-1.SSM.describe_parameters.0
+t1.us-east-1.GuardDuty.list_detectors.0
+```
+
+Use the `-q` command line option to re-raise these exceptions so troubleshooting access issues is easier.
 
 ```
 Traceback (most recent call last):
-arn:aws:sts::1234567890:assumed-role/role/9876543210 is not authorized to perform: codepipeline:GetPipeline on resource: arn:aws:codepipeline:us-west-2:876543210123:pipeline (Aws::CodePipeline::Errors::AccessDeniedException)
+arn:aws:sts::1234567890:assumed-role/role/my-audit-role is not authorized to perform:
+ codepipeline:GetPipeline on resource: arn:aws:codepipeline:us-west-2:1234567890:pipeline
+ (Aws::CodePipeline::Errors::AccessDeniedException)
 ```
 
-The exact API operation that triggered the exception is indicated on the last line of the stack trace. If you can't resolve the necessary access, you should exclude those services with `-x` or `--not-services` so the collection can continue.
+The exact API operation that triggered the exception is indicated on the last line of the stack trace. If you can't resolve the necessary access, you should exclude those services with `-x` or `--not-services`, or leave off the `-q` option so the collection can continue.
 
 ### Threads
 
@@ -184,14 +209,20 @@ For global services like IAM, Shield, and Support, requests are not multi-thread
 
 For regional services, a thread (up to the thread limit) is spawned for each service in a region. By default, up to 8 threads will be used. If your account has resources spread across many regions, you may see a speed improvement by increasing threads with `-t X`, where `X` is the number of threads.
 
+### Performance
+
+AWS Recon will make a minimum of ~2,000 API calls in a new/empty account, just to query the supported services in all 20 standard (non-GovCloud, non-China) regions. It is very likely to encounter API rate-limiting (throttling) on large accounts if you enable more threads than the default (8).
+
+Recon will automatically backoff and respect the retry limits in the API response. If you observe long pauses during collection, this is likely what is happening. Retry collection with the `-d` or `--debug` option to observe the wire trace and see if you're being throttled. Consider using fewer threads or requesting higher rate limits from AWS if you are regularly getting rate-limited.
+
 ### Options
 
-Most users will want to limit collection to relevant services and regions. Running without any options will attempt to collect all resources from all 16 regular regions.
+Most users will want to limit collection to relevant services and regions. Running without any exclusions will attempt to collect all resources from all regions enabled for the account.
 
 ```
 $ aws_recon -h
 
-AWS Recon - AWS Inventory Collector (0.2.8)
+AWS Recon - AWS Inventory Collector (0.2.26)
 
 Usage: aws_recon [options]
     -r, --regions [REGIONS]          Regions to scan, separated by comma (default: all)
@@ -204,8 +235,10 @@ Usage: aws_recon [options]
     -t, --threads [THREADS]          Specify max threads (default: 8, max: 128)
     -u, --user-data                  Collect EC2 instance user data (default: false)
     -z, --skip-slow                  Skip slow operations (default: false)
+    -g, --skip-credential-report     Skip generating IAM credential report (default: false)
     -j, --stream-output              Stream JSON lines to stdout (default: false)
     -v, --verbose                    Output client progress and current operation
+    -q, --quit-on-exception          Stop collection if an API error is encountered (default: false)
     -d, --debug                      Output debug with wire trace info
     -h, --help                       Print this help information
 
@@ -215,6 +248,20 @@ Usage: aws_recon [options]
 
 Output is always some form of JSON - either JSON lines or plain JSON. The output is either written to a file (the default), or written to stdout (with `-j`).
 
+## Support for Manually Enabled Regions
+
+If you have enabled **manually enabled regions**:
+
+- me-south-1 - Middle East (Bahrain)
+- af-south-1 - Africa (Cape Town)
+- ap-east-1 - Asia Pacific (Hong Kong)
+- eu-south-1 - Europe (Milan)
+
+and you are using STS to assume a role into an account, you will need to [enable v2 STS tokens](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_enable-regions.html) in the account you are assuming the role **from** to be able to run AWS Recon against those regions.
+
+> Version 1 tokens are valid only in AWS Regions that are available by default. These tokens do not work in manually enabled Regions, such as Asia Pacific (Hong Kong). Version 2 tokens are valid in all Regions. However, version 2 tokens are longer and might affect systems where you temporarily store tokens.
+
+If you are using a static access key/secret, you can collect from these regions regardless of STS token version.
 
 ## Supported Services & Resources
 
@@ -250,8 +297,9 @@ AWS Recon aims to collect all resources and metadata that are relevant in determ
 - [x] ECR
 - [x] ECS
 - [x] EFS
-- [x] ELB
 - [x] EKS
+- [x] ELB
+- [x] EMR
 - [x] Elasticsearch
 - [x] ElastiCache
 - [x] Firehose
@@ -309,11 +357,8 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ### TODO
 
-- [ ] Optionally suppress AWS API errors instead of re-raising them
-- [x] Package as a gem
 - [ ] Test coverage with AWS SDK stubbed resources
 
-
 ## Kudos
 
 AWS Recon was inspired by the excellent work of the people and teams behind these tools:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws_recon
 version: !ruby/object:Gem::Version
-  version: 0.2.21
+  version: 0.2.26
 platform: ruby
 authors:
 - Josh Larsen
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-27 00:00:00.000000000 Z
+date: 2020-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -209,6 +209,7 @@ files:
 - lib/aws_recon/collectors/elasticloadbalancing.rb
 - lib/aws_recon/collectors/elasticloadbalancingv2.rb
 - lib/aws_recon/collectors/elasticsearch.rb
+- lib/aws_recon/collectors/emr.rb
 - lib/aws_recon/collectors/firehose.rb
 - lib/aws_recon/collectors/guardduty.rb
 - lib/aws_recon/collectors/iam.rb