IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: add 'SiteSetting.port' to 'Onebox.allowed_ports' in development mode

Browse Source
This commit is contained in:
Régis Hanol
2017-12-18 18:31:41 +01:00
parent ad41523895
commit 8e55400392
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/oneboxer.rb
View File

@@ -154,6 +154,7 @@ module Oneboxer
fd = FinalDestination.new(url, ignore_redirects: ignore_redirects, force_get_hosts: force_get_hosts) fd = FinalDestination.new(url, ignore_redirects: ignore_redirects, force_get_hosts: force_get_hosts)
uri = fd.resolve uri = fd.resolve
return blank_onebox if uri.blank? || SiteSetting.onebox_domains_blacklist.include?(uri.hostname) return blank_onebox if uri.blank? || SiteSetting.onebox_domains_blacklist.include?(uri.hostname)
options = { options = {
cache: {}, cache: {},
max_width: 695, max_width: 695,
@@ -162,7 +163,12 @@ module Oneboxer
options[:cookie] = fd.cookie if fd.cookie options[:cookie] = fd.cookie if fd.cookie
if Rails.env.development? && SiteSetting.port.to_i > 0
Onebox.options = { allowed_ports: [80, 443, SiteSetting.port.to_i] }
end
r = Onebox.preview(uri.to_s, options) r = Onebox.preview(uri.to_s, options)
{ onebox: r.to_s, preview: r.try(:placeholder_html).to_s } { onebox: r.to_s, preview: r.try(:placeholder_html).to_s }
end end
rescue => e rescue => e