foreman_openscap 7.1.0 → 8.0.0

data/locale/zh_TW/foreman_openscap.edit.po

@@ -382,15 +382,15 @@ msgstr "刪除 %s 合規報告失敗"
 msgid "Successfully deleted %s compliance reports"
 msgstr "刪除 %s 合規報告成功"
 
-#: ../app/controllers/arf_reports_controller.rb:85
+#: ../app/controllers/arf_reports_controller.rb:106
 msgid "No compliance reports were found."
 msgstr ""
 
-#: ../app/controllers/arf_reports_controller.rb:89
+#: ../app/controllers/arf_reports_controller.rb:110
 msgid "No compliance reports selected"
 msgstr ""
 
-#: ../app/controllers/arf_reports_controller.rb:94
+#: ../app/controllers/arf_reports_controller.rb:115
 msgid "Something went wrong while selecting compliance reports - %s"
 msgstr "選擇合規報告時發生了錯誤 - %s"
 
@@ -430,15 +430,15 @@ msgstr "已更新主機：未從合規政策指定 '%s'"
 msgid "No valid policy ID provided"
 msgstr ""
 
-#: ../app/controllers/policies_controller.rb:125
-msgid "No hosts were found."
-msgstr "找不到主機。"
-
 #: ../app/controllers/policies_controller.rb:129
+msgid "No hosts were found with that id, name or query filter"
+msgstr ""
+
+#: ../app/controllers/policies_controller.rb:134
 msgid "No hosts selected"
 msgstr "未選擇主機"
 
-#: ../app/controllers/policies_controller.rb:134
+#: ../app/controllers/policies_controller.rb:139
 msgid "Something went wrong while selecting hosts - %s"
 msgstr "選擇主機時發生了錯誤 - %s"
 
@@ -510,18 +510,22 @@ msgstr ""
 msgid " through %s"
 msgstr ""
 
-#: ../app/helpers/arf_reports_helper.rb:66
+#: ../app/helpers/arf_reports_helper.rb:67
 msgid "Hosts failing this rule"
 msgstr ""
 
-#: ../app/helpers/arf_reports_helper.rb:67
+#: ../app/helpers/arf_reports_helper.rb:68
 msgid "Hosts passing this rule"
 msgstr ""
 
-#: ../app/helpers/arf_reports_helper.rb:68
+#: ../app/helpers/arf_reports_helper.rb:69
 msgid "Hosts othering this rule"
 msgstr ""
 
+#: ../app/helpers/arf_reports_helper.rb:72
+msgid "Remediation"
+msgstr ""
+
 #: ../app/helpers/compliance_dashboard_helper.rb:3 ../app/views/arf_reports/_list.html.erb:6 ../app/views/arf_reports/delete_multiple.html.erb:7 ../app/views/policy_dashboard/_policy_reports.html.erb:6
 msgid "Host"
 msgstr "主機"
@@ -1161,7 +1165,7 @@ msgstr "月份中的日子，請注意並不是所有月份都有同樣的天數
 msgid "You can specify custom cron line, e.g. \"0  3  *  *  *\", separate each of 5 values by space"
 msgstr "您可指定自訂的 cron 行，例如\"0  3  *  *  *\"，五個數值均由空格隔開"
 
-#: ../app/views/policies/_list.html.erb:3 ../app/views/tailoring_files/_list.html.erb:3 ../webpack/routes/OvalContents/OvalContentsIndex/OvalContentsTable.js:19 ../webpack/routes/OvalContents/OvalContentsNew/OvalContentsNew.js:57 ../webpack/routes/OvalContents/OvalContentsShow/OvalContentsShow.js:48 ../webpack/routes/OvalPolicies/OvalPoliciesIndex/OvalPoliciesTable.js:19 ../webpack/routes/OvalPolicies/OvalPoliciesNew/NewOvalPolicyForm.js:56 ../webpack/routes/OvalPolicies/OvalPoliciesShow/DetailsTab.js:31 ../webpack/routes/OvalPolicies/OvalPoliciesShow/HostgroupsTable.js:9
+#: ../app/views/policies/_list.html.erb:3 ../app/views/tailoring_files/_list.html.erb:3 ../webpack/components/OpenscapRemediationWizard/steps/ReviewHosts.js:162 ../webpack/routes/OvalContents/OvalContentsIndex/OvalContentsTable.js:19 ../webpack/routes/OvalContents/OvalContentsNew/OvalContentsNew.js:57 ../webpack/routes/OvalContents/OvalContentsShow/OvalContentsShow.js:48 ../webpack/routes/OvalPolicies/OvalPoliciesIndex/OvalPoliciesTable.js:19 ../webpack/routes/OvalPolicies/OvalPoliciesNew/NewOvalPolicyForm.js:56 ../webpack/routes/OvalPolicies/OvalPoliciesShow/DetailsTab.js:31 ../webpack/routes/OvalPolicies/OvalPoliciesShow/HostgroupsTable.js:9
 msgid "Name"
 msgstr "名稱"
 
