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

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

diff --git a/app/models/acl.rb b/app/models/acl.rb
index 90dd7f3cf48d19f30f9b6a5da185b4af0744eed6..aa503f40c539647dfb9d66aea990b57e6f8c76c6 100644 (file)
--- 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)
 
   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
     acls = acls.or(Acl.where(:mx => options[:mx])) if options[:mx]
 
     acls


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