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

Allow override of domains and whitelist in rules #132

Closed
wants to merge 7 commits into from

Conversation

lozlow
Copy link
Contributor

@lozlow lozlow commented Jun 8, 2020

Builds on the work of mathcantin in #63

  • Implements PR feedback
  • Resolves merge conflicts

Closes #57
Closes #63

@lozlow
Copy link
Contributor Author

lozlow commented Jun 8, 2020

Ah woops, more conflicts 🙂, I'll get this updated

This removes the chance for the _default_ (no rule applied) case to overlap with a user-specified rule
@lozlow lozlow changed the title Allow to override domains and whitelist in rules Allow override of domains and whitelist in rules Jun 10, 2020
@lozlow
Copy link
Contributor Author

lozlow commented Jun 10, 2020

This is ready for review, thanks!

@tdorsey
Copy link

tdorsey commented Jun 13, 2020

@lozlow Looks like we worked this one simultaneously. Would you mind to have a look at #133 and see what you think? My implementation is slightly different. It combines address/domain whitelists into one field, and respects the MatchWhitelistOrDomain property instead of having the rule override the global config entirely

@ilteoood
Copy link

ilteoood commented Jun 22, 2020

+1 for this.
I really need it!
@thomseddon

@thomseddon
Copy link
Owner

Hi, this looks awesome, thank you so much! I've rebased and added some minor tweaks in #169 - does that look to you?

@thomseddon
Copy link
Owner

Merged in #169 - thanks again!

@thomseddon thomseddon closed this Sep 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Whitelist per TFA domain?
5 participants