cfn-nag 0.3.69 → 0.3.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2471f38f4fade1aa0683c1f26d888f98dfecc520dfd440302e44abdbe4f91b7
-  data.tar.gz: 83cbc36c169ca23c5e33793ef4a30239fffad5f10bcdc37caac8bac13500f43d
+  metadata.gz: 87b103419c81f7993bac0aaea152c9d4f5fb90df1a266d219b768e31e93c962f
+  data.tar.gz: ad57b13ca5e9d12ae76e9ab0ab2190b30f3edf82f12ad4cb4fde137fda9fa7ce
 SHA512:
-  metadata.gz: f6f7265da9cbf280f7a453b4253ffe81b794188a2f5290dd2840a2d44f9a98b21d1c40c3454ba577c84ba4ed4789c959329a47c529e57b9c47777d1f8bd4c66a
-  data.tar.gz: 82b6265c74af0cb1f97306d930b3f1b4ed6a6bc326f4f66e076a834cc05ce6a843d8da0530a64c4071d03c70ad03994a517200eb0c04a8aad36341cbad82c354
+  metadata.gz: 9c944634f99d05d4233c336052d88305be821d95c03e488d3ee5620191e18a66833bfdac7a6c2e5bbe64c83a79bee4e5cf878be060c08de9533adbe67d57a64f
+  data.tar.gz: 15ca6d74a6c3aa6813d8a31c2e4e6bd1f4535e91abf23525a3d4f96a738ed4c655635516e181be08447e3624cbc7e25a2fe8c50e2080d79874f1f76441a84a7d

data/lib/cfn-nag/cfn_nag.rb

@@ -85,7 +85,7 @@ class CfnNag
     rescue Psych::SyntaxError, ParserError => parser_error
       violations << fatal_violation(parser_error.to_s)
     rescue JSON::ParserError => json_parameters_error
-      error = "JSON Parameter values parse error: #{json_parameters_error.to_s}"
+      error = "JSON Parameter values parse error: #{json_parameters_error}"
       violations << fatal_violation(error)
     end
 

data/lib/cfn-nag/custom_rule_loader.rb

@@ -85,9 +85,9 @@ class CustomRuleLoader
         )
         audit_result = rule_class.new.audit(filtered_cfn_model)
         violations << audit_result unless audit_result.nil?
-      rescue Exception => exception
-        raise exception unless @isolate_custom_rule_exceptions
-        STDERR.puts exception
+      rescue ScriptError, StandardError => rule_error
+        raise rule_error unless @isolate_custom_rule_exceptions
+        STDERR.puts rule_error
       end
     end
   end

data/lib/cfn-nag/custom_rules/CloudFormationAuthenticationRule.rb

@@ -17,21 +17,22 @@ class CloudFormationAuthenticationRule < BaseRule
   end
 
   def audit_impl(cfn_model)
-    logical_resource_ids = []
-    cfn_model.raw_model['Resources'].each do |resource_name, resource|
-      unless resource['Metadata'].nil?
-        unless resource['Metadata']['AWS::CloudFormation::Authentication'].nil?
-
-          resource['Metadata']['AWS::CloudFormation::Authentication'].each do |auth_name, auth|
-            if potentially_sensitive_credentials? auth
-              logical_resource_ids << resource_name
-            end
-          end
-
-        end
-      end
+    violating_resources = cfn_model.raw_model['Resources'].select do |_resource_name, resource|
+      resource_has_authentication?(resource) && resource_has_sensitive_credentials?(resource)
     end
-    logical_resource_ids
+    violating_resources.keys
+  end
+
+  private
+
+  def resource_has_sensitive_credentials?(resource)
+    resource['Metadata']['AWS::CloudFormation::Authentication'].find do |_auth_name, auth|
+      potentially_sensitive_credentials? auth
+    end
+  end
+
+  def resource_has_authentication?(resource)
+    resource['Metadata'] && resource['Metadata']['AWS::CloudFormation::Authentication']
   end
 
   def potentially_sensitive_credentials?(auth)

data/lib/cfn-nag/jmes_path_discovery.rb

@@ -5,13 +5,13 @@ class JmesPathDiscovery
     @rule_registry = rule_registry
   end
 
-  def warning(id:, jmespath:, message:)
+  def warning(id:, message:)
     @rule_registry.definition(id: id,
                               type: Violation::WARNING,
                               message: message)
   end
 
-  def failure(id:, jmespath:, message:)
+  def failure(id:, message:)
     @rule_registry.definition(id: id,
                               type: Violation::FAILING_VIOLATION,
                               message: message)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfn-nag
 version: !ruby/object:Gem::Version
-  version: 0.3.69
+  version: 0.3.70
 platform: ruby
 authors:
 - Eric Kascic