foreman_rh_cloud 12.1.0 → 12.1.2

data/config/routes.rb

@@ -37,6 +37,7 @@ Rails.application.routes.draw do
       get 'inventory_upload', to: '/react#index'
     end
     get 'insights_cloud', to: '/react#index' # Uses foreman's react controller
+    get 'insights_vulnerability', to: '/react#index'
   end
 
   scope :module => :'insights_cloud/api', :path => :redhat_access do

data/lib/foreman_rh_cloud/engine.rb

@@ -44,12 +44,12 @@ module ForemanRhCloud
               setting('allow_auto_inventory_upload', type: :boolean, description: N_('Enable automatic upload of your host inventory to the Red Hat cloud'), default: true, full_name: N_('Automatic inventory upload'))
               setting('allow_auto_insights_sync', type: :boolean, description: N_('Enable automatic synchronization of Insights recommendations from the Red Hat cloud'), default: true, full_name: N_('Synchronize recommendations Automatically'))
               setting('allow_auto_insights_mismatch_delete', type: :boolean, description: N_('Enable automatic deletion of mismatched host records from the Red Hat cloud'), default: false, full_name: N_('Automatic mismatch deletion'))
-              setting('obfuscate_inventory_hostnames', type: :boolean, description: N_('Obfuscate host names sent to the Red Hat cloud. (If insights_minimal_data_collection is set to true, this setting is ignored and host names are always obfuscated.)'), default: false, full_name: N_('Obfuscate host names'))
-              setting('obfuscate_inventory_ips', type: :boolean, description: N_('Obfuscate ipv4 addresses sent to the Red Hat cloud.  (If insights_minimal_data_collection is set to true, this setting is ignored and host ipv4 addresses are always obfuscated.)'), default: false, full_name: N_('Obfuscate host ipv4 addresses.'))
+              setting('obfuscate_inventory_hostnames', type: :boolean, description: N_('Obfuscate host names sent to the Red Hat cloud. (If insights_minimal_data_collection is set to true, this setting is ignored because host names are not included in the report.)'), default: false, full_name: N_('Obfuscate host names'))
+              setting('obfuscate_inventory_ips', type: :boolean, description: N_('Obfuscate ipv4 addresses sent to the Red Hat cloud.  (If insights_minimal_data_collection is set to true, this setting is ignored because host IPv4 addresses are not included in the report.)'), default: false, full_name: N_('Obfuscate host ipv4 addresses.'))
               setting('exclude_installed_packages', type: :boolean, description: N_('Exclude installed packages from being uploaded to the Red Hat cloud. (If insights_minimal_data_collection is set to true, this setting is ignored and installed packages are always excluded.)'), default: false, full_name: N_("Exclude installed packages"))
               setting('include_parameter_tags', type: :boolean, description: N_('Should import include parameter tags from Foreman?'), default: false, full_name: N_('Include parameters in insights-client reports'))
               setting('rhc_instance_id', type: :string, description: N_('RHC daemon id'), default: nil, full_name: N_('ID of the RHC(Yggdrasil) daemon'))
-              setting('insights_minimal_data_collection', type: :boolean, default: false, full_name: N_('Minimal data collection'), description: N_('Only send the minimum required data to Red Hat cloud, and obfuscate wherever possible. When this is true, hostnames and IPv4 addresses are always obfuscated and installed packages are excluded, regardless of those settings.'))
+              setting('insights_minimal_data_collection', type: :boolean, default: false, full_name: N_('Minimal data collection'), description: N_('Only include the minimum required data in inventory reports for uploading to Red Hat cloud. When this is true, installed packages are excluded from the report regardless of the exclude_installed_packages setting, and host names and IPv4 addresses are excluded from the report regardless of obfuscation settings.'))
             end
           end
 
@@ -117,11 +117,18 @@ module ForemanRhCloud
               parent: :insights_menu,
               if: -> { !ForemanRhCloud.with_local_advisor_engine? }
             menu :top_menu, :insights_hits, caption: N_('Recommendations'), url: '/foreman_rh_cloud/insights_cloud', url_hash: { controller: :react, action: :index }, parent: :insights_menu