@@ -1487,14 +1491,22 @@ msgstr ""
 msgid "ID of OpenSCAP Proxy"
 msgstr ""
 
-#: ../lib/foreman_openscap/engine.rb:270 ../lib/foreman_openscap/engine.rb:283
+#: ../lib/foreman_openscap/engine.rb:270 ../lib/foreman_openscap/engine.rb:293
 msgid "Run OpenSCAP scan"
 msgstr ""
 
-#: ../lib/foreman_openscap/engine.rb:275 ../lib/foreman_openscap/engine.rb:284
+#: ../lib/foreman_openscap/engine.rb:275 ../lib/foreman_openscap/engine.rb:294
 msgid "Run OVAL scan"
 msgstr ""
 
+#: ../lib/foreman_openscap/engine.rb:279 ../lib/foreman_openscap/engine.rb:295
+msgid "Run OpenSCAP remediation with Ansible"
+msgstr ""
+
+#: ../lib/foreman_openscap/engine.rb:284 ../lib/foreman_openscap/engine.rb:296
+msgid "Run OpenSCAP remediation with Shell"
+msgstr ""
+
 #: ../webpack/components/ConfirmModal.js:19
 msgid "Confirm"
 msgstr ""
@@ -1507,14 +1519,130 @@ msgstr ""
 msgid "There's no available report for this host"
 msgstr ""
 
-#: ../webpack/components/withDeleteModal.js:27
-msgid "Are you sure you want to delete %s?"
+#: ../webpack/components/OpenscapRemediationWizard/ViewSelectedHostsLink.js:27
+msgid "View selected hosts"
 msgstr ""
 
-#: ../webpack/components/withLoading.js:12
+#: ../webpack/components/OpenscapRemediationWizard/index.js:69 ../webpack/components/OpenscapRemediationWizard/steps/ReviewHosts.js:174
+msgid "Review hosts"
+msgstr ""
+
+#: ../webpack/components/OpenscapRemediationWizard/index.js:77 ../webpack/components/OpenscapRemediationWizard/steps/SnippetSelect.js:123
+msgid "Select snippet"
+msgstr ""
+
+#: ../webpack/components/OpenscapRemediationWizard/index.js:85 ../webpack/components/OpenscapRemediationWizard/steps/ReviewRemediation.js:94
+msgid "Review remediation"
+msgstr ""
+
+#: ../webpack/components/OpenscapRemediationWizard/index.js:89
+msgid "Run"
+msgstr ""
+
+#: ../webpack/components/OpenscapRemediationWizard/index.js:93
+msgid "Done"
+msgstr ""
+
+#: ../webpack/components/OpenscapRemediationWizard/index.js:127
+msgid "Remediate %s rule"
+msgstr ""
+
+#: ../webpack/components/OpenscapRemediationWizard/steps/Finish.js:84
+msgid "Job details"
+msgstr ""
+
+#: ../webpack/components/OpenscapRemediationWizard/steps/Finish.js:87
+msgid "Close"
+msgstr ""
+
+#: ../webpack/components/OpenscapRemediationWizard/steps/Finish.js:97 ../webpack/components/OpenscapRemediationWizard/steps/SnippetSelect.js:144 ../webpack/components/withLoading.js:12
 msgid "Error!"
 msgstr ""
 
