foreman_openscap 5.1.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0deaa4503a6ab004120595983e5b6fac947691d57e7b8da5d38a0aed3316f1a6
-  data.tar.gz: 7447310d905705fbf71ca93f1cca7b2314e7d13827e90ce9c3a8b321cfcba411
+  metadata.gz: 0cadd1a7264151b9ab0bd0cc4d21eb212f621094c9f62c68a5922c2c0fe7d20f
+  data.tar.gz: 87a58a9b949841cd923a9d91d7fc18bc2717194a6cd1a8c96f90f89cebf925ae
 SHA512:
-  metadata.gz: 192e4e96375311fbf3225aa5e715eed99797338a8ba2be9d5b19cdf3f49dcae9ff5a78cb0136df175744360dbcc5ffc2ce453058ac31839a71f0373e79fa22cc
-  data.tar.gz: 2b231f618e80bc0bd187417328afae0c2b7f4c7a10d0954dc26ff554fd4ad34c67073b252cdc6f86ae6194d9a9d7c53c5c08bb00ba7348d884e334baac82f1fe
+  metadata.gz: 7f22820ffa670981fb8a2495ebfe19e9f67633e6549341972ac8caf23c5a826da6429ea2672f8a5d5b42b7a769662c87a068b3b7bbdda7d8d84f4d56043a1c37
+  data.tar.gz: 2134035b26dc747b698c69173d54eaeac67c17d81474997269872a6c62b0c8fe9cfe6a0c3c0734f13e5270b4e84b9f6da95f889b017dc366c1a276679e048d74

data/app/graphql/mutations/oval_policies/create.rb

@@ -0,0 +1,33 @@
+module Mutations
+  module OvalPolicies
+    class Create < ::Mutations::BaseMutation
+      description 'Creates a new OVAL Policy'
+      graphql_name 'CreateOvalPolicyMutation'
+
+      resource_class ::ForemanOpenscap::OvalPolicy
+
+      argument :name, String
+      argument :description, String, required: false
+      argument :period, String
+      argument :weekday, String, required: false
+      argument :day_of_month, Integer, required: false
+      argument :cron_line, String, required: false
+      argument :oval_content_id, Integer, required: true
+      argument :hostgroup_ids, [Integer], required: false
+
+      field :oval_policy, Types::OvalPolicy, 'The new OVAL Policy.', null: true
+      field :check_collection, [Types::OvalCheck], 'A collection of checks to detect OVAL policy configuration error', null: false
+
+      def resolve(hostgroup_ids:, **params)
+        policy = ::ForemanOpenscap::OvalPolicy.new params
+        validate_object(policy)
+        authorize!(policy, :create)
+        check_collection = ::ForemanOpenscap::Oval::Configure.new.assign(policy, hostgroup_ids, ::Hostgroup)
+        {
+          :oval_policy => policy,
+          :check_collection => check_collection.checks
+        }
+      end
+    end
+  end
+end

data/app/helpers/policies_helper.rb

@@ -93,7 +93,7 @@ module PoliciesHelper
   def tailoring_file_profile_selector(form, tailoring_file)
     if tailoring_file
       select_f form, :tailoring_file_profile_id, tailoring_file.scap_content_profiles, :id, :title,
-               { :selected => tailoring_file.scap_content_profiles.first.id },
+               { :selected => @policy.tailoring_file_profile_id },
                { :label => _("XCCDF Profile in Tailoring File"),
                  :help_inline => _("This profile will be used to override the one from scap content") }
     else

data/app/models/concerns/foreman_openscap/oval_facet_hostgroup_extensions.rb

@@ -11,6 +11,7 @@ module ForemanOpenscap
                     :on => :id,
                     :rename => :oval_policy_id,
                     :complete_value => false,
+                    :only_explicit => true,
                     :ext_method => :find_by_oval_policy_id,
                     :operators => ['= ']
     end

data/app/models/concerns/foreman_openscap/policy_common.rb

