Merge pull request #14852 from lpichler/allow_descendats_of_host_mode…

…l_to_use_belongsto_filters

Allow descendants of Host model to use belongsto filters in RBAC
(cherry picked from commit 4bcba39)

https://bugzilla.redhat.com/show_bug.cgi?id=1445075

lib/rbac/filterer.rb

@@ -560,7 +560,7 @@ def apply_select(klass, scope, extra_cols)
     end
 
     def get_belongsto_matches(blist, klass)
-      return get_belongsto_matches_for_host(blist) if klass == Host
+      return get_belongsto_matches_for_host(blist) if klass <= Host
       return get_belongsto_matches_for_storage(blist) if klass == Storage
       association_name = klass.base_model.to_s.tableize
 

spec/lib/rbac/filterer_spec.rb

@@ -817,6 +817,21 @@ def get_rbac_results_for_and_expect_objects(klass, expected_objects)
           expect(attrs[:auth_count]).to eq(1)
           expect(results3.length).to eq(1)
         end
+
+        it 'searches Hosts with tag and host & cluster filters' do
+          group.entitlement = Entitlement.new
+          group.entitlement.set_belongsto_filters([@cluster_folder_path])
+          group.entitlement.set_managed_filters([['/managed/environment/prod']])
+          group.save!
+
+          @host_1.tag_with('/managed/environment/prod', :ns => '*')
+
+          results, attrs = described_class.search(:class => "Host", :user => user)
+
+          expect(attrs[:user_filters]).to eq("managed"   => [['/managed/environment/prod']], "belongsto" => [@cluster_folder_path])
+          expect(attrs[:auth_count]).to eq(1)
+          expect(results.length).to eq(1)
+        end
       end
     end