-
Notifications
You must be signed in to change notification settings - Fork 5
Store school email domains #787
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
Merged
Merged
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
0880b4f
Create school_email_domains table
PetarSimonovic 60e3fcb
Add SchoolEmailDomain model
PetarSimonovic 76c7df5
Format domains
PetarSimonovic f748dd1
Add has_many association on School
PetarSimonovic 93805ea
Scope domain uniqueness to school_id
PetarSimonovic 878716c
Use type of error instead of string
PetarSimonovic 170e0be
Declare subject above other let statements
PetarSimonovic d1933fa
Parse and return host when URI provided
PetarSimonovic 5c64c31
Validate domains against Public Suffix List
PetarSimonovic 1634375
Update validation and specs
PetarSimonovic 20abcca
Add email domain validation on School
PetarSimonovic afaf941
Align host validation with Profile
PetarSimonovic fce88d3
Add SchoolEmailDomainValidator
PetarSimonovic b789663
Add explanatory comment for accounts_host_format regex
PetarSimonovic 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
Some comments aren't visible on the classic Files Changed page.
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
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,18 @@ | ||
| # frozen_string_literal: true | ||
|
|
||
| class SchoolEmailDomain < ApplicationRecord | ||
| belongs_to :school | ||
|
|
||
| validates :domain, presence: true | ||
|
PetarSimonovic marked this conversation as resolved.
|
||
| validates :domain, uniqueness: { scope: :school_id } | ||
|
|
||
| before_validation :validate_domain | ||
|
|
||
| private | ||
|
|
||
| def validate_domain | ||
| self.domain = SchoolEmailDomainValidator.call(domain) | ||
| rescue ::SchoolEmailDomainValidator::Error => e | ||
| errors.add(:domain, e.error_code) | ||
| end | ||
|
PetarSimonovic marked this conversation as resolved.
|
||
| 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| # frozen_string_literal: true | ||
|
|
||
| class CreateSchoolEmailDomains < ActiveRecord::Migration[7.2] | ||
| def change | ||
| create_table :school_email_domains, id: :uuid do |t| | ||
|
PetarSimonovic marked this conversation as resolved.
|
||
| t.references :school, null: false, foreign_key: true, type: :uuid | ||
| t.string :domain, null: false | ||
|
|
||
| t.timestamps | ||
| end | ||
|
|
||
| add_index :school_email_domains, %i[school_id domain], unique: true | ||
| end | ||
| end | ||
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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,64 @@ | ||
| # frozen_string_literal: true | ||
|
|
||
| module SchoolEmailDomainValidator | ||
| class Error < StandardError | ||
| def error_code | ||
| :invalid | ||
| end | ||
| end | ||
|
|
||
| class BlankDomainError < Error | ||
| def error_code | ||
| :blank | ||
| end | ||
| end | ||
|
|
||
| class InvalidURIError < Error | ||
| def error_code | ||
| :invalid_uri | ||
| end | ||
| end | ||
|
|
||
| class InvalidHostError < Error | ||
| def error_code | ||
| :invalid_host | ||
| end | ||
| end | ||
|
|
||
| class PublicSuffixError < Error | ||
| def error_code | ||
| :invalid_public_suffix | ||
| end | ||
| end | ||
|
|
||
| def self.call(domain) | ||
| raise BlankDomainError if domain.blank? | ||
|
|
||
| validate_domain(domain) | ||
| end | ||
|
|
||
| def self.validate_domain(domain) | ||
| value = domain.strip.downcase | ||
| # Add a scheme unless it already has one, so URI can parse it | ||
| value = "http://#{value}" unless %r{\A[a-z][a-z0-9+\-.]*://}i.match?(value) | ||
| uri = URI.parse(value) | ||
| host = uri.host&.delete_suffix('.') | ||
|
|
||
| validate_host(host) | ||
| rescue URI::InvalidURIError | ||
| raise InvalidURIError | ||
| end | ||
|
|
||
| def self.validate_host(host) | ||
| # School email domains are sent to Profile, which validates them using a "fully qualified domain name" regex | ||
| # Any changes to accounts_host_format must align with the pattern that Profile applies in its app/lib/fqdn.js | ||
| accounts_host_format = | ||
| /\A\s*(?:[A-Za-z0-9](?:[A-Za-z0-9-]{0,61}[A-Za-z0-9])?\.)+[A-Za-z]{2,63}\s*\z/i | ||
|
|
||
| raise InvalidHostError unless host&.match?(accounts_host_format) | ||
|
|
||
| raise PublicSuffixError, 'domain has no registered public suffix' unless PublicSuffix.valid?(host) | ||
|
|
||
| host | ||
| 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| # frozen_string_literal: true | ||
|
|
||
| require 'rails_helper' | ||
|
|
||
| RSpec.describe SchoolEmailDomainValidator do | ||
| describe '.call' do | ||
| it 'returns success with a normalised host for a valid domain' do | ||
| result = described_class.call('example.com') | ||
|
|
||
| expect(result).to eq('example.com') | ||
| end | ||
|
|
||
| context 'with a valid domain' do | ||
| it 'extracts the host for http' do | ||
| result = described_class.call('http://mail.school.edu/path?query=1') | ||
| expect(result).to eq('mail.school.edu') | ||
| end | ||
|
|
||
| it 'extracts the host for https' do | ||
| result = described_class.call('https://mail.school.edu/path?query=1') | ||
| expect(result).to eq('mail.school.edu') | ||
| end | ||
|
|
||
| it 'removes a trailing dot' do | ||
| result = described_class.call('example.edu.') | ||
| expect(result).to eq('example.edu') | ||
| end | ||
|
|
||
| it 'lowercases the host' do | ||
| result = described_class.call('EXAMPLE.EDU') | ||
| expect(result).to eq('example.edu') | ||
| end | ||
|
|
||
| it 'removes a leading @' do | ||
| result = described_class.call('@example.edu') | ||
| expect(result).to eq('example.edu') | ||
| end | ||
|
|
||
| it 'accepts a subdomain' do | ||
| result = described_class.call('mail.example.edu') | ||
| expect(result).to eq('mail.example.edu') | ||
| end | ||
|
|
||
| it 'accepts a hostname er a multi-part public suffix' do | ||
| result = described_class.call('school.example.co.uk') | ||
| expect(result).to eq('school.example.co.uk') | ||
| end | ||
|
|
||
| it 'accepts a district-style with a multi-part public suffix' do | ||
| result = described_class.call('school.k12.tx.us') | ||
| expect(result).to eq('school.k12.tx.us') | ||
| end | ||
| end | ||
|
|
||
| context 'when the domain is blank' do | ||
| it 'raises BlankDomain' do | ||
| expect { described_class.call('') }.to raise_error(SchoolEmailDomainValidator::BlankDomainError) | ||
| end | ||
| end | ||
|
|
||
| context 'when the domain has an invalid URI' do | ||
| it 'raises InvalidURIError' do | ||
| expect { described_class.call('https://exa mple.com') }.to raise_error(SchoolEmailDomainValidator::InvalidURIError) | ||
| end | ||
| end | ||
|
|
||
| context 'when the host does not match accounts_host_format' do | ||
| it 'raises InvalidHostError' do | ||
| expect { described_class.call('school_domain.edu') } | ||
| .to raise_error(SchoolEmailDomainValidator::InvalidHostError) | ||
| end | ||
| end | ||
|
|
||
| context 'when the host fails PublicSuffix validation' do | ||
| it 'raises PublicSuffixError' do | ||
| expect { described_class.call('co.uk') } | ||
| .to raise_error(SchoolEmailDomainValidator::PublicSuffixError) | ||
| 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| # frozen_string_literal: true | ||
|
|
||
| require 'rails_helper' | ||
|
|
||
| RSpec.describe SchoolEmailDomain do | ||
|
PetarSimonovic marked this conversation as resolved.
|
||
| subject(:school_email_domain) { described_class.create!(school:, domain:) } | ||
|
|
||
| let(:school) { create(:school, creator_id: SecureRandom.uuid) } | ||
| let(:domain) { 'example.edu' } | ||
|
|
||
| describe 'associations' do | ||
| it { is_expected.to belong_to(:school) } | ||
| it { is_expected.to validate_presence_of(:domain) } | ||
| it { is_expected.to be_valid } | ||
| end | ||
|
|
||
| context 'with a valid domain' do | ||
| it 'accepts the domain' do | ||
| expect(school_email_domain.domain).to eq('example.edu') | ||
| end | ||
|
|
||
| describe 'domain normalisation' do | ||
| let(:domain) { '@EXAMPLE.EDU.' } | ||
|
|
||
| it 'normalises a domain' do | ||
| expect(school_email_domain.domain).to eq('example.edu') | ||
| end | ||
| end | ||
|
|
||
| describe 'domain uniqueness' do | ||
| context 'when the proposed domain matches the existing record' do | ||
| subject(:school_email_domain) { described_class.new(school:, domain:) } | ||
|
|
||
| let(:domain) { 'example.edu' } | ||
|
|
||
| before do | ||
| described_class.create!(school:, domain: 'example.edu') | ||
| school_email_domain.valid? | ||
| end | ||
|
|
||
| it 'rejects the duplicate' do | ||
| expect(school_email_domain).not_to be_valid | ||
| end | ||
|
|
||
| it 'records :taken on domain' do | ||
| expect(school_email_domain.errors.of_kind?(:domain, :taken)).to be(true) | ||
| end | ||
| end | ||
|
|
||
| context 'when the proposed domain matches after normalisation' do | ||
| subject(:school_email_domain) { described_class.new(school:, domain:) } | ||
|
|
||
| let(:domain) { 'http://EXAMPLE.EDU' } | ||
|
|
||
| before do | ||
| described_class.create!(school:, domain: 'example.edu') | ||
| school_email_domain.valid? | ||
| end | ||
|
|
||
| it 'rejects the duplicate' do | ||
| expect(school_email_domain).not_to be_valid | ||
| end | ||
|
|
||
| it 'records :taken on domain' do | ||
| expect(school_email_domain.errors.of_kind?(:domain, :taken)).to be(true) | ||
| end | ||
| end | ||
|
|
||
| it 'allows the same domain for a different school' do | ||
| described_class.create!(school:, domain: 'example.edu') | ||
| other_school = create(:school, creator_id: SecureRandom.uuid) | ||
| other_school_email_domain = described_class.new(school: other_school, domain: 'example.edu') | ||
|
|
||
| expect(other_school_email_domain).to be_valid | ||
| end | ||
| end | ||
| end | ||
|
|
||
| context 'with an invalid domain' do | ||
| it { is_expected.not_to allow_value('').for(:domain) } | ||
| it { is_expected.not_to allow_value(' ').for(:domain) } | ||
| it { is_expected.not_to allow_value('http://').for(:domain) } | ||
| it { is_expected.not_to allow_value('edu').for(:domain) } | ||
| it { is_expected.not_to allow_value('com').for(:domain) } | ||
| it { is_expected.not_to allow_value('co.uk').for(:domain) } | ||
| it { is_expected.not_to allow_value('http://invalid uri').for(:domain) } | ||
| it { is_expected.not_to allow_value('-wrong.edu').for(:domain) } | ||
|
PetarSimonovic marked this conversation as resolved.
|
||
| 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
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.
Uh oh!
There was an error while loading. Please reload this page.