foreman_openscap 7.1.0 → 8.0.0

data/webpack/components/OpenscapRemediationWizard/steps/SnippetSelect.js

@@ -0,0 +1,160 @@
+import React, { useContext } from 'react';
+import { map, split, capitalize, join, slice, isEmpty } from 'lodash';
+import {
+  Form,
+  FormGroup,
+  FormSelect,
+  FormSelectOption,
+  Radio,
+  Alert,
+} from '@patternfly/react-core';
+
+import { translate as __ } from 'foremanReact/common/I18n';
+import { STATUS } from 'foremanReact/constants';
+import Loading from 'foremanReact/components/Loading';
+
+import OpenscapRemediationWizardContext from '../OpenscapRemediationWizardContext';
+import WizardHeader from '../WizardHeader';
+import EmptyState from '../../EmptyState';
+import { errorMsg, supportedRemediationSnippets } from '../helpers';
+
+const SnippetSelect = () => {
+  const {
+    fixes,
+    snippet,
+    setSnippet,
+    method,
+    setMethod,
+    logStatus,
+    logError,
+    supportedJobSnippets,
+  } = useContext(OpenscapRemediationWizardContext);
+
+  const snippetNameMap = {
+    'urn:xccdf:fix:script:ansible': 'Ansible',
+    'urn:xccdf:fix:script:puppet': 'Puppet',
+    'urn:xccdf:fix:script:sh': 'Shell',
+    'urn:xccdf:fix:script:kubernetes': 'Kubernetes',
+    'urn:redhat:anaconda:pre': 'Anaconda',
+    'urn:redhat:osbuild:blueprint': 'OSBuild Blueprint',
+  };
+
+  const snippetName = system => {
+    const mapped = snippetNameMap[system];
+    if (mapped) return mapped;
+
+    return join(
+      map(slice(split(system, ':'), -2), n => capitalize(n)),
+      ' '
+    );
+  };
+
+  const resetSnippet = meth => {
+    const snip = supportedRemediationSnippets(
+      fixes,
+      meth,
+      supportedJobSnippets
+    )[0];
+    setSnippet(snip);
+    return snip;
+  };
+
+  const setMethodResetSnippet = meth => {
+    setMethod(meth);
+    resetSnippet(meth);
+  };
+
+  const body =
+    logStatus === STATUS.RESOLVED ? (
+      <Form>
+        <FormGroup
+          label={__('Method')}
+          type="string"
+          fieldId="method"
+          isRequired={false}
+        >
+          <Radio
+            label={__('Remote job')}
+            id="job"
+            name="job"
+            ouiaId="job"
+            aria-label="job"
+            isChecked={method === 'job'}
+            onChange={() => setMethodResetSnippet('job')}
+          />
+          <Radio
+            label={__('Manual')}
+            id="manual"
+            name="manual"
+            ouiaId="manual"
+            aria-label="manual"
+            isChecked={method === 'manual'}
+            onChange={() => setMethodResetSnippet('manual')}
+          />
+        </FormGroup>
+        {isEmpty(
+          supportedRemediationSnippets(fixes, method, supportedJobSnippets)
+        ) ? (
+          <Alert
+            ouiaId="snippet-alert"
+            variant="info"
+            title={__(
+              'There is no job to remediate with. Please remediate manually.'
+            )}
+          />
+        ) : (
+          <FormGroup
+            label={__('Snippet')}
+            type="string"
+            fieldId="snippet"
+            isRequired
+          >
+            <FormSelect
+              ouiaId="snippet-select"
+              isRequired
+              value={snippet}
+              onChange={value => setSnippet(value)}
+              aria-label="FormSelect Input"
+            >
+              <FormSelectOption
+                isDisabled
+                key={0}
+                value=""
+                label={__('Select snippet')}
+              />
+              {map(
+                supportedRemediationSnippets(
+                  fixes,
+                  method,
+                  supportedJobSnippets
+                ),
+                fix => (
+                  <FormSelectOption
+                    key={fix}
+                    value={fix}
+                    label={snippetName(fix)}
+                  />
+                )
+              )}
+            </FormSelect>
+          </FormGroup>
+        )}
+      </Form>
+    ) : (
+      <EmptyState error title={__('Error!')} body={errorMsg(logError)} />
+    );
+
+  return (
+    <>
+      <WizardHeader
+        title={__('Select remediation method')}
+        description={__(
+          'You can remediate by running a remote job or you can display a snippet for manual remediation.'
+        )}
+      />
+      {logStatus === STATUS.PENDING ? <Loading /> : body}
+    </>
+  );
+};
+
+export default SnippetSelect;

data/webpack/components/OpenscapRemediationWizard/steps/index.js

@@ -0,0 +1,4 @@
+export { default as SnippetSelect } from './SnippetSelect';
+export { default as ReviewHosts } from './ReviewHosts';
+export { default as ReviewRemediation } from './ReviewRemediation';
+export { default as Finish } from './Finish';

data/webpack/index.js

@@ -1,8 +1,13 @@
 import componentRegistry from 'foremanReact/components/componentRegistry';
 
 import RuleSeverity from './components/RuleSeverity';
