Fixes #38718 - Register feature scope in belongs_to_proxy

Author: adamruzicka

Gemfile

@@ -8,7 +8,7 @@ gem 'rest-client', '>= 2.0.0', '< 3', :require => 'rest_client'
 gem 'audited', '~> 5.0', '!= 5.1.0'
 gem 'will_paginate', '~> 3.3'
 gem 'ancestry', '~> 4.0'
-gem 'scoped_search', '>= 4.1.10', '< 5'
+gem 'scoped_search', '>= 4.3.0', '< 5'
 gem 'ldap_fluff', '>= 0.9.0', '< 1.0'
 gem 'apipie-rails', '>= 0.8.0', '< 2'
 gem 'apipie-dsl', '>= 2.6.2'

app/controllers/api/base_controller.rb

@@ -85,6 +85,7 @@ def parent_scope
       association ||= resource_class.reflect_on_all_associations.detect { |assoc| assoc.class_name == parent_name.camelize }
       if association.nil? && parent_name == 'host'
         association = resource_class.reflect_on_all_associations.detect { |assoc| assoc.class_name == 'Host::Base' }
+        association ||= resource_class.reflect_on_all_associations.detect { |assoc| assoc.class_name == 'Host::Managed' }
       end
       return resource_class.all if association.nil? && Taxonomy.types.include?(resource_class_for(resource_name(parent_name)))
       raise "Association not found for #{parent_name}" unless association

app/models/concerns/audit_search.rb

@@ -4,15 +4,15 @@ module AuditSearch
   included do
     belongs_to :user, :class_name => 'User'
     belongs_to :search_users, :class_name => 'User', :foreign_key => :user_id
-    belongs_to :search_hosts, -> { where(:audits => { :auditable_type => 'Host::Base' }) },
-      :class_name => 'Host::Base', :foreign_key => :auditable_id
+    belongs_to :search_hosts, -> { joins(:audits).where(:audits => { :auditable_type => 'Host::Base' }) },
+      :class_name => 'Host::Managed', :foreign_key => :auditable_id
     belongs_to :search_hostgroups, :class_name => 'Hostgroup', :foreign_key => :auditable_id
     belongs_to :search_parameters, :class_name => 'Parameter', :foreign_key => :auditable_id
     belongs_to :search_templates, :class_name => 'ProvisioningTemplate', :foreign_key => :auditable_id
     belongs_to :search_ptables, :class_name => 'Ptable', :foreign_key => :auditable_id
     belongs_to :search_os, :class_name => 'Operatingsystem', :foreign_key => :auditable_id
     belongs_to :search_class, :class_name => 'Puppetclass', :foreign_key => :auditable_id
-    belongs_to :search_nics, -> { where('audits.auditable_type LIKE ?', "Nic::%") }, :class_name => 'Nic::Base', :foreign_key => :auditable_id
+    belongs_to :search_nics, -> { joins(:audits).where('audits.auditable_type LIKE ?', "Nic::%") }, :class_name => 'Nic::Base', :foreign_key => :auditable_id
     belongs_to :search_settings, :class_name => 'Setting', :foreign_key => :auditable_id
 
     scoped_search :on => :id, :complete_value => false

app/models/concerns/belongs_to_proxies.rb

@@ -16,7 +16,7 @@ def belongs_to_proxy(name, options)
 
     def register_smart_proxy(name, options)
       self.registered_smart_proxies = registered_smart_proxies.merge(name => options)
-      belongs_to name, :class_name => 'SmartProxy'
+      belongs_to name, -> { with_features(options[:feature]) }, :class_name => 'SmartProxy'
       validates name, :proxy_features => { :feature => options[:feature], :required => options[:required] }
     end
 

app/validators/proxy_features_validator.rb

@@ -5,11 +5,13 @@ def initialize(args)
   end
 
   def validate_each(record, attribute, value)
-    if !value && @options[:required]
+    id = record.public_send("#{attribute}_id")
+    if !id && @options[:required]
       record.errors.add("#{attribute}_id", _('was not found'))
     end
 
-    if value && !value.has_feature?(@options[:feature])
+    # Due to scope being set on the association, it can happen that the id is present but the association is nil
+    if (id || value) && !value.try(:has_feature?, @options[:feature])
       if @options[:message].nil?
         message = _('does not have the %s feature') % @options[:feature]
       else

test/controllers/concerns/auto_complete_search_test.rb