+#: ../webpack/components/OpenscapRemediationWizard/steps/Finish.js:105
+msgid "The job has started on selected host(s), you can check the status on the job details page."
+msgstr ""
+
+#: ../webpack/components/OpenscapRemediationWizard/steps/ReviewHosts.js:167
+msgid "OS"
+msgstr ""
+
+#: ../webpack/components/OpenscapRemediationWizard/steps/ReviewHosts.js:175
+msgid "By default, remediation is applied to the current host. Optionally, remediate any additional hosts that fail the rule."
+msgstr ""
+
+#: ../webpack/components/OpenscapRemediationWizard/steps/ReviewRemediation.js:61
+msgid "Review the remediation snippet and apply it to the host manually."
+msgstr ""
+
+#: ../webpack/components/OpenscapRemediationWizard/steps/ReviewRemediation.js:62
+msgid "Review the remediation snippet that will be applied to selected host(s)."
+msgstr ""
+
+#: ../webpack/components/OpenscapRemediationWizard/steps/ReviewRemediation.js:67
+msgid "A reboot is required after applying remediation."
+msgstr ""
+
+#: ../webpack/components/OpenscapRemediationWizard/steps/ReviewRemediation.js:68
+msgid "A reboot might be required after applying remediation."
+msgstr ""
+
+#: ../webpack/components/OpenscapRemediationWizard/steps/ReviewRemediation.js:84
+msgid "Successfully copied to clipboard!"
+msgstr ""
+
+#: ../webpack/components/OpenscapRemediationWizard/steps/ReviewRemediation.js:85
+msgid "Copy to clipboard"
+msgstr ""
+
+#: ../webpack/components/OpenscapRemediationWizard/steps/ReviewRemediation.js:103
+msgid "Do not implement any of the recommended remedial actions or scripts without first testing them in a non-production environment."
+msgstr ""
+
+#: ../webpack/components/OpenscapRemediationWizard/steps/ReviewRemediation.js:106
+msgid "Remediation might render the system non-functional."
+msgstr ""
+
+#: ../webpack/components/OpenscapRemediationWizard/steps/ReviewRemediation.js:139
+msgid "Other hosts failing this rule"
+msgstr ""
+
+#: ../webpack/components/OpenscapRemediationWizard/steps/ReviewRemediation.js:155
+msgid "Reboot the system(s)"
+msgstr ""
+
+#: ../webpack/components/OpenscapRemediationWizard/steps/SnippetSelect.js:71
+msgid "Method"
+msgstr ""
+
+#: ../webpack/components/OpenscapRemediationWizard/steps/SnippetSelect.js:77
+msgid "Remote job"
+msgstr ""
+
+#: ../webpack/components/OpenscapRemediationWizard/steps/SnippetSelect.js:86
+msgid "Manual"
+msgstr ""
+
+#: ../webpack/components/OpenscapRemediationWizard/steps/SnippetSelect.js:101
+msgid "There is no job to remediate with. Please remediate manually."
+msgstr ""
+
+#: ../webpack/components/OpenscapRemediationWizard/steps/SnippetSelect.js:107
+msgid "Snippet"
+msgstr ""
+
+#: ../webpack/components/OpenscapRemediationWizard/steps/SnippetSelect.js:150
+msgid "Select remediation method"
+msgstr ""
+
+#: ../webpack/components/OpenscapRemediationWizard/steps/SnippetSelect.js:151
+msgid "You can remediate by running a remote job or you can display a snippet for manual remediation."
+msgstr ""
+
+#: ../webpack/components/withDeleteModal.js:27
+msgid "Are you sure you want to delete %s?"
+msgstr ""
+
 #: ../webpack/components/withLoading.js:64
 msgid "Permission denied"
 msgstr ""

data/locale/zh_TW/foreman_openscap.po

@@ -62,6 +62,12 @@ msgstr ""
 msgid "<b>Foreman</b> OpenSCAP summary"
 msgstr ""
 
+msgid "A reboot is required after applying remediation."
+msgstr ""
+
+msgid "A reboot might be required after applying remediation."
+msgstr ""
+
 msgid "A summary of reports for OpenSCAP policies"
 msgstr ""
 
@@ -113,6 +119,9 @@ msgstr ""
 msgid "Back"
 msgstr "上一頁"
 
+msgid "By default, remediation is applied to the current host. Optionally, remediate any additional hosts that fail the rule."
+msgstr ""
+
 msgid "CVEs"
 msgstr ""
 
