X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ea59d95f4aad7cafe3a0d0b4d5ef533b0662e365..729179c9c6be1978e13905f8a6091b38b1dd82e0:/app/models/acl.rb?ds=sidebyside diff --git a/app/models/acl.rb b/app/models/acl.rb index 90dd7f3cf..a65c3a35a 100644 --- a/app/models/acl.rb +++ b/app/models/acl.rb @@ -23,7 +23,15 @@ 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