X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/52e5fa6ad78f375cec5a207a123a4aa3939c8ddf..a41d500b9f65ec9f4e848effd38dc1ae117e7594:/app/models/acl.rb?ds=sidebyside

diff --git a/app/models/acl.rb b/app/models/acl.rb
index 94e377343..06f754c22 100644
--- a/app/models/acl.rb
+++ b/app/models/acl.rb
@@ -1,13 +1,43 @@
-class Acl < ActiveRecord::Base
-  scope :address, lambda { |address| where("#{inet_aton} & netmask = address", address) }
+# == 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)
+#
 
-private
+class Acl < ApplicationRecord
+  validates :k, :presence => true
 
-  def self.inet_aton
-    if self.connection.adapter_name == "MySQL"
-      "inet_aton(?)"
-    else
-      "?"
-    end
+  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.no_trace_download(address, domain = nil)
+    match(address, :domain => domain).where(:k => "no_trace_download").exists?
   end
 end