@@ -158,6 +167,9 @@ msgstr "選擇期間"
 msgid "Choose weekday"
 msgstr "選擇星期幾"
 
+msgid "Close"
+msgstr ""
+
 msgid "Compliance"
 msgstr "合規"
 
@@ -191,6 +203,9 @@ msgstr ""
 msgid "Content"
 msgstr ""
 
+msgid "Copy to clipboard"
+msgstr ""
+
 msgid "Could not find host identified by: %s"
 msgstr ""
 
@@ -302,9 +317,15 @@ msgstr ""
 msgid "Directory to upload when using \"directory\" upload type"
 msgstr ""
 
+msgid "Do not implement any of the recommended remedial actions or scripts without first testing them in a non-production environment."
+msgstr ""
+
 msgid "Documentation"
 msgstr "文件"
 
+msgid "Done"
+msgstr ""
+
 msgid "Download"
 msgstr "下載"
 
@@ -505,6 +526,9 @@ msgstr ""
 msgid "It may sometimes be required to adjust the security policy to your specific needs. "
 msgstr ""
 
+msgid "Job details"
+msgstr ""
+
 msgid "Latest Compliance Reports"
 msgstr ""
 
@@ -538,9 +562,15 @@ msgstr "載入中…"
 msgid "Locations"
 msgstr "位置"
 
+msgid "Manual"
+msgstr ""
+
 msgid "Message"
 msgstr "訊息"
 
+msgid "Method"
+msgstr ""
+
 msgid "Monthly, day of month: %s"
 msgstr ""
 
@@ -622,8 +652,8 @@ msgstr ""
 msgid "No hosts selected"
 msgstr "未選擇主機"
 
-msgid "No hosts were found."
-msgstr "找不到主機。"
+msgid "No hosts were found with that id, name or query filter"
+msgstr ""
 
 msgid "No proxy found for %{name} or %{url}"
 msgstr ""
@@ -676,6 +706,9 @@ msgstr "事件數量"
 msgid "Number of a day in month, note that not all months have same count of days"
 msgstr "月份中的日子，請注意並不是所有月份都有同樣的天數"
 
+msgid "OS"
+msgstr ""
+
 msgid "OVAL Content"
 msgstr ""
 
@@ -775,6 +808,9 @@ msgstr ""
 msgid "Other"
 msgstr "其他"
 
+msgid "Other hosts failing this rule"
+msgstr ""
+
 msgid "Othered"
 msgstr "其它"
 
@@ -867,6 +903,9 @@ msgstr "Puppet 類別"
 msgid "Rationale"
 msgstr "理由"
 
+msgid "Reboot the system(s)"
+msgstr ""
+
 msgid "Red Hat %s default content"
 msgstr ""
 
@@ -876,9 +915,21 @@ msgstr ""
 msgid "References"
 msgstr "參照"
 
+msgid "Remediate %s rule"
+msgstr ""
+
+msgid "Remediation"
+msgstr ""
+
+msgid "Remediation might render the system non-functional."
+msgstr ""
+
 msgid "Remote action:"
 msgstr "遠端動作："
 
+msgid "Remote job"
+msgstr ""
+
 msgid "Report Metrics"
 msgstr "報告計量"
 
@@ -915,12 +966,33 @@ msgstr "資源"
 msgid "Result"
 msgstr "結果"
 
+msgid "Review hosts"
+msgstr ""
+
+msgid "Review remediation"
+msgstr ""
+
+msgid "Review the remediation snippet and apply it to the host manually."
+msgstr ""
+
+msgid "Review the remediation snippet that will be applied to selected host(s)."
+msgstr ""
+
 msgid "Rule Results"
 msgstr ""
 
+msgid "Run"
+msgstr ""
+
 msgid "Run OVAL scan"
 msgstr ""
 
+msgid "Run OpenSCAP remediation with Ansible"
+msgstr ""
+
+msgid "Run OpenSCAP remediation with Shell"
+msgstr ""
+
 msgid "Run OpenSCAP scan"
 msgstr ""
 
@@ -963,6 +1035,12 @@ msgstr ""
 msgid "Select all items in this page"
 msgstr "選擇這頁中的所有項目"
 
