cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/pull/4407'

Browse source
This commit is contained in:
Tom Hughes 2023-12-17 18:41:56 +00:00
commit 1b675a6dee
3 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/users_controller.rb
View file

@ -355,6 +355,8 @@ class UsersController < ApplicationController
domain_mx_servers(domain) domain_mx_servers(domain)
end end
return true if Acl.allow_account_creation(request.remote_ip, :domain => domain, :mx => mx_servers)
blocked = Acl.no_account_creation(request.remote_ip, :domain => domain, :mx => mx_servers) blocked = Acl.no_account_creation(request.remote_ip, :domain => domain, :mx => mx_servers)
blocked ||= SIGNUP_IP_LIMITER && !SIGNUP_IP_LIMITER.allow?(request.remote_ip) blocked ||= SIGNUP_IP_LIMITER && !SIGNUP_IP_LIMITER.allow?(request.remote_ip)

9
app/models/acl.rb
View file

@ -41,6 +41,15 @@ class Acl < ApplicationRecord
match(address, options).exists?(:k => "no_account_creation") match(address, options).exists?(:k => "no_account_creation")
end end
def self.allow_account_creation(address, options = {})
acls = Acl.where("address >>= ?", address)
.and(Acl.where(:k => "allow_account_creation"))
acls = acls.and(Acl.where(:domain => options[:domain])) if options[:domain]
acls = acls.and(Acl.where(:mx => options[:mx])) if options[:mx]
!acls.empty?
end
def self.no_note_comment(address, domain = nil) def self.no_note_comment(address, domain = nil)
match(address, :domain => domain).exists?(:k => "no_note_comment") match(address, :domain => domain).exists?(:k => "no_note_comment")
end end

13
test/models/acl_test.rb
View file

@ -27,4 +27,17 @@ class AclTest < ActiveSupport::TestCase
create(:acl, :mx => "mail.example.com", :k => "no_account_creation") create(:acl, :mx => "mail.example.com", :k => "no_account_creation")
assert Acl.no_account_creation("192.168.1.1", :mx => "mail.example.com") assert Acl.no_account_creation("192.168.1.1", :mx => "mail.example.com")
end end
def test_allowed_account_creation
assert_not Acl.allow_account_creation("192.168.1.1", :domain => "example.com", :mx => "mail.example.com")
create(:acl, :address => "192.168.1.1", :domain => "example.com", :mx => "mail.example.com", :k => "allow_account_creation")
assert_not Acl.allow_account_creation("192.168.1.2")
assert Acl.allow_account_creation("192.168.1.1")
assert_not Acl.allow_account_creation("192.168.1.2", :domain => "example.com", :mx => "mail.example.com")
assert_not Acl.allow_account_creation("192.168.1.1", :domain => "example1.com", :mx => "mail.example.com")
assert_not Acl.allow_account_creation("192.168.1.1", :domain => "example.com", :mx => "mail1.example.com")
assert Acl.allow_account_creation("192.168.1.1", :domain => "example.com", :mx => "mail.example.com")
end
end end