Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-08 12:24:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4821 from discourse/revert-4819-website-validation

Browse Source 
Revert "FIX: User website allows new TLDs"
This commit is contained in:
Arpit Jalan 2017-04-18 13:37:26 +05:30 committed by GitHub
commit ca567caee4
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/models/user_profile.rb
View File

@ -1,7 +1,10 @@
class UserProfile < ActiveRecord::Base class UserProfile < ActiveRecord::Base
belongs_to :user, inverse_of: :user_profile belongs_to :user, inverse_of: :user_profile
WEBSITE_REGEXP = /(^$)|(^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,10}(([0-9]{1,5})?\/.*)?$)/ix
validates :bio_raw, length: { maximum: 3000 } validates :bio_raw, length: { maximum: 3000 }
validates :website, format: { with: WEBSITE_REGEXP }, allow_blank: true, if: Proc.new { |c| c.new_record? || c.website_changed? }
validates :user, presence: true validates :user, presence: true
before_save :cook before_save :cook
after_save :trigger_badges after_save :trigger_badges
@ -102,13 +105,11 @@ class UserProfile < ActiveRecord::Base
end end
def website_domain_validator def website_domain_validator
return if self.website.blank? allowed_domains = SiteSetting.user_website_domains_whitelist
domain = Addressable::URI.parse(self.website).host return if (allowed_domains.blank? || self.website.blank?)
self.errors.add :website, :invalid unless PublicSuffix.valid?(domain, default_rule: nil)
allowed_domains = SiteSetting.user_website_domains_whitelist.split('|') domain = URI.parse(self.website).host
return if allowed_domains.empty? self.errors.add :base, (I18n.t('user.website.domain_not_allowed', domains: allowed_domains.split('|').join(", "))) unless allowed_domains.split('|').include?(domain)
self.errors.add :base, (I18n.t('user.website.domain_not_allowed', domains: allowed_domains.join(", "))) unless allowed_domains.include?(domain)
end end
end end

6
spec/models/user_profile_spec.rb
View File

@ -62,12 +62,6 @@ describe UserProfile do
expect(Fabricate.build(:user_profile, user: user, website: "https://google.com")).to be_valid expect(Fabricate.build(:user_profile, user: user, website: "https://google.com")).to be_valid
end end
it "recognizes new TLDs" do
expect(Fabricate.build(:user_profile, user: user, website: "http://discourse.productions")).to be_valid
expect(Fabricate.build(:user_profile, user: user, website: "https://website.vermögensberatung")).to be_valid
expect(Fabricate.build(:user_profile, user: user, website: "http://site.notavalidtld")).not_to be_valid
end
it "validates website domain if user_website_domains_whitelist setting is present" do it "validates website domain if user_website_domains_whitelist setting is present" do
SiteSetting.user_website_domains_whitelist = "discourse.org" SiteSetting.user_website_domains_whitelist = "discourse.org"
expect(Fabricate.build(:user_profile, user: user, website: "https://google.com")).not_to be_valid expect(Fabricate.build(:user_profile, user: user, website: "https://google.com")).not_to be_valid