cfn-nag 0.7.15 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21844ee26ff22655e7c4ca236ff4f27511c6c538450c5a67ee5981aa739c40ae
-  data.tar.gz: 151d8518421441674483e09ecdec0454da73e973c58b8d3826f95417d9423917
+  metadata.gz: d0dd505f40c9fd504634b10223a8742375032a6fd225febe29460692dae4b5d2
+  data.tar.gz: 6e535f22dde6837b2384a94a95f1a115ca0ec89c30450793ae490b092d034622
 SHA512:
-  metadata.gz: b09918a74b3c26e097b63d171bd3af8fe2ff83d72b6782c03fe56b23f99a5f10e43bd6b111ea1a8ae4381bb4e376d71efcc4d8484d5ddb32266096294a869e95
-  data.tar.gz: 1f5558eb98f3455d2fd2a195ef887d51a6899f7a62bcd7515b048b0e451d783d99bb4cca84a6e8a584f0e66cdde05ca4573115f8c3e723aa2d8e10d3ff00a2f7
+  metadata.gz: 0d75d174639ebf1056c2add11c6acca90f273d545dd825703a710b1e15c0483c90dee85a161d4c7d4b6261371ac7d3ec1b6df3f80facbec2f59cb0adf683b060
+  data.tar.gz: cd3d89960bf8662a99e2a6e180c46ad587413872e30085e77b7db625a46a1e9d0d8d7a742debe3cdd7b8f8f51bc07190696eb9271479cf0ce13ee8b707320e05

data/bin/cfn_nag_rules

@@ -6,7 +6,7 @@ require 'cfn-nag'
 require 'rubygems/specification'
 
 opts = Optimist.options do
-  version Gem::Specification.find_by_name('cfn-nag').version
+  version CfnNagVersion::VERSION
 
   opt :rule_directory, 'Extra rule directories', type: :io,
                                                  required: false,
@@ -27,12 +27,12 @@ end
 
 profile_definition = nil
 unless opts[:profile_path].nil?
-  profile_definition = IO.read(opts[:profile_path])
+  profile_definition = File.read(opts[:profile_path])
 end
 
 rule_repository_definitions = []
 opts[:rule_repository]&.each do |rule_repository|
-  rule_repository_definitions << IO.read(rule_repository)
+  rule_repository_definitions << File.read(rule_repository)
 end
 
 rule_dumper = CfnNagRuleDumper.new(profile_definition: profile_definition,

data/bin/spcm_scan

@@ -41,7 +41,7 @@ end
 
 def read_conditionally(path)
   unless path.nil?
-    IO.read(path)
+    File.read(path)
   end
 end
 

data/lib/cfn-nag/base_rule.rb

@@ -20,10 +20,16 @@ class CfnNag
       logical_resource_ids = audit_impl(cfn_model)
       return if logical_resource_ids.empty?
 
+      violation(logical_resource_ids)
+    end
+
+    def violation(logical_resource_ids, line_numbers = nil)
       Violation.new(id: rule_id,
+                    name: self.class.name,
                     type: rule_type,
                     message: rule_text,
-                    logical_resource_ids: logical_resource_ids)
+                    logical_resource_ids: logical_resource_ids,
+                    line_numbers: line_numbers)
     end
   end
 end

data/lib/cfn-nag/cfn_nag.rb

@@ -8,6 +8,7 @@ require_relative 'result_view/stdout_results'
 require_relative 'result_view/simple_stdout_results'
 require_relative 'result_view/colored_stdout_results'
 require_relative 'result_view/json_results'
+require_relative 'result_view/sarif_results'
 require 'cfn-model'
 
 # Top-level CfnNag class for running profiles
@@ -55,8 +56,8 @@ class CfnNag
                                    parameter_values_path: nil,
                                    condition_values_path: nil,
                                    template_pattern: DEFAULT_TEMPLATE_PATTERN)
-    parameter_values_string = parameter_values_path.nil? ? nil : IO.read(parameter_values_path)
-    condition_values_string = condition_values_path.nil? ? nil : IO.read(condition_values_path)
+    parameter_values_string = parameter_values_path.nil? ? nil : File.read(parameter_values_path)
+    condition_values_string = condition_values_path.nil? ? nil : File.read(condition_values_path)
 
     templates = TemplateDiscovery.new.discover_templates(input_json_path: input_path,
                                                          template_pattern: template_pattern)
