FIX: make get_hostname more lenient to user input

lib/site_setting_extension.rb

@@ -252,13 +252,17 @@ module SiteSettingExtension
     refresh_settings.include?(name.to_sym)
   end
 
+  HOSTNAME_SETTINGS ||= %w{
+    disabled_image_download_domains onebox_domains_blacklist exclude_rel_nofollow_domains
+    email_domains_blacklist email_domains_whitelist white_listed_spam_host_domains
+  }
+
   def filter_value(name, value)
-    if %w[disabled_image_download_domains onebox_domains_blacklist exclude_rel_nofollow_domains email_domains_blacklist email_domains_whitelist white_listed_spam_host_domains].include? name
+    if HOSTNAME_SETTINGS.include?(name)
-      domain_array = []
+      value.split("|").map { |url| get_hostname(url) }.compact.uniq.join("|")
-      value.split('|').each { |url| domain_array << get_hostname(url) }
+    else
-      value = domain_array.join("|")
+      value
     end
-    value
   end
 
   def set(name, value)
@@ -339,16 +343,21 @@ module SiteSettingExtension
   end
 
   def get_hostname(url)
-    uri = begin
+    url.strip!
-      URI.parse(url)
+
+    host = begin
+      URI.parse(url)&.host
     rescue URI::InvalidURIError
+      nil
     end
 
-    unless uri.scheme.nil?
+    host ||= begin
-      url = uri.host
+      URI.parse("http://#{url}")&.host
+    rescue URI::InvalidURIError
+      nil
     end
 
-    url
+    host.presence || url
   end
 
   private

spec/components/site_setting_extension_spec.rb

@@ -586,4 +586,15 @@ describe SiteSettingExtension do
     end
   end
 
+  describe "get_hostname" do
+
+    it "properly extracts the hostname" do
+      expect(settings.send(:get_hostname, "discourse.org")).to eq("discourse.org")
+      expect(settings.send(:get_hostname, " discourse.org ")).to eq("discourse.org")
+      expect(settings.send(:get_hostname, "@discourse.org")).to eq("discourse.org")
+      expect(settings.send(:get_hostname, "https://discourse.org")).to eq("discourse.org")
+    end
+
+  end
+
 end