Browse Source

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

closed-social-glitch-2
Eugen Rochko 1 year ago
committed by GitHub
parent
commit
630436ab2d
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 7 deletions
  1. +3
    -1
      app/lib/request.rb
  2. +0
    -6
      config/environments/development.rb

+ 3
- 1
app/lib/request.rb View File

@ -273,7 +273,9 @@ class Request
def check_private_address(address, host)
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)
end

+ 0
- 6
config/environments/development.rb View File

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

Loading…
Cancel
Save