treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Refactor monkey-patching of `PrivateAddressCheck` (#24122)

pull/59/head
Eugen Rochko 2023-03-16 04:33:38 +01:00 committed by GitHub
parent aa947a143b
commit 630436ab2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/lib/request.rb
View File

@ -273,7 +273,9 @@ class Request
def check_private_address(address, host) def check_private_address(address, host)
addr = IPAddr.new(address.to_s) addr = IPAddr.new(address.to_s)
return if private_address_exceptions.any? { |range| range.include?(addr) }
return if Rails.env.development? || private_address_exceptions.any? { |range| range.include?(addr) }
raise Mastodon::PrivateNetworkAddressError, host if PrivateAddressCheck.private_address?(addr) raise Mastodon::PrivateNetworkAddressError, host if PrivateAddressCheck.private_address?(addr)
end end

6
config/environments/development.rb
View File

@ -77,9 +77,3 @@ Rails.application.configure do
end end
Redis.raise_deprecations = true Redis.raise_deprecations = true
module PrivateAddressCheck
def self.private_address?(*)
false
end
end