fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-27 02:54:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1698 from ClearlyClaire/glitch-soc/merge-upstream

Browse source 
Merge upstream changes
This commit is contained in:
Claire 2022-02-21 15:47:49 +01:00 committed by GitHub
parent 23a548d794 2bd9bcf698
commit e0d94323bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
config/initializers/rack_attack.rb
View file

@ -83,11 +83,10 @@ class Rack::Attack
throttle('throttle_sign_up_attempts/ip', limit: 25, period: 5.minutes) do |req| throttle('throttle_sign_up_attempts/ip', limit: 25, period: 5.minutes) do |req|
if req.post? && req.path == '/auth' if req.post? && req.path == '/auth'
if req.remote_ip.ipv6? addr = req.remote_ip
req.remote_ip.mask(64) addr = IPAddr.new(addr) if addr.is_a?(String)
else addr = addr.mask(64) if addr.ipv6?
req.remote_ip addr.to_s
end
end end
end end