Improve UX for error signing up from proxies.

aibooruorg · Oct 4, 2024 · 63bd149 · 63bd149
1 parent eb3c6a1
commit 63bd149
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -63,7 +63,6 @@ def profile
   end
 
   def create
-    raise User::PrivilegeError if Danbooru::IpAddress.new(request.remote_ip).is_proxy?
     user_verifier = UserVerifier.new(CurrentUser.user, request)
 
     @user = authorize User.new(

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -110,6 +110,7 @@ module Levels
   validates :comment_threshold, inclusion: { in: (-100..5) }
   validate :validate_custom_css, if: :custom_style_changed?
   validate :validate_add_extra_data_attributes, unless: :new_record?
+  validate :validate_not_signing_up_from_proxy, if: :new_record?
   before_validation :normalize_blacklisted_tags
   before_create :promote_to_owner_if_first_user
 
@@ -231,6 +232,12 @@ def validate_add_extra_data_attributes
       end
     end
 
+    def validate_not_signing_up_from_proxy
+      if last_ip_addr&.is_proxy?
+        errors.add(:base, "Sign ups are not allowed from that IP address.")
+      end
+    end
+
     def name_errors
       UserNameValidator.new(attributes: [:name], skip_uniqueness: true).validate(self)
       errors

diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
@@ -12,6 +12,7 @@
   inflect.acronym "AI"
   inflect.acronym "SFTP"
   inflect.acronym "TOTP"
+  inflect.acronym "IP"
   inflect.acronym "VAE"
   inflect.acronym "UI"
   inflect.acronym "RNG"