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

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

diff --git a/app/models/acl.rb b/app/models/acl.rb
index 095bad89b942d07e62ee74b18e999100905c456b..aa503f40c539647dfb9d66aea990b57e6f8c76c6 100644 (file)
--- a/app/models/acl.rb
+++ b/app/models/acl.rb
@@ -2,37 +2,54 @@
 #
 # Table name: acls
 #
 #
 # Table name: acls
 #

-#  id      :integer          not null, primary key
+#  id      :bigint(8)        not null, primary key

 #  address :inet
 #  k       :string           not null
 #  v       :string
 #  domain  :string
 #  address :inet
 #  k       :string           not null
 #  v       :string
 #  domain  :string

+#  mx      :string

 #
 # Indexes
 #
 #
 # Indexes
 #

-#  acls_k_idx  (k)
+#  acls_k_idx             (k)
+#  index_acls_on_address  (address) USING gist
+#  index_acls_on_domain   (domain)
+#  index_acls_on_mx       (mx)

 #
 
 #
 

-class Acl < ActiveRecord::Base
+class Acl < ApplicationRecord

   validates :k, :presence => true
 
   validates :k, :presence => true
 

-  def self.match(address, domain = nil)
-    if domain
-      Acl.where("address >>= ? OR domain = ?", address, domain)
-    else
-      Acl.where("address >>= ?", address)
+  def self.match(address, options = {})
+    acls = Acl.where("address >>= ?", address)
+
+    if options[:domain]
+      labels = options[:domain].split(".")
+
+      until labels.empty?
+        acls = acls.or(Acl.where(:domain => labels.join(".")))
+        labels.shift
+      end

     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).exists?(:k => "no_account_creation")

   end
 
   end
 

-  def self.no_account_creation(address, domain = nil)
-    match(address, domain).where(:k => "no_account_creation").exists?
+  def self.allow_account_creation(address, options = {})
+    match(address, options).exists?(:k => "allow_account_creation")

   end
 
   def self.no_note_comment(address, domain = nil)
   end
 
   def self.no_note_comment(address, domain = nil)

-    match(address, 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)
   end
 
   def self.no_trace_download(address, domain = nil)

-    match(address, domain).where(:k => "no_trace_download").exists?
+    match(address, :domain => domain).exists?(:k => "no_trace_download")

   end
 end
   end
 end