@@ -69,7 +69,7 @@ module ForemanOpenscap
 
     def weekday_number
       # 0 is sunday, 1 is monday in cron, while DAYS_INTO_WEEK has 0 as monday, 6 as sunday
-      (Date::DAYS_INTO_WEEK.with_indifferent_access[weekday] + 1) % 7
+      (Date::DAYS_INTO_WEEK.with_indifferent_access[weekday]) % 7
     end
   end
 end

data/app/services/foreman_openscap/oval/configure.rb

@@ -16,21 +16,26 @@ module ForemanOpenscap
         if model_class == ::Hostgroup
           roles_method = :inherited_and_own_ansible_roles
           ids_setter = :hostgroup_ids=
+          check_id = :hostgroups_without_proxy
         elsif model_class == ::Host::Managed
           roles_method = :all_ansible_roles
           ids_setter = :host_ids=
+          check_id = :hosts_without_proxy
         else
           raise "Unexpected model_class, expected ::Hostgroup or ::Host::Managed, got: #{model_class}"
         end
 
         items_with_proxy, items_without_proxy = openscap_proxy_associated(ids, model_class)
 
-        oval_policy.send(ids_setter, items_with_proxy.pluck(:id))
 
-        check_collection = without_proxy_to_check items_without_proxy
+        if items_without_proxy.any?
+          return without_proxy_to_check items_without_proxy, check_id
+        end
+
+        oval_policy.send(ids_setter, items_with_proxy.pluck(:id))
 
         unless oval_policy.save
-          return check_collection.add_check model_to_check(oval_policy)
+          return check_collection.add_check model_to_check(oval_policy, :oval_policy_errors)
         end
 
         check_collection.merge modify_items(items_with_proxy, oval_policy, ansible_role, roles_method)
@@ -47,31 +52,29 @@ module ForemanOpenscap
           role_ids = item.ansible_role_ids + [ansible_role.id]
           item.ansible_role_ids = role_ids unless item.send(roles_method).include? ansible_role
           item.save if item.changed?
-          memo.add_check model_to_check(item)
+          memo.add_check model_to_check(item, item.is_a?(::Hostgroup) ? 'hostgroup' : 'host')
           add_overrides ansible_role.ansible_variables, item, @config
           memo
         end
       end
 
-      def without_proxy_to_check(items)
+      def without_proxy_to_check(items, check_id)
         items.reduce(CheckCollection.new) do |memo, item|
           memo.add_check(
             SetupCheck.new(
               :title => (_("Was %s configured successfully?") % item.class.name),
-              :fail_msg => (_("Assign openscap_proxy to %s before proceeding.") % item.name)
+              :fail_msg => (_("Assign openscap_proxy to %s before proceeding.") % item.name),
+              :id => check_id
             ).fail!
           )
         end
       end
 
-      def model_to_s(model)
-        model.is_a?(::Hostgroup) ? 'hostgroup' : 'host'
-      end
-
-      def model_to_check(model)
+      def model_to_check(model, check_id)
         check = SetupCheck.new(
-          :title => (_("Was %{model_name} %{name} configured successfully?") % { :model_name => model_to_s(model), :name => model.name }),
-          :errors => model.errors.to_h
+          :title => (_("Was %{model_name} %{name} configured successfully?") % { :model_name => model.class.name, :name => model.name }),
+          :errors => model.errors.to_h,
+          :id => check_id
         )
         model.errors.any? ? check.fail! : check.pass!
       end

data/app/services/foreman_openscap/oval/setup_check.rb

@@ -1,7 +1,7 @@
 module ForemanOpenscap
   module Oval
     class SetupCheck
-      attr_reader :result, :id, :errors
+      attr_reader :result, :id, :title, :errors
 
       def initialize(hash)
         @id = hash[:id]

data/lib/foreman_openscap/engine.rb

