foreman_openscap 4.3.2 → 5.1.1

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 {
@@ -16,20 +22,30 @@ import {
   pagePaginationHistoryMock,
   emptyMocks,
   errorMocks,
+  viewerMocks,
+  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);
     expect(screen.queryByText('Loading')).not.toBeInTheDocument();
     expect(screen.getByText('ansible OVAL content')).toBeInTheDocument();
+    expect(
+      screen.getByText(
+        'http://oval-content-source/security/data/oval/ansible-2-including-unpatched.oval.xml.bz2'
+      )
+    ).toBeInTheDocument();
     expect(screen.getByText('openshift OVAL content')).toBeInTheDocument();
+    expect(screen.getByText('openshift.oval.xml.bz2')).toBeInTheDocument();
     const pageItems = container.querySelector('.pf-c-pagination__total-items');
     expect(within(pageItems).getByText(/1 - 4/)).toBeInTheDocument();
     expect(within(pageItems).getByText('of')).toBeInTheDocument();
@@ -39,6 +55,7 @@ describe('OvalContentsIndex', () => {
     const { container } = render(
       <TestComponent
         history={pagePaginationHistoryMock}
+        location={{}}
         mocks={paginatedMocks}
       />
     );
@@ -56,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();
@@ -72,4 +93,30 @@ describe('OvalContentsIndex', () => {
     ).toBeInTheDocument();
     expect(screen.getByText('Error!')).toBeInTheDocument();
   });
+  it('should load page for user with permissions', async () => {
+    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}
+        location={{}}
+      />
+    );
+    await waitFor(tick);
+    expect(screen.queryByText('Loading')).not.toBeInTheDocument();
+    expect(screen.queryByText('ansible OVAL content')).not.toBeInTheDocument();
+    expect(
+      screen.getByText(
+        'You are not authorized to view the page. Request the following permissions from administrator: view_oval_contents.'
+      )
+    ).toBeInTheDocument();
+    expect(screen.getByText('Permission denied')).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") }),
+  });

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

@@ -0,0 +1,104 @@
+import React from 'react';
+
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import '@testing-library/jest-dom';
+import api from 'foremanReact/redux/API/API';
+
+import OvalContentsNew from '../OvalContentsNew';
+import { withRouter, withRedux, tick } from '../../../../testHelper';
+import { ovalContentsPath } from '../../../../helpers/pathsHelper';
+
+jest.mock('foremanReact/redux/API/API', () => ({ post: jest.fn() }));
+
+const TestComponent = withRouter(withRedux(OvalContentsNew));
+
+describe('OvalContentsNew', () => {
+  it('should create with content from URL', async () => {
+    const pushMock = jest.fn();
+    const toastMock = jest.fn();
+
+    api.post.mockImplementation(() => Promise.resolve());
+
+    render(
+      <TestComponent history={{ push: pushMock }} showToast={toastMock} />
+    );
+    expect(screen.getByText('Name')).toBeInTheDocument();
+    expect(screen.getByText('OVAL Content Source')).toBeInTheDocument();
+    expect(screen.getByText('URL')).toBeInTheDocument();
+    expect(screen.queryByText('File')).not.toBeInTheDocument();
+    expect(screen.getByText('Submit')).toBeDisabled();
+    userEvent.type(screen.getByLabelText('name'), 'test content');
+    await waitFor(tick);
+    expect(screen.getByText('Submit')).toBeDisabled();
+    userEvent.type(
+      screen.getByLabelText(/url/),
+      'http://oval-content-source.org/security/data/oval/v2/CentOS7/ansible-2.9.oval.xml.bz2'
+    );
+    await waitFor(tick);
+    expect(screen.getByText('Submit')).not.toBeDisabled();
+    userEvent.click(screen.getByText('Submit'));
+    await waitFor(tick);
+    expect(pushMock).toHaveBeenCalledWith(ovalContentsPath, {
+      refreshOvalContents: true,
+    });
+    expect(toastMock).toHaveBeenCalledWith({
+      type: 'success',
+      message: 'OVAL Content test content successfully created',
+    });
+  });
+  it('should show resource errors', async () => {
+    const pushMock = jest.fn();
+    const toastMock = jest.fn();
+    api.post.mockImplementation(() => {
+      // eslint-disable-next-line no-throw-literal
+      throw {
+        response: {
+          status: 422,
+          data: { error: { errors: { name: ['has already been taken'] } } },
+        },
+      };
+    });
+
+    render(
+      <TestComponent history={{ push: pushMock }} showToast={toastMock} />
+    );
+    userEvent.type(screen.getByLabelText('name'), 'test content');
+    userEvent.type(
+      screen.getByLabelText(/url/),
+      'http://oval-content-source.org/security/data/oval/v2/CentOS7/ansible-2.9.oval.xml.bz2'
+    );
+    await waitFor(tick);
+    userEvent.click(screen.getByText('Submit'));
+    await waitFor(tick);
+    expect(pushMock).not.toHaveBeenCalled();
+    expect(screen.getByText('has already been taken')).toBeInTheDocument();
+  });
+  it('should show error toast on unexpected error', async () => {
+    const pushMock = jest.fn();
+    const toastMock = jest.fn();
+
+    api.post.mockImplementation(() => {
+      // eslint-disable-next-line no-throw-literal
+      throw { response: { status: 500 } };
+    });
+
+    render(
+      <TestComponent history={{ push: pushMock }} showToast={toastMock} />
+    );
+    userEvent.type(screen.getByLabelText('name'), 'test content');
+    userEvent.type(
+      screen.getByLabelText(/url/),
+      'http://oval-content-source.org/security/data/oval/v2/CentOS7/ansible-2.9.oval.xml.bz2'
+    );
+    await waitFor(tick);
+    userEvent.click(screen.getByText('Submit'));
+    await waitFor(tick);
+    expect(pushMock).not.toHaveBeenCalled();
+    expect(screen.getByText('Submit')).not.toBeDisabled();
+    expect(toastMock).toHaveBeenCalledWith({
+      type: 'error',
+      message: 'Unknown error when submitting data, please try again later.',
+    });
+  });
+});

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

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

