cfn-nag 0.7.13 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7468bb8ad4896224af85b81f45d0cd975f94a4e1632e97138428a3af5a81efd0
-  data.tar.gz: 436c593b203699a02bd01bd0a83e3e46b2464eed99d8773779e823c068ebb891
+  metadata.gz: e4c41df0b3f754ff3eed8026a43244578095abe1ce06be4c89a2457af83c718b
+  data.tar.gz: 7c648f6838985bc45f6bb2a4f600ea93c05b8f10b1078a0e83b936c7e7449e59
 SHA512:
-  metadata.gz: 5c788cd8722129a28ef8c1bbfe0fd3ff284f69890dd2e120609ba434ecca8b7364eb5a57f423cac157f9f7ada1c08cef9decf2be6d5302fbece4466352b267cf
-  data.tar.gz: 05d4491602e8c7b7f645f4255827f6665086b2ff1d2cab6a7f99d2f1dc7ba8315b969a9d78d9e9831b3eb1deb11a5b2bc730c2b86316a10c176cc0056e4b3ecb
+  metadata.gz: 1e90784cea9ee178aed35ae2f0bc27ecaeb3115307bd21553a45b2504dcd2e02aa561d9dd6150fdc7f2e1ee96632488bc6160422df7c7a1a7a466e1e5ceed585
+  data.tar.gz: d2937c0bf6c1b4d2326b6ab11ea68149c8635de02722d93ac4d6c5824d8fa1b885ce2691d30901044a3f889019227956faaaec489609178d4e1f63812e036de9

data/bin/cfn_nag_rules

@@ -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/cfn_nag.rb

@@ -55,8 +55,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 +64,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,7 +93,7 @@ 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)
@@ -107,7 +107,7 @@ class CfnNag
   end
 
   def prune_fatal_violations(violations)
-    violations.reject { |violation| violation.type == Violation::FAILING_VIOLATION }
+    violations.reject { |violation| violation.id == 'FATAL' }
   end
 
   def render_results(aggregate_results:,
@@ -127,21 +127,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 << fatal_violation(deny_list_or_profile_parse_error.to_s)
     violations
   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 = []
@@ -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

@@ -5,8 +5,8 @@ require 'optimist'
 # 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
 
@@ -25,7 +25,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 +58,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
@@ -145,8 +150,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

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

@@ -29,9 +29,7 @@ class IamUserLoginProfilePasswordResetRule < BaseRule
 
   def iam_user_password_reset_required_key?(login_profile)
     if login_profile.key? 'PasswordResetRequired'
-      if login_profile['PasswordResetRequired'].nil?
-        true
-      elsif not_truthy?(login_profile['PasswordResetRequired'])
+      if login_profile['PasswordResetRequired'].nil? || not_truthy?(login_profile['PasswordResetRequired'])
         true
       end
     else
@@ -40,10 +38,10 @@ class IamUserLoginProfilePasswordResetRule < BaseRule
   end
 
   def violating_iam_users?(iam_user)
-    if !iam_user.loginProfile.nil?
-      iam_user_password_reset_required_key?(iam_user.loginProfile)
-    else
+    if iam_user.loginProfile.nil?
       false
+    else
+      iam_user_password_reset_required_key?(iam_user.loginProfile)
     end
   end
 end

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

@@ -6,7 +6,7 @@ require_relative 'base'
 class KMSKeyWildcardPrincipalRule < BaseRule
   def rule_text
     'KMS key should not allow * principal ' \
-    '(https://docs.aws.amazon.com/kms/latest/developerguide/key-policies.html)'
+      '(https://docs.aws.amazon.com/kms/latest/developerguide/key-policies.html)'
   end
 
   def rule_type

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

@@ -6,9 +6,9 @@ require_relative 'password_base_rule'
 class KinesisFirehoseDeliveryStreamRedshiftDestinationConfigurationPasswordRule < PasswordBaseRule
   def rule_text
     'Kinesis Firehose DeliveryStream RedshiftDestinationConfiguration 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.'
+      '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.'
   end
 
   def rule_type

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

@@ -6,9 +6,9 @@ require_relative 'password_base_rule'
 class KinesisFirehoseDeliveryStreamSplunkDestinationConfigurationHECTokenRule < PasswordBaseRule
   def rule_text
     'Kinesis Firehose DeliveryStream SplunkDestinationConfiguration HECToken ' \
-    '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/KinesisStreamStreamEncryptionRule.rb

@@ -27,11 +27,9 @@ class KinesisStreamStreamEncryptionRule < BaseRule
   private
 
   def violating_kinesis_streams?(kinesis_stream)
-    if kinesis_stream.streamEncryption.nil?
-      true
-    elsif kinesis_stream.streamEncryption['EncryptionType'].nil?
-      true
-    elsif kinesis_stream.streamEncryption['KeyId'].nil?
+    if kinesis_stream.streamEncryption.nil? ||
+       kinesis_stream.streamEncryption['EncryptionType'].nil? ||
+       kinesis_stream.streamEncryption['KeyId'].nil?
       true
     else
       kinesis_stream.streamEncryption['EncryptionType'] == 'NONE'

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

@@ -6,8 +6,8 @@ require_relative 'password_base_rule'
 class LambdaPermissionEventSourceTokenRule < PasswordBaseRule
   def rule_text
     'Lambda Permission EventSourceToken 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