diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-03-18 11:17:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-18 11:17:46 +0100 |
| commit | 00fe0f6cb4a736bbb5e633c567ddf7ac9a09ce69 (patch) | |
| tree | 9ddf09dda84c65904c36dec759834ea446b4ac5d /app/lib/request.rb | |
| parent | f5daa20f2a90098c9d689c5ec9d95ce9887b3a33 (diff) | |
| parent | 8f97ffe91e79c0418666f64b5830d3e74fcc83ba (diff) | |
Merge pull request #2136 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/request.rb')
| -rw-r--r-- | app/lib/request.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/lib/request.rb b/app/lib/request.rb index 85716f999..4bde6fc91 100644 --- a/app/lib/request.rb +++ b/app/lib/request.rb @@ -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 |