github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-01 09:08:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Apply onebox blocked domain checks on every redirect (#16150)

Browse Source 
The `blocked onebox domains` setting lets site owners change what sites
are allowed to be oneboxed. When a link is entered into a post,
Discourse checks the domain of the link against that setting and blocks
the onebox if the domain is blocked. But if there's a chain of
redirects, then only the final destination website is checked against
the site setting.

This commit amends that behavior so that every website in the redirect
chain is checked against the site setting, and if anything is blocked
the original link doesn't onebox at all in the post. The
`Discourse-No-Onebox` header is also checked in every response and the
onebox is blocked if the header is set to "1".

Additionally, Discourse will now include the `Discourse-No-Onebox`
header with every response if the site requires login to access content.
This is done to signal to a Discourse instance that it shouldn't attempt
to onebox other Discourse instances if they're login-only. Non-Discourse
websites can also use include that header if they don't wish to have
Discourse onebox their content.

Internal ticket: t59305.
This commit is contained in:
Osama Sayegh
2022-03-11 09:18:12 +03:00
committed by GitHub
parent 8e010aecfb
commit b0656f3ed0
7 changed files with 171 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/oneboxer.rb
View File

@ -397,9 +397,14 @@ module Oneboxer
available_strategies ||= Oneboxer.ordered_strategies(uri.hostname)
strategy = available_strategies.shift
fd = FinalDestination.new(url, get_final_destination_options(url, strategy))
fd = FinalDestination.new(
url,
get_final_destination_options(url, strategy).merge(stop_at_blocked_pages: true)
)
uri = fd.resolve
return blank_onebox if fd.status == :blocked_page
if fd.status != :resolved
args = { link: url }
if fd.status == :invalid_address
@ -416,7 +421,7 @@ module Oneboxer
return error_box
end
return blank_onebox if uri.blank? || Onebox::DomainChecker.is_blocked?(uri.hostname)
return blank_onebox if uri.blank?
onebox_options = {
max_width: 695,