foreman_openscap 5.0.0 → 5.1.0

data/webpack/routes/OvalContents/OvalContentsIndex/__tests__/OvalContentsDestroy.fixtures.js

@@ -0,0 +1,105 @@
+import { admin } from '../../../../testHelper';
+
+import ovalContentsQuery from '../../../../graphql/queries/ovalContents.gql';
+import deleteOvalContent from '../../../../graphql/mutations/deleteOvalContent.gql';
+
+export const firstCall = {
+  data: {
+    ovalContents: {
+      totalCount: 5,
+      nodes: [
+        {
+          id: 'MDE6Rm9yZW1hbk9wZW5zY2FwOjpPdmFsQ29udGVudC0z',
+          name: 'ansible OVAL content',
+          url:
+            'http://oval-content-source/security/data/oval/ansible-2-including-unpatched.oval.xml.bz2',
+          originalFilename: '',
+          meta: { canDestroy: true },
+        },
+        {
+          id: 'MDE6Rm9yZW1hbk9wZW5zY2FwOjpPdmFsQ29udGVudC00',
+          name: 'dotnet OVAL content',
+          url:
+            'http://oval-content-source/security/data/oval/dotnet-2.2.oval.xml.bz2',
+          originalFilename: '',
+          meta: { canDestroy: true },
+        },
+      ],
+    },
+    currentUser: admin,
+  },
+};
+
+export const secondCall = {
+  data: {
+    ovalContents: {
+      totalCount: 4,
+      nodes: [
+        {
+          id: 'MDE6Rm9yZW1hbk9wZW5zY2FwOjpPdmFsQ29udGVudC00',
+          name: 'dotnet OVAL content',
+          url:
+            'http://oval-content-source/security/data/oval/dotnet-2.2.oval.xml.bz2',
+          originalFilename: '',
+          meta: { canDestroy: true },
+        },
+        {
+          id: 'MDE6Rm9yZW1hbk9wZW5zY2FwOjpPdmFsQ29udGVudC03',
+          name: 'jboss OVAL content',
+          url: '',
+          originalFilename: 'jboss.oval.xml.bz2',
+          meta: { canDestroy: true },
+        },
+      ],
+    },
+    currentUser: admin,
+  },
+};
+
+export const deleteMockFactory = (first, second, errors = null) => {
+  let called = false;
+
+  const deleteMocks = [
+    {
+      request: {
+        query: deleteOvalContent,
+        variables: {
+          id: 'MDE6Rm9yZW1hbk9wZW5zY2FwOjpPdmFsQ29udGVudC0z',
+        },
+      },
+      result: {
+        data: {
+          deleteOvalContent: {
+            id: 'MDE6Rm9yZW1hbk9wZW5zY2FwOjpPdmFsQ29udGVudC0z',
+            errors,
+          },
+        },
+      },
+    },
+    {
+      request: {
+        query: ovalContentsQuery,
+        variables: {
+          first: 2,
+          last: 2,
+        },
+      },
+      newData: () => {
+        if (called && !errors) {
+          return second;
+        } else if (called && errors) {
+          return first;
+        }
+        called = true;
+        return first;
+      },
+    },
+  ];
+  return deleteMocks;
+};
+
+export const pageParamsHistoryMock = {
+  location: {
+    search: '?page=1&perPage=2',
+  },
+};

data/webpack/routes/OvalContents/OvalContentsIndex/__tests__/OvalContentsDestroy.test.js