@@ -64,7 +65,7 @@ class CfnNag
     templates.each do |template|
       aggregate_results << {
         filename: template,
-        file_results: audit(cloudformation_string: IO.read(template),
+        file_results: audit(cloudformation_string: File.read(template),
                             parameter_values_string: parameter_values_string,
                             condition_values_string: condition_values_string)
       }
@@ -93,13 +94,13 @@ class CfnNag
         @config.custom_rule_loader.rule_definitions
       )
 
-      violations = filter_violations_by_blacklist_and_profile(violations)
+      violations = filter_violations_by_deny_list_and_profile(violations)
       violations = mark_line_numbers(violations, cfn_model)
     rescue RuleRepoException, Psych::SyntaxError, ParserError => fatal_error
-      violations << fatal_violation(fatal_error.to_s)
+      violations << Violation.fatal_violation(fatal_error.to_s)
     rescue JSON::ParserError => json_parameters_error
       error = "JSON Parameter values parse error: #{json_parameters_error}"
-      violations << fatal_violation(error)
+      violations << Violation.fatal_violation(error)
     end
 
     violations = prune_fatal_violations(violations) if @config.ignore_fatal
@@ -112,7 +113,7 @@ class CfnNag
 
   def render_results(aggregate_results:,
                      output_format:)
-    results_renderer(output_format).new.render(aggregate_results)
+    results_renderer(output_format).new.render(aggregate_results, @config.custom_rule_loader.rule_definitions)
   end
 
   private
@@ -127,21 +128,21 @@ class CfnNag
     violations
   end
 
-  def filter_violations_by_blacklist_and_profile(violations)
+  def filter_violations_by_deny_list_and_profile(violations)
     violations = filter_violations_by_profile(
       profile_definition: @config.profile_definition,
       rule_definitions: @config.custom_rule_loader.rule_definitions,
       violations: violations
     )
 
-    # this must come after - blacklist should always win
-    filter_violations_by_blacklist(
-      blacklist_definition: @config.blacklist_definition,
+    # this must come after - deny list should always win
+    filter_violations_by_deny_list(
+      deny_list_definition: @config.deny_list_definition,
       rule_definitions: @config.custom_rule_loader.rule_definitions,
       violations: violations
     )
-  rescue StandardError => blacklist_or_profile_parse_error
-    violations << fatal_violation(blacklist_or_profile_parse_error.to_s)
+  rescue StandardError => deny_list_or_profile_parse_error
+    violations << Violation.fatal_violation(deny_list_or_profile_parse_error.to_s)
     violations
   end
 
@@ -152,17 +153,12 @@ class CfnNag
     }
   end
 
-  def fatal_violation(message)
-    Violation.new(id: 'FATAL',
-                  type: Violation::FAILING_VIOLATION,
-                  message: message)
-  end
-
   def results_renderer(output_format)
     registry = {
       'colortxt' => ColoredStdoutResults,
       'txt' => SimpleStdoutResults,
-      'json' => JsonResults
+      'json' => JsonResults,
+      'sarif' => SarifResults
     }
     registry[output_format]
   end

data/lib/cfn-nag/cfn_nag_config.rb

@@ -3,7 +3,7 @@
 class CfnNagConfig
   # rubocop:disable Metrics/ParameterLists
   def initialize(profile_definition: nil,
-                 blacklist_definition: nil,
+                 deny_list_definition: nil,
                  rule_directory: nil,
                  allow_suppression: true,
                  print_suppression: false,
@@ -21,7 +21,7 @@ class CfnNagConfig
       rule_repository_definitions: rule_repository_definitions
     )
     @profile_definition = profile_definition
-    @blacklist_definition = blacklist_definition
+    @deny_list_definition = deny_list_definition
     @fail_on_warnings = fail_on_warnings
     @rule_repositories = rule_repositories
     @rule_arguments = rule_arguments
@@ -29,6 +29,6 @@ class CfnNagConfig
   end
   # rubocop:enable Metrics/ParameterLists
 
-  attr_reader :rule_arguments, :rule_directory, :custom_rule_loader, :profile_definition, :blacklist_definition, \
+  attr_reader :rule_arguments, :rule_directory, :custom_rule_loader, :profile_definition, :deny_list_definition, \
               :fail_on_warnings, :rule_repositories, :ignore_fatal
 end

data/lib/cfn-nag/cfn_nag_executor.rb

