foreman_openscap 4.3.1 → 5.1.0

data/webpack/components/withLoading.js

@@ -1,8 +1,12 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { translate as __ } from 'foremanReact/common/I18n';
-
 import Loading from 'foremanReact/components/Loading';
+import {
+  permissionCheck,
+  permissionDeniedMsg,
+} from '../helpers/permissionsHelper';
+
 import EmptyState from './EmptyState';
 
 const errorStateTitle = __('Error!');
@@ -24,9 +28,18 @@ const withLoading = Component => {
     resultPath,
     renameData,
     emptyStateTitle,
+    permissions,
+    primaryButton,
+    shouldRefetch,
     ...rest
   }) => {
-    const { loading, error, data } = fetchFn(rest);
+    const { loading, error, data, refetch } = fetchFn(rest);
+
+    useEffect(() => {
+      if (shouldRefetch) {
+        refetch();
+      }
+    }, [shouldRefetch, refetch]);
 
     if (loading) {
       return <Loading />;
@@ -42,10 +55,28 @@ const withLoading = Component => {
       );
     }
 
+    const check = permissionCheck(data.currentUser, permissions);
+
+    if (!check.allowed) {
+      return (
+        <EmptyState
+          lock
+          title={__('Permission denied')}
+          body={permissionDeniedMsg(check.permissions.map(item => item.name))}
+        />
+      );
+    }
+
     const result = pluckData(data, resultPath);
 
     if ((Array.isArray(result) && result.length === 0) || !result) {
-      return <EmptyState title={emptyStateTitle} body={emptyStateBody} />;
+      return (
+        <EmptyState
+          title={emptyStateTitle}
+          body={emptyStateBody}
+          primaryButton={primaryButton}
+        />
+      );
     }
 
     return <Component {...rest} {...renameData(data)} />;
@@ -56,10 +87,16 @@ const withLoading = Component => {
     resultPath: PropTypes.string.isRequired,
     renameData: PropTypes.func,
     emptyStateTitle: PropTypes.string.isRequired,
+    permissions: PropTypes.array,
+    primaryButton: PropTypes.node,
+    shouldRefetch: PropTypes.bool,
   };
 
   Subcomponent.defaultProps = {
     renameData: data => data,
+    permissions: [],
+    primaryButton: null,
+    shouldRefetch: false,
   };
 
   return Subcomponent;

data/webpack/graphql/mutations/deleteOvalContent.gql

@@ -0,0 +1,9 @@
+mutation DeleteOvalContent($id: ID!) {
+  deleteOvalContent(input: { id: $id }) {
+    id
+    errors {
+      path
+      message
+    }
+  }
+}

data/webpack/graphql/mutations/deleteOvalPolicy.gql

@@ -0,0 +1,9 @@
+mutation DeleteOvalPolicy($id: ID!) {
+  deleteOvalPolicy(input: { id: $id }) {
+    id
+    errors {
+      path
+      message
+    }
+  }
+}

data/webpack/graphql/mutations/updateOvalPolicy.gql

@@ -0,0 +1,14 @@
+mutation UpdateOvalPolicy($id: ID!, $name: String, $description: String, $cronLine: String) {
+  updateOvalPolicy(input:{ id:$id, name:$name, description: $description, cronLine: $cronLine }) {
+    ovalPolicy {
+      id
+      name
+      description
+      cronLine
+    }
+    errors {
+      path
+      message
+    }
+  }
+}

data/webpack/graphql/queries/currentUserAttributes.gql

@@ -0,0 +1,11 @@
+fragment CurrentUserAttributes on User {
+  id
+  login
+  admin
+  permissions {
+    nodes {
+      id
+      name
+    }
+  }
+}

data/webpack/graphql/queries/cves.gql

@@ -1,3 +1,5 @@
+#import "./currentUserAttributes.gql"
+
 query($search: String, $first: Int, $last: Int) {
   cves(search: $search, first: $first, last: $last) {
     totalCount
@@ -15,4 +17,7 @@ query($search: String, $first: Int, $last: Int) {
       }
     }
   }
+  currentUser {
+    ...CurrentUserAttributes
+  }
 }

data/webpack/graphql/queries/hostgroups.gql

