foreman_openscap 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: caa574656df74e25c0475002df05b229193b872e
-  data.tar.gz: 307217d077f8f6ab73c167fa0a48105d12145d32
+  metadata.gz: 57a91e2bc0562de60ea4959460a9afe2029dddcc
+  data.tar.gz: 5b1ed88b9b0d29381eccff2d5349c965b99c65d5
 SHA512:
-  metadata.gz: 350cb9657d7ac2939208c7264076c08da48004345666085df5260246e60aa45817d05667a258825993e76bf1369670187f7a847dd2b156c447dbadd56a1c3bdd
-  data.tar.gz: 20fd5f82f889557c8c14df2b5afc1d8f79535ee9b2846ab13c549f7748a836260554f561e90ea5f61e69b00c132dc0d180bd8e81851f60878aec6ca71c3aea72
+  metadata.gz: 199215c239ad13dd1e5ed6c971bd324f9dad62f138c5c0d42689dfa85050c71020514d247610e3c81d3acad4420927dc25d3e22cfe84355576b7067ecef914ab
+  data.tar.gz: 51af4f9460056312001d0b7edec878a28adc6aba39876682f36825fe9decb9f206acaff598981958704699497d0aebb3282912d60dd8b6ea5f25f9499f79d770

data/app/models/concerns/foreman_openscap/compliance_status_scoped_search.rb

@@ -15,11 +15,9 @@ module ForemanOpenscap
       end
 
       def search_by_policy_name(_key, _operator, policy_name)
-        cond = sanitize_policy_name(policy_name)
-        { :conditions => ArfReport.arel_table[:id].in(
-          PolicyArfReport.select(PolicyArfReport.arel_table[:arf_report_id])
-            .of_policy(Policy.find_by(name: cond).id).ast
-        ).to_sql }
+        query = PolicyArfReport.of_policy(Policy.find_by(:name => policy_name))
+                               .select(PolicyArfReport.arel_table[:arf_report_id]).to_sql
+        query_conditions query
       end
 
       def search_by_comply_with(_key, _operator, policy_name)
@@ -35,11 +33,9 @@ module ForemanOpenscap
       end
 
       def search_by_policy_results(policy_name, &selection)
-        cond = sanitize_policy_name(policy_name)
-        { :conditions => ArfReport.arel_table[:id].in(
-          ArfReport.select(ArfReport.arel_table[:id])
-              .latest_of_policy(Policy.find_by(name: cond)).instance_eval(&selection).ast
-        ).to_sql }
+        query = ArfReport.of_policy(Policy.find_by(:name => policy_name).id)
+                         .instance_eval(&selection).select(ArfReport.arel_table[:id]).to_sql
+        query_conditions query
       end
 
       def search_by_last_for(key, operator, by)
@@ -66,8 +62,8 @@ module ForemanOpenscap
 
       private
 
-      def sanitize_policy_name(policy_name)
-        sanitize_sql_for_conditions('foreman_openscap_policies.name' => policy_name)
+      def query_conditions(query)
+        { :conditions => "reports.id IN (#{query})" }
       end
     end
 

data/app/views/api/v2/compliance/policies/children.json.rabl

@@ -0,0 +1,9 @@
+object @policy
+
+child :hosts => :hosts do |host|
+  attributes :id, :name
+end
+
+child :hostgroups => :hostgroups do |hostgroup|
+  attributes :id, :name, :title
+end

data/app/views/api/v2/compliance/policies/main.json.rabl

@@ -1,5 +1,6 @@
 object @policy
 
 extends "api/v2/compliance/policies/base"
+extends "api/v2/compliance/policies/children"
 
 attributes :created_at, :updated_at

data/app/views/api/v2/compliance/policies/show.json.rabl

@@ -1,7 +1,4 @@
 object @policy
 
-child :hostgroups => :hostgroups do |hostgroup|
-  attributes :id, :name, :title
-end
-
 extends "api/v2/compliance/policies/main"
+extends "api/v2/compliance/policies/children"

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "0.10.0".freeze
+  VERSION = "0.10.1".freeze
 end

data/test/functional/api/v2/compliance/arf_reports_controller_test.rb

@@ -14,6 +14,7 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
 
     @from_json = arf_from_json "#{ForemanOpenscap::Engine.root}/test/files/arf_report/arf_report.json"
     @cname = '9521a5c5-8f44-495f-b087-20e86b30bf67'
+    @proxy = FactoryBot.create(:smart_proxy, :url => "http://smart-proxy.org:8000")
   end
 
   test "should get index" do
@@ -144,6 +145,99 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
     assert_equal new_msgs.first.digest, Digest::SHA1.hexdigest("Disable Firefox Configuration File ROT-13 Encoding Changed For Test")
   end
 
