Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FEATURE: check `blocked_onebox_domains` setting for inline oneboxes (#11944)

This commit is contained in:
Arpit Jalan 2021-02-03 21:45:22 +05:30 committed by GitHub
parent 2309032e68
commit 7f86a310ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/inline_oneboxer.rb
View File

@ -50,9 +50,10 @@ class InlineOneboxer
end end
always_allow = SiteSetting.enable_inline_onebox_on_all_domains always_allow = SiteSetting.enable_inline_onebox_on_all_domains
domains = SiteSetting.allowed_inline_onebox_domains&.split('|') unless always_allow allowed_domains = SiteSetting.allowed_inline_onebox_domains&.split('|') unless always_allow
blocked_domains = SiteSetting.blocked_onebox_domains&.split('|')
if always_allow || domains if always_allow || allowed_domains
uri = begin uri = begin
URI(url) URI(url)
rescue URI::Error rescue URI::Error
@ -60,7 +61,8 @@ class InlineOneboxer
if uri.present? && if uri.present? &&
uri.hostname.present? && uri.hostname.present? &&
(always_allow || domains.include?(uri.hostname)) (always_allow || allowed_domains.include?(uri.hostname)) &&
!blocked_domains.include?(uri.hostname)
title = RetrieveTitle.crawl(url) title = RetrieveTitle.crawl(url)
title = nil if title && title.length < MIN_TITLE_LENGTH title = nil if title && title.length < MIN_TITLE_LENGTH
return onebox_for(url, title, opts) return onebox_for(url, title, opts)

6
spec/components/inline_oneboxer_spec.rb
View File

@ -153,6 +153,12 @@ describe InlineOneboxer do
expect(onebox).to be_blank expect(onebox).to be_blank
end end
it "will not crawl domains that are blocked" do
SiteSetting.blocked_onebox_domains = "eviltrout.com"
onebox = InlineOneboxer.lookup("https://eviltrout.com", skip_cache: true)
expect(onebox).to be_blank
end
it "will crawl anything if allowed to" do it "will crawl anything if allowed to" do
SiteSetting.enable_inline_onebox_on_all_domains = true SiteSetting.enable_inline_onebox_on_all_domains = true