Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#211 - Refactoring boolean rules to be more DRY #222

Merged
1 commit merged into from
Jun 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions lib/cfn-nag/custom_rules/EFSFileSystemEncryptedRule.rb
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# frozen_string_literal: true

require 'cfn-nag/violation'
require_relative 'base'
require_relative 'boolean_base_rule'

class EFSFileSystemEncryptedRule < BaseRule
class EFSFileSystemEncryptedRule < BooleanBaseRule
def rule_text
'EFS FileSystem should have encryption enabled'
end
Expand All @@ -16,14 +16,11 @@ def rule_id
'F32'
end

def audit_impl(cfn_model)
resources = cfn_model.resources_by_type('AWS::EFS::FileSystem')

violating_filesystems = resources.select do |filesystem|
filesystem.encrypted.nil? ||
filesystem.encrypted.to_s.casecmp('false').zero?
end
def resource_type
'AWS::EFS::FileSystem'
end

violating_filesystems.map(&:logical_resource_id)
def boolean_property
:encrypted
end
end
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# frozen_string_literal: true

require 'cfn-nag/violation'
require_relative 'base'
require_relative 'boolean_base_rule'

class ElastiCacheReplicationGroupAtRestEncryptionRule < BaseRule
class ElastiCacheReplicationGroupAtRestEncryptionRule < BooleanBaseRule
def rule_text
'ElastiCache ReplicationGroup should have encryption enabled for at rest'
end
Expand All @@ -16,14 +16,11 @@ def rule_id
'F25'
end

def audit_impl(cfn_model)
resources = cfn_model.resources_by_type('AWS::ElastiCache::ReplicationGroup')

violating_groups = resources.select do |group|
group.atRestEncryptionEnabled.nil? ||
group.atRestEncryptionEnabled.to_s.casecmp('false').zero?
end
def resource_type
'AWS::ElastiCache::ReplicationGroup'
end

violating_groups.map(&:logical_resource_id)
def boolean_property
:atRestEncryptionEnabled
end
end
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# frozen_string_literal: true

require 'cfn-nag/violation'
require_relative 'base'
require_relative 'boolean_base_rule'

class ElastiCacheReplicationGroupTransitEncryptionRule < BaseRule
class ElastiCacheReplicationGroupTransitEncryptionRule < BooleanBaseRule
def rule_text
'ElastiCache ReplicationGroup should have encryption enabled for in transit'
end
Expand All @@ -16,14 +16,11 @@ def rule_id
'F24'
end

def audit_impl(cfn_model)
resources = cfn_model.resources_by_type('AWS::ElastiCache::ReplicationGroup')

violating_groups = resources.select do |group|
group.transitEncryptionEnabled.nil? ||
group.transitEncryptionEnabled.to_s.casecmp('false').zero?
end
def resource_type
'AWS::ElastiCache::ReplicationGroup'
end

violating_groups.map(&:logical_resource_id)
def boolean_property
:transitEncryptionEnabled
end
end
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# frozen_string_literal: true

require 'cfn-nag/violation'
require_relative 'base'
require_relative 'boolean_base_rule'

class NeptuneDBClusterStorageEncryptedRule < BaseRule
class NeptuneDBClusterStorageEncryptedRule < BooleanBaseRule
def rule_text
'Neptune database cluster storage should have encryption enabled'
end
Expand All @@ -16,14 +16,11 @@ def rule_id
'F30'
end

def audit_impl(cfn_model)
resources = cfn_model.resources_by_type('AWS::Neptune::DBCluster')

violating_storage = resources.select do |filesystem|
filesystem.storageEncrypted.nil? ||
filesystem.storageEncrypted.to_s.casecmp('false').zero?
end
def resource_type
'AWS::Neptune::DBCluster'
end

violating_storage.map(&:logical_resource_id)
def boolean_property
:storageEncrypted
end
end
17 changes: 7 additions & 10 deletions lib/cfn-nag/custom_rules/RDSDBClusterStorageEncryptedRule.rb
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# frozen_string_literal: true

require 'cfn-nag/violation'
require_relative 'base'
require_relative 'boolean_base_rule'

class RDSDBClusterStorageEncryptedRule < BaseRule
class RDSDBClusterStorageEncryptedRule < BooleanBaseRule
def rule_text
'RDS DBCluster should have StorageEncrypted enabled'
end
Expand All @@ -16,14 +16,11 @@ def rule_id
'F26'
end

def audit_impl(cfn_model)
resources = cfn_model.resources_by_type('AWS::RDS::DBCluster')

