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

Make allow_account_creation work the same as other ACLs

Browse source
This commit is contained in:
Tom Hughes 2023-12-19 11:58:30 +00:00
parent 585b77abba
commit 9a6a6fab73
2 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/models/acl.rb
View file

@ -42,12 +42,7 @@ class Acl < ApplicationRecord
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?
match(address, options).exists?(:k => "allow_account_creation")
end
def self.no_note_comment(address, domain = nil)

25
test/models/acl_test.rb
View file

@ -28,16 +28,23 @@ class AclTest < ActiveSupport::TestCase
assert Acl.no_account_creation("192.168.1.1", :mx => "mail.example.com")
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")
def test_allow_account_creation_by_subnet
assert_not Acl.allow_account_creation("192.168.1.1")
create(:acl, :address => "192.168.0.0/16", :k => "allow_account_creation")
assert Acl.allow_account_creation("192.168.1.1")
end
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")
def test_allow_account_creation_by_domain
assert_not Acl.allow_account_creation("192.168.1.1", :domain => "example.com")
assert_not Acl.allow_account_creation("192.168.1.1", :domain => "test.example.com")
create(:acl, :domain => "example.com", :k => "allow_account_creation")
assert Acl.allow_account_creation("192.168.1.1", :domain => "example.com")
assert Acl.allow_account_creation("192.168.1.1", :domain => "test.example.com")
end
def test_allow_account_creation_by_mx
assert_not Acl.allow_account_creation("192.168.1.1", :mx => "mail.example.com")
create(:acl, :mx => "mail.example.com", :k => "allow_account_creation")
assert Acl.allow_account_creation("192.168.1.1", :mx => "mail.example.com")
end
end