+msgid "Select remediation method"
+msgstr ""
+
+msgid "Select snippet"
+msgstr ""
+
 msgid "Severity"
 msgstr "嚴重性"
 
@@ -1005,6 +1083,9 @@ msgstr "顯示日誌訊息："
 msgid "Smart Class Parameters"
 msgstr ""
 
+msgid "Snippet"
+msgstr ""
+
 msgid "Something went wrong while selecting compliance reports - %s"
 msgstr "選擇合規報告時發生了錯誤 - %s"
 
@@ -1023,6 +1104,9 @@ msgstr "狀態表"
 msgid "Submit"
 msgstr "提交"
 
+msgid "Successfully copied to clipboard!"
+msgstr ""
+
 msgid "Successfully deleted %s compliance reports"
 msgstr "刪除 %s 合規報告成功"
 
@@ -1085,9 +1169,15 @@ msgstr ""
 msgid "The identifier of the host"
 msgstr ""
 
+msgid "The job has started on selected host(s), you can check the status on the job details page."
+msgstr ""
+
 msgid "There are significant differences in deployment options."
 msgstr ""
 
+msgid "There is no job to remediate with. Please remediate manually."
+msgstr ""
+
 msgid "There was a following error when deleting %(name)s: %(error)s"
 msgstr ""
 
@@ -1210,6 +1300,9 @@ msgstr "檢視報告"
 msgid "View full report"
 msgstr "檢視完整報告"
 
+msgid "View selected hosts"
+msgstr ""
+
 msgid "Was %s configured successfully?"
 msgstr ""
 
@@ -1240,6 +1333,9 @@ msgstr "是"
 msgid "You are not authorized to view the page. "
 msgstr ""
 
+msgid "You can remediate by running a remote job or you can display a snippet for manual remediation."
+msgstr ""
+
 msgid "You can specify custom cron line, e.g. \"0  3  *  *  *\", separate each of 5 values by space"
 msgstr "您可指定自訂的 cron 行，例如\"0  3  *  *  *\"，五個數值均由空格隔開"
 

data/webpack/components/EmptyState.js

@@ -56,8 +56,12 @@ EmptyStateIcon.defaultProps = {
 
 EmptyState.propTypes = {
   title: PropTypes.string,
-  body: PropTypes.string,
-  error: PropTypes.oneOfType([PropTypes.shape({}), PropTypes.string]),
+  body: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
+  error: PropTypes.oneOfType([
+    PropTypes.shape({}),
+    PropTypes.string,
+    PropTypes.bool,
+  ]),
   search: PropTypes.bool,
   lock: PropTypes.bool,
   primaryButton: PropTypes.node,

data/webpack/components/OpenscapRemediationWizard/OpenscapRemediationSelectors.js

@@ -0,0 +1,16 @@
+import {
+  selectAPIError,
+  selectAPIResponse,
+  selectAPIStatus,
+} from 'foremanReact/redux/API/APISelectors';
+import { STATUS } from 'foremanReact/constants';
+import { REPORT_LOG_REQUEST_KEY } from './constants';
+
+export const selectLogResponse = state =>
+  selectAPIResponse(state, REPORT_LOG_REQUEST_KEY);
+
+export const selectLogStatus = state =>
+  selectAPIStatus(state, REPORT_LOG_REQUEST_KEY) || STATUS.PENDING;
+
+export const selectLogError = state =>
+  selectAPIError(state, REPORT_LOG_REQUEST_KEY);

data/webpack/components/OpenscapRemediationWizard/OpenscapRemediationWizardContext.js

@@ -0,0 +1,4 @@
+import { createContext } from 'react';
+
+const OpenscapRemediationWizardContext = createContext({});
+export default OpenscapRemediationWizardContext;

data/webpack/components/OpenscapRemediationWizard/ViewSelectedHostsLink.js

@@ -0,0 +1,38 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import { ExternalLinkSquareAltIcon } from '@patternfly/react-icons';
+import { Button } from '@patternfly/react-core';
+
+import { translate as __ } from 'foremanReact/common/I18n';
+import { foremanUrl } from 'foremanReact/common/helpers';
+import { getHostsPageUrl } from 'foremanReact/Root/Context/ForemanContext';
+
+const ViewSelectedHostsLink = ({
+  hostIdsParam,
+  isAllHostsSelected,
+  defaultFailedHostsSearch,
+}) => {
+  const search = isAllHostsSelected ? defaultFailedHostsSearch : hostIdsParam;
+  const url = foremanUrl(`${getHostsPageUrl(false)}?search=${search}`);
+  return (
+    <Button
+      component="a"
+      variant="link"
+      icon={<ExternalLinkSquareAltIcon />}
+      iconPosition="right"
+      target="_blank"
+      href={url}
+    >
+      {__('View selected hosts')}
+    </Button>
+  );
+};
+
+ViewSelectedHostsLink.propTypes = {
+  isAllHostsSelected: PropTypes.bool.isRequired,
+  defaultFailedHostsSearch: PropTypes.string.isRequired,
+  hostIdsParam: PropTypes.string.isRequired,
+};
+
+export default ViewSelectedHostsLink;

data/webpack/components/OpenscapRemediationWizard/WizardHeader.js

@@ -0,0 +1,43 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {
+  Grid,
+  TextContent,
+  Text,
+  TextVariants,
+  Flex,
+  FlexItem,
+} from '@patternfly/react-core';
+
+const WizardHeader = ({ title, description }) => (
+  <Grid style={{ gridGap: '24px' }}>
+    {title && (
+      <TextContent>
+        <Text ouiaId="wizard-header-text" component={TextVariants.h2}>
+          {title}
+        </Text>
+      </TextContent>
+    )}
+    {description && (
+      <TextContent>
+        <Flex flex={{ default: 'inlineFlex' }}>
+          <FlexItem>
+            <TextContent>{description}</TextContent>
+          </FlexItem>
+        </Flex>
+      </TextContent>
+    )}
+  </Grid>
+);
+
+WizardHeader.propTypes = {
+  title: PropTypes.oneOfType([PropTypes.node, PropTypes.string]),
+  description: PropTypes.oneOfType([PropTypes.node, PropTypes.string]),
+};
+
+WizardHeader.defaultProps = {
+  title: undefined,
+  description: undefined,
+};
+
+export default WizardHeader;

data/webpack/components/OpenscapRemediationWizard/constants.js

@@ -0,0 +1,14 @@
+export const OPENSCAP_REMEDIATION_MODAL_ID = 'openscapRemediationModal';
+export const HOSTS_PATH = '/hosts';
+export const FAIL_RULE_SEARCH = 'fails_xccdf_rule';
+
+export const HOSTS_API_PATH = '/api/hosts';
+export const HOSTS_API_REQUEST_KEY = 'HOSTS';
+export const REPORT_LOG_REQUEST_KEY = 'ARF_REPORT_LOG';
+
+export const JOB_INVOCATION_PATH = '/job_invocations';
+export const JOB_INVOCATION_API_PATH = '/api/job_invocations';
+export const JOB_INVOCATION_API_REQUEST_KEY = 'OPENSCAP_REX_JOB_INVOCATIONS';
+
+export const SNIPPET_SH = 'urn:xccdf:fix:script:sh';
+export const SNIPPET_ANSIBLE = 'urn:xccdf:fix:script:ansible';

data/webpack/components/OpenscapRemediationWizard/helpers.js

@@ -0,0 +1,33 @@
+import { join, find, map, compact, includes, filter, isString } from 'lodash';
+
+const getResponseErrorMsgs = ({ data } = {}) => {
+  if (data) {
+    const messages =
+      data.displayMessage || data.message || data.errors || data.error?.message;
+    return Array.isArray(messages) ? messages : [messages];
+  }
+  return [];
+};
+
+export const errorMsg = data => {
+  if (isString(data)) return data;
+
+  return join(getResponseErrorMsgs({ data }), '\n');
+};
+
+export const findFixBySnippet = (fixes, snippet) =>
+  find(fixes, fix => fix.system === snippet);
+
+export const supportedRemediationSnippets = (
+  fixes,
+  meth,
+  supportedJobSnippets
+) => {
+  if (meth === 'manual') return map(fixes, f => f.system);
+  return compact(
+    map(
+      filter(fixes, fix => includes(supportedJobSnippets, fix.system)),
+      f => f.system
+    )
+  );
+};