aws_recon 0.5.4 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d64ead4511b072694c681eb0e13fab491d01398319ba19ea1c70e533040e0454
-  data.tar.gz: 37c12b9b8dda2ac030fd62f4da97912800a2725070b56cc3fac70fdea118e281
+  metadata.gz: f63df658eeddb1e81970f6dc99a1f05a2fa2d1d62b037e35665c46d4016ead29
+  data.tar.gz: c8328a76621f50123f5552681ce3d54e17567c194ad2c12e0eab8a2e6c8cd2c9
 SHA512:
-  metadata.gz: 6ef8c579c750d232000e2d1e0d53b0cb5054da766a8e62c9e0f49f6000d860b2cecb36c403126bad7cc9e1aa593fe459da953412c73829957786a4837cb0f9da
-  data.tar.gz: b70c879f9f092a5f74076f97109374b3ddcf948f6d4d9163cce99b313499b6bb63e2d73165d1a32b5e254000ef0a354ca6666ee6f301f50a7d30180e7870fc64
+  metadata.gz: fa3f60bce87b3d2c1124baf02cc05274596234e5510a54cdf0d880027aac8b6fe604729ceab7c5e01af955ef9b3e43407c37edd7a7854235190b1d1f28fd61d3
+  data.tar.gz: 56cd4b818b3e62f9d7ffaa7ae1c9badb9ba99583e1cea27d58160add1606b3e0b4145e712ef9340946423ca13470a5df7bc9955d7c63e45e1aa87496b2e7c5e2

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

@@ -56,7 +56,7 @@
 - name: ECR
   alias: ecr
 - name: DynamoDB
-  alias: ddb
+  alias: dynamodb
 - name: KMS
   alias: kms
 - name: Kinesis
@@ -102,7 +102,7 @@
     - af-south-1
     - ap-northeast-3
 - name: SecretsManager
-  alias: sm
+  alias: secretsmanager
 - name: SecurityHub
   alias: securityhub
 - name: Support
@@ -153,9 +153,8 @@
   alias: transfer
   excluded_regions:
     - ap-northeast-3
-    - eu-south-1
 - name: DirectConnect
-  alias: dc
+  alias: directconnect
 - name: DirectoryService
   alias: ds
   excluded_regions:

data/lib/aws_recon/version.rb

@@ -1,3 +1,3 @@
 module AwsRecon
-  VERSION = "0.5.4"
+  VERSION = "0.5.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws_recon
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.9
 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-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk