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

[rails.git] / app / models / acl.rb

diff --git a/app/models/acl.rb b/app/models/acl.rb
index 895ed61e4de8883db9940f25c056222f4d2b6965..a65c3a35ad68977fe1a1da5f6296c280006145a0 100644 (file)
--- a/app/models/acl.rb
+++ b/app/models/acl.rb
@@ -17,27 +17,35 @@
 #  index_acls_on_mx       (mx)
 #
 
-class Acl < ActiveRecord::Base
+class Acl < ApplicationRecord
   validates :k, :presence => true
 
   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.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