aws_recon 0.2.24 → 0.2.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '091d2a7a27fb6c37494ec2bbddfc029c73e915925ea93e4011dbaaf6fbf637e5'
-  data.tar.gz: a6f2cfb73e6a667f3d3faff70956d26e065d3f83a6dedcdbdf0cd8eb82102385
+  metadata.gz: 8786af60d08967c2203b1f4417480b135ae32b9a40ec05810afc9c2ae126f49d
+  data.tar.gz: fbd4741002a54dc15f2b2716dee6e1b6efcec48edfdf3e101d9c7bcb19105a4e
 SHA512:
-  metadata.gz: b488755dd29b5d262e2b6775a9de1830f024975874a4f617f0cd01f80a621e2a18e1955b4a590418aa0d1efc203b2427221129ae069c01a038d1ed35bdc0b500
-  data.tar.gz: 8997f3f3350fc9c8a6ded6fbd437816005d5a17a7b6db76c2e3e646b9076af210c4b803a68e2b568bff8ea277950bfb99031c6baa767b23138db5da9869c41c0
+  metadata.gz: 2c11e60d61cf9fcf894b8e38cb136e934b03fd7e9ef1bd349ce27c41c9943e75cb146893d14374167d7f2eb73b40d97a901fbaebd6e6aee5ac93ef8095b1d0b4
+  data.tar.gz: 9510a49029fbc382fefc50ad8ae0de0351b6f8648a1044abbebdf695459ef5a4845014057618387549546876c10ea1eb09cba55f4692a0405f41b96810c0dce5

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/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/iam.rb

@@ -101,7 +101,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
 
     #
@@ -183,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

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

@@ -48,7 +48,10 @@ class Organizations < Mapper
       end
     rescue Aws::Organizations::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

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/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

@@ -20,7 +20,10 @@ class SecurityHub < Mapper
       end
     rescue Aws::SecurityHub::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

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/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

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
@@ -94,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
@@ -125,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:
@@ -133,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.24"
+  VERSION = "0.2.25"
 end

data/readme.md

@@ -215,6 +215,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 with either `v1` or `v2` STS tokens.
 
 ## Supported Services & Resources
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws_recon
 version: !ruby/object:Gem::Version
-  version: 0.2.24
+  version: 0.2.25
 platform: ruby
 authors:
 - Josh Larsen
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-05 00:00:00.000000000 Z
+date: 2020-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk