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: Support multiple embeddable host records with the same host

Browse Source
This commit is contained in:
Robin Ward
2017-02-17 12:39:33 -05:00
parent 1935f624b8
commit e62c0a42fa
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/models/embeddable_host.rb
View File

@@ -17,20 +17,19 @@ class EmbeddableHost < ActiveRecord::Base
host = uri.host
return false unless host.present?
where("lower(host) = ?", host).first
path = uri.path
path << "?" << uri.query if uri.query.present?
where("lower(host) = ?", host).each do |eh|
return eh if eh.path_whitelist.blank? || !Regexp.new(eh.path_whitelist).match(path).nil?
end
nil
end
def self.url_allowed?(url)
uri = URI(url) rescue nil
return false unless uri.present?
path = uri.path
path << "?" << uri.query if uri.query.present?
host = record_for_url(uri)
return host.present? &&
(host.path_whitelist.blank? || !Regexp.new(host.path_whitelist).match(path).nil?)
uri.present? && record_for_url(uri).present?
end
private