github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 16:34:31 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Ignore OneBox blacklisted domains.

Browse Source
This commit is contained in:
Bianca Nenciu
2018-08-26 16:31:02 +02:00
parent b12cf08c57
commit b6963b8ffb
4 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/oneboxer.rb
View File

@ -250,9 +250,11 @@ module Oneboxer
def self.external_onebox(url)
Rails.cache.fetch(onebox_cache_key(url), expires_in: 1.day) do
fd = FinalDestination.new(url, ignore_redirects: ignore_redirects, force_get_hosts: force_get_hosts)
ignored = SiteSetting.onebox_domains_blacklist.split("|")
fd = FinalDestination.new(url, ignore_redirects: ignore_redirects, ignore_hostnames: ignored, force_get_hosts: force_get_hosts)
uri = fd.resolve
return blank_onebox if uri.blank? || SiteSetting.onebox_domains_blacklist.include?(uri.hostname)
return blank_onebox if uri.blank? || ignored.map { |hostname| uri.hostname.match?(hostname) }.any?
options = {
cache: {},