aws_recon 0.5.6 → 0.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42390b8c429d5b20271c43cca771dd8303ac36625a1854ab03b1979e09efa5eb
-  data.tar.gz: 651d4118fcc2c677f127055caa1c8eef791c60586d24686f2f841ed3635d2398
+  metadata.gz: b36afd6476827dbf5a2adaefc02adc5e936f6757634a6309d3e33eeeca8794f1
+  data.tar.gz: df21a116d19d6e44981633ec00213e9033e332b03bac8b36a1a55d3e2078e2a2
 SHA512:
-  metadata.gz: 289c6cb8f23196b46b5b2648e285ff161bfbc8dbd3fa634f8056d4d1e300755da798422d576f0b5d2512c1272347c9ea7da9fbd90b6a76345c049ea64e434149
-  data.tar.gz: d0c0239b791945fb2bb7223bc401387c1252c0d806105d85a2f53d0a36cead3e626cdcfb952e3a958213858dcadb55199f999d492b54b7175eccd4af2dbb7faf
+  metadata.gz: 9ad331ae1f7c75d1640f7de804912bae3fec6e85ded6e2aee90b4cc3e34b6b085873660b231f4cec52cca421f430ad2fd82871947bfe293321d33a8a9240d6ea
+  data.tar.gz: 6b96da64805694b2b4cf2b3cf23184c8a28ab9d65f56f855e51aecfc77c67745f0fd7df68d648f36426d6bd5ea67791ef4e1b7c4fff5f0ffcd5336203faa9450

data/Dockerfile

@@ -1,4 +1,4 @@
-ARG RUBY_VERSION=2.6.6
+ARG RUBY_VERSION=2.7.3
 FROM ruby:${RUBY_VERSION}-alpine
 
 LABEL maintainer="Darkbit <info@darkbit.io>"

data/aws_recon.gemspec

@@ -24,14 +24,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'aws-sdk', '~> 3.0'
-  spec.add_dependency 'parallel', '~> 1.19'
+  spec.add_dependency 'parallel', '~> 1.20.1'
 
-  spec.add_development_dependency 'bundler', '~> 1.17'
+  spec.add_development_dependency 'bundler', '~> 2.2.17'
+  spec.add_development_dependency 'byebug', '~> 11.1'
   spec.add_development_dependency 'gem-release', '~> 2.1'
-  spec.add_development_dependency 'rake', '~> 12.3'
   spec.add_development_dependency 'minitest', '~> 5.0'
-  spec.add_development_dependency 'solargraph', '~> 0.39.11'
-  spec.add_development_dependency 'rubocop', '~> 0.87.1'
   spec.add_development_dependency 'pry', '~> 0.13.1'
-  spec.add_development_dependency 'byebug', '~> 11.1'
+  spec.add_development_dependency 'rake', '~> 12.3'
+  spec.add_development_dependency 'rubocop', '~> 1.15'
+  spec.add_development_dependency 'solargraph', '~> 0.40.4'
 end

data/lib/aws_recon/aws_recon.rb

@@ -34,7 +34,7 @@ module AwsRecon
       # formatter
       @formatter = Formatter.new
 
-      return unless @options.stream_output
+      return if @options.stream_output
 
       puts "\nStarting collection with #{@options.threads} threads...\n"
     end
@@ -66,7 +66,7 @@ module AwsRecon
     end
 
     #
-    # Format @resources as either
+    # Format @resources as either JSON or JSONL
     #
     def formatted_json
       if @options.jsonl
@@ -117,7 +117,7 @@ module AwsRecon
     ensure
       elapsed = Process.clock_gettime(Process::CLOCK_MONOTONIC) - @starting
 
-      puts "\nFinished in #{elapsed.to_i} seconds.\n\n"
+      puts "\nFinished in #{elapsed.to_i} seconds.\n\n" unless @options.stream_output
 
       # write output file
       if @options.output_file && !@options.s3

data/lib/aws_recon/collectors/lambda.rb

@@ -17,6 +17,9 @@ class Lambda < Mapper
         struct = OpenStruct.new(function)
         struct.type = 'function'
         struct.arn = function.function_arn