@@ -7,7 +7,7 @@ require 'cfn-nag/cfn_nag_config'
 class CfnNagExecutor
   def initialize
     @profile_definition = nil
-    @blacklist_definition = nil
+    @deny_list_definition = nil
     @parameter_values_string = nil
     @condition_values_string = nil
     @rule_repository_definitions = []
@@ -74,9 +74,9 @@ class CfnNagExecutor
   end
 
   def validate_options(opts)
-    unless opts[:output_format].nil? || %w[colortxt txt json].include?(opts[:output_format])
+    unless opts[:output_format].nil? || %w[colortxt txt json sarif].include?(opts[:output_format])
       Optimist.die(:output_format,
-                   'Must be colortxt, txt, or json')
+                   'Must be colortxt, txt, json or sarif')
     end
 
     opts[:rule_arguments]&.each do |rule_argument|
@@ -89,7 +89,7 @@ class CfnNagExecutor
   def execute_io_options(opts)
     @profile_definition = read_conditionally(opts[:profile_path])
 
-    @blacklist_definition = read_conditionally(opts[:blacklist_path])
+    @deny_list_definition = read_conditionally(opts[:deny_list_path]) || read_conditionally(opts[:blacklist_path])
 
     @parameter_values_string = read_conditionally(opts[:parameter_values_path])
 
@@ -98,13 +98,13 @@ class CfnNagExecutor
     @rule_arguments_string = read_conditionally(opts[:rule_arguments_path])
 
     opts[:rule_repository]&.each do |rule_repository|
-      @rule_repository_definitions << IO.read(rule_repository)
+      @rule_repository_definitions << File.read(rule_repository)
     end
   end
 
   def read_conditionally(path)
     unless path.nil?
-      IO.read(path)
+      File.read(path)
     end
   end
 
