cfn-nag 0.3.39 → 0.3.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2843c50fa4d415aedb5606961c12ab5646a1fa75aa9c919bf66d29fea086e4f0
-  data.tar.gz: 748fa1657a3f5c77915983ea5aee06cc569114719338226bd76646f51c46ea69
+  metadata.gz: 6c5f5526f00bdcb756ccda1d679afe742fa2ea77a5858eb86fb5d1b8216a89b8
+  data.tar.gz: 307512c7fe5ea5de57323c68e7aeab2646026c4d2411c41e5f6b9da9f066b243
 SHA512:
-  metadata.gz: e0550dc541239547c330aa2ee983a8f787ca02d5b8f4b4b6646bbe8e0a511a8f9be53b12df5ced20168ab85b50df3941e5d35d10d310f64a9d146a1b304b7baa
-  data.tar.gz: 65534e73756b15adb8c9a980af95efb3185a8d2d01075f4f49a0d8552341a43170d6d7a599c25a410fcbba365cbabc32807dd400b6319a75a5aef453c52508a7
+  metadata.gz: 38392d3069353e411ad7a4bff68113f0420ccf1ad2ae6ae3288d3510214114e3d339bf9110a267a5e41d74ea612d5b0900fe7c1d69c554b3cffafa15a8b959ec
+  data.tar.gz: 5057bb311c09bd37e9271f6e4ec02822e189416fabac9abf0ca718d679432303f8ede7bf45118f9ac661c0f66e6d085833415b274e2cbf7e4b90b29b4887fe51

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

@@ -18,7 +18,6 @@ class S3BucketPolicyWildcardActionRule < BaseRule
     logical_resource_ids = []
 
     cfn_model.resources_by_type('AWS::S3::BucketPolicy').each do |bucket_policy|
-
       if !bucket_policy.policy_document.wildcard_allowed_actions.empty?
         logical_resource_ids << bucket_policy.logical_resource_id
       end

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

@@ -18,7 +18,6 @@ class SqsQueuePolicyWildcardActionRule < BaseRule
     logical_resource_ids = []
 
     cfn_model.resources_by_type('AWS::SQS::QueuePolicy').each do |queue_policy|
-
       if !queue_policy.policy_document.wildcard_allowed_actions.empty?
         logical_resource_ids << queue_policy.logical_resource_id
       end

data/lib/cfn-nag/profile_loader.rb

@@ -1,30 +1,48 @@
 require_relative 'profile'
 
+# Load rule profile
 class ProfileLoader
   def initialize(rules_registry)
     @rules_registry = rules_registry
   end
 
+  # Load rules from a profile definition
   def load(profile_definition:)
-    if profile_definition.nil? || (profile_definition.strip == '')
-      raise 'Empty profile'
-    end
+    # coerce falsy profile_definition into empty string for
+    # empty profile check
+    profile_definition ||= ''
+    raise 'Empty profile' if profile_definition.strip == ''
 
     new_profile = Profile.new
 
     profile_definition.each_line do |line|
-      rule_id = line.chomp
-      rule_line_match = /^([a-zA-Z]*?[0-9]+)\s*(.*)/.match(rule_id)
-      if !rule_line_match.nil?
-        rule_id = rule_line_match.captures.first
-        if @rules_registry.by_id(rule_id) == nil
-          raise "#{rule_id} is not a legal rule identifier from: " \
-                "#{@rules_registry.rules.map(&:id)}"
-        else
-          new_profile.add_rule rule_id
-        end
-      end
+      next unless (rule_id = rule_line_match(line))
+      check_valid_rule_id rule_id
+      new_profile.add_rule rule_id
     end
     new_profile
   end
+
+  private
+
+  # Parses a line, returns first matching line or false if
+  # no match
+  def rule_line_match(rule_id)
+    rule_id = rule_id.chomp
+    matches = /^([a-zA-Z]*?[0-9]+)\s*(.*)/.match(rule_id)
+    return false if matches.nil?
+    matches.captures.first
+  end
+
+  # Return ids of rules in registry
+  def rules_ids
+    @rules_registry.rules.map(&:id)
+  end
+
+  # Return true if rule_id is valid (present in rules registry),
+  # else raise an error
+  def check_valid_rule_id(rule_id)
+    return true unless @rules_registry.by_id(rule_id).nil?
+    raise "#{rule_id} is not a legal rule identifier from: #{rules_ids}"
+  end
 end

metadata

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