+        struct.vpc_config = function.vpc_config.to_h
+        struct.tracing_config = function.tracing_config.to_h
+        struct.layers = function.layers ? function.layers.map(&:to_h) : []
         struct.policy = @client.get_policy({ function_name: function.function_name }).policy.parse_policy
 
       rescue Aws::Lambda::Errors::ResourceNotFoundException => e
@@ -36,6 +39,7 @@ class Lambda < Mapper
         struct = OpenStruct.new(layer)
         struct.type = 'layer'
         struct.arn = layer.layer_arn
+        struct.latest_matching_version = layer.latest_matching_version.to_h
 
         # list_layer_versions
         struct.versions = @client.list_layer_versions({ layer_name: layer.layer_name }).layer_versions.map(&:to_h)

data/lib/aws_recon/collectors/wafv2.rb

@@ -7,9 +7,7 @@ class WAFV2 < Mapper
   #
   # Returns an array of resources.
   #
-  # TODO: test live
   # TODO: resolve scope (e.g. CLOUDFRONT supported?)
-  # TODO: confirm paging behavior
   #
   def collect
     resources = []
@@ -25,7 +23,6 @@ class WAFV2 < Mapper
         response.web_acls.each do |acl|
           struct = OpenStruct.new(acl.to_h)
           struct.type = 'web_acl'
-          # struct.arn = "arn:aws:#{@service}:#{@region}::web_acl/#{acl.id}"
 
           params = {
             name: acl.name,
@@ -40,7 +37,7 @@ class WAFV2 < Mapper
           end
 
           # list_resources_for_web_acl
-          @client.list_resources_for_web_acl({ web_acl_arn: 'ResourceArn' }).each do |r|
+          @client.list_resources_for_web_acl({ web_acl_arn: acl.arn }).each do |r|
             struct.resources = r.resource_arns.map(&:to_h)
           end
 

data/lib/aws_recon/options.rb

@@ -100,6 +100,7 @@ class Parser
 
       # write output file to S3 bucket
       opts.on('-b', '--s3-bucket [BUCKET:REGION]', 'Write output file to S3 bucket (default: \'\')') do |bucket_with_region|
+        args.stream_output = false
         args.s3 = bucket_with_region
       end
 
@@ -109,8 +110,8 @@ class Parser
       end
 
       # output format
-      opts.on('-f', '--format [FORMAT]', 'Specify output format (default: aws)') do |file|
-        args.output_format = file.downcase if %w[aws custom].include?(file.downcase)
+      opts.on('-f', '--format [FORMAT]', 'Specify output format (default: aws)') do |f|
+        args.output_format = f.downcase if %w[aws custom].include?(f.downcase)
       end
 
       # threads

data/lib/aws_recon/services.yaml

@@ -126,7 +126,6 @@
     - af-south-1
     - ap-east-1
     - ap-northeast-3
-    - eu-north-1
     - eu-south-1
     - me-south-1
     - sa-east-1
@@ -153,7 +152,6 @@
   alias: transfer
   excluded_regions:
     - ap-northeast-3
-    - eu-south-1
 - name: DirectConnect
   alias: directconnect
 - name: DirectoryService

data/lib/aws_recon/version.rb

@@ -1,3 +1,3 @@
 module AwsRecon
-  VERSION = "0.5.6"
+  VERSION = "0.5.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws_recon
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.11
 platform: ruby
 authors:
 - Josh Larsen
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-16 00:00:00.000000000 Z
+date: 2021-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -31,56 +31,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: 1.20.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: 1.20.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.17
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.17
 - !ruby/object:Gem::Dependency
-  name: gem-release
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '11.1'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -96,61 +96,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: solargraph
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.39.11
+        version: 0.13.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.39.11
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.87.1
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.87.1
+        version: '12.3'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: '1.15'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: solargraph
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: 0.40.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: 0.40.4
 description: AWS Recon is a command line tool to collect resources from an Amazon
   Web Services (AWS) account. The tool outputs JSON suitable for processing with other
   tools.