+import OpenscapRemediationWizard from './components/OpenscapRemediationWizard';
 
-componentRegistry.register({
-  name: 'RuleSeverity',
-  type: RuleSeverity,
+const components = [
+  { name: 'RuleSeverity', type: RuleSeverity },
+  { name: 'OpenscapRemediationWizard', type: OpenscapRemediationWizard },
+];
+
+components.forEach(component => {
+  componentRegistry.register(component);
 });

data/webpack/testHelper.js

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useState } from 'react';
 import { Provider } from 'react-redux';
 import store from 'foremanReact/redux';
 import { MockedProvider } from '@apollo/react-testing';
@@ -19,20 +19,21 @@ export const withRouter = Component => props => (
 );
 
 export const withMockedProvider = Component => props => {
-  const ForemanContext = getForemanContext(ctx);
   // eslint-disable-next-line react/prop-types
   const { mocks, ...rest } = props;
 
-  const ctx = {
+  const [context, setContext] = useState({
     metadata: {
       UISettings: {
         perPage: 20,
       },
     },
-  };
+  });
 
+  const contextData = { context, setContext };
+  const ForemanContext = getForemanContext(contextData);
   return (
-    <ForemanContext.Provider value={ctx}>
+    <ForemanContext.Provider value={contextData}>
       <MockedProvider mocks={mocks}>
         <Component {...rest} />
       </MockedProvider>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 8.0.0
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-13 00:00:00.000000000 Z
+date: 2024-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,6 +44,7 @@ files:
 - app/assets/javascripts/foreman_openscap/locale/gl/foreman_openscap.js
 - app/assets/javascripts/foreman_openscap/locale/it/foreman_openscap.js
 - app/assets/javascripts/foreman_openscap/locale/ja/foreman_openscap.js
+- app/assets/javascripts/foreman_openscap/locale/ka/foreman_openscap.js
 - app/assets/javascripts/foreman_openscap/locale/ko/foreman_openscap.js
 - app/assets/javascripts/foreman_openscap/locale/pt_BR/foreman_openscap.js
 - app/assets/javascripts/foreman_openscap/locale/ru/foreman_openscap.js
@@ -223,6 +224,8 @@ files:
 - app/views/foreman_openscap/policy_mailer/_policy.erb
 - app/views/foreman_openscap/policy_mailer/policy_summary.erb
 - app/views/hosts/select_multiple_openscap_proxy.html.erb
+- app/views/job_templates/run_openscap_remediation_-_ansible_default.erb
+- app/views/job_templates/run_openscap_remediation_-_script_default.erb
 - app/views/job_templates/run_openscap_scans.erb
 - app/views/job_templates/run_oval_scans.erb
 - app/views/policies/_form.html.erb
@@ -322,6 +325,7 @@ files:
 - 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/migrate/20230912122310_add_fixes_to_message.rb
 - db/seeds.d/75-job_templates.rb
 - db/seeds.d/openscap_feature.rb
 - db/seeds.d/openscap_policy_notification.rb
@@ -372,6 +376,10 @@ files:
 - locale/ja/foreman_openscap.edit.po
 - locale/ja/foreman_openscap.po
 - locale/ja/foreman_openscap.po.time_stamp
+- locale/ka/LC_MESSAGES/foreman_openscap.mo
+- locale/ka/foreman_openscap.edit.po
+- locale/ka/foreman_openscap.po
+- locale/ka/foreman_openscap.po.time_stamp
 - locale/ko/LC_MESSAGES/foreman_openscap.mo
 - locale/ko/foreman_openscap.edit.po
 - locale/ko/foreman_openscap.po
@@ -470,6 +478,19 @@ files:
 - webpack/components/IndexTable/IndexTableHelper.js
 - webpack/components/IndexTable/index.js
 - webpack/components/LinkButton.js
+- webpack/components/OpenscapRemediationWizard/OpenscapRemediationSelectors.js
+- webpack/components/OpenscapRemediationWizard/OpenscapRemediationWizardContext.js
+- webpack/components/OpenscapRemediationWizard/ViewSelectedHostsLink.js
+- webpack/components/OpenscapRemediationWizard/WizardHeader.js
+- webpack/components/OpenscapRemediationWizard/constants.js
+- webpack/components/OpenscapRemediationWizard/helpers.js
+- webpack/components/OpenscapRemediationWizard/index.js
+- webpack/components/OpenscapRemediationWizard/steps/Finish.js
+- webpack/components/OpenscapRemediationWizard/steps/ReviewHosts.js
+- webpack/components/OpenscapRemediationWizard/steps/ReviewRemediation.js
+- webpack/components/OpenscapRemediationWizard/steps/ReviewRemediation.scss
+- webpack/components/OpenscapRemediationWizard/steps/SnippetSelect.js
+- webpack/components/OpenscapRemediationWizard/steps/index.js
 - webpack/components/RuleSeverity/RuleSeverity.scss
 - webpack/components/RuleSeverity/RuleSeverity.test.js
 - webpack/components/RuleSeverity/__snapshots__/RuleSeverity.test.js.snap
@@ -566,7 +587,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: Foreman plug-in for displaying OpenSCAP audit reports