X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/81835c55a027e4b5dda06a2d5e1107315f1bf24d..91a37235ac748df7dc241b215790d6cbecd652f3:/app/models/acl.rb

diff --git a/app/models/acl.rb b/app/models/acl.rb
index 5fb99b9e5..895ed61e4 100644
--- a/app/models/acl.rb
+++ b/app/models/acl.rb
@@ -1,13 +1,43 @@
+# == 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 < ActiveRecord::Base
-  def self.find_by_address(address, options)
-    self.with_scope(:find => {:conditions => ["inet_aton(?) & netmask = address", address]}) do
-      return self.find(:first, options)
-    end
+  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, options = {})
+    match(address, options).where(:k => "no_account_creation").exists?
+  end
+
+  def self.no_note_comment(address, domain = nil)
+    match(address, :domain => domain).where(:k => "no_note_comment").exists?
   end
 
-  def self.find_all_by_address(address, options)
-    self.with_scope(:find => {:conditions => ["inet_aton(?) & netmask = address", address]}) do
-      return self.find(:all, options)
-    end
+  def self.no_trace_download(address, domain = nil)
+    match(address, :domain => domain).where(:k => "no_trace_download").exists?
   end
 end