+  test "should find reports by policy name" do
+    reports_cleanup
+    report_a = create_arf_report
+    report_b = create_arf_report
+    policy = FactoryBot.create(:policy)
+    FactoryBot.create(:policy_arf_report, :policy_id => @policy.id, :arf_report_id => report_a.id)
+    FactoryBot.create(:policy_arf_report, :policy_id => policy.id, :arf_report_id => report_b.id)
+
+    get :index, :params => { :search => "compliance_policy=#{policy.name}" }, :session => set_session_user
+    response = ActiveSupport::JSON.decode(@response.body)
+    assert_response :success
+    assert_equal 1, response['results'].count
+  end
+
+  test "should find reports compliant with policy" do
+    reports_cleanup
+    policy = FactoryBot.create(:policy)
+    create_arf_report_for_search({ "passed" => 1, "othered" => 2, "failed" => 3 }, @policy)
+    create_arf_report_for_search({ "passed" => 1, "othered" => 0, "failed" => 0 }, @policy)
+    create_arf_report_for_search({ "passed" => 1, "othered" => 2, "failed" => 0 }, @policy)
+    create_arf_report_for_search({ "passed" => 3, "othered" => 0, "failed" => 0 }, @policy)
+    create_arf_report_for_search({ "passed" => 5, "othered" => 0, "failed" => 0 }, policy)
+
+    get :index, :params => { :search => "comply_with=#{@policy.name}" }, :session => set_session_user
+    response = ActiveSupport::JSON.decode(@response.body)
+    assert_response :success
+    assert_equal 2, response['results'].count
+  end
+
+  test "should find reports inconclusive for policy" do
+    reports_cleanup
+    policy = FactoryBot.create(:policy)
+    create_arf_report_for_search({ "passed" => 1, "othered" => 5, "failed" => 0 }, @policy)
+    create_arf_report_for_search({ "passed" => 1, "othered" => 2, "failed" => 3 }, @policy)
+    create_arf_report_for_search({ "passed" => 1, "othered" => 0, "failed" => 0 }, @policy)
+    create_arf_report_for_search({ "passed" => 1, "othered" => 2, "failed" => 0 }, @policy)
+    create_arf_report_for_search({ "passed" => 2, "othered" => 3, "failed" => 0 }, policy)
+
+    get :index, :params => { :search => "inconclusive_with=#{@policy.name}" }, :session => set_session_user
+    response = ActiveSupport::JSON.decode(@response.body)
+    assert_response :success
+    assert_equal 2, response['results'].count
+  end
+
+  test "should find reports failing for policy" do
+    reports_cleanup
+    policy = FactoryBot.create(:policy)
+    create_arf_report_for_search({ "passed" => 0, "othered" => 0, "failed" => 1 }, @policy)
+    create_arf_report_for_search({ "passed" => 1, "othered" => 0, "failed" => 0 }, @policy)
+    create_arf_report_for_search({ "passed" => 1, "othered" => 2, "failed" => 0 }, @policy)
+    create_arf_report_for_search({ "passed" => 1, "othered" => 2, "failed" => 4 }, @policy)
+    create_arf_report_for_search({ "passed" => 2, "othered" => 3, "failed" => 7 }, policy)
+
+    get :index, :params => { :search => "not_comply_with=#{@policy.name}" }, :session => set_session_user
+    response = ActiveSupport::JSON.decode(@response.body)
+    assert_response :success
+    assert_equal 2, response['results'].count
+  end
+
+  test "should find last report for policy" do
+    reports_cleanup
+    policy = FactoryBot.create(:policy)
+    create_arf_report_for_search({ "passed" => 1, "othered" => 0, "failed" => 0 }, @policy)
+    create_arf_report_for_search({ "passed" => 1, "othered" => 0, "failed" => 4 }, @policy)
+    create_arf_report_for_search({ "passed" => 1, "othered" => 0, "failed" => 0 }, policy)
+    create_arf_report_for_search({ "passed" => 2, "othered" => 3, "failed" => 7 }, policy)
+
+    get :index, :params => { :search => "last_for=policy" }, :session => set_session_user
+    response = ActiveSupport::JSON.decode(@response.body)
+    assert_response :success
+    assert_equal 2, response['results'].count
+    assert_equal 7, response['results'].find { |hash| hash["policy"]["name"] == policy.name }["failed"]
+    assert_equal 4, response['results'].find { |hash| hash["policy"]["name"] == @policy.name }["failed"]
+  end
+
+  test "should find last report for hosts" do
+    reports_cleanup
+    host_a = FactoryBot.create(:compliance_host)
+    host_b = FactoryBot.create(:compliance_host)
+    policy = FactoryBot.create(:policy)
+    create_arf_report_for_search({ "passed" => 1, "othered" => 0, "failed" => 0 }, policy, host_a)
+    create_arf_report_for_search({ "passed" => 1, "othered" => 0, "failed" => 4 }, policy, host_a)
+    create_arf_report_for_search({ "passed" => 1, "othered" => 0, "failed" => 0 }, policy, host_b)
+    create_arf_report_for_search({ "passed" => 2, "othered" => 3, "failed" => 7 }, policy, host_b)
+
+    get :index, :params => { :search => "last_for=host" }, :session => set_session_user
+    response = ActiveSupport::JSON.decode(@response.body)
+    assert_response :success
+    assert_equal 2, response['results'].count
+    assert_equal 4, response['results'].find { |hash| hash["host"]["name"] == host_a.name }["failed"]
+    assert_equal 7, response['results'].find { |hash| hash["host"]["name"] == host_b.name }["failed"]
+  end
+
   private
 
   def reports_cleanup
