X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/52e5fa6ad78f375cec5a207a123a4aa3939c8ddf..15b104f4ff4614aa78c01180b6a9b89dd5a1400f:/app/models/acl.rb

diff --git a/app/models/acl.rb b/app/models/acl.rb
index 94e377343..095bad89b 100644
--- a/app/models/acl.rb
+++ b/app/models/acl.rb
@@ -1,13 +1,38 @@
-class Acl < ActiveRecord::Base
-  scope :address, lambda { |address| where("#{inet_aton} & netmask = address", address) }
+# == Schema Information
+#
+# Table name: acls
+#
+#  id      :integer          not null, primary key
+#  address :inet
+#  k       :string           not null
+#  v       :string
+#  domain  :string
+#
+# Indexes
+#
+#  acls_k_idx  (k)
+#
 
-private
+class Acl < ActiveRecord::Base
+  validates :k, :presence => true
 
-  def self.inet_aton
-    if self.connection.adapter_name == "MySQL"
-      "inet_aton(?)"
+  def self.match(address, domain = nil)
+    if domain
+      Acl.where("address >>= ? OR domain = ?", address, domain)
     else
-      "?"
+      Acl.where("address >>= ?", address)
     end
   end
+
+  def self.no_account_creation(address, domain = nil)
+    match(address, domain).where(:k => "no_account_creation").exists?
+  end
+
+  def self.no_note_comment(address, domain = nil)
+    match(address, domain).where(:k => "no_note_comment").exists?
+  end
+
+  def self.no_trace_download(address, domain = nil)
+    match(address, domain).where(:k => "no_trace_download").exists?
+  end
 end