data/webpack/routes/OvalContents/OvalContentsShow/OvalContentsShow.js

@@ -0,0 +1,62 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Helmet } from 'react-helmet';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+import {
+  Grid,
+  GridItem,
+  TextContent,
+  Text,
+  TextVariants,
+} from '@patternfly/react-core';
+
+import withLoading from '../../../components/withLoading';
+
+const OvalContentsShow = ({ ovalContent }) => {
+  let contentSource;
+  if (ovalContent.url) {
+    contentSource = (
+      <React.Fragment>
+        <Text component={TextVariants.h3}>{__('URL')}</Text>
+        <Text component={TextVariants.p}>{ovalContent.url || ''}</Text>
+      </React.Fragment>
+    );
+  } else {
+    contentSource = (
+      <React.Fragment>
+        <Text component={TextVariants.h3}>{__('File')}</Text>
+        <Text component={TextVariants.p}>
+          {ovalContent.originalFilename || ''}
+        </Text>
+      </React.Fragment>
+    );
+  }
+
+  return (
+    <React.Fragment>
+      <Helmet>
+        <title>{`${ovalContent.name} | ${__('OVAL Content')}`}</title>
+      </Helmet>
+      <Grid className="scap-page-grid">
+        <GridItem span={10}>
+          <Text component={TextVariants.h1}>{ovalContent.name}</Text>
+        </GridItem>
+        <GridItem span={2} />
+        <GridItem span={12}>
+          <TextContent className="pf-u-pt-md">
+            <Text component={TextVariants.h3}>{__('Name')}</Text>
+            <Text component={TextVariants.p}>{ovalContent.name}</Text>
+            {contentSource}
+          </TextContent>
+        </GridItem>
+      </Grid>
+    </React.Fragment>
+  );
+};
+
+OvalContentsShow.propTypes = {
+  ovalContent: PropTypes.object.isRequired,
+};
+
+export default withLoading(OvalContentsShow);

data/webpack/routes/OvalContents/OvalContentsShow/OvalContentsShow.test.js

