foreman_openscap 4.3.2 → 5.2.0

data/webpack/routes/OvalPolicies/OvalPoliciesShow/__tests__/OvalPoliciesShow.test.js

@@ -12,17 +12,27 @@ import {
   resolvePath,
 } from '../../../../helpers/pathsHelper';
 
-import { withMockedProvider, tick, withRouter } from '../../../../testHelper';
+import {
+  withRedux,
+  withMockedProvider,
+  tick,
+  withRouter,
+} from '../../../../testHelper';
 import {
   policyDetailMock,
   historyMock,
   historyWithSearch,
   pushMock,
   policyCvesMock,
+  policyHostgroupsMock,
+  policyHostgroupsDeniedMock,
   ovalPolicyId,
+  policyUnauthorizedMock,
 } from './OvalPoliciesShow.fixtures';
 
-const TestComponent = withRouter(withMockedProvider(OvalPoliciesShow));
+const TestComponent = withRedux(
+  withRouter(withMockedProvider(OvalPoliciesShow))
+);
 
 describe('OvalPoliciesShow', () => {
   it('should load details by default and handle tab change', async () => {
@@ -36,7 +46,7 @@ describe('OvalPoliciesShow', () => {
     expect(screen.getByText('Loading')).toBeInTheDocument();
     await waitFor(tick);
     expect(screen.queryByText('Loading')).not.toBeInTheDocument();
-    expect(screen.getByText('Third policy')).toBeInTheDocument();
+    expect(screen.getAllByText('Third policy').pop()).toBeInTheDocument();
     expect(screen.getByText('Weekly, on tuesday')).toBeInTheDocument();
     expect(screen.getByText('A very strict policy')).toBeInTheDocument();
     const activeTabHeader = container.querySelector(
@@ -67,6 +77,22 @@ describe('OvalPoliciesShow', () => {
     expect(screen.queryByText('Loading')).not.toBeInTheDocument();
     expect(screen.getByText('Weekly, on tuesday')).toBeInTheDocument();
   });
+  it('should not load the page when user does not have permissions', async () => {
+    render(
+      <TestComponent
+        history={historyMock}
+        match={{ params: { id: ovalPolicyId }, path: ovalPoliciesShowPath }}
+        mocks={policyUnauthorizedMock}
+      />
+    );
+    await waitFor(tick);
+    expect(screen.queryByText('Loading')).not.toBeInTheDocument();
+    expect(
+      screen.getByText(
+        'You are not authorized to view the page. Request the following permissions from administrator: view_oval_policies.'
+      )
+    ).toBeInTheDocument();
+  });
   it('should load CVEs tab when specified in URL', async () => {
     const mocks = policyDetailMock.concat(policyCvesMock);
     render(
@@ -88,7 +114,7 @@ describe('OvalPoliciesShow', () => {
   it('should have button for scanning all hostgroups', async () => {
     const btnText = 'Scan All Hostgroups';
 
-    const WithProvider = withMockedProvider(OvalPoliciesShow);
+    const WithProvider = withRedux(withMockedProvider(OvalPoliciesShow));
     const history = createMemoryHistory();
     history.push = jest.fn();
 
@@ -109,4 +135,38 @@ describe('OvalPoliciesShow', () => {
       '/job_invocations/new?feature=foreman_openscap_run_oval_scans&host_ids=hostgroup_id+%5E+%284+10+12+11%29&inputs%5Boval_policies%5D=3'
     );
   });
+  it('should load hostgroups tab when specified in URL', async () => {
+    const mocks = policyDetailMock.concat(policyHostgroupsMock);
+    render(
+      <TestComponent
+        history={historyWithSearch}
+        match={{
+          params: { id: ovalPolicyId, tab: 'hostgroups' },
+          path: ovalPoliciesShowPath,
+        }}
+        mocks={mocks}
+      />
+    );
+    expect(screen.getByText('Loading')).toBeInTheDocument();
+    await waitFor(tick);
+    await waitFor(tick);
+    expect(screen.queryByText('Loading')).not.toBeInTheDocument();
+    expect(screen.getByText('first hostgroup')).toBeInTheDocument();
+  });
+  it('should not show hostgroups for a user without permissions', async () => {
+    const mocks = policyDetailMock.concat(policyHostgroupsDeniedMock);
+    render(
+      <TestComponent
+        history={historyWithSearch}
+        match={{
+          params: { id: ovalPolicyId, tab: 'hostgroups' },
+          path: ovalPoliciesShowPath,
+        }}
+        mocks={mocks}
+      />
+    );
+    await waitFor(tick);
+    await waitFor(tick);
+    expect(screen.getByText('Permission denied')).toBeInTheDocument();
+  });
 });

data/webpack/routes/OvalPolicies/OvalPoliciesShow/index.js

@@ -1,8 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { useQuery } from '@apollo/client';
+import { useDispatch } from 'react-redux';
 
 import { translate as __ } from 'foremanReact/common/I18n';
+import { showToast } from '../../../helpers/toastHelper';
 
 import OvalPoliciesShow from './OvalPoliciesShow';
 import { encodeId } from '../../../helpers/globalIdHelper';
@@ -24,6 +26,8 @@ const WrappedOvalPoliciesShow = props => {
       renameData={renameData}
       resultPath="ovalPolicy"
       emptyStateTitle={__('No OVAL Policy found')}
+      permissions={['view_oval_policies']}
+      showToast={showToast(useDispatch())}
     />
   );
 };

data/webpack/routes/routes.js

@@ -1,12 +1,18 @@
 import React from 'react';
 import OvalContentsIndex from './OvalContents/OvalContentsIndex';
+import OvalContentsShow from './OvalContents/OvalContentsShow';
+import OvalContentsNew from './OvalContents/OvalContentsNew';
 import OvalPoliciesIndex from './OvalPolicies/OvalPoliciesIndex';
+import OvalPoliciesNew from './OvalPolicies/OvalPoliciesNew';
 import OvalPoliciesShow from './OvalPolicies/OvalPoliciesShow';
 
 import {
   ovalContentsPath,
+  ovalContentsShowPath,
+  ovalContentsNewPath,
   ovalPoliciesPath,
   ovalPoliciesShowPath,
+  ovalPoliciesNewPath,
 } from '../helpers/pathsHelper';
 
 export default [
@@ -15,11 +21,26 @@ export default [
     render: props => <OvalContentsIndex {...props} />,
     exact: true,
   },
+  {
+    path: ovalContentsNewPath,
+    render: props => <OvalContentsNew {...props} />,
+    exact: true,
+  },
+  {
+    path: ovalContentsShowPath,
+    render: props => <OvalContentsShow {...props} />,
+    exact: true,
+  },
   {
     path: ovalPoliciesPath,
     render: props => <OvalPoliciesIndex {...props} />,
     exact: true,
   },
+  {
+    path: ovalPoliciesNewPath,
+    render: props => <OvalPoliciesNew {...props} />,
+    exact: true,
+  },
   {
     path: ovalPoliciesShowPath,
     render: props => <OvalPoliciesShow {...props} />,

data/webpack/testHelper.js

@@ -1,7 +1,16 @@
 import React from 'react';
+import { Provider } from 'react-redux';
+import store from 'foremanReact/redux';
 import { MockedProvider } from '@apollo/react-testing';
 import { MemoryRouter } from 'react-router-dom';
 import { getForemanContext } from 'foremanReact/Root/Context/ForemanContext';
+import { waitFor } from '@testing-library/react';
+
+export const withRedux = Component => props => (
+  <Provider store={store}>
+    <Component {...props} />
+  </Provider>
+);
 
 export const withRouter = Component => props => (
   <MemoryRouter>
@@ -24,7 +33,7 @@ export const withMockedProvider = Component => props => {
 
   return (
     <ForemanContext.Provider value={ctx}>
-      <MockedProvider mocks={mocks} addTypename={false}>
+      <MockedProvider mocks={mocks}>
         <Component {...rest} />
       </MockedProvider>
     </ForemanContext.Provider>
@@ -34,16 +43,65 @@ export const withMockedProvider = Component => props => {
 // use to resolve async mock requests for apollo MockedProvider
 export const tick = () => new Promise(resolve => setTimeout(resolve, 0));
 
+export const wait = async (tickCount = 1) => {
+  for (let i = 1; i < tickCount; i++) {
+    // eslint-disable-next-line no-await-in-loop
+    await waitFor(tick);
+  }
+  return waitFor(tick);
+};
+
 export const historyMock = {
   location: {
     search: '',
   },
 };
 
+export const admin = {
+  __typename: 'User',
+  id: 'MDE6VXNlci00',
+  login: 'admin',
+  admin: true,
+  permissions: {
+    nodes: [],
+  },
+};
+
+export const userFactory = (login, permissions = []) => ({
+  __typename: 'User',
+  id: 'MDE6VXNlci01',
+  login,
+  admin: false,
+  permissions: {
+    nodes: permissions,
+  },
+});
+
+export const intruder = userFactory('intruder', [
+  {
+    __typename: 'Permission',
+    id: 'MDE6UGVybWlzc2lvbi0x',
+    name: 'view_architectures',
+  },
+]);
+
+export const viewer = userFactory('viewer', [
+  {
+    __typename: 'Permission',
+    id: 'MDE6UGVybWlzc2lvbi0yOTY=',
+    name: 'view_oval_contents',
+  },
+  {
+    __typename: 'Permission',
+    id: 'MDE6UGVybWlzc2lvbi0yNzU=',
+    name: 'view_oval_policies',
+  },
+]);
+
 export const mockFactory = (resultName, query) => (
   variables,
   modelResults,
-  errors = []
+  { errors = [], currentUser = null } = {}
 ) => {
   const mock = {
     request: {
@@ -60,5 +118,9 @@ export const mockFactory = (resultName, query) => (
   if (errors.length !== 0) {
     mock.result.errors = errors;
   }
+
+  if (currentUser) {
+    mock.result.data.currentUser = currentUser;
+  }
   return [mock];
 };

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 4.3.2
+  version: 5.2.0
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-09 00:00:00.000000000 Z
+date: 2021-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -72,7 +72,12 @@ files:
 - app/controllers/policy_dashboard_controller.rb
 - app/controllers/scap_contents_controller.rb
 - app/controllers/tailoring_files_controller.rb
+- app/graphql/mutations/oval_contents/delete.rb
+- app/graphql/mutations/oval_policies/create.rb
+- app/graphql/mutations/oval_policies/delete.rb
+- app/graphql/mutations/oval_policies/update.rb
 - app/graphql/types/cve.rb
+- app/graphql/types/oval_check.rb
 - app/graphql/types/oval_content.rb
 - app/graphql/types/oval_policy.rb
 - app/helpers/arf_report_dashboard_helper.rb
@@ -152,6 +157,7 @@ files:
 - app/views/api/v2/compliance/common/_org.json.rabl
 - app/views/api/v2/compliance/oval_contents/base.json.rabl
 - app/views/api/v2/compliance/oval_contents/create.json.rabl
+- app/views/api/v2/compliance/oval_contents/destroy.json.rabl
 - app/views/api/v2/compliance/oval_contents/index.json.rabl
 - app/views/api/v2/compliance/oval_contents/show.json.rabl
 - app/views/api/v2/compliance/oval_contents/sync.json.rabl
@@ -300,6 +306,7 @@ files:
 - db/migrate/20201217130800_add_has_errata_to_cve.rb
 - db/migrate/20201217161511_add_url_to_oval_content.rb
 - db/migrate/20210409095625_add_oval_policy_reference_to_cve.rb
+- db/migrate/20210819143316_drop_unused_tables.rb
 - db/seeds.d/75-job_templates.rb
 - db/seeds.d/openscap_feature.rb
 - db/seeds.d/openscap_policy_notification.rb
@@ -386,6 +393,8 @@ files:
 - test/functional/arf_reports_controller_test.rb
 - test/functional/openscap_proxies_controller_test.rb
 - test/functional/tailoring_files_controller_test.rb
+- test/graphql/mutations/oval_policies/delete_mutation_test.rb
+- test/graphql/queries/oval_content_query_test.rb
 - test/graphql/queries/oval_contents_query_test.rb
 - test/graphql/queries/oval_policies_query_test.rb
 - test/helpers/arf_report_dashboard_helper_test.rb
@@ -409,15 +418,21 @@ files:
 - test/unit/services/hostgroup_overrider_test.rb
 - test/unit/services/lookup_key_overrider_test.rb
 - test/unit/services/oval/cves_test.rb
+- test/unit/services/oval/setup_check_test.rb
 - test/unit/services/oval/setup_test.rb
 - test/unit/services/report_dashboard/data_test.rb
 - test/unit/services/tailoring_files_proxy_check_test.rb
 - test/unit/tailoring_file_test.rb
+- webpack/components/ConfirmModal.js
+- webpack/components/ConfirmModal.scss
+- webpack/components/EditableInput.js
+- webpack/components/EditableInput.scss
 - webpack/components/EmptyState.js
 - webpack/components/IndexLayout.js
 - webpack/components/IndexLayout.scss
 - webpack/components/IndexTable/IndexTableHelper.js
 - webpack/components/IndexTable/index.js
+- webpack/components/LinkButton.js
 - webpack/components/RuleSeverity/RuleSeverity.scss
 - webpack/components/RuleSeverity/RuleSeverity.test.js
 - webpack/components/RuleSeverity/__snapshots__/RuleSeverity.test.js.snap
@@ -427,32 +442,70 @@ files:
 - webpack/components/RuleSeverity/i_severity-med.svg
 - webpack/components/RuleSeverity/i_unknown.svg
 - webpack/components/RuleSeverity/index.js
+- webpack/components/withDeleteModal.js
 - webpack/components/withLoading.js
 - webpack/global_index.js
+- webpack/graphql/mutations/createOvalPolicy.gql
+- webpack/graphql/mutations/deleteOvalContent.gql
+- webpack/graphql/mutations/deleteOvalPolicy.gql
+- webpack/graphql/mutations/updateOvalPolicy.gql
+- webpack/graphql/queries/currentUserAttributes.gql
 - webpack/graphql/queries/cves.gql
+- webpack/graphql/queries/hostgroups.gql
+- webpack/graphql/queries/ovalContent.gql
 - webpack/graphql/queries/ovalContents.gql
 - webpack/graphql/queries/ovalPolicies.gql
 - webpack/graphql/queries/ovalPolicy.gql
 - webpack/helpers/commonHelper.js
+- webpack/helpers/formFieldsHelper.js
 - webpack/helpers/globalIdHelper.js
+- webpack/helpers/mutationHelper.js
 - webpack/helpers/pageParamsHelper.js
 - webpack/helpers/pathsHelper.js
+- webpack/helpers/permissionsHelper.js
 - webpack/helpers/tableHelper.js
+- webpack/helpers/toastHelper.js
+- webpack/helpers/toastsHelper.js
 - webpack/index.js
 - webpack/routes/OvalContents/OvalContentsIndex/OvalContentsIndex.js
 - webpack/routes/OvalContents/OvalContentsIndex/OvalContentsTable.js
+- webpack/routes/OvalContents/OvalContentsIndex/__tests__/OvalContentsDestroy.fixtures.js
+- webpack/routes/OvalContents/OvalContentsIndex/__tests__/OvalContentsDestroy.test.js
 - webpack/routes/OvalContents/OvalContentsIndex/__tests__/OvalContentsIndex.fixtures.js
 - webpack/routes/OvalContents/OvalContentsIndex/__tests__/OvalContentsIndex.test.js
 - webpack/routes/OvalContents/OvalContentsIndex/index.js
+- webpack/routes/OvalContents/OvalContentsNew/OvalContentsNew.js
+- webpack/routes/OvalContents/OvalContentsNew/OvalContentsNew.scss
+- webpack/routes/OvalContents/OvalContentsNew/OvalContentsNewHelper.js
+- webpack/routes/OvalContents/OvalContentsNew/__tests__/OvalContentsNew.test.js
+- webpack/routes/OvalContents/OvalContentsNew/index.js
+- webpack/routes/OvalContents/OvalContentsShow/OvalContentsShow.js
+- webpack/routes/OvalContents/OvalContentsShow/OvalContentsShow.test.js
+- webpack/routes/OvalContents/OvalContentsShow/OvalContentsShowHelper.js
+- webpack/routes/OvalContents/OvalContentsShow/index.js
 - webpack/routes/OvalPolicies/OvalPoliciesIndex/OvalPoliciesIndex.js
 - webpack/routes/OvalPolicies/OvalPoliciesIndex/OvalPoliciesTable.js
+- webpack/routes/OvalPolicies/OvalPoliciesIndex/__tests__/OvalPoliciesDestroy.fixtures.js
+- webpack/routes/OvalPolicies/OvalPoliciesIndex/__tests__/OvalPoliciesDestroy.test.js
 - webpack/routes/OvalPolicies/OvalPoliciesIndex/__tests__/OvalPoliciesIndex.fixtures.js
 - webpack/routes/OvalPolicies/OvalPoliciesIndex/__tests__/OvalPoliciesIndex.test.js
 - webpack/routes/OvalPolicies/OvalPoliciesIndex/index.js
+- webpack/routes/OvalPolicies/OvalPoliciesNew/HostgroupSelect.js
+- webpack/routes/OvalPolicies/OvalPoliciesNew/NewOvalPolicyForm.js
+- webpack/routes/OvalPolicies/OvalPoliciesNew/NewOvalPolicyFormHelpers.js
+- webpack/routes/OvalPolicies/OvalPoliciesNew/OvalPoliciesNew.js
+- webpack/routes/OvalPolicies/OvalPoliciesNew/__tests__/OvalPoliciesNew.fixtures.js
+- webpack/routes/OvalPolicies/OvalPoliciesNew/__tests__/OvalPoliciesNew.test.js
+- webpack/routes/OvalPolicies/OvalPoliciesNew/index.js
 - webpack/routes/OvalPolicies/OvalPoliciesShow/CvesTab.js
 - webpack/routes/OvalPolicies/OvalPoliciesShow/CvesTable.js
+- webpack/routes/OvalPolicies/OvalPoliciesShow/DetailsTab.js
+- webpack/routes/OvalPolicies/OvalPoliciesShow/HostgroupsTab.js
+- webpack/routes/OvalPolicies/OvalPoliciesShow/HostgroupsTable.js
 - webpack/routes/OvalPolicies/OvalPoliciesShow/OvalPoliciesShow.js
 - webpack/routes/OvalPolicies/OvalPoliciesShow/OvalPoliciesShowHelper.js
+- webpack/routes/OvalPolicies/OvalPoliciesShow/__tests__/OvalPoliciesEdit.fixtures.js
+- webpack/routes/OvalPolicies/OvalPoliciesShow/__tests__/OvalPoliciesEdit.test.js
 - webpack/routes/OvalPolicies/OvalPoliciesShow/__tests__/OvalPoliciesShow.fixtures.js
 - webpack/routes/OvalPolicies/OvalPoliciesShow/__tests__/OvalPoliciesShow.test.js
 - webpack/routes/OvalPolicies/OvalPoliciesShow/index.js
@@ -500,7 +553,6 @@ test_files:
 - test/files/tailoring_files/ssg-firefox-ds-tailoring-2.xml
 - test/files/tailoring_files/ssg-firefox-ds-tailoring.xml
 - test/files/oval_contents/ansible-2.9.oval.xml.bz2
-- test/functional/api/v2/compliance/policies_controller_test.rb
 - test/functional/api/v2/compliance/scap_content_profiles_controller_test.rb
 - test/functional/api/v2/compliance/scap_contents_controller_test.rb
 - test/functional/api/v2/compliance/tailoring_files_controller_test.rb
@@ -508,6 +560,7 @@ test_files:
 - test/functional/api/v2/compliance/oval_contents_controller_test.rb
 - test/functional/api/v2/compliance/oval_policies_controller_test.rb
 - test/functional/api/v2/compliance/oval_reports_controller_test.rb
+- test/functional/api/v2/compliance/policies_controller_test.rb
 - test/functional/api/v2/hosts_controller_test.rb
 - test/functional/arf_reports_controller_test.rb
 - test/functional/openscap_proxies_controller_test.rb
@@ -524,19 +577,22 @@ test_files:
 - test/unit/openscap_host_test.rb
 - test/unit/policy_mailer_test.rb
 - test/unit/scap_content_test.rb
-- test/unit/services/config_name_service_test.rb
-- test/unit/services/hostgroup_overrider_test.rb
-- test/unit/services/lookup_key_overrider_test.rb
 - test/unit/services/report_dashboard/data_test.rb
 - test/unit/services/tailoring_files_proxy_check_test.rb
 - test/unit/services/oval/cves_test.rb
 - test/unit/services/oval/setup_test.rb
+- test/unit/services/oval/setup_check_test.rb
+- test/unit/services/config_name_service_test.rb
+- test/unit/services/lookup_key_overrider_test.rb
+- test/unit/services/hostgroup_overrider_test.rb
 - test/unit/tailoring_file_test.rb
-- test/unit/policy_test.rb
 - test/unit/oval_host_test.rb
 - test/unit/oval_policy_test.rb
 - test/unit/oval_status_test.rb
+- test/unit/policy_test.rb
 - test/fixtures/cve_fixtures.rb
 - test/graphql/queries/oval_contents_query_test.rb
 - test/graphql/queries/oval_policies_query_test.rb
+- test/graphql/queries/oval_content_query_test.rb
+- test/graphql/mutations/oval_policies/delete_mutation_test.rb
 - test/test_plugin_helper.rb