@@ -0,0 +1,124 @@
+import React from 'react';
+import { render, screen, waitFor } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import userEvent from '@testing-library/user-event';
+
+import OvalContentsIndex from '../OvalContentsIndex';
+import {
+  withRouter,
+  withRedux,
+  withMockedProvider,
+  tick,
+  historyMock,
+} from '../../../../testHelper';
+import { mocks, noDeleteMocks } from './OvalContentsIndex.fixtures';
+import {
+  firstCall,
+  secondCall,
+  deleteMockFactory,
+  pageParamsHistoryMock,
+} from './OvalContentsDestroy.fixtures';
+
+const TestComponent = withRouter(
+  withRedux(withMockedProvider(OvalContentsIndex))
+);
+
+describe('OvalContentsIndex', () => {
+  it('should open and close delete modal', async () => {
+    render(
+      <TestComponent
+        history={historyMock}
+        location={{}}
+        mocks={mocks}
+        showToast={jest.fn()}
+      />
+    );
+    await waitFor(tick);
+    expect(screen.getByText('ansible OVAL content')).toBeInTheDocument();
+    userEvent.click(screen.getAllByRole('button', { name: 'Actions' })[0]);
+    userEvent.click(screen.getByText('Delete OVAL Content'));
+    await waitFor(tick);
+    expect(
+      screen.getByText('Are you sure you want to delete ansible OVAL content?')
+    ).toBeInTheDocument();
+    userEvent.click(screen.getByText('Cancel'));
+    await waitFor(tick);
+    expect(
+      screen.queryByText(
+        'Are you sure you want to delete ansible OVAL content?'
+      )
+    ).not.toBeInTheDocument();
+    expect(screen.getByText('ansible OVAL content')).toBeInTheDocument();
+  });
+  it('should delete OVAL content', async () => {
+    const mocked = deleteMockFactory(firstCall, secondCall);
+    const showToast = jest.fn();
+    render(
+      <TestComponent
+        history={pageParamsHistoryMock}
+        location={{}}
+        mocks={mocked}
+        showToast={showToast}
+      />
+    );
+    await waitFor(tick);
+    expect(screen.getByText('ansible OVAL content')).toBeInTheDocument();
+    expect(screen.queryByText('jboss OVAL content')).not.toBeInTheDocument();
+    userEvent.click(screen.getAllByRole('button', { name: 'Actions' })[0]);
+    userEvent.click(screen.getByText('Delete OVAL Content'));
+    await waitFor(tick);
+    userEvent.click(screen.getByText('Confirm'));
+    await waitFor(tick);
+    expect(showToast).toHaveBeenCalledWith({
+      type: 'success',
+      message: 'OVAL Content successfully deleted.',
+    });
+    await waitFor(tick);
+    expect(screen.queryByText('ansible OVAL content')).not.toBeInTheDocument();
+    expect(screen.getByText('jboss OVAL content')).toBeInTheDocument();
+  });
+  it('should show error when deleting OVAL content fails', async () => {
+    const showToast = jest.fn();
+    render(
+      <TestComponent
+        history={pageParamsHistoryMock}
+        location={{}}
+        mocks={deleteMockFactory(firstCall, secondCall, [
+          { message: 'is used by first policy', path: ['base'] },
+          { message: 'is used by second policy', path: ['base'] },
+        ])}
+        showToast={showToast}
+      />
+    );
+    await waitFor(tick);
+    expect(screen.getByText('ansible OVAL content')).toBeInTheDocument();
+    expect(screen.queryByText('jboss OVAL content')).not.toBeInTheDocument();
+    userEvent.click(screen.getAllByRole('button', { name: 'Actions' })[0]);
+    userEvent.click(screen.getByText('Delete OVAL Content'));
+    await waitFor(tick);
+    userEvent.click(screen.getByText('Confirm'));
+    await waitFor(tick);
+    expect(showToast).toHaveBeenCalledWith({
+      type: 'error',
+      message:
+        'There was a following error when deleting OVAL Content: is used by first policy, is used by second policy',
+    });
+    expect(screen.getByText('ansible OVAL content')).toBeInTheDocument();
+    expect(screen.queryByText('jboss OVAL content')).not.toBeInTheDocument();
+  });
+  it('should not show delete button when user does not have delete permissions', async () => {
+    render(
+      <TestComponent
+        history={historyMock}
+        location={{}}
+        mocks={noDeleteMocks}
+        showToast={jest.fn()}
+      />
+    );
+    await waitFor(tick);
+    expect(screen.getByText('ansible OVAL content')).toBeInTheDocument();
+    expect(
+      screen.queryByRole('button', { name: 'Actions' })
+    ).not.toBeInTheDocument();
+  });
+});