@@ -161,9 +255,19 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
     JSON.parse file_content
   end
 
+  def create_arf_report_for_search(status, policy, host = @host)
+    report = FactoryBot.create(:arf_report,
+                               :host_id => host.id,
+                               :status => status,
+                               :metrics => status,
+                               :openscap_proxy => @proxy)
+    FactoryBot.create(:policy_arf_report, :policy_id => policy.id, :arf_report_id => report.id)
+    report
+  end
+
   def create_arf_report
     FactoryBot.create(:arf_report,
                       :host_id => @host.id,
-                      :openscap_proxy => FactoryBot.create(:smart_proxy, :url => "http://smart-proxy.org:8000"))
+                      :openscap_proxy => @proxy)
   end
 end

data/test/functional/api/v2/compliance/policies_controller_test.rb

@@ -19,6 +19,39 @@ class Api::V2::Compliance::PoliciesControllerTest < ActionController::TestCase
     assert_response :success
   end
 
+  test "should get index without hosts and hostgroups" do
+    FactoryBot.create(:policy)
+    get :index, :session => set_session_user
+    response = ActiveSupport::JSON.decode(@response.body)
+    assert response['results'][0]['hosts'].empty?
+    assert response['results'][0]['hostgroups'].empty?
+    assert_response :success
+  end
+
+  test "should get index and show hosts" do
+    host = FactoryBot.create(:host)
+    asset = FactoryBot.create(:asset, :assetable_id => host.id, :assetable_type => 'Host::Base')
+    policy = FactoryBot.create(:policy, :assets => [asset])
+    get :index, :session => set_session_user
+    response = ActiveSupport::JSON.decode(@response.body)
+    assert !response['results'].empty?
+    assert !response['results'][0]['hosts'].empty?
+    assert_response :success
+  end
+
+  test "should get index and show hostgroups" do
+    ForemanOpenscap::Policy.any_instance.stubs(:find_scap_puppetclass).returns(FactoryBot.create(:puppetclass, :name => 'foreman_scap_client'))
+    ForemanOpenscap::Policy.any_instance.stubs(:populate_overrides)
+    hostgroup = FactoryBot.create(:hostgroup)
+    asset = FactoryBot.create(:asset, :assetable_id => hostgroup.id, :assetable_type => 'Hostgroup')
+    policy = FactoryBot.create(:policy, :assets => [asset])
+    get :index, :session => set_session_user
+    response = ActiveSupport::JSON.decode(@response.body)
+    assert !response['results'].empty?
+    assert !response['results'][0]['hostgroups'].empty?
+    assert_response :success
+  end
+
   test "should show a policy" do
     policy = FactoryBot.create(:policy)
     get :show, :params => { :id => policy.to_param }, :session => set_session_user
@@ -27,6 +60,21 @@ class Api::V2::Compliance::PoliciesControllerTest < ActionController::TestCase
     assert_response :success
   end
 
+  test "should show a policy hosts and hostgroups" do
+    ForemanOpenscap::Policy.any_instance.stubs(:find_scap_puppetclass).returns(FactoryBot.create(:puppetclass, :name => 'foreman_scap_client'))
+    ForemanOpenscap::Policy.any_instance.stubs(:populate_overrides)
+    hostgroup = FactoryBot.create(:hostgroup)
+    host = FactoryBot.create(:host)
+    hostgroup_asset = FactoryBot.create(:asset, :assetable_id => hostgroup.id, :assetable_type => 'Hostgroup')
+    host_asset = FactoryBot.create(:asset, :assetable_id => host.id, :assetable_type => 'Host::Base')
+    policy = FactoryBot.create(:policy, :assets => [hostgroup_asset, host_asset])
+    get :show, :params => { :id => policy.to_param }, :session => set_session_user
+    response = ActiveSupport::JSON.decode(@response.body)
+    assert !response['hosts'].empty?
+    assert !response['hostgroups'].empty?
+    assert_response :success
+  end
+
   test "should update a policy" do
     policy = FactoryBot.create(:policy)
     put :update, :params => { :id => policy.id, :policy => { :period => 'monthly', :day_of_month => 15 } }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-31 00:00:00.000000000 Z
+date: 2018-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -106,6 +106,7 @@ files:
 - app/views/api/v2/compliance/common/_loc.json.rabl
 - app/views/api/v2/compliance/common/_org.json.rabl
 - app/views/api/v2/compliance/policies/base.json.rabl
+- app/views/api/v2/compliance/policies/children.json.rabl
 - app/views/api/v2/compliance/policies/create.json.rabl
 - app/views/api/v2/compliance/policies/index.json.rabl
 - app/views/api/v2/compliance/policies/main.json.rabl