@@ -0,0 +1,14 @@
+#import "./currentUserAttributes.gql"
+
+query($search: String, $first: Int, $last: Int) {
+  hostgroups(search: $search, first: $first, last: $last) {
+    totalCount
+    nodes {
+      id
+      name
+    }
+  }
+  currentUser {
+    ...CurrentUserAttributes
+  }
+}

data/webpack/graphql/queries/ovalContent.gql

@@ -0,0 +1,8 @@
+query($id: String!) {
+  ovalContent(id: $id) {
+    id
+    name
+    url
+    originalFilename
+  }
+}

data/webpack/graphql/queries/ovalContents.gql

@@ -1,3 +1,5 @@
+#import "./currentUserAttributes.gql"
+
 query($first: Int, $last: Int) {
   ovalContents(first: $first, last: $last) {
     totalCount
@@ -6,6 +8,12 @@ query($first: Int, $last: Int) {
       name
       url
       originalFilename
+      meta {
+        canDestroy
+      }
     }
   }
+  currentUser {
+    ...CurrentUserAttributes
+  }
 }

data/webpack/graphql/queries/ovalPolicies.gql

@@ -1,12 +1,20 @@
+#import "./currentUserAttributes.gql"
+
 query($first: Int, $last: Int) {
   ovalPolicies(first: $first, last: $last) {
     totalCount
     nodes {
       id
       name
+      meta {
+        canDestroy
+      }
       ovalContent {
         name
       }
     }
   }
+  currentUser {
+    ...CurrentUserAttributes
+  }
 }

data/webpack/graphql/queries/ovalPolicy.gql

@@ -1,3 +1,5 @@
+#import "./currentUserAttributes.gql"
+
 query($id: String!) {
   ovalPolicy(id: $id) {
     id
@@ -18,4 +20,7 @@ query($id: String!) {
       }
     }
   }
+  currentUser {
+    ...CurrentUserAttributes
+  }
 }

data/webpack/helpers/formFieldsHelper.js

@@ -0,0 +1,63 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import { FormGroup, TextInput } from '@patternfly/react-core';
+import { ExclamationCircleIcon } from '@patternfly/react-icons';
+
+const wrapFieldProps = fieldProps => {
+  const { onChange } = fieldProps;
+  // modify onChange args to correctly wire formik with pf4 input handlers
+  const wrappedOnChange = (value, event) => {
+    onChange(event);
+  };
+
+  return { ...fieldProps, onChange: wrappedOnChange };
+};
+
+const shouldValidate = (form, fieldName) => {
+  if (form.touched[fieldName]) {
+    return form.errors[fieldName] ? 'error' : 'success';
+  }
+
+  return 'noval';
+};
+
+const fieldWithHandlers = Component => {
+  const Subcomponent = ({ label, form, field, isRequired, ...rest }) => {
+    const fieldProps = wrapFieldProps(field);
+    const valid = shouldValidate(form, field.name);
+
+    return (
+      <FormGroup
+        label={label}
+        isRequired={isRequired}
+        helperTextInvalid={form.errors[field.name]}
+        helperTextInvalidIcon={<ExclamationCircleIcon />}
+        validated={valid}
+      >
+        <Component
+          aria-label={fieldProps.name}
+          {...fieldProps}
+          {...rest}
+          validated={valid}
+          isDisabled={form.isSubmitting}
+        />
+      </FormGroup>
+    );
+  };
+
+  Subcomponent.propTypes = {
+    form: PropTypes.object.isRequired,
+    field: PropTypes.object.isRequired,
+    label: PropTypes.string.isRequired,
+    isRequired: PropTypes.bool,
+  };
+
+  Subcomponent.defaultProps = {
+    isRequired: false,
+  };
+
+  return Subcomponent;
+};
+
+export const TextField = fieldWithHandlers(TextInput);

data/webpack/helpers/mutationHelper.js