@@ -122,7 +122,7 @@ class CfnNagExecutor
   def cfn_nag_config(opts)
     CfnNagConfig.new(
       profile_definition: @profile_definition,
-      blacklist_definition: @blacklist_definition,
+      deny_list_definition: @deny_list_definition,
       rule_directory: opts[:rule_directory],
       allow_suppression: opts[:allow_suppression],
       print_suppression: opts[:print_suppression],

data/lib/cfn-nag/cli_options.rb

@@ -1,14 +1,15 @@
 # frozen_string_literal: true
 
 require 'optimist'
+require_relative 'version'
 
 # rubocop:disable Metrics/ClassLength
 class Options
   @custom_rule_exceptions_message = 'Isolate custom rule exceptions - just ' \
-                                   'emit the exception without stack trace ' \
-                                   'and keep chugging'
+                                    'emit the exception without stack trace ' \
+                                    'and keep chugging'
 
-  @version = Gem::Specification.find_by_name('cfn-nag').version
+  @version = CfnNagVersion::VERSION
 
   def self.for(type)
     case type
@@ -25,7 +26,7 @@ class Options
   # rubocop:disable Metrics/MethodLength
   def self.file_options
     options_message = '[options] <cloudformation template path ...>|' \
-                        '<cloudformation template in STDIN>'
+                      '<cloudformation template in STDIN>'
     custom_rule_exceptions_message = @custom_rule_exceptions_message
     version = @version
 
@@ -58,8 +59,13 @@ class Options
           type: :string,
           required: false,
           default: nil
+      opt :deny_list_path,
+          'Path to a deny list file',
+          type: :string,
+          required: false,
+          default: nil
       opt :blacklist_path,
-          'Path to a blacklist file',
+          '(Deprecated) Path to a deny list file',
           type: :string,
           required: false,
           default: nil
@@ -84,7 +90,7 @@ class Options
           required: false,
           default: false
       opt :output_format,
-          'Format of results: [txt, json, colortxt]',
+          'Format of results: [txt, json, colortxt, sarif]',
           type: :string,
           default: 'colortxt'
       opt :rule_repository,
@@ -127,7 +133,7 @@ class Options
           type: :string,
           required: true
       opt :output_format,
-          'Format of results: [txt, json, colortxt]',
+          'Format of results: [txt, json, colortxt, sarif]',
           type: :string,
           default: 'colortxt'
       opt :debug,
@@ -145,8 +151,13 @@ class Options
           type: :string,
           required: false,
           default: nil
+      opt :deny_list_path,
+          'Path to a deny list file',
+          type: :string,
+          required: false,
+          default: nil
       opt :blacklist_path,
-          'Path to a blacklist file',
+          '(Deprecated) Path to a deny list file',
           type: :string,
           required: false,
           default: nil

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

@@ -8,7 +8,7 @@ require_relative 'base'
 class AlexaASKSkillAuthenticationConfigurationClientSecretRule < BaseRule
   def rule_text
     'Alexa ASK Skill AuthenticationConfiguration ClientSecret must not be ' \
-    'a plaintext string or a Ref to a NoEcho Parameter with a Default value.'
+      'a plaintext string or a Ref to a NoEcho Parameter with a Default value.'
   end
 
   def rule_type

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

@@ -8,7 +8,7 @@ require_relative 'base'
 class AlexaASKSkillAuthenticationConfigurationRefreshTokenRule < BaseRule
   def rule_text
     'Alexa ASK Skill AuthenticationConfiguration RefreshToken must not be ' \
-    'a plaintext string or a Ref to a NoEcho Parameter with a Default value.'
+      'a plaintext string or a Ref to a NoEcho Parameter with a Default value.'
   end
 
   def rule_type

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

@@ -6,7 +6,7 @@ require_relative 'sub_property_with_list_password_base_rule'
 class AmazonMQBrokerUsersPasswordRule < SubPropertyWithListPasswordBaseRule
   def rule_text
     'AmazonMQ Broker Users Password must not be a plaintext string or a Ref to a Parameter with a Default value. ' \
-    'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager value.'
+      'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager value.'
   end
 
   def rule_type

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

@@ -6,8 +6,8 @@ require_relative 'password_base_rule'
 class AmplifyAppAccessTokenRule < PasswordBaseRule
   def rule_text
     'Amplify App AccessToken must not be a plaintext string ' \
-    'or a Ref to a Parameter with a Default value.  ' \
-    'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager value.'
+      'or a Ref to a Parameter with a Default value.  ' \
+      'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager value.'
   end
 
   def rule_type

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

@@ -6,8 +6,8 @@ require_relative 'password_base_rule'
 class AmplifyAppBasicAuthConfigPasswordRule < PasswordBaseRule
   def rule_text
     'Amplify App BasicAuthConfig Password must not be a plaintext string ' \
-    'or a Ref to a Parameter with a Default value.  ' \
-    'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager value.'
+      'or a Ref to a Parameter with a Default value.  ' \
+      'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager value.'
   end
 
   def rule_type

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

@@ -6,8 +6,8 @@ require_relative 'password_base_rule'
 class AmplifyAppOauthTokenRule < PasswordBaseRule
   def rule_text
     'Amplify App OauthToken must not be a plaintext string ' \
-    'or a Ref to a Parameter with a Default value.  ' \
-    'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager value.'
+      'or a Ref to a Parameter with a Default value.  ' \
+      'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager value.'
   end
 
   def rule_type

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

@@ -6,8 +6,8 @@ require_relative 'password_base_rule'
 class AmplifyBranchBasicAuthConfigPasswordRule < PasswordBaseRule
   def rule_text
     'Amplify Branch BasicAuthConfig Password must not be a plaintext ' \
-    'string or a Ref to a Parameter with a Default value.  ' \
-    'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager value.'
+      'string or a Ref to a Parameter with a Default value.  ' \
+      'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager value.'
   end
 
   def rule_type

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

@@ -6,7 +6,7 @@ require_relative 'base'
 class ApiGatewayAccessLoggingRule < BaseRule
   def rule_text
     'ApiGateway Deployment resource should have AccessLogSetting property configured when creating an ' \
-    'API Stage itself (through specifying the StageName and StageDescription properties).'
+      'API Stage itself (through specifying the StageName and StageDescription properties).'
   end
 
   def rule_type

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

@@ -6,7 +6,7 @@ require_relative 'base'
 class ApiGatewayCacheEncryptedRule < BaseRule
   def rule_text
     'ApiGateway Deployment should have cache data encryption enabled when caching is enabled' \
-    ' in StageDescription properties'
+      ' in StageDescription properties'
   end
 
   def rule_type

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

@@ -6,7 +6,7 @@ require_relative 'base'
 class ApiGatewayMethodAuthorizationTypeRule < BaseRule
   def rule_text
     "AWS::ApiGateway::Method should not have AuthorizationType set to 'NONE' unless it is of " \
-    'HttpMethod: OPTIONS.'
+      'HttpMethod: OPTIONS.'
   end
 
   def rule_type

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

@@ -6,9 +6,9 @@ require_relative 'password_base_rule'
 class AppStreamDirectoryConfigServiceAccountCredentialsAccountPasswordRule < PasswordBaseRule
   def rule_text
     'AppStream DirectoryConfig ServiceAccountCredentials AccountPassword ' \
-    'must not be a plaintext string or a Ref to a Parameter ' \
-    'with a Default value.  ' \
-    'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager value.'
+      'must not be a plaintext string or a Ref to a Parameter ' \
+      'with a Default value.  ' \
+      'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager value.'
   end
 
   def rule_type

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

@@ -6,8 +6,8 @@ require_relative 'password_base_rule'
 class CodePipelineWebhookAuthenticationConfigurationSecretTokenRule < PasswordBaseRule
   def rule_text
     'CodePipeline Webhook AuthenticationConfiguration SecretToken must not be ' \
-    'a plaintext string or a Ref to a Parameter with a Default value.  ' \
-    'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager value.'
+      'a plaintext string or a Ref to a Parameter with a Default value.  ' \
+      'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager value.'
   end
 
   def rule_type

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

@@ -7,7 +7,7 @@ require_relative 'base'
 class CognitoIdentityPoolAllowUnauthenticatedIdentitiesRule < BaseRule
   def rule_text
     'AWS::Cognito::IdentityPool AllowUnauthenticatedIdentities property should be false ' \
-    'but CAN be true if proper restrictive IAM roles and permissions are established for unauthenticated users.'
+      'but CAN be true if proper restrictive IAM roles and permissions are established for unauthenticated users.'
   end
 
   def rule_type

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

@@ -6,8 +6,8 @@ require_relative 'password_base_rule'
 class DMSEndpointMongoDbSettingsPasswordRule < PasswordBaseRule
   def rule_text
     'DMS Endpoint MongoDbSettings Password must not be a plaintext string ' \
-    'or a Ref to a Parameter with a Default value.  ' \
-    'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager value.'
+      'or a Ref to a Parameter with a Default value.  ' \
+      'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager value.'
   end
 
   def rule_type

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

@@ -6,8 +6,8 @@ require_relative 'password_base_rule'
 class DMSEndpointPasswordRule < PasswordBaseRule
   def rule_text
     'DMS Endpoint password must not be a plaintext string ' \
-    'or a Ref to a Parameter with a Default value.  ' \
-    'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager value.'
+      'or a Ref to a Parameter with a Default value.  ' \
+      'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager value.'
   end
 
   def rule_type

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

@@ -7,8 +7,8 @@ require_relative 'password_base_rule'
 class DirectoryServiceMicrosoftADPasswordRule < PasswordBaseRule
   def rule_text
     'Directory Service Microsoft AD password must not be a plaintext string ' \
-    'or a Ref to a Parameter with a Default value.  ' \
-    'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager/ssm-secure value.'
+      'or a Ref to a Parameter with a Default value.  ' \
+      'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager/ssm-secure value.'
   end
 
   def rule_type

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

@@ -7,8 +7,8 @@ require_relative 'password_base_rule'
 class DirectoryServiceSimpleADPasswordRule < PasswordBaseRule
   def rule_text
     'DirectoryService SimpleAD password must not be a plaintext string ' \
-    'or a Ref to a Parameter with a Default value.  ' \
-    'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager/ssm-secure value.'
+      'or a Ref to a Parameter with a Default value.  ' \
+      'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager/ssm-secure value.'
   end
 
   def rule_type

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

@@ -6,8 +6,8 @@ require_relative 'password_base_rule'
 class DocDBDBClusterMasterUserPasswordRule < PasswordBaseRule
   def rule_text
     'DocDB DB Cluster master user password must not be a plaintext string ' \
-    'or a Ref to a Parameter with a Default value.  ' \
-    'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager value.'
+      'or a Ref to a Parameter with a Default value.  ' \
+      'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager value.'
   end
 
   def rule_type

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

@@ -6,7 +6,7 @@ require_relative 'base'
 class EC2NetworkAclEntryProtocolRule < BaseRule
   def rule_text
     'To avoid opening all ports for Allow rules, EC2 NetworkACL Entry Protocol should be either 6 (for TCP), 17 ' \
-    '(for UDP), 1 (for ICMP), or 58 (for ICMPv6, which must include an IPv6 CIDR block, ICMP type, and code).'
+      '(for UDP), 1 (for ICMP), or 58 (for ICMPv6, which must include an IPv6 CIDR block, ICMP type, and code).'
   end
 
   def rule_type
@@ -53,12 +53,8 @@ class EC2NetworkAclEntryProtocolRule < BaseRule
 
   def violating_network_acl_entries?(network_acl_entry)
     if rule_action_allow?(network_acl_entry)
-      if tcp_udp_icmp_protocol?(network_acl_entry) ||
-         icmpv6_protocol?(network_acl_entry)
-        false
-      else
-        true
-      end
+      !(tcp_udp_icmp_protocol?(network_acl_entry) ||
+         icmpv6_protocol?(network_acl_entry))
     end
   end
 end

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

@@ -18,9 +18,7 @@ class EKSClusterEncryptionRule < BaseRule
 
   def audit_impl(cfn_model)
     violating_clusters = cfn_model.resources_by_type('AWS::EKS::Cluster').select do |cluster|
-      if cluster.encryptionConfig.nil?
-        true
-      elsif violating_configs?(cluster)
+      if cluster.encryptionConfig.nil? || violating_configs?(cluster)
         true
       else
         violating_providers?(cluster)

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

@@ -6,8 +6,8 @@ require_relative 'password_base_rule'
 class EMRClusterKerberosAttributesADDomainJoinPasswordRule < PasswordBaseRule
   def rule_text
     'EMR Cluster KerberosAttributes AD Domain JoinPassword must not be a ' \
-    'plaintext string or a Ref to a Parameter with a Default value.  ' \
-    'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager value.'
+      'plaintext string or a Ref to a Parameter with a Default value.  ' \
+      'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager value.'
   end
 
   def rule_type

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

@@ -6,9 +6,9 @@ require_relative 'password_base_rule'
 class EMRClusterKerberosAttributesCrossRealmTrustPrincipalPasswordRule < PasswordBaseRule
   def rule_text
     'EMR Cluster KerberosAttributes CrossRealmTrustPrincipal Password must ' \
-    'not be a plaintext string or a Ref to a Parameter with a ' \
-    'Default value.  ' \
-    'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager value.'
+      'not be a plaintext string or a Ref to a Parameter with a ' \
+      'Default value.  ' \
+      'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager value.'
   end
 
   def rule_type

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

@@ -6,8 +6,8 @@ require_relative 'password_base_rule'
 class EMRClusterKerberosAttributesKdcAdminPasswordRule < PasswordBaseRule
   def rule_text
     'EMR Cluster KerberosAttributes KdcAdmin Password must not be a ' \
-    'plaintext string or a Ref to a Parameter with a Default value.  ' \
-    'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager value.'
+      'plaintext string or a Ref to a Parameter with a Default value.  ' \
+      'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager value.'
   end
 
   def rule_type

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

@@ -6,8 +6,8 @@ require_relative 'password_base_rule'
 class ElastiCacheReplicationGroupAuthTokenRule < PasswordBaseRule
   def rule_text
     'ElastiCache ReplicationGroup AuthToken must not be a plaintext string ' \
-    'or a Ref to a Parameter with a Default value.  ' \
-    'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager/ssm-secure value.'
+      'or a Ref to a Parameter with a Default value.  ' \
+      'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager/ssm-secure value.'
   end
 
   def rule_type

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

@@ -18,6 +18,8 @@ class GameLiftFleetInboundPortRangeRule < BaseRule
 
   def audit_impl(cfn_model)
     violating_gamelift_fleets = cfn_model.resources_by_type('AWS::GameLift::Fleet').select do |gamelift_fleet|
+      next false if gamelift_fleet.eC2InboundPermissions.nil?
+
       violating_permissions = gamelift_fleet.eC2InboundPermissions.select do |permission|
         # Cast to strings incase template provided mixed types
         permission['FromPort'].to_s != permission['ToPort'].to_s

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

@@ -6,8 +6,8 @@ require_relative 'password_base_rule'
 class IAMUserLoginProfilePasswordRule < PasswordBaseRule
   def rule_text
     'IAM User LoginProfile Password must not be a plaintext string or ' \
-    'a Ref to a Parameter with a Default value.  ' \
-    'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager value.'
+      'a Ref to a Parameter with a Default value.  ' \
+      'Can be Ref to a NoEcho Parameter without a Default, or a dynamic reference to a secretsmanager value.'
   end
 
   def rule_type