data/webpack/routes/OvalContents/OvalContentsIndex/__tests__/OvalContentsIndex.fixtures.js

@@ -9,63 +9,6 @@ import {
 
 const ovalContentMockFactory = mockFactory('ovalContents', ovalContentsQuery);
 
-const ovalContents = {
-  totalCount: 4,
-  nodes: [
-    {
-      __typename: 'ForemanOpenscap::OvalContent',
-      id: 'abc',
-      name: 'ansible OVAL content',
-      url:
-        'http://oval-content-source/security/data/oval/ansible-2-including-unpatched.oval.xml.bz2',
-      originalFilename: '',
-    },
-    {
-      __typename: 'ForemanOpenscap::OvalContent',
-      id: 'bcd',
-      name: 'dotnet OVAL content',
-      url:
-        'http://oval-content-source/security/data/oval/dotnet-2.2.oval.xml.bz2',
-      originalFilename: '',
-    },
-    {
-      __typename: 'ForemanOpenscap::OvalContent',
-      id: 'cde',
-      name: 'jboss OVAL content',
-      url: '',
-      originalFilename: 'jboss.oval.xml.bz2',
-    },
-    {
-      __typename: 'ForemanOpenscap::OvalContent',
-      id: 'def',
-      name: 'openshift OVAL content',
-      url: '',
-      originalFilename: 'openshift.oval.xml.bz2',
-    },
-  ],
-};
-
-const paginatedOvalContents = {
-  totalCount: 7,
-  nodes: [
-    {
-      __typename: 'ForemanOpenscap::OvalContent',
-      id: 'bcd',
-      name: 'dotnet OVAL content',
-      url:
-        'http://oval-content-source/security/data/oval/dotnet-2.2.oval.xml.bz2',
-      originalFilename: '',
-    },
-    {
-      __typename: 'ForemanOpenscap::OvalContent',
-      id: 'def',
-      name: 'openshift OVAL content',
-      url: '',
-      originalFilename: 'openshift.oval.xml.bz2',
-    },
-  ],
-};
-
 const viewer = userFactory('viewer', [
   {
     __typename: 'Permission',
@@ -74,15 +17,62 @@ const viewer = userFactory('viewer', [
   },
 ]);
 
+const firstContent = (meta = { canDestroy: true }) => ({
+  id: 'MDE6Rm9yZW1hbk9wZW5zY2FwOjpPdmFsQ29udGVudC0z',
+  name: 'ansible OVAL content',
+  url:
+    'http://oval-content-source/security/data/oval/ansible-2-including-unpatched.oval.xml.bz2',
+  originalFilename: '',
+  meta,
+});
+
+const secondContent = (meta = { canDestroy: true }) => ({
+  id: 'MDE6Rm9yZW1hbk9wZW5zY2FwOjpPdmFsQ29udGVudC00',
+  name: 'dotnet OVAL content',
+  url: 'http://oval-content-source/security/data/oval/dotnet-2.2.oval.xml.bz2',
+  originalFilename: '',
+  meta,
+});
+
+const thirdContent = (meta = { canDestroy: true }) => ({
+  id: 'MDE6Rm9yZW1hbk9wZW5zY2FwOjpPdmFsQ29udGVudC03',
+  name: 'jboss OVAL content',
+  url: '',
+  originalFilename: 'jboss.oval.xml.bz2',
+  meta,
+});
+
+const fourthContent = (meta = { canDestroy: true }) => ({
+  id: 'MDE6Rm9yZW1hbk9wZW5zY2FwOjpPdmFsQ29udGVudC0zMw==',
+  name: 'openshift OVAL content',
+  url: '',
+  originalFilename: 'openshift.oval.xml.bz2',
+  meta,
+});
+
+const ovalContentNodes = [
+  firstContent(),
+  secondContent(),
+  thirdContent(),
+  fourthContent(),
+];
+const ovalContents = {
+  totalCount: ovalContentNodes.length,
+  nodes: ovalContentNodes,
+};
+
 export const mocks = ovalContentMockFactory(
   { first: 20, last: 20 },
-  ovalContents,
+  {
+    totalCount: 4,
+    nodes: [firstContent(), secondContent(), thirdContent(), fourthContent()],
+  },
   { currentUser: admin }
 );
 
 export const paginatedMocks = ovalContentMockFactory(
   { first: 10, last: 5 },
-  paginatedOvalContents,
+  { totalCount: 7, nodes: [secondContent(), fourthContent()] },
   { currentUser: admin }
 );
 
@@ -109,6 +99,18 @@ export const unauthorizedMocks = ovalContentMockFactory(
   { currentUser: intruder }
 );
 
+export const noDeleteMocks = ovalContentMockFactory(
+  { first: 20, last: 20 },
+  {
+    totalCount: 2,
+    nodes: [
+      firstContent({ canDestroy: false }),
+      secondContent({ canDestroy: false }),
+    ],
+  },
+  { currentUser: admin }
+);
+
 export const pushMock = jest.fn();
 
 export const pagePaginationHistoryMock = {

data/webpack/routes/OvalContents/OvalContentsIndex/__tests__/OvalContentsIndex.test.js

@@ -4,9 +4,15 @@ import { within } from '@testing-library/dom';
 import userEvent from '@testing-library/user-event';
 import '@testing-library/jest-dom';
 
-import OvalContentsIndex from '../OvalContentsIndex';
+import OvalContentsIndex from '../';
 
-import { withMockedProvider, tick, historyMock } from '../../../../testHelper';
+import {
+  withRouter,
+  withRedux,
+  withMockedProvider,
+  tick,
+  historyMock,
+} from '../../../../testHelper';
 import { ovalContentsPath } from '../../../../helpers/pathsHelper';
 
 import {
@@ -20,12 +26,14 @@ import {
   unauthorizedMocks,
 } from './OvalContentsIndex.fixtures';
 
-const TestComponent = withMockedProvider(OvalContentsIndex);
+const TestComponent = withRedux(
+  withRouter(withMockedProvider(OvalContentsIndex))
+);
 
 describe('OvalContentsIndex', () => {
   it('should load page', async () => {
     const { container } = render(
-      <TestComponent history={historyMock} mocks={mocks} />
+      <TestComponent history={historyMock} mocks={mocks} location={{}} />
     );
     expect(screen.getByText('Loading')).toBeInTheDocument();
     await waitFor(tick);
@@ -47,6 +55,7 @@ describe('OvalContentsIndex', () => {
     const { container } = render(
       <TestComponent
         history={pagePaginationHistoryMock}
+        location={{}}
         mocks={paginatedMocks}
       />
     );
@@ -64,14 +73,18 @@ describe('OvalContentsIndex', () => {
     );
   });
   it('should show empty state', async () => {
-    render(<TestComponent history={historyMock} mocks={emptyMocks} />);
+    render(
+      <TestComponent history={historyMock} mocks={emptyMocks} location={{}} />
+    );
     expect(screen.getByText('Loading')).toBeInTheDocument();
     await waitFor(tick);
     expect(screen.queryByText('Loading')).not.toBeInTheDocument();
     expect(screen.getByText('No OVAL Contents found.')).toBeInTheDocument();
   });
   it('should show errors', async () => {
-    render(<TestComponent history={historyMock} mocks={errorMocks} />);
+    render(
+      <TestComponent history={historyMock} mocks={errorMocks} location={{}} />
+    );
     expect(screen.getByText('Loading')).toBeInTheDocument();
     await waitFor(tick);
     expect(screen.queryByText('Loading')).not.toBeInTheDocument();
@@ -81,13 +94,21 @@ describe('OvalContentsIndex', () => {
     expect(screen.getByText('Error!')).toBeInTheDocument();
   });
   it('should load page for user with permissions', async () => {
-    render(<TestComponent history={historyMock} mocks={viewerMocks} />);
+    render(
+      <TestComponent history={historyMock} mocks={viewerMocks} location={{}} />
+    );
     await waitFor(tick);
     expect(screen.queryByText('Loading')).not.toBeInTheDocument();
     expect(screen.getByText('ansible OVAL content')).toBeInTheDocument();
   });
   it('should not load page for user without permissions', async () => {
-    render(<TestComponent history={historyMock} mocks={unauthorizedMocks} />);
+    render(
+      <TestComponent
+        history={historyMock}
+        mocks={unauthorizedMocks}
+        location={{}}
+      />
+    );
     await waitFor(tick);
     expect(screen.queryByText('Loading')).not.toBeInTheDocument();
     expect(screen.queryByText('ansible OVAL content')).not.toBeInTheDocument();

data/webpack/routes/OvalContents/OvalContentsIndex/index.js

@@ -1,7 +1,13 @@
 import React from 'react';
+import { useDispatch } from 'react-redux';
+import { showToast } from '../../../helpers/toastHelper';
 
 import OvalContentsIndex from './OvalContentsIndex';
 
-const WrappedOvalContentsIndex = props => <OvalContentsIndex {...props} />;
+const WrappedOvalContentsIndex = props => {
+  const dispatch = useDispatch();
+
+  return <OvalContentsIndex {...props} showToast={showToast(dispatch)} />;
+};
 
 export default WrappedOvalContentsIndex;

data/webpack/routes/OvalContents/OvalContentsNew/OvalContentsNew.js

@@ -0,0 +1,138 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { Formik, Field as FormikField } from 'formik';
+
+import {
+  Form as PfForm,
+  ActionGroup,
+  Button,
+  FileUpload,
+  FormGroup,
+  Radio,
+  Spinner,
+} from '@patternfly/react-core';
+import {
+  onSubmit,
+  createValidationSchema,
+  validateFile,
+  submitDisabled,
+} from './OvalContentsNewHelper';
+import LinkButton from '../../../components/LinkButton';
+import IndexLayout from '../../../components/IndexLayout';
+import { TextField } from '../../../helpers/formFieldsHelper';
+import { ovalContentsPath } from '../../../helpers/pathsHelper';
+
+import './OvalContentsNew.scss';
+
+const OvalContentsNew = props => {
+  const [file, setFile] = useState(null);
+  const [fileTouched, setFileTouched] = useState(false);
+  const [fileFromUrl, setFileFromUrl] = useState(true);
+
+  const handleFileChange = (value, filename, event) => {
+    setFile(value);
+    setFileTouched(true);
+  };
+
+  return (
+    <IndexLayout pageTitle={__('New OVAL Content')} contentWidthSpan={6}>
+      <Formik
+        onSubmit={(values, actions) =>
+          onSubmit(
+            values,
+            actions,
+            props.showToast,
+            props.history,
+            fileFromUrl,
+            file
+          )
+        }
+        initialValues={{ name: '', url: '' }}
+        validationSchema={createValidationSchema(fileFromUrl)}
+      >
+        {formProps => (
+          <PfForm>
+            <FormikField
+              label="Name"
+              name="name"
+              component={TextField}
+              isRequired
+            />
+            <FormGroup label={__('OVAL Content Source')}>
+              <Radio
+                id="scap-file-source-url"
+                isChecked={fileFromUrl}
+                isDisabled={formProps.isSubmitting}
+                name="fileSource"
+                onChange={() => {
+                  setFileFromUrl(true);
+                  // Force validations to run by setting the same value.
+                  // Workaround for https://github.com/formium/formik/issues/1755
+                  formProps.setFieldValue(formProps.values.url);
+                }}
+                label={__('OVAL Content from URL')}
+              />
+              <Radio
+                id="scap-file-source-file"
+                isChecked={!fileFromUrl}
+                isDisabled={formProps.isSubmitting}
+                name="fileSource"
+                onChange={() => {
+                  setFileFromUrl(false);
+                  const filtered = Object.entries(formProps.errors).filter(
+                    ([key, value]) => key !== 'url'
+                  );
+                  formProps.setErrors(Object.fromEntries(filtered));
+                }}
+                label={__('OVAL Content from file')}
+              />
+            </FormGroup>
+            {!fileFromUrl ? (
+              <FormGroup label="File" isRequired>
+                <FileUpload
+                  value={file}
+                  filename={file ? file.name : ''}
+                  onChange={handleFileChange}
+                  isDisabled={formProps.isSubmitting}
+                  validated={validateFile(file, fileTouched)}
+                />
+              </FormGroup>
+            ) : (
+              <FormikField
+                label={__('URL')}
+                name="url"
+                component={TextField}
+                placeholder="https://www.redhat.com/security/data/oval/v2/RHEL8/rhel-8.oval.xml.bz2"
+                isRequired
+              />
+            )}
+            <ActionGroup>
+              <Button
+                variant="primary"
+                onClick={formProps.handleSubmit}
+                isDisabled={submitDisabled(formProps, file, fileFromUrl)}
+              >
+                {__('Submit')}
+              </Button>
+              <LinkButton
+                btnVariant="link"
+                isDisabled={formProps.isSubmitting}
+                btnText={__('Cancel')}
+                path={ovalContentsPath}
+              />
+              {formProps.isSubmitting ? <Spinner size="lg" /> : null}
+            </ActionGroup>
+          </PfForm>
+        )}
+      </Formik>
+    </IndexLayout>
+  );
+};
+
+OvalContentsNew.propTypes = {
+  showToast: PropTypes.func.isRequired,
+  history: PropTypes.object.isRequired,
+};
+
+export default OvalContentsNew;

data/webpack/routes/OvalContents/OvalContentsNew/OvalContentsNew.scss

@@ -0,0 +1,3 @@
+#scap-file-source-url, #scap-file-source-file {
+  margin: 0;
+}

data/webpack/routes/OvalContents/OvalContentsNew/OvalContentsNewHelper.js

@@ -0,0 +1,73 @@
+import * as Yup from 'yup';
+
+import api from 'foremanReact/redux/API/API';
+import { prepareErrors } from 'foremanReact/redux/actions/common/forms';
+import { sprintf, translate as __ } from 'foremanReact/common/I18n';
+import {
+  ovalContentsPath,
+  ovalContentsApiPath,
+} from '../../../helpers/pathsHelper';
+
+export const submitForm = (params, actions) => {
+  const headers = {
+    'Content-Type': 'multipart/form-data',
+  };
+  return api.post(ovalContentsApiPath, params, headers);
+};
+
+export const onSubmit = async (
+  values,
+  actions,
+  showToast,
+  history,
+  fileFromUrl,
+  file
+) => {
+  const formData = new FormData();
+  if (fileFromUrl) {
+    formData.append('oval_content[url]', values.url);
+  } else {
+    formData.append('oval_content[scap_file]', file);
+  }
+  formData.append('oval_content[name]', values.name);
+  try {
+    await submitForm(formData, actions);
+    history.push(ovalContentsPath, { refreshOvalContents: true });
+    showToast({
+      type: 'success',
+      message: sprintf(__('OVAL Content %s successfully created'), values.name),
+    });
+  } catch (error) {
+    onError(error, actions, showToast);
+  }
+};
+
+const onError = (error, actions, showToast) => {
+  actions.setSubmitting(false);
+  if (error.response?.status === 422) {
+    actions.setErrors(prepareErrors(error?.response?.data?.error?.errors, {}));
+  } else {
+    showToast({
+      type: 'error',
+      message: __(
+        'Unknown error when submitting data, please try again later.'
+      ),
+    });
+  }
+};
+
+export const validateFile = (file, touched) => {
+  if (!touched) {
+    return 'default';
+  }
+  return file ? 'success' : 'error';
+};
+
+export const submitDisabled = (formProps, file, fileFromUrl) =>
+  formProps.isSubmitting || !formProps.isValid || (!fileFromUrl && !file);
+
+export const createValidationSchema = contentFromUrl =>
+  Yup.object().shape({
+    name: Yup.string().required("can't be blank"),
+    ...(contentFromUrl && { url: Yup.string().required("can't be blank") }),
+  });