-
Notifications
You must be signed in to change notification settings - Fork 116
Add in ability to dynamically load in deny_listed domains #249
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
Open
scouttyg
wants to merge
2
commits into
micke:main
Choose a base branch
from
scouttyg:scott/add-in-dynamic-email-parsing
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
# frozen_string_literal:true | ||
|
||
module ValidEmail2 | ||
class DynamicOptionValues | ||
class << self | ||
def deny_list_function | ||
@deny_list_function ||= ->(_domain) { false } | ||
end | ||
|
||
def deny_list_function=(lambda_function) | ||
return unless lambda_function.is_a?(Proc) | ||
return unless lambda_function.arity == 1 | ||
|
||
@deny_list_function = lambda_function | ||
end | ||
|
||
def parse_option_for_additional_items(type, value) | ||
return false unless respond_to?("#{type}_function=") | ||
|
||
case value | ||
when NilClass | ||
return false | ||
when TrueClass, FalseClass | ||
return value | ||
when Set, Array | ||
self.deny_list_function = ->(domain) { value.include?(domain) } | ||
when Proc | ||
self.deny_list_function = value | ||
else | ||
return false | ||
end | ||
|
||
true | ||
end | ||
|
||
def domain_is_in?(type, address) | ||
return false unless type.is_a?(Symbol) | ||
return false unless respond_to?(type) | ||
return false unless address.is_a?(Mail::Address) | ||
|
||
downcase_domain = address.domain.downcase | ||
|
||
send(type).call(downcase_domain) | ||
end | ||
end | ||
end | ||
end |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -59,6 +59,22 @@ class TestUserDisallowDenyListed < TestModel | |
validates :email, 'valid_email_2/email': { deny_list: true } | ||
end | ||
|
||
class TestUserDisallowDenyListedWithDynamicArray < TestModel | ||
validates :email, 'valid_email_2/email': { deny_list: proc { |domain| ["test-dynamic-array.com"].include?(domain) } } | ||
end | ||
|
||
class TestUserDisallowDenyListedWithDynamicSet < TestModel | ||
validates :email, 'valid_email_2/email': { deny_list: proc { |domain| Set.new(["test-dynamic-set.com"]).include?(domain) } } | ||
end | ||
|
||
class TestUserDisallowDenyListedWithDynamicLambda < TestModel | ||
validates :email, 'valid_email_2/email': { deny_list: ->(domain) { Set.new(["test-dynamic-lambda.com"]).include?(domain) } } | ||
end | ||
|
||
class TestUserDisallowDenyListedWithDynamicRailsModel < TestModel | ||
validates :email, 'valid_email_2/email': { deny_list: ->(domain) { TestDynamicDomainModel.exists?(domain: domain) } } | ||
end | ||
|
||
class TestUserMessage < TestModel | ||
validates :email, 'valid_email_2/email': { message: "custom message" } | ||
end | ||
|
@@ -262,6 +278,34 @@ def set_allow_list | |
user = TestUserDisallowDenyListed.new(email: "[email protected]") | ||
expect(user.valid?).to be_falsey | ||
end | ||
|
||
it "is invalid if the domain is deny-listed via a dynamic array option" do | ||
user = TestUserDisallowDenyListedWithDynamicArray.new(email: "[email protected]") | ||
expect(user.valid?).to be_falsy | ||
end | ||
|
||
it "is invalid if the domain is deny-listed via a dynamic set option" do | ||
user = TestUserDisallowDenyListedWithDynamicSet.new(email: "[email protected]") | ||
expect(user.valid?).to be_falsy | ||
end | ||
|
||
it "is invalid if the domain is deny-listed via a dynamic proc option" do | ||
user = TestUserDisallowDenyListedWithDynamicLambda.new(email: "[email protected]") | ||
expect(user.valid?).to be_falsy | ||
end | ||
|
||
it "is invalid if the domain is deny-listed via a dynamic rails model" do | ||
invalid_dynamic_domain = "test-dynamic-rails-model.com" | ||
TestDynamicDomainModel.domain_attribute_values = [invalid_dynamic_domain] | ||
user = TestUserDisallowDenyListedWithDynamicRailsModel.new(email: "foo@#{invalid_dynamic_domain}") | ||
expect(user.valid?).to be_falsy | ||
end | ||
|
||
it "is valid if the dynamic domain list does not include the email domain" do | ||
TestDynamicDomainModel.domain_attribute_values = ["not-deny-listed.com"] | ||
user = TestUserDisallowDenyListedWithDynamicRailsModel.new(email: "[email protected]") | ||
expect(user.valid?).to be_truthy | ||
end | ||
end | ||
|
||
describe "with mx validation" do | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is kind of a fake class we can use to test the hash for setting an active record query