@@ -0,0 +1,68 @@
+import { useMutation } from '@apollo/client';
+import { translate as __, sprintf } from 'foremanReact/common/I18n';
+
+import { useCurrentPagination, pageToVars } from './pageParamsHelper';
+
+const formatError = (error, name) =>
+  sprintf(__('There was a following error when deleting %(name)s: %(error)s'), {
+    name,
+    error,
+  });
+
+const joinErrors = errors => errors.map(err => err.message).join(', ');
+
+const onError = (showToast, resourceName) => error => {
+  showToast({ type: 'error', message: formatError(error, resourceName) });
+};
+
+const onCompleted = (
+  toggleModal,
+  showToast,
+  mutationName,
+  successMsg,
+  resourceName
+) => data => {
+  toggleModal();
+  const { errors } = data[mutationName];
+  if (Array.isArray(errors) && errors.length > 0) {
+    showToast({
+      type: 'error',
+      message: formatError(joinErrors(errors), resourceName),
+    });
+  } else {
+    showToast({
+      type: 'success',
+      message: successMsg,
+    });
+  }
+};
+
+export const prepareMutation = (
+  history,
+  showToast,
+  refetchQuery,
+  mutationName,
+  successMsg,
+  mutation,
+  resourceName
+) => toggleModal => {
+  const pagination = pageToVars(useCurrentPagination(history));
+
+  const options = {
+    refetchQueries: [{ query: refetchQuery, variables: pagination }],
+    onCompleted: onCompleted(
+      toggleModal,
+      showToast,
+      mutationName,
+      successMsg,
+      resourceName
+    ),
+    onError: onError(showToast, resourceName),
+  };
+
+  return useMutation(mutation, options);
+};
+
+export const submitDelete = (mutation, id) => {
+  mutation({ variables: { id } });
+};

data/webpack/helpers/pathsHelper.js

@@ -3,6 +3,7 @@ import { decodeId } from './globalIdHelper';
 const experimental = path => `/experimental${path}`;
 
 const showPath = path => `${path}/:id`;
+const newPath = path => `${path}/new`;
 
 export const modelPath = (basePath, model) => `${basePath}/${decodeId(model)}`;
 
@@ -14,7 +15,11 @@ export const resolvePath = (path, params) =>
     path
   );
 
+export const ovalContentsApiPath = '/api/v2/compliance/oval_contents';
+
 export const ovalContentsPath = experimental('/compliance/oval_contents');
+export const ovalContentsShowPath = showPath(ovalContentsPath);
+export const ovalContentsNewPath = newPath(ovalContentsPath);
 export const ovalPoliciesPath = experimental('/compliance/oval_policies');
 export const ovalPoliciesShowPath = `${showPath(ovalPoliciesPath)}/:tab?`;
 export const hostsPath = '/hosts';

data/webpack/helpers/permissionsHelper.js

@@ -0,0 +1,42 @@
+import { translate as __, sprintf } from 'foremanReact/common/I18n';
+
+export const permissionCheck = (user, permissionsRequired) => {
+  if (permissionsRequired.length === 0) {
+    return { allowed: true };
+  }
+
+  if (!user) {
+    throw new Error(
+      'No user data when loading the page - cannot determine if current user is allowed to view the page.'
+    );
+  }
+
+  if (user.admin) {
+    return { allowed: true };
+  }
+
+  const permList = permissionsRequired.reduce((memo, item) => {
+    const found = user.permissions.nodes.find(
+      permission => permission.name === item
+    );
+    memo.push({ name: item, present: !!found });
+    return memo;
+  }, []);
+
+  if (permList.reduce((memo, item) => memo && item.present, true)) {
+    return { allowed: true, permissions: permList };
+  }
+
+  return { allowed: false, permissions: permList };
+};
+
+export const permissionDeniedMsg = permissions => {
+  let msg = __('You are not authorized to view the page. ');
+  if (permissions?.length > 0) {
+    msg += sprintf(
+      __('Request the following permissions from administrator: %s.'),
+      permissions.join(', ')
+    );
+  }
+  return msg;
+};

data/webpack/helpers/toastHelper.js

@@ -0,0 +1,3 @@
+import { addToast } from 'foremanReact/components/ToastsList';
+
+export const showToast = dispatch => toast => dispatch(addToast(toast));

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

@@ -4,12 +4,17 @@ import { useQuery } from '@apollo/client';
 import { translate as __ } from 'foremanReact/common/I18n';
 
 import IndexLayout from '../../../components/IndexLayout';
+import LinkButton from '../../../components/LinkButton';
 import OvalContentsTable from './OvalContentsTable';
