restore check_private_address to upstream

This commit is contained in:
Izalia Mae 2022-11-17 07:24:47 -05:00
parent 31804aabab
commit 433a871a14

View file

@ -266,9 +266,15 @@ class Request
alias new open
def check_private_address(address, host)
#raise Mastodon::HostValidationError if PrivateAddressCheck.private_address?(IPAddr.new(address.to_s))
# People run multiple AP servers on the same network sometimes
nil
addr = IPAddr.new(address.to_s)
return if private_address_exceptions.any? { |range| range.include?(addr) }
raise Mastodon::PrivateNetworkAddressError, host if PrivateAddressCheck.private_address?(addr)
end
def private_address_exceptions
@private_address_exceptions = begin
(ENV['ALLOWED_PRIVATE_ADDRESSES'] || '').split(',').map { |addr| IPAddr.new(addr) }
end
end
end
end