mirror of
https://github.com/discourse/discourse.git
synced 2025-05-28 22:08:01 +08:00
SECURITY: Expand and improve SSRF Protections (#18815)
See https://github.com/discourse/discourse/security/advisories/GHSA-rcc5-28r3-23rr Co-authored-by: OsamaSayegh <asooomaasoooma90@gmail.com> Co-authored-by: Daniel Waterworth <me@danielwaterworth.com>
This commit is contained in:
88
lib/final_destination/ssrf_detector.rb
Normal file
88
lib/final_destination/ssrf_detector.rb
Normal file
@ -0,0 +1,88 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class FinalDestination
|
||||
module SSRFDetector
|
||||
class DisallowedIpError < SocketError
|
||||
end
|
||||
|
||||
def self.standard_private_ranges
|
||||
@private_ranges ||= [
|
||||
IPAddr.new("0.0.0.0/8"),
|
||||
IPAddr.new("127.0.0.1"),
|
||||
IPAddr.new("172.16.0.0/12"),
|
||||
IPAddr.new("192.168.0.0/16"),
|
||||
IPAddr.new("10.0.0.0/8"),
|
||||
IPAddr.new("::1"),
|
||||
IPAddr.new("fc00::/7"),
|
||||
IPAddr.new("fe80::/10"),
|
||||
]
|
||||
end
|
||||
|
||||
def self.blocked_ip_blocks
|
||||
SiteSetting
|
||||
.blocked_ip_blocks
|
||||
.split(/[|\n]/)
|
||||
.filter_map do |r|
|
||||
IPAddr.new(r.strip)
|
||||
rescue IPAddr::InvalidAddressError
|
||||
nil
|
||||
end
|
||||
end
|
||||
|
||||
def self.allowed_internal_hosts
|
||||
hosts =
|
||||
[
|
||||
SiteSetting.Upload.s3_cdn_url,
|
||||
GlobalSetting.try(:cdn_url),
|
||||
Discourse.base_url_no_prefix,
|
||||
].filter_map do |url|
|
||||
URI.parse(url).hostname if url
|
||||
rescue URI::Error
|
||||
nil
|
||||
end
|
||||
|
||||
hosts += SiteSetting.allowed_internal_hosts.split(/[|\n]/).filter_map { |h| h.strip.presence }
|
||||
|
||||
hosts
|
||||
end
|
||||
|
||||
def self.host_bypasses_checks?(hostname)
|
||||
allowed_internal_hosts.any? { |h| h.downcase == hostname.downcase }
|
||||
end
|
||||
|
||||
def self.ip_allowed?(ip)
|
||||
ip = ip.is_a?(IPAddr) ? ip : IPAddr.new(ip)
|
||||
|
||||
if ip_in_ranges?(ip, blocked_ip_blocks) || ip_in_ranges?(ip, standard_private_ranges)
|
||||
return false
|
||||
end
|
||||
|
||||
true
|
||||
end
|
||||
|
||||
def self.lookup_and_filter_ips(name, timeout: nil)
|
||||
ips = lookup_ips(name, timeout: timeout)
|
||||
return ips if host_bypasses_checks?(name)
|
||||
|
||||
ips.filter! { |ip| FinalDestination::SSRFDetector.ip_allowed?(ip) }
|
||||
|
||||
raise DisallowedIpError, "FinalDestination: all resolved IPs were disallowed" if ips.empty?
|
||||
|
||||
ips
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def self.ip_in_ranges?(ip, ranges)
|
||||
ranges.any? { |r| r === ip }
|
||||
end
|
||||
|
||||
def self.lookup_ips(name, timeout: nil)
|
||||
if Rails.env.test?
|
||||
["1.2.3.4"]
|
||||
else
|
||||
FinalDestination::Resolver.lookup(name, timeout: timeout)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
Reference in New Issue
Block a user