@@ -13,6 +13,6 @@ class AutoCompleteSearchTest < ActionController::TestCase
     assert_predicate response, :successful?
     suggestions = ActiveSupport::JSON.decode(response.body)
     assert_equal 1, suggestions.length
-    assert_equal suggestions.first['part'], "name = #{domain1.name}"
+    assert_equal suggestions.first['label'], "name = \"#{domain1.name}\""
   end
 end

test/controllers/subnets_controller_test.rb

@@ -16,11 +16,11 @@ class SubnetsControllerTest < ActionController::TestCase
   context 'three similar subnets exists' do
     def setup
       as_admin do
-        @s1 = FactoryBot.create(:subnet_ipv4, :network => '100.20.100.100', :cidr => '24', :organization_ids => [taxonomies(:organization1).id], :location_ids => [taxonomies(:location1).id])
-        @s3 = FactoryBot.create(:subnet_ipv4, :network => '200.100.100.100', :cidr => '24', :organization_ids => [taxonomies(:organization1).id], :location_ids => [taxonomies(:location1).id])
-        @s2 = FactoryBot.create(:subnet_ipv4, :network => '100.100.100.100', :cidr => '24', :organization_ids => [taxonomies(:organization1).id], :location_ids => [taxonomies(:location1).id])
-        @s4 = FactoryBot.create(:subnet_ipv6, :network => 'beef::', :cidr => '64', :organization_ids => [taxonomies(:organization1).id], :location_ids => [taxonomies(:location1).id])
-        @s5 = FactoryBot.create(:subnet_ipv6, :network => 'ffee::', :cidr => '64', :organization_ids => [taxonomies(:organization1).id], :location_ids => [taxonomies(:location1).id])
+        @s1 = FactoryBot.create(:subnet_ipv4, :dhcp, :network => '100.20.100.100', :cidr => '24', :organization_ids => [taxonomies(:organization1).id], :location_ids => [taxonomies(:location1).id])
+        @s3 = FactoryBot.create(:subnet_ipv4, :dhcp, :network => '200.100.100.100', :cidr => '24', :organization_ids => [taxonomies(:organization1).id], :location_ids => [taxonomies(:location1).id])
+        @s2 = FactoryBot.create(:subnet_ipv4, :dhcp, :network => '100.100.100.100', :cidr => '24', :organization_ids => [taxonomies(:organization1).id], :location_ids => [taxonomies(:location1).id])
+        @s4 = FactoryBot.create(:subnet_ipv6, :dhcp, :network => 'beef::', :cidr => '64', :organization_ids => [taxonomies(:organization1).id], :location_ids => [taxonomies(:location1).id])
+        @s5 = FactoryBot.create(:subnet_ipv6, :dhcp, :network => 'ffee::', :cidr => '64', :organization_ids => [taxonomies(:organization1).id], :location_ids => [taxonomies(:location1).id])
       end
     end
 

test/models/concerns/audit_search_test.rb

@@ -11,7 +11,7 @@ def setup
   end
 
   test "host autocomplete works in audit search" do
-    FactoryBot.create(:host, :managed)
+    FactoryBot.create(:host, :managed, :with_auditing)
     hosts = Audit.complete_for("host = ", {:controller => 'audits'})
     assert hosts.count > 0
   end

test/models/concerns/belongs_to_proxies_test.rb

@@ -5,7 +5,7 @@ class SampleModel
     include BelongsToProxies
 
     class << self
-      def belongs_to(name, options = {})
+      def belongs_to(name, scope, options = {})
       end
 
       def validates(name, options = {})

test/unit/validators/proxy_features_validator_test.rb

@@ -4,7 +4,7 @@ class ProxyFeaturesValidatorTest < ActiveSupport::TestCase
   class Validatable
     include ActiveModel::Validations
     validates :proxy, :proxy_features => { :feature => 'DNS' }
-    attr_accessor :proxy
+    attr_accessor :proxy, :proxy_id
   end
 
   def setup
@@ -21,4 +21,10 @@ def setup
     refute_valid @validatable
     assert_equal ['does not have the DNS feature'], @validatable.errors[:proxy_id]
   end
+
+  test 'should fail when id is present but association returns nil' do
+    @validatable.proxy_id = FactoryBot.create(:dhcp_smart_proxy).id
+    refute_valid @validatable
+    assert_equal ['does not have the DNS feature'], @validatable.errors[:proxy_id]
+  end
 end