X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e78859aeaf40fd7c3d9f1ef1c0c8d1fd14bf41b0..952188c814382b4ee0a90f6fc6084542dd113e75:/app/models/acl.rb?ds=sidebyside

diff --git a/app/models/acl.rb b/app/models/acl.rb
index ea19c74b0..aa503f40c 100644
--- a/app/models/acl.rb
+++ b/app/models/acl.rb
@@ -2,39 +2,54 @@
 #
 # 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
+#  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
+class Acl < ApplicationRecord
   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
+
+    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
 
-  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)
-    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)
-    match(address, domain).where(:k => "no_trace_download").exists?
+    match(address, :domain => domain).exists?(:k => "no_trace_download")
   end
 end