+            menu :top_menu,
+              :insights_vulnerability,
+              caption: N_('Vulnerability'),
+              url: '/foreman_rh_cloud/insights_vulnerability',
+              url_hash: { controller: :react, action: :index },
+              parent: :insights_menu,
+              if: -> { ForemanRhCloud.with_local_advisor_engine? }
           end
 
           register_facet InsightsFacet, :insights do
             configure_host do
-              api_view :list => 'api/v2/hosts/insights/insights'
+              api_view :list => 'api/v2/hosts/insights/insights', :single => 'api/v2/hosts/insights/single'
               set_dependent_action :destroy
             end
           end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '12.1.0'.freeze
+  VERSION = '12.1.2'.freeze
 end

data/lib/insights_vulnerability.rb

@@ -0,0 +1,2 @@
+module InsightsVulnerability
+end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "12.1.0",
+  "version": "12.1.2",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {

data/test/controllers/insights_cloud/api/machine_telemetries_controller_test.rb

@@ -98,13 +98,46 @@ module InsightsCloud::Api
         assert_equal net_http_resp[:content_type], @response.headers['Content-Type']
       end
 
+      test "should handle StandardError" do
+        error_message = "Connection refused"
+        ::ForemanRhCloud::CloudRequestForwarder.any_instance.stubs(:execute_cloud_request).raises(Errno::ECONNREFUSED.new)
+
+        get :forward_request, params: { "path" => "platform/module-update-router/v1/channel" }
+        assert_equal 502, @response.status
+        body = JSON.parse(@response.body)
+        assert_equal error_message, body['error']
+      end
+
+      test "should handle 304 cloud" do
+        net_http_resp = Net::HTTPResponse.new(1.0, 304, "Not Modified")
+        res = RestClient::Response.create(@body, net_http_resp, @http_req)
+
+        ::ForemanRhCloud::CloudRequestForwarder.any_instance.stubs(:execute_cloud_request).raises(RestClient::NotModified.new(res))
+
+        get :forward_request, params: { "path" => "platform/module-update-router/v1/channel" }
+        assert_equal 304, @response.status
+        assert_equal 'Cloud request not modified', JSON.parse(@response.body)['message']
+      end
+
+      test "should handle RestClient::Exceptions::Timeout" do
+        timeout_message = "execution expired"
+        ::ForemanRhCloud::CloudRequestForwarder.any_instance.stubs(:execute_cloud_request).raises(RestClient::Exceptions::Timeout.new(timeout_message))
+
+        get :forward_request, params: { "path" => "platform/module-update-router/v1/channel" }
+        assert_equal 504, @response.status
+        body = JSON.parse(@response.body)
+        assert_equal timeout_message, body['message']
+        assert_equal timeout_message, body['error']
+      end
+
       test "should handle failed authentication to cloud" do
         net_http_resp = Net::HTTPResponse.new(1.0, 401, "Unauthorized")
         res = RestClient::Response.create(@body, net_http_resp, @http_req)
-        ::ForemanRhCloud::CloudRequestForwarder.any_instance.stubs(:forward_request).returns(res)
+
+        ::ForemanRhCloud::CloudRequestForwarder.any_instance.stubs(:execute_cloud_request).raises(RestClient::Unauthorized.new(res))
 
         get :forward_request, params: { "path" => "platform/module-update-router/v1/channel" }
-        assert_equal 502, @response.status
+        assert_equal 401, @response.status
         assert_equal 'Authentication to the Insights Service failed.', JSON.parse(@response.body)['message']
       end
 

data/webpack/CVEsHostDetailsTab/CVEsHostDetailsTab.js

@@ -0,0 +1,17 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+const CVEsHostDetailsTab = ({ hostName }) => (
+  <div>
+    <h1>
+      {__('CVEs tab for host:')} {hostName}
+    </h1>
+  </div>
+);
+
+CVEsHostDetailsTab.propTypes = {
+  hostName: PropTypes.string.isRequired,
+};
+
+export default CVEsHostDetailsTab;

data/webpack/CVEsHostDetailsTab/__tests__/CVEsHostDetailsTab.test.js

@@ -0,0 +1,18 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import CVEsHostDetailsTab from '../CVEsHostDetailsTab';
+
+describe('CVEsHostDetailsTab', () => {
+  it('renders without crashing', () => {
+    render(<CVEsHostDetailsTab hostName="test-host.example.com" />);
+    expect(
+      screen.getByText('CVEs tab for host: test-host.example.com')
+    ).toBeTruthy();
+  });
+
+  it('renders the host name', () => {
+    const hostName = 'test-host.example.com';
+    render(<CVEsHostDetailsTab hostName={hostName} />);
+    expect(screen.getByText(`CVEs tab for host: ${hostName}`)).toBeTruthy();
+  });
+});

data/webpack/CVEsHostDetailsTab/index.js

@@ -0,0 +1,3 @@
+import CVEsHostDetailsTab from './CVEsHostDetailsTab';
+
+export default CVEsHostDetailsTab;

data/webpack/ForemanInventoryUpload/Components/InventorySettings/MinimalInventoryDropdown.js

@@ -25,7 +25,7 @@ const MinimalInventoryDropdown = ({ setChosenValue }) => {
       ),
     },
     optional: {
-      title: __('Optional data collection'),
+      title: __('Analytics data collection'),
       description: __(
         'Send additional data to enhance Insights services, as per the settings'
       ),

data/webpack/ForemanRhCloudFills.js

@@ -3,7 +3,8 @@ import { addGlobalFill } from 'foremanReact/components/common/Fill/GlobalFill';
 import InventoryAutoUploadSwitcher from './ForemanInventoryUpload/SubscriptionsPageExtension/InventoryAutoUpload';
 import NewHostDetailsTab from './InsightsHostDetailsTab/NewHostDetailsTab';
 import { InsightsTotalRiskChartWrapper } from './InsightsHostDetailsTab/InsightsTotalRiskChartWrapper';
-import { isNotRhelHost } from './ForemanRhCloudHelpers';
+import { isNotRhelHost, vulnerabilityDisabled } from './ForemanRhCloudHelpers';
+import CVEsHostDetailsTab from './CVEsHostDetailsTab/CVEsHostDetailsTab';
 
 const fills = [
   {
@@ -27,6 +28,15 @@ const fills = [
     component: props => <InsightsTotalRiskChartWrapper {...props} />,
     weight: 2800,
   },
+  {
+    slot: 'host-details-page-tabs',
+    name: 'CVEs',
+    component: props => <CVEsHostDetailsTab {...props} />,
+    weight: 300,
+    metadata: {
+      hideTab: vulnerabilityDisabled,
+    },
+  },
 ];
 
 export const registerFills = () => {

data/webpack/ForemanRhCloudHelpers.js

@@ -11,3 +11,6 @@ export const isNotRhelHost = ({ hostDetails }) =>
     // eslint-disable-next-line camelcase
     hostDetails?.operatingsystem_name
   );
+
+export const vulnerabilityDisabled = ({ hostDetails }) =>
+  isNotRhelHost({ hostDetails }) || !hostDetails?.vulnerability?.enabled;

data/webpack/ForemanRhCloudPages.js

@@ -2,6 +2,7 @@ import React from 'react';
 import componentRegistry from 'foremanReact/components/componentRegistry';
 import { registerRoutes as foremanRegisterRoutes } from 'foremanReact/routes/RoutingService';
 import ForemanInventoryUpload from './ForemanInventoryUpload';
+import InsightsVulnerability from './InsightsVulnerability/InsightsVulnerability';
 import InsightsCloudSync from './InsightsCloudSync';
 import InsightsHostDetailsTab from './InsightsHostDetailsTab';
 
@@ -9,6 +10,7 @@ const pages = [
   { name: 'ForemanInventoryUpload', type: ForemanInventoryUpload },
   { name: 'InsightsCloudSync', type: InsightsCloudSync },
   { name: 'InsightsHostDetailsTab', type: InsightsHostDetailsTab },
+  { name: 'InsightsVulnerability', type: InsightsVulnerability },
 ];
 
 export const registerPages = () => {
@@ -26,6 +28,11 @@ export const routes = [
     exact: true,
     render: props => <ForemanInventoryUpload {...props} />,
   },
+  {
+    path: '/foreman_rh_cloud/insights_vulnerability',
+    exact: true,
+    render: props => <InsightsVulnerability {...props} />,
+  },
 ];
 
 export const registerRoutes = () => {

data/webpack/InsightsCloudSync/Components/InsightsTable/InsightsLabel.js

@@ -0,0 +1,40 @@
+import React from 'react';
+import {
+  AngleDoubleDownIcon,
+  AngleDoubleUpIcon,
+  CriticalRiskIcon,
+  EqualsIcon,
+} from '@patternfly/react-icons';
+import { Label } from '@patternfly/react-core';
+import PropTypes from 'prop-types';
+
+const VALUE_TO_STATE = {
+  1: { icon: <AngleDoubleDownIcon />, text: 'Low', color: 'blue' },
+  2: { icon: <EqualsIcon />, text: 'Moderate', color: 'yellow' },
+  3: { icon: <AngleDoubleUpIcon />, text: 'Important', color: 'orange' },
+  4: { icon: <CriticalRiskIcon />, text: 'Critical', color: 'red' },
+};
+
+const InsightsLabel = ({ value = 1, text, hideIcon, ...props }) => (
+  <Label
+    {...props}
+    color={VALUE_TO_STATE[value].color}
+    icon={!hideIcon && VALUE_TO_STATE[value].icon}
+  >
+    {text || VALUE_TO_STATE[value].text}
+  </Label>
+);
+
+InsightsLabel.propTypes = {
+  value: PropTypes.oneOf([1, 2, 3, 4]),
+  text: PropTypes.string,
+  hideIcon: PropTypes.bool,
+};
+
+InsightsLabel.defaultProps = {
+  value: 1,
+  text: '',
+  hideIcon: false,
+};
+
+export default InsightsLabel;

data/webpack/InsightsCloudSync/Components/InsightsTable/InsightsSection.js

@@ -0,0 +1,30 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import './InsightsSection.scss';
+
+const InsightsSection = ({ type, children, className, ...props }) => {
+  let sectionClasses = className || '';
+  if (type !== undefined) {
+    sectionClasses = `${sectionClasses} ins-l-${type}`.trim();
+  }
+
+  return (
+    <section {...props} className={sectionClasses}>
+      {children}
+    </section>
+  );
+};
+
+InsightsSection.propTypes = {
+  type: PropTypes.string,
+  children: PropTypes.node,
+  className: PropTypes.string,
+};
+InsightsSection.defaultProps = {
+  type: undefined,
+  children: null,
+  className: '',
+};
+
+export default InsightsSection;

data/webpack/InsightsCloudSync/Components/InsightsTable/InsightsSection.scss

@@ -0,0 +1,25 @@
+section.ins-l-content {
+  padding: var(--pf-t--global--spacer--lg);
+}
+
+section.ins-l-button-group {
+  > * { display: inline; }
+  * + * { margin-left: 0.3125rem; } // 5px = 0.3125rem
+  margin: 1.5rem 0; // 24px = 1.5rem
+}
+
+section.ins-l-icon-group {
+  * + * { margin-left: 0.625rem; } // 10px = 0.625rem
+}
+
+section.ins-l-icon-group__with-major {
+  * + * { margin-left: 0.46875rem; } // 7.5px = 0.46875rem
+  .ins-battery:last-of-type {
+    padding-left: 0.9375rem; // 15px = 0.9375rem
+    border-left: 2px solid #eaeaea;
+    span.label{
+      font-weight: 500;
+      margin: 0 0.625rem; // 10px = 0.625rem
+    }
+  }
+}

data/webpack/InsightsCloudSync/Components/InsightsTable/InsightsTableConstants.js

@@ -1,21 +1,19 @@
 /* eslint-disable camelcase */
 import React from 'react';
-import {
-  InsightsLabel,
-  Section,
-} from '@redhat-cloud-services/frontend-components';
 import { DropdownItem } from '@patternfly/react-core/deprecated';
 import { sortable, cellWidth } from '@patternfly/react-table';
 import { AnsibeTowerIcon, ExternalLinkAltIcon } from '@patternfly/react-icons';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { foremanUrl } from '../../../ForemanRhCloudHelpers';
 import DropdownToggle from '../../../common/DropdownToggle';
+import InsightsSection from './InsightsSection';
+import InsightsLabel from './InsightsLabel';
 
 export const totalRiskFormatter = ({ title: totalRisk }) => ({
   children: (
-    <Section className="insights-total-risk" type="icon-group">
+    <InsightsSection className="insights-total-risk" type="icon-group">
       <InsightsLabel value={totalRisk} />
-    </Section>
+    </InsightsSection>
   ),
 });
 

data/webpack/InsightsVulnerability/InsightsVulnerability.js

@@ -0,0 +1,13 @@
+import React from 'react';
+import PageLayout from 'foremanReact/routes/common/PageLayout/PageLayout';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+const InsightsVulnerability = () => (
+  <PageLayout searchable={false} header={__('Vulnerability')}>
+    <div className="insights-vulnerability">
+      <p>This page is under development. Please check back soon for updates.</p>
+    </div>
+  </PageLayout>
+);
+
+export default InsightsVulnerability;

data/webpack/InsightsVulnerability/InsightsVulnerability.test.js

@@ -0,0 +1,18 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import InsightsVulnerability from './InsightsVulnerability';
+
+describe('InsightsVulnerability component', () => {
+  it('renders the "under development" message', () => {
+    render(<InsightsVulnerability />);
+    expect(
+      screen.getByText(/this page is under development/i)
+    ).toBeInTheDocument();
+  });
+
+  it('renders the container with correct class', () => {
+    const { container } = render(<InsightsVulnerability />);
+    expect(container.querySelector('.insights-vulnerability')).toBeTruthy();
+  });
+});

data/webpack/__tests__/ForemanRhCloudHelpers.test.js

@@ -1,10 +1,39 @@
 import { testSelectorsSnapshotWithFixtures } from '@theforeman/test';
-import { foremanUrl } from '../ForemanRhCloudHelpers';
+import { foremanUrl, vulnerabilityDisabled } from '../ForemanRhCloudHelpers';
 
 global.URL_PREFIX = 'MY_TEST_URL_PREFIX.example.com';
 
 const fixtures = {
   'should return foreman Url': () => foremanUrl('/test_path'),
+  'vulnerabilityDisabled returns false for RHEL host with vulnerability enabled': () =>
+    vulnerabilityDisabled({
+      hostDetails: {
+        operatingsystem_name: 'Red Hat Enterprise Linux',
+        vulnerability: { enabled: true },
+      },
+    }),
+  'vulnerabilityDisabled returns true for non-RHEL host': () =>
+    vulnerabilityDisabled({
+      hostDetails: {
+        operatingsystem_name: 'Ubuntu',
+        vulnerability: { enabled: true },
+      },
+    }),
+  'vulnerabilityDisabled returns true for RHEL host with vulnerability disabled': () =>
+    vulnerabilityDisabled({
+      hostDetails: {
+        operatingsystem_name: 'Red Hat Enterprise Linux',
+        vulnerability: { enabled: false },
+      },
+    }),
+  'vulnerabilityDisabled returns true for missing vulnerability object': () =>
+    vulnerabilityDisabled({
+      hostDetails: {
+        operatingsystem_name: 'Red Hat Enterprise Linux',
+      },
+    }),
+  'vulnerabilityDisabled returns true for missing hostDetails': () =>
+    vulnerabilityDisabled({}),
 };
 
 describe('ForemanRhCloud helpers', () =>

data/webpack/__tests__/__snapshots__/ForemanRhCloudHelpers.test.js.snap

@@ -1,3 +1,13 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`ForemanRhCloud helpers should return foreman Url 1`] = `"MY_TEST_URL_PREFIX.example.com/test_path"`;
+
+exports[`ForemanRhCloud helpers vulnerabilityDisabled returns false for RHEL host with vulnerability enabled 1`] = `false`;
+
+exports[`ForemanRhCloud helpers vulnerabilityDisabled returns true for RHEL host with vulnerability disabled 1`] = `true`;
+
+exports[`ForemanRhCloud helpers vulnerabilityDisabled returns true for missing hostDetails 1`] = `true`;
+
+exports[`ForemanRhCloud helpers vulnerabilityDisabled returns true for missing vulnerability object 1`] = `true`;
+
+exports[`ForemanRhCloud helpers vulnerabilityDisabled returns true for non-RHEL host 1`] = `true`;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 12.1.0
+  version: 12.1.2
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
@@ -144,6 +144,7 @@ files:
 - app/views/api/v2/advisor_engine/host_details.json.rabl
 - app/views/api/v2/hosts/insights/base.rabl
 - app/views/api/v2/hosts/insights/insights.rabl
+- app/views/api/v2/hosts/insights/single.rabl
 - app/views/hosts/_insights_tab.html.erb
 - app/views/job_templates/cloud_connector.erb
 - app/views/job_templates/rh_cloud_download_playbook.erb
@@ -207,6 +208,7 @@ files:
 - lib/insights_cloud/async/insights_scheduled_sync.rb
 - lib/insights_cloud/async/rules_result.rb
 - lib/insights_cloud/generators/playbook_progress_generator.rb
+- lib/insights_vulnerability.rb
 - lib/inventory_sync/async/host_result.rb
 - lib/inventory_sync/async/inventory_full_sync.rb
 - lib/inventory_sync/async/inventory_hosts_sync.rb
@@ -278,6 +280,9 @@ files:
 - test/unit/shell_process_job_test.rb
 - test/unit/slice_generator_test.rb
 - test/unit/tags_generator_test.rb
+- webpack/CVEsHostDetailsTab/CVEsHostDetailsTab.js
+- webpack/CVEsHostDetailsTab/__tests__/CVEsHostDetailsTab.test.js
+- webpack/CVEsHostDetailsTab/index.js
 - webpack/ForemanInventoryUpload/Components/AccountList/AccountList.fixtures.js
 - webpack/ForemanInventoryUpload/Components/AccountList/AccountList.js
 - webpack/ForemanInventoryUpload/Components/AccountList/AccountList.stories.js
@@ -538,6 +543,9 @@ files:
 - webpack/InsightsCloudSync/Components/InsightsSettings/__tests__/__snapshots__/InsightsSettingsSelectors.test.js.snap
 - webpack/InsightsCloudSync/Components/InsightsSettings/index.js
 - webpack/InsightsCloudSync/Components/InsightsSettings/insightsSettings.scss
+- webpack/InsightsCloudSync/Components/InsightsTable/InsightsLabel.js
+- webpack/InsightsCloudSync/Components/InsightsTable/InsightsSection.js
+- webpack/InsightsCloudSync/Components/InsightsTable/InsightsSection.scss
 - webpack/InsightsCloudSync/Components/InsightsTable/InsightsTable.js
 - webpack/InsightsCloudSync/Components/InsightsTable/InsightsTableActions.js
 - webpack/InsightsCloudSync/Components/InsightsTable/InsightsTableConstants.js
@@ -599,6 +607,8 @@ files:
 - webpack/InsightsHostDetailsTab/components/ListItem/ListItem.js
 - webpack/InsightsHostDetailsTab/components/ListItem/index.js
 - webpack/InsightsHostDetailsTab/index.js
+- webpack/InsightsVulnerability/InsightsVulnerability.js
+- webpack/InsightsVulnerability/InsightsVulnerability.test.js
 - webpack/__mocks__/foremanReact/Root/Context/ForemanContext.js
 - webpack/__mocks__/foremanReact/common/I18n.js
 - webpack/__mocks__/foremanReact/common/MountingService.js