X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1f7bd08f4a8a6a626a0c1d7ed60f2dcd6a6801e8..ba982e48c478ee67ee2fc5766299e1b57cc3ba11:/app/models/acl.rb?ds=sidebyside

diff --git a/app/models/acl.rb b/app/models/acl.rb
index e2f163ea5..90dd7f3cf 100644
--- a/app/models/acl.rb
+++ b/app/models/acl.rb
@@ -1,21 +1,43 @@
-class Acl < ActiveRecord::Base
-  def self.match(address, domain = nil)
-    if domain
-      condition = Acl.where("address >>= ? OR domain = ?", address, domain)
-    else
-      condition = Acl.where("address >>= ?", address)
-    end
+# == Schema Information
+#
+# Table name: acls
+#
+#  id      :bigint(8)        not null, primary key
+#  address :inet
+#  k       :string           not null
+#  v       :string
+#  domain  :string
+#  mx      :string
+#
+# Indexes
+#
+#  acls_k_idx             (k)
+#  index_acls_on_address  (address) USING gist
+#  index_acls_on_domain   (domain)
+#  index_acls_on_mx       (mx)
+#
+
+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]
+    acls = acls.or(Acl.where(:mx => options[:mx])) if options[:mx]
+
+    acls
   end
 
-  def self.no_account_creation(address, domain = nil)
-    self.match(address, domain).where(:k => "no_account_creation").exists?
+  def self.no_account_creation(address, options = {})
+    match(address, options).exists?(:k => "no_account_creation")
   end
 
   def self.no_note_comment(address, domain = nil)
-    self.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)
-    self.match(address, domain).where(:k => "no_trace_download").exists?
+    match(address, :domain => domain).exists?(:k => "no_trace_download")
   end
 end