@@ -0,0 +1,45 @@
+import React from 'react';
+import '@testing-library/jest-dom';
+import { render, screen, waitFor } from '@testing-library/react';
+
+import { withMockedProvider, tick } from '../../../testHelper';
+import ovalContentQuery from '../../../graphql/queries/ovalContent.gql';
+import OvalContentsShow from './';
+
+const TestComponent = withMockedProvider(OvalContentsShow);
+
+const matchMock = { params: { id: 4 } };
+const name = 'dotnet OVAL content';
+const url =
+  'http://oval-content-source/security/data/oval/dotnet-2.2.oval.xml.bz2';
+const id = 'MDE6Rm9yZW1hbk9wZW5zY2FwOjpPdmFsQ29udGVudC00';
+
+const mocks = [
+  {
+    request: {
+      query: ovalContentQuery,
+      variables: { id },
+    },
+    result: {
+      data: {
+        ovalContent: {
+          id,
+          name,
+          url,
+          originalFilename: '',
+        },
+      },
+    },
+  },
+];
+
+describe('OVAL Contents show page', () => {
+  it('should show OVAL Content', async () => {
+    render(<TestComponent match={matchMock} mocks={mocks} />);
+    expect(screen.getByText('Loading')).toBeInTheDocument();
+    await waitFor(tick);
+    expect(screen.queryByText('Loading')).not.toBeInTheDocument();
+    expect(screen.getAllByText(name).length === 2).toBeTruthy();
+    expect(screen.getByText(url)).toBeInTheDocument();
+  });
+});

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

@@ -0,0 +1,35 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useQuery } from '@apollo/client';
+
+import { translate as __ } from 'foremanReact/common/I18n';
+
+import OvalContentsShow from './OvalContentsShow';
+import { encodeId } from '../../../helpers/globalIdHelper';
+
+import ovalContent from '../../../graphql/queries/ovalContent.gql';
+
+const WrappedOvalContentsShow = props => {
+  const id = encodeId('ForemanOpenscap::OvalContent', props.match.params.id);
+
+  const useFetchFn = componentProps =>
+    useQuery(ovalContent, { variables: { id } });
+
+  const renameData = data => ({ ovalContent: data.ovalContent });
+
+  return (
+    <OvalContentsShow
+      {...props}
+      fetchFn={useFetchFn}
+      renameData={renameData}
+      resultPath="ovalContent"
+      emptyStateTitle={__('No OVAL Content found')}
+    />
+  );
+};
+
+WrappedOvalContentsShow.propTypes = {
+  match: PropTypes.object.isRequired,
+};
+
+export default WrappedOvalContentsShow;

data/webpack/routes/OvalPolicies/OvalPoliciesIndex/OvalPoliciesIndex.js

@@ -4,6 +4,8 @@ import { useQuery } from '@apollo/client';
 import { translate as __ } from 'foremanReact/common/I18n';
 
 import OvalPoliciesTable from './OvalPoliciesTable';
+import { submitDelete, prepareMutation } from '../../../helpers/mutationHelper';
+
 import IndexLayout from '../../../components/IndexLayout';
 
 import {
@@ -11,10 +13,9 @@ import {
   useCurrentPagination,
 } from '../../../helpers/pageParamsHelper';
 import policiesQuery from '../../../graphql/queries/ovalPolicies.gql';
+import deleteOvalPolicyMutation from '../../../graphql/mutations/deleteOvalPolicy.gql';
 
 const OvalPoliciesIndex = props => {
-  const pagination = useCurrentPagination(props.history);
-
   const useFetchFn = componentProps =>
     useQuery(policiesQuery, {
       variables: useParamsToVars(componentProps.history),
@@ -25,6 +26,8 @@ const OvalPoliciesIndex = props => {
     totalCount: data.ovalPolicies.totalCount,
   });
 
+  const pagination = useCurrentPagination(props.history);
+
   return (
     <IndexLayout pageTitle={__('OVAL Policies')}>
       <OvalPoliciesTable
@@ -34,6 +37,18 @@ const OvalPoliciesIndex = props => {
         resultPath="ovalPolicies.nodes"
         pagination={pagination}
         emptyStateTitle={__('No OVAL Policies found')}
+        permissions={['view_oval_policies']}
+        confirmDeleteTitle={__('Delete OVAL Policy')}
+        submitDelete={submitDelete}
+        prepareMutation={prepareMutation(
+          props.history,
+          props.showToast,
+          policiesQuery,
+          'deleteOvalPolicy',
+          __('OVAL policy was successfully deleted.'),
+          deleteOvalPolicyMutation,
+          __('OVAL policy')
+        )}
       />
     </IndexLayout>
   );
@@ -41,6 +56,7 @@ const OvalPoliciesIndex = props => {
 
 OvalPoliciesIndex.propTypes = {
   history: PropTypes.object.isRequired,
+  showToast: PropTypes.func.isRequired,
 };
 
 export default OvalPoliciesIndex;