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

Merge upstream changes

1 files changed, 7 insertions, 1 deletions

diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index 964d4266d..a1fea7712 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -82,7 +82,13 @@ class Rack::Attack
   end
 
   throttle('throttle_sign_up_attempts/ip', limit: 25, period: 5.minutes) do |req|
-    req.remote_ip if req.post? && req.path == '/auth'
+    if req.post? && req.path == '/auth'
+      if req.remote_ip.ipv6?
+        req.remote_ip.mask(64)
+      else
+        req.remote_ip
+      end
+    end
   end
 
   throttle('throttle_password_resets/ip', limit: 25, period: 5.minutes) do |req|