violating_clusters = resources.select do |cluster|
cluster.storageEncrypted.nil? ||
cluster.storageEncrypted.to_s.casecmp('false').zero?
end
def resource_type
'AWS::RDS::DBCluster'
end

violating_clusters.map(&:logical_resource_id)
def boolean_property
:storageEncrypted
end
end
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,7 @@ def audit_impl(cfn_model)
resources = cfn_model.resources_by_type('AWS::RDS::DBInstance')

violating_instances = resources.select do |instance|
instance.dBClusterIdentifier.nil? &&
(
instance.storageEncrypted.nil? ||
instance.storageEncrypted.to_s.casecmp('false').zero?
)
instance.dBClusterIdentifier.nil? && not_truthy?(instance.storageEncrypted)
end

violating_instances.map(&:logical_resource_id)
Expand Down
17 changes: 7 additions & 10 deletions lib/cfn-nag/custom_rules/RedshiftClusterEncryptedRule.rb
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# frozen_string_literal: true

require 'cfn-nag/violation'
require_relative 'base'
require_relative 'boolean_base_rule'

class RedshiftClusterEncryptedRule < BaseRule
class RedshiftClusterEncryptedRule < BooleanBaseRule
def rule_text
'Redshift Cluster should have encryption enabled'
end
Expand All @@ -16,14 +16,11 @@ def rule_id
'F28'
end

def audit_impl(cfn_model)
resources = cfn_model.resources_by_type('AWS::Redshift::Cluster')

violating_clusters = resources.select do |cluster|
cluster.encrypted.nil? ||
cluster.encrypted.to_s.casecmp('false').zero?
end
def resource_type
'AWS::Redshift::Cluster'
end

violating_clusters.map(&:logical_resource_id)
def boolean_property
:encrypted
end
end
25 changes: 25 additions & 0 deletions lib/cfn-nag/custom_rules/boolean_base_rule.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# frozen_string_literal: true

require 'cfn-nag/violation'
require_relative 'base'
require 'cfn-nag/util/truthy.rb'

class BooleanBaseRule < BaseRule
def resource_type
raise 'must implement in subclass'
end

def boolean_property
raise 'must implement in subclass'
end

def audit_impl(cfn_model)
resources = cfn_model.resources_by_type(resource_type)

violating_resources = resources.select do |resource|
not_truthy?(resource.send(boolean_property))
end

violating_resources.map(&:logical_resource_id)
end
end
4 changes: 4 additions & 0 deletions lib/cfn-nag/util/truthy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,7 @@
def truthy?(string)
string.to_s.casecmp('true').zero?
end

def not_truthy?(string)
string.nil? || string.to_s.casecmp('false').zero?
end
82 changes: 82 additions & 0 deletions spec/custom_rules/boolean_base_rule_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
require 'spec_helper'
require 'cfn-model'
require 'cfn-nag/custom_rules/boolean_base_rule'

describe BooleanBaseRule do
describe '#audit' do
it 'raises an error when properties are not set' do
expect do
BooleanBaseRule.new.audit_impl nil
end.to raise_error 'must implement in subclass'
end

it 'returns violation when boolean value is false' do
base_rule = BooleanBaseRule.new
base_rule.instance_eval do
def rule_id
'F3333'
end

def rule_type
Violation::FAILING_VIOLATION
end

def rule_text
'This is an epic fail!'
end

def resource_type
'AWS::EFS::FileSystem'
end

def boolean_property
:encrypted
end
end

expect(base_rule).to receive(:boolean_property).and_return(:encrypted)
expect(base_rule).to receive(:resource_type).and_return('AWS::EFS::FileSystem')

cfn_model = CfnParser.new.parse read_test_template 'json/efs/filesystem_with_encryption_false.json'

expected_violation = Violation.new(id: 'F3333',
type: Violation::FAILING_VIOLATION,
message: 'This is an epic fail!',
logical_resource_ids: %w[filesystem])

expect(base_rule.audit(cfn_model)).to eq expected_violation
end

it 'returns no violation when boolean value is true' do
base_rule = BooleanBaseRule.new
base_rule.instance_eval do
def rule_id
'F3333'
end

def rule_type
Violation::FAILING_VIOLATION
end

def rule_text
'This is an epic fail!'
end

def resource_type
'AWS::EFS::FileSystem'
end

def boolean_property
:encrypted
end
end

expect(base_rule).to receive(:boolean_property).and_return(:encrypted)
expect(base_rule).to receive(:resource_type).and_return('AWS::EFS::FileSystem')

cfn_model = CfnParser.new.parse read_test_template 'json/efs/filesystem_with_encryption.json'

expect(base_rule.audit(cfn_model)).to be nil
end
end
end