aws_recon 0.5.18 → 0.5.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c15eafbd64e2a41405c27df26f663d967fb600fe92928414a45f7278ce4a2f55
-  data.tar.gz: 71455e2d1dfc37993303ec58704ddffd87a05cd3713562c8b3bd42177bdfb7ba
+  metadata.gz: a0225940b06ce4f050b76411a63eef4d83fab157ff64524214ecc37aaa9b4763
+  data.tar.gz: 5bbcdb94d22cfe23caa9f5d43ddc1c7dd5a2e58a7784f19ff6f0defb753f324a
 SHA512:
-  metadata.gz: fe48606bd7de9da79ddadf19c6414492282395e5776eec11f5be3dbe6fc01167436af2447c92db88dd3cf2956f05f020e8ef558a3392544b0eb5c1ae626c3ba2
-  data.tar.gz: d82ad1c04091c3137f33a82d9485ecfd6e78a35ba7068e3e8cc59ffe9307dc910fa21fbb567b6da11b2f6cde4374d111cf911cc73923359585aa29bddfb863b6
+  metadata.gz: cc712417ee38a98f13aea07c7809aa4412598b4165f775a9c1986aa1981474194b90d35ddfc86992cb9faa705b3dc9d5b0ca0122d1070f995c4d072e4e4c3b27
+  data.tar.gz: de820cc2a6551defd85fca374d3aa875c494d0c9c1dd9084f09e371618623fb53edeaf4864aad04d126a6a4fc3831115d9419a175a40a961f2567c139b66d8b1

data/aws_recon.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'aws-sdk', '~> 3.0'
+  spec.add_dependency 'aws-sdk', '~> 3.1'
   spec.add_dependency 'parallel', '~> 1.20.1'
 
   spec.add_development_dependency 'bundler', '~> 2.2.17'

data/lib/aws_recon/collectors/ec2.rb

@@ -98,7 +98,10 @@ class EC2 < Mapper
           struct.type = 'vpc'
           struct.arn = "arn:aws:ec2:#{@region}:#{@account}:vpc/#{vpc.vpc_id}" # no true ARN
           struct.flow_logs = @client
-                             .describe_flow_logs({ filter: [{ name: 'resource-id', values: [vpc.vpc_id] }] })
+                             .describe_flow_logs({ filter: [{
+                                                   name: 'resource-id',
+                                                   values: [vpc.vpc_id]
+                                                 }] })
                              .flow_logs.first.to_h
 
           resources.push(struct.to_h)
@@ -337,19 +340,33 @@ class EC2 < Mapper
       #
       # describe_managed_prefix_lists
       #
-      @client.describe_managed_prefix_lists.each_with_index do |response, page|
-        log(response.context.operation_name, page)
+      begin
+        @client.describe_managed_prefix_lists.each_with_index do |response, page|
+          log(response.context.operation_name, page)
 
-        response.prefix_lists.each do |list|
-          struct = OpenStruct.new(list.to_h)
-          struct.type = 'prefix_list'
-          struct.arn = list.prefix_list_arn
+          response.prefix_lists.each do |list|
+            struct = OpenStruct.new(list.to_h)
+            struct.type = 'prefix_list'
+            struct.arn = list.prefix_list_arn
 
-          resources.push(struct.to_h)
+            resources.push(struct.to_h)
+          end
         end
+      rescue Aws::EC2::Errors::ServiceError => e
+        log_error(e.code)
+
+        raise e unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
       end
     end
 
     resources
   end
+
+  private
+
+  def suppressed_errors
+    %w[
+      InvalidAction
+    ]
+  end
 end

data/lib/aws_recon/collectors/organizations.rb

@@ -13,13 +13,19 @@ class Organizations < Mapper
     #
     # describe_organization
     #
-    @client.describe_organization.each do |response|
-      log(response.context.operation_name)
+    begin
+      @client.describe_organization.each do |response|
+        log(response.context.operation_name)
 
-      struct = OpenStruct.new(response.organization.to_h)
-      struct.type = 'organization'
+        struct = OpenStruct.new(response.organization.to_h)
+        struct.type = 'organization'
 
-      resources.push(struct.to_h)
+        resources.push(struct.to_h)
+      end
+    rescue Aws::Organizations::Errors::ServiceError => e
+      log_error(e.code)
+
+      raise e unless suppressed_errors.include?(e.code) && !@options.quit_on_exception
     end
 
     #
@@ -66,6 +72,7 @@ class Organizations < Mapper
   def suppressed_errors
     %w[
       AccessDeniedException
+      AWSOrganizationsNotInUseException
     ]
   end
 end

data/lib/aws_recon/collectors/s3.rb

@@ -53,7 +53,8 @@ class S3 < Mapper
           { func: 'get_bucket_tagging', key: 'tagging', field: nil },
           { func: 'get_bucket_logging', key: 'logging', field: 'logging_enabled' },
           { func: 'get_bucket_versioning', key: 'versioning', field: nil },
-          { func: 'get_bucket_website', key: 'website', field: nil }
+          { func: 'get_bucket_website', key: 'website', field: nil },
+          { func: 'get_bucket_ownership_controls', key: 'ownership_controls', field: 'ownership_controls' }
         ]
 
         operations.each do |operation|
@@ -96,6 +97,7 @@ class S3 < Mapper
       ReplicationConfigurationNotFoundError
       NoSuchPublicAccessBlockConfiguration
       ObjectLockConfigurationNotFoundError
+      OwnershipControlsNotFoundError
     ]
   end
 end

data/lib/aws_recon/services.yaml

@@ -87,7 +87,6 @@
   alias: ses
   excluded_regions:
     - ap-east-1
-    - ap-northeast-3
 - name: CloudWatch
   alias: cloudwatch
 - name: CloudWatchLogs

data/lib/aws_recon/version.rb

@@ -1,3 +1,3 @@
 module AwsRecon
-  VERSION = "0.5.18"
+  VERSION = "0.5.22"
 end

data/readme.md

@@ -37,6 +37,7 @@ AWS Recon handles collection from large accounts by taking advantage of automati
 - [Pinterest](https://www.pinterest.com/)
 - [HackerOne](https://www.hackerone.com/)
 - [MuleSoft](https://www.mulesoft.com/)
+- [Slack](https://slack.com/)
 - [Drata](https://drata.com/)
 
 > ** usage does not imply endorsement

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws_recon
 version: !ruby/object:Gem::Version
-  version: 0.5.18
+  version: 0.5.22
 platform: ruby
 authors:
 - Josh Larsen
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-11 00:00:00.000000000 Z
+date: 2021-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement