zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-16 17:37:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

Punycode validations

Browse source
This commit is contained in:
Martin Lensment 2014-07-02 11:21:18 +03:00
parent 51091679c4
commit c07dffe7cc
3 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/models/domain.rb
View file

@ -9,6 +9,7 @@ class Domain < ActiveRecord::Base
belongs_to :admin_contact, class_name: 'Contact' belongs_to :admin_contact, class_name: 'Contact'
validates :name, domain_name: true validates :name, domain_name: true
validates :name_puny, domain_name: true
def name=(value) def name=(value)
value.strip! value.strip!

8
app/validators/domain_name_validator.rb
View file

@ -16,19 +16,19 @@ class DomainNameValidator < ActiveModel::EachValidator
def validate(value) def validate(value)
value = value.mb_chars.downcase.strip value = value.mb_chars.downcase.strip
general_domains = /(.pri.ee|.edu.ee|.aip.ee|.org.ee|.med.ee|.riik.ee|.ee)/ #TODO Add more general domains here general_domains = /(.pri.ee|.com.ee|.fie.ee|.med.ee|.ee)/ #TODO Add more general domains here
# it's punycode # it's punycode
if value[2] == '-' && value[3] == '-' if value[2] == '-' && value[3] == '-'
regexp = /\Axn--[a-zA-Z0-9-]{0,61}#{general_domains}\z/ regexp = /\Axn--[a-zA-Z0-9-]{0,59}#{general_domains}\z/
return false unless value =~ regexp return false unless value =~ regexp
value = SimpleIDN.to_unicode(value) value = SimpleIDN.to_unicode(value).mb_chars.downcase.strip
end end
unicode_chars = /\u00E4\u00F5\u00F6\u00FC\u0161\u017E/ #äõöüšž unicode_chars = /\u00E4\u00F5\u00F6\u00FC\u0161\u017E/ #äõöüšž
regexp = /\A[a-zA-Z0-9#{unicode_chars}][a-zA-Z0-9#{unicode_chars}-]{0,61}[a-zA-Z0-9#{unicode_chars}]#{general_domains}\z/ regexp = /\A[a-zA-Z0-9#{unicode_chars}][a-zA-Z0-9#{unicode_chars}-]{0,61}[a-zA-Z0-9#{unicode_chars}]#{general_domains}\z/
value =~ regexp !!(value =~ regexp)
end end
end end

16
spec/models/domain_spec.rb
View file

@ -11,16 +11,28 @@ describe Domain do
d = Fabricate(:domain) d = Fabricate(:domain)
expect(d.name).to_not be_nil expect(d.name).to_not be_nil
invalid = ['a.ee', "#{'a' * 64}.ee", 'ab.eu', 'test.ab.ee', '-test.ee', '-test-.ee', 'test-.ee', 'te--st.ee', 'õ.pri.ee', 'test.com', 'www.ab.ee', 'test.eu', ' .ee', 'a b.ee', 'Ž .ee'] invalid = ['a.ee', "#{'a' * 64}.ee", 'ab.eu', 'test.ab.ee', '-test.ee', '-test-.ee', 'test-.ee', 'te--st.ee', 'õ.pri.ee', 'test.com', 'www.ab.ee', 'test.eu', ' .ee', 'a b.ee', 'Ž .ee', 'test.edu.ee']
invalid.each do |x| invalid.each do |x|
expect(Fabricate.build(:domain, name: x).valid?).to be false expect(Fabricate.build(:domain, name: x).valid?).to be false
end end
valid = ['ab.ee', "#{'a' * 63}.ee", 'te-s-t.ee', 'jäääär.ee', 'päike.pri.ee', 'õigus.edu.ee', 'õäöü.aip.ee', 'test.org.ee', 'test.med.ee', 'test.riik.ee', 'žä.ee', ' ŽŠ.ee '] valid = ['ab.ee', "#{'a' * 63}.ee", 'te-s-t.ee', 'jäääär.ee', 'päike.pri.ee', 'õigus.com.ee', 'õäöü.fie.ee', 'test.med.ee', 'žä.ee', ' ŽŠ.ee ']
valid.each do |x| valid.each do |x|
expect(Fabricate.build(:domain, name: x).valid?).to be true expect(Fabricate.build(:domain, name: x).valid?).to be true
end end
invalid_punycode = ['xn--geaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-4we.pri.ee']
invalid_punycode.each do |x|
expect(Fabricate.build(:domain, name: x).valid?).to be false
end
valid_punycode = ['xn--ge-uia.pri.ee', 'xn--geaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-9te.pri.ee']
valid_punycode.each do |x|
expect(Fabricate.build(:domain, name: x).valid?).to be true
end
end end
end end