+import { ovalContentsNewPath } from '../../../helpers/pathsHelper';
 import {
   useParamsToVars,
   useCurrentPagination,
 } from '../../../helpers/pageParamsHelper';
+
+import { submitDelete, prepareMutation } from '../../../helpers/mutationHelper';
 import ovalContentsQuery from '../../../graphql/queries/ovalContents.gql';
+import deleteOvalContentMutation from '../../../graphql/mutations/deleteOvalContent.gql';
 
 const OvalContentsIndex = props => {
   const useFetchFn = componentProps =>
@@ -33,6 +38,25 @@ const OvalContentsIndex = props => {
         resultPath="ovalContents.nodes"
         pagination={pagination}
         emptyStateTitle={__('No OVAL Contents found.')}
+        permissions={['view_oval_contents']}
+        confirmDeleteTitle={__('Delete OVAL Content')}
+        submitDelete={submitDelete}
+        prepareMutation={prepareMutation(
+          props.history,
+          props.showToast,
+          ovalContentsQuery,
+          'deleteOvalContent',
+          __('OVAL Content successfully deleted.'),
+          deleteOvalContentMutation,
+          __('OVAL Content')
+        )}
+        primaryButton={
+          <LinkButton
+            path={ovalContentsNewPath}
+            btnText={__('Create OVAL Content')}
+          />
+        }
+        shouldRefetch={props.location?.state?.refreshOvalContents}
       />
     </IndexLayout>
   );
@@ -40,6 +64,8 @@ const OvalContentsIndex = props => {
 
 OvalContentsIndex.propTypes = {
   history: PropTypes.object.isRequired,
+  showToast: PropTypes.func.isRequired,
+  location: PropTypes.object.isRequired,
 };
 
 export default OvalContentsIndex;

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

@@ -1,29 +1,73 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { translate as __ } from 'foremanReact/common/I18n';
+import { Button } from '@patternfly/react-core';
 
 import withLoading from '../../../components/withLoading';
+import withDeleteModal from '../../../components/withDeleteModal';
 import IndexTable from '../../../components/IndexTable';
+import {
+  ovalContentsNewPath,
+  ovalContentsPath,
+  modelPath,
+} from '../../../helpers/pathsHelper';
+
+import { linkCell } from '../../../helpers/tableHelper';
 
 const OvalContentsTable = props => {
-  const columns = [{ title: __('Name') }];
+  const columns = [
+    { title: __('Name') },
+    { title: __('URL') },
+    { title: __('Original File Name') },
+  ];
 
   const rows = props.ovalContents.map(ovalContent => ({
-    cells: [{ title: ovalContent.name }],
+    cells: [
+      {
+        title: linkCell(
+          modelPath(ovalContentsPath, ovalContent),
+          ovalContent.name
+        ),
+      },
+      { title: ovalContent.url || '' },
+      { title: ovalContent.originalFilename || '' },
+    ],
     ovalContent,
   }));
 
-  const actions = [];
+  const actionResolver = (rowData, rest) => {
+    const actions = [];
+    if (rowData.ovalContent.meta.canDestroy) {
+      actions.push({
+        title: __('Delete OVAL Content'),
+        onClick: (event, rowId, rData, extra) => {
+          props.toggleModal(rData.ovalContent);
+        },
+      });
+    }
+    return actions;
+  };
+
+  const createBtn = (
+    <Button
+      onClick={() => props.history.push(ovalContentsNewPath)}
+      variant="primary"
+      aria-label="create_oval_content"
+    >
+      {__('Create OVAL Content')}
+    </Button>
+  );
 
   return (
     <IndexTable
       columns={columns}
       rows={rows}
-      actions={actions}
+      actionResolver={actionResolver}
       pagination={props.pagination}
       totalCount={props.totalCount}
       history={props.history}
       ariaTableLabel={__('OVAL Contents table')}
+      toolbarBtns={createBtn}
     />
   );
 };
@@ -33,6 +77,7 @@ OvalContentsTable.propTypes = {
   pagination: PropTypes.object.isRequired,
   totalCount: PropTypes.number.isRequired,
   history: PropTypes.object.isRequired,
+  toggleModal: PropTypes.func.isRequired,
 };
 
-export default withLoading(OvalContentsTable);
+export default withLoading(withDeleteModal(OvalContentsTable));

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',
+  },
+};