X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a41d500b9f65ec9f4e848effd38dc1ae117e7594..377391e8bb4294a539d5363a20af51243877243c:/app/models/acl.rb diff --git a/app/models/acl.rb b/app/models/acl.rb index 06f754c22..aa503f40c 100644 --- a/app/models/acl.rb +++ b/app/models/acl.rb @@ -23,21 +23,33 @@ class Acl < ApplicationRecord def self.match(address, options = {}) acls = Acl.where("address >>= ?", address) - acls = acls.or(Acl.where(:domain => options[:domain])) if options[:domain] + if options[:domain] + labels = options[:domain].split(".") + + until labels.empty? + acls = acls.or(Acl.where(:domain => labels.join("."))) + labels.shift + end + end + acls = acls.or(Acl.where(:mx => options[:mx])) if options[:mx] acls end def self.no_account_creation(address, options = {}) - match(address, options).where(:k => "no_account_creation").exists? + match(address, options).exists?(:k => "no_account_creation") + end + + def self.allow_account_creation(address, options = {}) + match(address, options).exists?(:k => "allow_account_creation") end def self.no_note_comment(address, domain = nil) - match(address, :domain => domain).where(:k => "no_note_comment").exists? + match(address, :domain => domain).exists?(:k => "no_note_comment") end def self.no_trace_download(address, domain = nil) - match(address, :domain => domain).where(:k => "no_trace_download").exists? + match(address, :domain => domain).exists?(:k => "no_trace_download") end end