@@ -227,6 +227,7 @@ module ForemanOpenscap
         register_graphql_mutation_field :delete_oval_policy, ::Mutations::OvalPolicies::Delete
         register_graphql_mutation_field :delete_oval_content, ::Mutations::OvalContents::Delete
         register_graphql_mutation_field :update_oval_policy, ::Mutations::OvalPolicies::Update
+        register_graphql_mutation_field :create_oval_policy, ::Mutations::OvalPolicies::Create
 
         register_facet ForemanOpenscap::Host::OvalFacet, :oval_facet do
           configure_host do

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "5.1.0".freeze
+  VERSION = "5.1.1".freeze
 end

data/webpack/components/EditableInput.js

@@ -49,6 +49,7 @@ const EditableInput = props => {
   const onCancel = () => {
     setInputValue(props.value);
     setEditing(false);
+    setError('');
   };
 
   const onChange = value => {
@@ -58,20 +59,24 @@ const EditableInput = props => {
     setInputValue(value);
   };
 
+  const editBtn = (
+    <SplitItem>
+      <Button
+        className="inline-edit-icon"
+        aria-label={`edit ${props.attrName}`}
+        variant="plain"
+        onClick={() => setEditing(true)}
+      >
+        <PencilAltIcon />
+      </Button>
+    </SplitItem>
+  );
+
   if (!editing) {
     return (
       <Split>
         <SplitItem>{props.value || <i>{__('None provided')}</i>}</SplitItem>
-        <SplitItem>
-          <Button
-            className="inline-edit-icon"
-            aria-label={`edit ${props.attrName}`}
-            variant="plain"
-            onClick={() => setEditing(true)}
-          >
-            <PencilAltIcon />
-          </Button>
-        </SplitItem>
+        {props.allowed && editBtn}
       </Split>
     );
   }
@@ -142,6 +147,7 @@ const EditableInput = props => {
 };
 
 EditableInput.propTypes = {
+  allowed: PropTypes.bool.isRequired,
   value: PropTypes.string,
   onConfirm: PropTypes.func.isRequired,
   attrName: PropTypes.string.isRequired,

data/webpack/components/IndexTable/index.js

@@ -41,7 +41,12 @@ const IndexTable = ({
           />
         </FlexItem>
       </Flex>
-      <Table aria-label={ariaTableLabel} cells={columns} {...rest}>
+      <Table
+        aria-label={ariaTableLabel}
+        cells={columns}
+        {...rest}
+        variant="compact"
+      >
         <TableHeader />
         <TableBody />
       </Table>
@@ -59,7 +64,7 @@ IndexTable.propTypes = {
 };
 
 IndexTable.defaultProps = {
-  toolbarBtns: [],
+  toolbarBtns: null,
 };
 
 export default IndexTable;

data/webpack/components/LinkButton.js

@@ -3,9 +3,19 @@ import { Link } from 'react-router-dom';
 import { Button } from '@patternfly/react-core';
 import PropTypes from 'prop-types';
 
-const LinkButton = ({ path, btnVariant, btnText, isDisabled }) => (
+const LinkButton = ({
+  path,
+  btnVariant,
+  btnText,
+  isDisabled,
+  btnAriaLabel,
+}) => (
   <Link to={path}>
-    <Button variant={btnVariant} isDisabled={isDisabled}>
+    <Button
+      variant={btnVariant}
+      isDisabled={isDisabled}
+      aria-label={btnAriaLabel}
+    >
       {btnText}
     </Button>
   </Link>
@@ -16,11 +26,13 @@ LinkButton.propTypes = {
   btnText: PropTypes.string.isRequired,
   btnVariant: PropTypes.string,
   isDisabled: PropTypes.bool,
+  btnAriaLabel: PropTypes.string,
 };
 
 LinkButton.defaultProps = {
   btnVariant: 'primary',
   isDisabled: false,
+  btnAriaLabel: null,
 };
 
 export default LinkButton;

data/webpack/components/withLoading.js

@@ -10,7 +10,6 @@ import {
 import EmptyState from './EmptyState';
 
 const errorStateTitle = __('Error!');
-const emptyStateBody = '';
 
 const pluckData = (data, path) => {
   const split = path.split('.');
@@ -28,6 +27,7 @@ const withLoading = Component => {
     resultPath,
     renameData,
     emptyStateTitle,
+    emptyStateBody,
     permissions,
     primaryButton,
     shouldRefetch,
@@ -87,6 +87,7 @@ const withLoading = Component => {
     resultPath: PropTypes.string.isRequired,
     renameData: PropTypes.func,
     emptyStateTitle: PropTypes.string.isRequired,
+    emptyStateBody: PropTypes.string,
     permissions: PropTypes.array,
     primaryButton: PropTypes.node,
     shouldRefetch: PropTypes.bool,
@@ -97,6 +98,7 @@ const withLoading = Component => {
     permissions: [],
     primaryButton: null,
     shouldRefetch: false,
+    emptyStateBody: '',
   };
 
   return Subcomponent;

data/webpack/graphql/mutations/createOvalPolicy.gql

@@ -0,0 +1,22 @@
+mutation CreateOvalPolicy($name: String!, $period: String!, $cronLine: String, $ovalContentId: Int!, $hostgroupIds: [Int!]) {
+  createOvalPolicy(input: {name: $name, period: $period, cronLine: $cronLine, ovalContentId: $ovalContentId, hostgroupIds: $hostgroupIds}) {
+    ovalPolicy {
+      name
+      id
+      period
+      cronLine
+      hostgroups {
+        nodes {
+          name
+          id
+        }
+      }
+    }
+    checkCollection {
+      id
+      errors
+      failMsg
+      result
+    }
+  }
+}

data/webpack/graphql/queries/ovalPolicy.gql

@@ -9,6 +9,9 @@ query($id: String!) {
     weekday
     dayOfMonth
     description
+    meta {
+      canEdit
+    }
     hostgroups {
       nodes {
         id

data/webpack/helpers/formFieldsHelper.js

@@ -1,9 +1,58 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import { FormGroup, TextInput } from '@patternfly/react-core';
+import {
+  FormGroup,
+  TextInput,
+  TextArea,
+  FormSelect,
+  FormSelectOption,
+} from '@patternfly/react-core';
 import { ExclamationCircleIcon } from '@patternfly/react-icons';
 
+export const SelectField = props => {
+  const { selectItems, field, form } = props;
+  const fieldProps = wrapFieldProps(field);
+
+  const valid = shouldValidate(form, field.name);
+
+  return (
+    <FormGroup
+      label={props.label}
+      isRequired={props.isRequired}
+      helperTextInvalid={form.errors[field.name]}
+      helperTextInvalidIcon={<ExclamationCircleIcon />}
+      validated={valid}
+    >
+      <FormSelect
+        {...fieldProps}
+        className="without_select2"
+        aria-label={fieldProps.name}
+        validated={valid}
+        isDisabled={form.isSubmitting}
+      >
+        <FormSelectOption key={0} value="" label={props.blankLabel} />
+        {selectItems.map((item, idx) => (
+          <FormSelectOption key={idx + 1} value={item.id} label={item.name} />
+        ))}
+      </FormSelect>
+    </FormGroup>
+  );
+};
+
+SelectField.propTypes = {
+  selectItems: PropTypes.array,
+  label: PropTypes.string.isRequired,
+  isRequired: PropTypes.bool,
+  field: PropTypes.object.isRequired,
+  form: PropTypes.object.isRequired,
+  blankLabel: PropTypes.string.isRequired,
+};
+SelectField.defaultProps = {
+  selectItems: [],
+  isRequired: false,
+};
+
 const wrapFieldProps = fieldProps => {
   const { onChange } = fieldProps;
   // modify onChange args to correctly wire formik with pf4 input handlers
@@ -61,3 +110,4 @@ const fieldWithHandlers = Component => {
 };
 
 export const TextField = fieldWithHandlers(TextInput);
+export const TextAreaField = fieldWithHandlers(TextArea);

data/webpack/helpers/globalIdHelper.js

@@ -4,8 +4,10 @@ const idSeparator = '-';
 const versionSeparator = ':';
 const defaultVersion = '01';
 
-export const decodeId = model => {
-  const split = atob(model.id).split(idSeparator);
+export const decodeModelId = model => decodeId(model.id);
+
+export const decodeId = globalId => {
+  const split = atob(globalId).split(idSeparator);
   return parseInt(last(split), 10);
 };
 

data/webpack/helpers/pathsHelper.js

@@ -1,11 +1,12 @@
-import { decodeId } from './globalIdHelper';
+import { decodeModelId } 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)}`;
+export const modelPath = (basePath, model) =>
+  `${basePath}/${decodeModelId(model)}`;
 
 // react-router uses path-to-regexp, should we use it as well in a future?
 // https://github.com/pillarjs/path-to-regexp/tree/v1.7.0#compile-reverse-path-to-regexp
@@ -22,6 +23,7 @@ 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 ovalPoliciesNewPath = newPath(ovalPoliciesPath);
 export const hostsPath = '/hosts';
-export const newJobPath = '/job_invocations/new';
+export const newJobPath = newPath('/job_invocations');
 export const hostsShowPath = showPath(hostsPath);

data/webpack/helpers/toastsHelper.js

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

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

@@ -56,7 +56,8 @@ const ovalContentNodes = [
   thirdContent(),
   fourthContent(),
 ];
-const ovalContents = {
+
+export const ovalContents = {
   totalCount: ovalContentNodes.length,
   nodes: ovalContentNodes,
 };
@@ -70,6 +71,10 @@ export const mocks = ovalContentMockFactory(
   { currentUser: admin }
 );
 
+export const unpagedMocks = ovalContentMockFactory({}, ovalContents, {
+  currentUser: admin,
+});
+
 export const paginatedMocks = ovalContentMockFactory(
   { first: 10, last: 5 },
   { totalCount: 7, nodes: [secondContent(), fourthContent()] },

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

@@ -1,5 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { Button } from '@patternfly/react-core';
+
 import { translate as __ } from 'foremanReact/common/I18n';
 
 import IndexTable from '../../../components/IndexTable';
@@ -7,7 +9,11 @@ import withLoading from '../../../components/withLoading';
 import withDeleteModal from '../../../components/withDeleteModal';
 
 import { linkCell } from '../../../helpers/tableHelper';
-import { ovalPoliciesPath, modelPath } from '../../../helpers/pathsHelper';
+import {
+  ovalPoliciesPath,
+  modelPath,
+  ovalPoliciesNewPath,
+} from '../../../helpers/pathsHelper';
 
 const OvalPoliciesTable = props => {
   const columns = [{ title: __('Name') }, { title: __('OVAL Content') }];
@@ -33,6 +39,16 @@ const OvalPoliciesTable = props => {
     return actions;
   };
 
+  const createBtn = (
+    <Button
+      onClick={() => props.history.push(ovalPoliciesNewPath)}
+      variant="primary"
+      aria-label="create_oval_policy"
+    >
+      {__('Create OVAL Policy')}
+    </Button>
+  );
+
   return (
     <IndexTable
       columns={columns}
@@ -42,6 +58,7 @@ const OvalPoliciesTable = props => {
       totalCount={props.totalCount}
       history={props.history}
       ariaTableLabel={__('OVAL Policies Table')}
+      toolbarBtns={createBtn}
     />
   );
 };

data/webpack/routes/OvalPolicies/OvalPoliciesNew/HostgroupSelect.js

@@ -0,0 +1,135 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import { useLazyQuery } from '@apollo/client';
+import { translate as __, sprintf } from 'foremanReact/common/I18n';
+import {
+  Select,
+  SelectOption,
+  SelectVariant,
+  FormGroup,
+} from '@patternfly/react-core';
+import { ExclamationCircleIcon } from '@patternfly/react-icons';
+import hostgroupsQuery from '../../../graphql/queries/hostgroups.gql';
+
+const HostgroupSelect = ({
+  selected,
+  setSelected,
+  hgsError,
+  showError,
+  setShowError,
+}) => {
+  const [isOpen, setIsOpen] = useState(false);
+
+  const [typingTimeout, setTypingTimeout] = useState(null);
+
+  const [fetchHostgroups, { loading, data, error }] = useLazyQuery(
+    hostgroupsQuery
+  );
+  const results = data?.hostgroups?.nodes ? data.hostgroups.nodes : [];
+
+  const onSelect = (event, selection) => {
+    if (selected.find(item => item.name === selection)) {
+      setSelected(selected.filter(item => item.name !== selection));
+    } else {
+      const hg = results.find(item => item.name === selection);
+      setSelected([...selected, hg]);
+    }
+  };
+
+  const onClear = () => {
+    if (showError) {
+      setShowError(false);
+    }
+    setSelected([]);
+  };
+
+  const onInputChange = value => {
+    if (showError) {
+      setShowError(false);
+    }
+    if (typingTimeout) {
+      clearTimeout(typingTimeout);
+    }
+    const variables = { search: `name ~ ${value}` };
+    setTypingTimeout(setTimeout(() => fetchHostgroups({ variables }), 500));
+  };
+
+  const shouldValidate = (err, shouldShowError) => {
+    if (shouldShowError) {
+      return err ? 'error' : 'success';
+    }
+    return 'noval';
+  };
+
+  const prepareOptions = fetchedResults => {
+    if (loading) {
+      return [
+        <SelectOption isDisabled key={0}>
+          {__('Loading...')}
+        </SelectOption>,
+      ];
+    }
+
+    if (error) {
+      return [
+        <SelectOption isDisabled key={0}>
+          {sprintf('Failed to fetch hostgroups, cause: %s', error.message)}
+        </SelectOption>,
+      ];
+    }
+
+    if (fetchedResults.length > 20) {
+      return [
+        <SelectOption isDisabled key={0}>
+          {sprintf(
+            'You have %s hostgroups to display. Please refine your search.',
+            fetchedResults.length
+          )}
+        </SelectOption>,
+      ];
+    }
+
+    return fetchedResults.map((hg, idx) => (
+      <SelectOption key={hg.id} value={hg.name} />
+    ));
+  };
+
+  return (
+    <FormGroup
+      label={__('Hostgroups')}
+      helperTextInvalidIcon={<ExclamationCircleIcon />}
+      helperTextInvalid={showError && hgsError}
+      validated={shouldValidate(hgsError, showError)}
+    >
+      <Select
+        variant={SelectVariant.typeaheadMulti}
+        typeAheadAriaLabel="Select a hostgroup"
+        placeholderText="Type a hostroup name..."
+        onToggle={() => setIsOpen(!isOpen)}
+        onSelect={onSelect}
+        onClear={onClear}
+        selections={selected.map(item => item.name)}
+        isOpen={isOpen}
+        onTypeaheadInputChanged={onInputChange}
+        validated={shouldValidate(hgsError, showError)}
+      >
+        {prepareOptions(results)}
+      </Select>
+    </FormGroup>
+  );
+};
+
+HostgroupSelect.propTypes = {
+  selected: PropTypes.array,
+  setSelected: PropTypes.func.isRequired,
+  hgsError: PropTypes.string,
+  showError: PropTypes.bool.isRequired,
+  setShowError: PropTypes.func.isRequired,
+};
+
+HostgroupSelect.defaultProps = {
+  selected: [],
+  hgsError: '',
+};
+
+export default HostgroupSelect;