treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix sign-up restrictions based on email addresses not being enforced (#28732)

th-new
Claire 2024-01-15 12:06:48 +01:00 committed by GitHub
parent 8013d6c56d
commit 8cb4825c8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/user.rb
View File

@ -187,7 +187,7 @@ class User < ApplicationRecord
def confirm def confirm
new_user = !confirmed? new_user = !confirmed?
self.approved = true if open_registrations? && !sign_up_from_ip_requires_approval? self.approved = true if grant_approval_on_confirmation?
super super
@ -206,7 +206,7 @@ class User < ApplicationRecord
def confirm! def confirm!
new_user = !confirmed? new_user = !confirmed?
self.approved = true if open_registrations? self.approved = true if grant_approval_on_confirmation?
skip_confirmation! skip_confirmation!
save! save!
@ -426,6 +426,11 @@ class User < ApplicationRecord
end end
end end
def grant_approval_on_confirmation?
# Re-check approval on confirmation if the server has switched to open registrations
open_registrations? && !sign_up_from_ip_requires_approval? && !sign_up_email_requires_approval?
end
def sign_up_from_ip_requires_approval? def sign_up_from_ip_requires_approval?
!sign_up_ip.nil? && IpBlock.where(severity: :sign_up_requires_approval).where('ip >>= ?', sign_up_ip.to_s).exists? !sign_up_ip.nil? && IpBlock.where(severity: :sign_up_requires_approval).where('ip >>= ?', sign_up_ip.to_s).exists?
end end