@rancher/shell 3.0.12-rc.2 → 3.0.12-rc.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/apis/impl/apis.ts +6 -0
- package/apis/index.ts +26 -0
- package/apis/intf/resources-api/cluster-api.ts +18 -0
- package/apis/intf/resources-api/mgmt-api.ts +15 -0
- package/apis/intf/resources-api/resource-base.ts +107 -0
- package/apis/intf/resources-api/resource-constants.ts +147 -0
- package/apis/intf/resources-api/resources-api.ts +143 -0
- package/apis/intf/resources.ts +49 -0
- package/apis/intf/{modal.ts → shell-api/modal.ts} +21 -26
- package/apis/intf/shell-api/proxy.ts +216 -0
- package/apis/intf/{slide-in.ts → shell-api/slide-in.ts} +4 -3
- package/apis/intf/{system.ts → shell-api/system.ts} +4 -1
- package/apis/intf/shell.ts +12 -6
- package/apis/resources/__tests__/resources-api-class.test.ts +550 -0
- package/apis/resources/index.ts +22 -0
- package/apis/resources/resources-api-class.ts +187 -0
- package/apis/shell/__tests__/proxy.test.ts +369 -0
- package/apis/shell/index.ts +8 -1
- package/apis/shell/modal.ts +4 -1
- package/apis/shell/notifications.ts +9 -6
- package/apis/shell/proxy.ts +256 -0
- package/apis/shell/slide-in.ts +4 -1
- package/apis/vue-shim.d.ts +2 -1
- package/assets/data/aws-regions.json +4 -0
- package/assets/fonts/lato/LatoLatin-Black.woff +0 -0
- package/assets/fonts/lato/LatoLatin-Black.woff2 +0 -0
- package/assets/fonts/lato/LatoLatin-BlackItalic.woff +0 -0
- package/assets/fonts/lato/LatoLatin-BlackItalic.woff2 +0 -0
- package/assets/fonts/lato/LatoLatin-Bold.woff +0 -0
- package/assets/fonts/lato/LatoLatin-Bold.woff2 +0 -0
- package/assets/fonts/lato/LatoLatin-BoldItalic.woff +0 -0
- package/assets/fonts/lato/LatoLatin-BoldItalic.woff2 +0 -0
- package/assets/fonts/lato/LatoLatin-Heavy.woff +0 -0
- package/assets/fonts/lato/LatoLatin-Heavy.woff2 +0 -0
- package/assets/fonts/lato/LatoLatin-HeavyItalic.woff +0 -0
- package/assets/fonts/lato/LatoLatin-HeavyItalic.woff2 +0 -0
- package/assets/fonts/lato/LatoLatin-Italic.woff +0 -0
- package/assets/fonts/lato/LatoLatin-Italic.woff2 +0 -0
- package/assets/fonts/lato/LatoLatin-Light.woff +0 -0
- package/assets/fonts/lato/LatoLatin-Light.woff2 +0 -0
- package/assets/fonts/lato/LatoLatin-LightItalic.woff +0 -0
- package/assets/fonts/lato/LatoLatin-LightItalic.woff2 +0 -0
- package/assets/fonts/lato/LatoLatin-Medium.woff +0 -0
- package/assets/fonts/lato/LatoLatin-Medium.woff2 +0 -0
- package/assets/fonts/lato/LatoLatin-MediumItalic.woff +0 -0
- package/assets/fonts/lato/LatoLatin-MediumItalic.woff2 +0 -0
- package/assets/fonts/lato/LatoLatin-Regular.woff +0 -0
- package/assets/fonts/lato/LatoLatin-Regular.woff2 +0 -0
- package/assets/fonts/lato/LatoLatin-Semibold.woff +0 -0
- package/assets/fonts/lato/LatoLatin-Semibold.woff2 +0 -0
- package/assets/fonts/lato/LatoLatin-SemiboldItalic.woff +0 -0
- package/assets/fonts/lato/LatoLatin-SemiboldItalic.woff2 +0 -0
- package/assets/styles/base/_variables.scss +2 -0
- package/assets/styles/fonts/_fontstack.scss +132 -8
- package/assets/translations/en-us.yaml +22 -5
- package/chart/monitoring/index.vue +10 -1
- package/components/ActionDropdownShell.vue +2 -1
- package/components/CruResourceFooter.vue +9 -5
- package/components/ExplorerProjectsNamespaces.vue +1 -1
- package/components/InstallHelmCharts.vue +2 -2
- package/components/LandingPagePreference.vue +14 -5
- package/components/Resource/Detail/Metadata/IdentifyingInformation/index.vue +15 -1
- package/components/Resource/Detail/Metadata/index.vue +6 -0
- package/components/Resource/Detail/ResourcePopover/index.vue +12 -1
- package/components/Resource/Detail/SpacedRow.vue +3 -1
- package/components/Resource/Detail/TitleBar/index.vue +10 -11
- package/components/ResourceList/Masthead.vue +12 -8
- package/components/SelectIconGrid.vue +0 -10
- package/components/SingleClusterInfo.vue +1 -0
- package/components/SortableTable/__tests__/sorting.test.ts +126 -0
- package/components/SortableTable/index.vue +6 -9
- package/components/SortableTable/selection.js +23 -5
- package/components/SortableTable/sorting.js +6 -3
- package/components/Wizard.vue +14 -13
- package/components/fleet/FleetBundles.vue +100 -12
- package/components/fleet/FleetClusterTargets/index.vue +37 -15
- package/components/fleet/__tests__/FleetClusterTargets.test.ts +149 -115
- package/components/fleet/__tests__/FleetClusters.test.ts +12 -12
- package/components/form/LabeledSelect.vue +20 -3
- package/components/form/NameNsDescription.vue +11 -0
- package/components/form/Security.vue +6 -2
- package/components/form/WorkloadPorts.vue +2 -7
- package/components/form/__tests__/Security.test.ts +76 -0
- package/components/formatter/Autoscaler.vue +4 -4
- package/components/formatter/ClusterKubeVersion.vue +27 -0
- package/components/formatter/ClusterLink.vue +1 -7
- package/components/formatter/ClusterProvider.vue +6 -10
- package/components/formatter/FleetSummaryGraph.vue +0 -3
- package/components/formatter/MachineSummaryGraph.vue +1 -1
- package/components/formatter/PodsUsage.vue +2 -2
- package/components/formatter/__tests__/Autoscaler.test.ts +19 -22
- package/components/formatter/__tests__/FleetSummaryGraph.test.ts +216 -0
- package/components/formatter/__tests__/PodsUsage.test.ts +6 -10
- package/components/nav/NamespaceFilter.vue +2 -2
- package/components/nav/TopLevelMenu.helper.ts +15 -3
- package/components/nav/TopLevelMenu.vue +16 -5
- package/components/nav/__tests__/TopLevelMenu.test.ts +145 -21
- package/components/templates/home.vue +18 -0
- package/components/templates/plain.vue +18 -0
- package/components/templates/standalone.vue +17 -0
- package/composables/useFormValidation.ts +93 -0
- package/composables/useVeeValidateField.test.ts +159 -0
- package/composables/useVeeValidateField.ts +67 -0
- package/config/pagination-table-headers.js +18 -1
- package/config/product/manager.js +82 -21
- package/config/router/routes.js +6 -0
- package/config/table-headers.js +20 -1
- package/config/types.js +2 -1
- package/core/__tests__/plugin-products.test.ts +904 -20
- package/core/plugin-products-base.ts +107 -7
- package/core/plugin-products.ts +4 -0
- package/core/plugin-types.ts +111 -1
- package/core/plugin.ts +15 -7
- package/core/productDebugger.js +9 -4
- package/core/types-provisioning.ts +43 -30
- package/core/types.ts +57 -20
- package/detail/__tests__/pod.test.ts +41 -0
- package/detail/harvesterhci.io.management.cluster.vue +6 -2
- package/detail/pod.vue +1 -1
- package/detail/provisioning.cattle.io.cluster.vue +4 -10
- package/edit/auth/__tests__/azuread.test.ts +217 -34
- package/edit/auth/azuread.vue +122 -14
- package/edit/auth/oidc.vue +2 -2
- package/edit/networking.k8s.io.ingress/DefaultBackend.vue +13 -4
- package/edit/networking.k8s.io.ingress/RulePath.vue +8 -4
- package/edit/networking.k8s.io.ingress/index.vue +75 -20
- package/edit/provisioning.cattle.io.cluster/__tests__/MachinePool.test.ts +104 -0
- package/edit/provisioning.cattle.io.cluster/index.vue +11 -7
- package/edit/provisioning.cattle.io.cluster/rke2.vue +8 -4
- package/edit/provisioning.cattle.io.cluster/tabs/MachinePool.vue +11 -0
- package/edit/provisioning.cattle.io.cluster/tabs/registries/RegistryConfigs.vue +37 -4
- package/edit/provisioning.cattle.io.cluster/tabs/registries/__tests__/RegistryConfigs.test.ts +132 -7
- package/edit/provisioning.cattle.io.cluster/tabs/registries/index.vue +2 -1
- package/edit/secret/__tests__/ssh.test.ts +5 -6
- package/edit/secret/basic.vue +31 -0
- package/edit/secret/index.vue +68 -17
- package/edit/secret/registry.vue +38 -0
- package/edit/secret/ssh.vue +29 -0
- package/edit/secret/tls.vue +30 -0
- package/edit/service.vue +4 -4
- package/edit/workload/Upgrading.vue +3 -3
- package/edit/workload/__tests__/Upgrading.test.ts +6 -9
- package/edit/workload/mixins/workload.js +2 -1
- package/list/fleet.cattle.io.bundle.vue +7 -104
- package/list/fleet.cattle.io.clusterregistrationtoken.vue +20 -0
- package/list/provisioning.cattle.io.cluster.vue +262 -180
- package/list/utils/management.cattle.io.cluster.utils.ts +128 -0
- package/mixins/__tests__/chart.test.ts +112 -0
- package/mixins/brand.js +2 -1
- package/mixins/chart.js +12 -8
- package/mixins/resource-fetch-api-pagination.js +41 -5
- package/models/__tests__/ext.cattle.io.kubeconfig.test.ts +67 -67
- package/models/__tests__/management.cattle.io.cluster.test.ts +1 -1
- package/models/__tests__/management.cattle.io.node.ts +6 -5
- package/models/__tests__/management.cattle.io.nodepool.ts +5 -4
- package/models/__tests__/provisioning.cattle.io.cluster.test.ts +32 -11
- package/models/base-cluster.x-k8s.io.js +26 -0
- package/models/cluster.js +1 -1
- package/models/cluster.x-k8s.io.machine.js +4 -22
- package/models/cluster.x-k8s.io.machinedeployment.js +2 -20
- package/models/cluster.x-k8s.io.machineset.js +2 -20
- package/models/compliance.cattle.io.clusterscan.js +130 -2
- package/models/ext.cattle.io.kubeconfig.ts +4 -7
- package/models/fleet-application.js +3 -1
- package/models/management.cattle.io.cluster.js +417 -40
- package/models/management.cattle.io.node.js +6 -4
- package/models/management.cattle.io.nodepool.js +1 -1
- package/models/networking.k8s.io.ingress.js +12 -4
- package/models/provisioning.cattle.io.cluster.js +47 -330
- package/models/rke.cattle.io.etcdsnapshot.js +1 -2
- package/package.json +11 -29
- package/pages/__tests__/readme.test.ts +49 -0
- package/pages/auth/setup.vue +2 -3
- package/pages/c/_cluster/apps/charts/__tests__/chart.test.ts +76 -0
- package/pages/c/_cluster/apps/charts/chart.vue +60 -8
- package/pages/c/_cluster/apps/charts/install.vue +10 -7
- package/pages/c/_cluster/explorer/__tests__/index.test.ts +23 -25
- package/pages/c/_cluster/explorer/index.vue +5 -49
- package/pages/c/_cluster/istio/__tests__/istio.index.test.ts +194 -0
- package/pages/c/_cluster/istio/index.vue +21 -6
- package/pages/c/_cluster/uiplugins/PluginInfoPanel.vue +1 -0
- package/pages/c/_cluster/uiplugins/__tests__/index.test.ts +719 -2
- package/pages/c/_cluster/uiplugins/index.vue +203 -197
- package/pages/diagnostic.vue +13 -17
- package/pages/fail-whale.vue +18 -0
- package/pages/home.vue +77 -260
- package/pages/readme.vue +88 -0
- package/plugins/dashboard-store/__tests__/resource-class.test.ts +88 -0
- package/plugins/dashboard-store/actions.js +40 -18
- package/plugins/dashboard-store/resource-class.js +5 -2
- package/plugins/steve/__tests__/subscribe.spec.ts +6 -3
- package/plugins/steve/steve-pagination-utils.ts +11 -3
- package/plugins/steve/subscribe.js +35 -5
- package/rancher-components/Form/LabeledInput/LabeledInput.test.ts +10 -4
- package/rancher-components/Form/LabeledInput/LabeledInput.vue +7 -52
- package/rancher-components/RcButton/RcButton.test.ts +37 -1
- package/rancher-components/RcButton/RcButton.vue +38 -8
- package/rancher-components/RcDropdown/RcDropdownTrigger.vue +10 -8
- package/store/__tests__/catalog.test.ts +115 -1
- package/store/__tests__/type-map.test.ts +556 -1
- package/store/action-menu.js +8 -3
- package/store/auth.js +1 -1
- package/store/aws.js +27 -16
- package/store/catalog.js +27 -3
- package/store/digitalocean.js +20 -38
- package/store/index.js +2 -0
- package/store/linode.js +25 -40
- package/store/pnap.js +1 -0
- package/store/type-map.js +111 -29
- package/tsconfig.paths.json +8 -8
- package/types/kube/kube-api.ts +14 -1
- package/types/rancher/steve.api.ts +12 -12
- package/types/resources/settings.d.ts +2 -1
- package/types/shell/index.d.ts +102 -2
- package/types/store/dashboard-store.types.ts +108 -11
- package/types/store/pagination.types.ts +6 -3
- package/utils/__tests__/alertmanagerconfig.test.ts +117 -0
- package/utils/__tests__/async.test.ts +87 -0
- package/utils/__tests__/aws.test.ts +140 -0
- package/utils/__tests__/banners.test.ts +176 -0
- package/utils/__tests__/chart.test.ts +64 -1
- package/utils/__tests__/color.test.ts +226 -0
- package/utils/__tests__/duration.test.ts +140 -0
- package/utils/__tests__/fleet.test.ts +340 -0
- package/utils/__tests__/ingress.test.ts +553 -0
- package/utils/__tests__/kube.test.ts +68 -0
- package/utils/__tests__/namespace-filter.test.ts +109 -0
- package/utils/__tests__/pagination-utils.test.ts +361 -0
- package/utils/__tests__/parse-externalid.test.ts +137 -0
- package/utils/__tests__/perf-setting.utils.test.ts +98 -0
- package/utils/__tests__/poller-sequential.test.ts +177 -0
- package/utils/__tests__/poller.test.ts +170 -0
- package/utils/__tests__/promise.test.ts +346 -0
- package/utils/__tests__/settings.test.ts +140 -0
- package/utils/__tests__/sort-utils.test.ts +301 -0
- package/utils/__tests__/string-utils.test.ts +798 -0
- package/utils/__tests__/string.test.ts +23 -1
- package/utils/__tests__/style.test.ts +154 -0
- package/utils/__tests__/svg-filter.test.ts +184 -0
- package/utils/__tests__/units.test.ts +417 -0
- package/utils/__tests__/versions.test.ts +128 -0
- package/utils/__tests__/xccdf.test.ts +391 -0
- package/utils/chart.js +36 -0
- package/utils/fleet.ts +13 -3
- package/utils/gatekeeper/__tests__/util.test.ts +174 -0
- package/utils/gc/__tests__/gc-interval.test.ts +119 -0
- package/utils/gc/__tests__/gc-root-store.test.ts +225 -0
- package/utils/gc/__tests__/gc-route-changed.test.ts +96 -0
- package/utils/gc/__tests__/gc.test.ts +487 -0
- package/utils/ingress.ts +9 -1
- package/utils/pagination-utils.ts +2 -1
- package/utils/string.js +25 -2
- package/utils/uiplugins.ts +5 -5
- package/utils/validators/__tests__/cluster-name.test.ts +110 -0
- package/utils/validators/__tests__/cron-schedule.test.ts +79 -0
- package/utils/validators/__tests__/index.test.ts +481 -0
- package/utils/validators/__tests__/kubernetes-name.test.ts +163 -0
- package/utils/validators/__tests__/misc-validators.test.ts +246 -0
- package/utils/validators/__tests__/pod-affinity.test.ts +382 -0
- package/utils/validators/__tests__/prometheusrule.test.ts +211 -0
- package/utils/validators/__tests__/role-template.test.ts +149 -0
- package/utils/validators/__tests__/service.test.ts +283 -0
- package/utils/validators/__tests__/setting.test.js +32 -0
- package/utils/validators/formRules/__tests__/index.test.ts +50 -0
- package/utils/validators/formRules/index.ts +5 -5
- package/utils/validators/machine-pool.ts +1 -1
- package/utils/validators/setting.js +18 -3
- package/utils/xccdf.ts +418 -0
- package/assets/fonts/lato/lato-v17-latin-700.woff +0 -0
- package/assets/fonts/lato/lato-v17-latin-700.woff2 +0 -0
- package/assets/fonts/lato/lato-v17-latin-regular.woff +0 -0
- package/assets/fonts/lato/lato-v17-latin-regular.woff2 +0 -0
package/utils/xccdf.ts
ADDED
|
@@ -0,0 +1,418 @@
|
|
|
1
|
+
import { create } from 'xmlbuilder2';
|
|
2
|
+
|
|
3
|
+
const XCCDF_NS = 'http://checklists.nist.gov/xccdf/1.2';
|
|
4
|
+
const ID_PREFIX = 'xccdf_compliance-operator';
|
|
5
|
+
const BENCHMARK_ID_SUFFIX = 'benchmark_kubernetes';
|
|
6
|
+
const TEST_RESULT_ID_SUFFIX = 'testresult_1';
|
|
7
|
+
const SCORING_SYSTEM = 'urn:xccdf:scoring:default';
|
|
8
|
+
const CHECK_SYSTEM = 'urn:xccdf:check:manual';
|
|
9
|
+
const NA = 'not-applicable';
|
|
10
|
+
|
|
11
|
+
export interface XccdfReportCheck {
|
|
12
|
+
id?: string;
|
|
13
|
+
description?: string;
|
|
14
|
+
remediation?: string;
|
|
15
|
+
audit?: string;
|
|
16
|
+
scored?: boolean;
|
|
17
|
+
state?: string;
|
|
18
|
+
nodes?: string[];
|
|
19
|
+
// eslint-disable-next-line camelcase
|
|
20
|
+
node_type?: string[];
|
|
21
|
+
// eslint-disable-next-line camelcase
|
|
22
|
+
actual_value_per_node?: Record<string, string>;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
export interface XccdfReportGroup {
|
|
26
|
+
id?: string;
|
|
27
|
+
description?: string;
|
|
28
|
+
checks?: XccdfReportCheck[];
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
export interface XccdfReport {
|
|
32
|
+
version?: string;
|
|
33
|
+
total?: number;
|
|
34
|
+
pass?: number;
|
|
35
|
+
nodes?: Record<string, string[]>;
|
|
36
|
+
results?: XccdfReportGroup[];
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
export interface BenchmarkMetadata {
|
|
40
|
+
benchmarkId?: string;
|
|
41
|
+
title?: string;
|
|
42
|
+
clusterName?: string;
|
|
43
|
+
contributor?: string;
|
|
44
|
+
creator?: string;
|
|
45
|
+
description?: string;
|
|
46
|
+
frontMatter?: string;
|
|
47
|
+
notice?: string;
|
|
48
|
+
noticeId?: string;
|
|
49
|
+
plainText?: string;
|
|
50
|
+
plainTextId?: string;
|
|
51
|
+
platform?: string;
|
|
52
|
+
publisher?: string;
|
|
53
|
+
rearMatter?: string;
|
|
54
|
+
referenceHref?: string;
|
|
55
|
+
referenceTitle?: string;
|
|
56
|
+
referenceType?: string;
|
|
57
|
+
referenceSubject?: string;
|
|
58
|
+
referenceIdentifier?: string;
|
|
59
|
+
checkHref?: string;
|
|
60
|
+
checkName?: string;
|
|
61
|
+
source?: string;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
export interface StigCheckMetadata {
|
|
65
|
+
ruleId?: string;
|
|
66
|
+
version?: string;
|
|
67
|
+
severity?: string;
|
|
68
|
+
fixId?: string;
|
|
69
|
+
checkId?: string;
|
|
70
|
+
cci?: string[];
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
export type StigChecks = Record<string, StigCheckMetadata>;
|
|
74
|
+
|
|
75
|
+
export interface XccdfTargetFact {
|
|
76
|
+
name: string;
|
|
77
|
+
type: string;
|
|
78
|
+
value: string;
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
export interface GenerateXccdfArgs {
|
|
82
|
+
report: XccdfReport;
|
|
83
|
+
benchmarkVersion: string;
|
|
84
|
+
metadata?: BenchmarkMetadata;
|
|
85
|
+
stigChecks?: StigChecks;
|
|
86
|
+
targetAddresses?: string[];
|
|
87
|
+
targetFacts?: XccdfTargetFact[];
|
|
88
|
+
/** Override the cluster name used for the <target> element. Falls back to metadata.clusterName, then derived node names. */
|
|
89
|
+
clusterName?: string;
|
|
90
|
+
/** Override the TestResult @id. Required when multiple documents from the same benchmark will be co-loaded into a validator. */
|
|
91
|
+
testResultId?: string;
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
const na = (s?: string): string => (s && s.length > 0 ? s : NA);
|
|
95
|
+
|
|
96
|
+
const safeId = (s: string): string => s.replace(/ /g, '_');
|
|
97
|
+
|
|
98
|
+
const ruleIdFor = (checkId: string): string => `${ ID_PREFIX }_rule_${ safeId(checkId) }`;
|
|
99
|
+
|
|
100
|
+
const fixIdFor = (checkId: string): string => `${ ruleIdFor(checkId) }_fix`;
|
|
101
|
+
|
|
102
|
+
const profileIdFor = (benchmarkVersion: string): string => `${ ID_PREFIX }_profile_${ safeId(benchmarkVersion) }`;
|
|
103
|
+
|
|
104
|
+
const stigGroupId = (checkId: string): string => {
|
|
105
|
+
const parts = checkId.split('-');
|
|
106
|
+
|
|
107
|
+
if (parts.length >= 2) {
|
|
108
|
+
return `${ parts[0] }-${ parts[1] }`;
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
return checkId;
|
|
112
|
+
};
|
|
113
|
+
|
|
114
|
+
const effectiveRuleId = (stig: StigCheckMetadata, checkId: string): string => {
|
|
115
|
+
if (!stig.ruleId) {
|
|
116
|
+
return ruleIdFor(checkId);
|
|
117
|
+
}
|
|
118
|
+
const gid = stigGroupId(checkId);
|
|
119
|
+
|
|
120
|
+
if (checkId === gid) {
|
|
121
|
+
return stig.ruleId;
|
|
122
|
+
}
|
|
123
|
+
const suffix = checkId.startsWith(`${ gid }-`) ? checkId.slice(gid.length + 1) : checkId;
|
|
124
|
+
|
|
125
|
+
return `${ stig.ruleId }_${ suffix }`;
|
|
126
|
+
};
|
|
127
|
+
|
|
128
|
+
const lookupStig = (stigChecks: StigChecks, checkId: string): StigCheckMetadata => {
|
|
129
|
+
return stigChecks[stigGroupId(checkId)] || {};
|
|
130
|
+
};
|
|
131
|
+
|
|
132
|
+
const mapResult = (state?: string): string => {
|
|
133
|
+
switch ((state || '').toLowerCase()) {
|
|
134
|
+
case 'pass': return 'pass';
|
|
135
|
+
case 'fail': return 'fail';
|
|
136
|
+
case 'skip': return 'notselected';
|
|
137
|
+
case 'notapplicable': return 'notapplicable';
|
|
138
|
+
case 'warn': return 'informational';
|
|
139
|
+
default: return 'informational';
|
|
140
|
+
}
|
|
141
|
+
};
|
|
142
|
+
|
|
143
|
+
const severityFor = (scored?: boolean): string => (scored ? 'medium' : 'low');
|
|
144
|
+
|
|
145
|
+
const stigSeverity = (stigSev: string | undefined, scored?: boolean): string => stigSev || severityFor(scored);
|
|
146
|
+
|
|
147
|
+
const ruleWeight = (scored?: boolean): string => (scored ? '10' : '0');
|
|
148
|
+
|
|
149
|
+
const ruleRole = (scored?: boolean): string => (scored ? 'full' : 'unscored');
|
|
150
|
+
|
|
151
|
+
const stigIdents = (ccis?: string[]): { system: string; value: string }[] => {
|
|
152
|
+
if (!ccis || ccis.length === 0) {
|
|
153
|
+
return [{ system: NA, value: NA }];
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
return ccis.map((cci) => ({ system: 'http://cyber.mil/cci', value: cci }));
|
|
157
|
+
};
|
|
158
|
+
|
|
159
|
+
const collectTargets = (report: XccdfReport): string[] => {
|
|
160
|
+
const seen = new Set<string>();
|
|
161
|
+
const targets: string[] = [];
|
|
162
|
+
const nodes = report.nodes || {};
|
|
163
|
+
|
|
164
|
+
Object.values(nodes).forEach((list) => {
|
|
165
|
+
(list || []).forEach((n) => {
|
|
166
|
+
if (!seen.has(n)) {
|
|
167
|
+
seen.add(n);
|
|
168
|
+
targets.push(n);
|
|
169
|
+
}
|
|
170
|
+
});
|
|
171
|
+
});
|
|
172
|
+
|
|
173
|
+
return targets.length > 0 ? targets : [NA];
|
|
174
|
+
};
|
|
175
|
+
|
|
176
|
+
const collectTargetAddresses = (addresses?: string[]): string[] => {
|
|
177
|
+
return addresses && addresses.length > 0 ? addresses : [NA];
|
|
178
|
+
};
|
|
179
|
+
|
|
180
|
+
const collectTargetFacts = (facts?: XccdfTargetFact[]): XccdfTargetFact[] => {
|
|
181
|
+
return facts && facts.length > 0 ? facts : [{
|
|
182
|
+
name: NA, type: 'string', value: NA
|
|
183
|
+
}];
|
|
184
|
+
};
|
|
185
|
+
|
|
186
|
+
export function generateXCCDF({
|
|
187
|
+
report,
|
|
188
|
+
benchmarkVersion,
|
|
189
|
+
metadata = {},
|
|
190
|
+
stigChecks = {},
|
|
191
|
+
targetAddresses,
|
|
192
|
+
targetFacts,
|
|
193
|
+
clusterName,
|
|
194
|
+
testResultId,
|
|
195
|
+
}: GenerateXccdfArgs): string {
|
|
196
|
+
const now = new Date();
|
|
197
|
+
const timeStr = now.toISOString().replace(/\.\d{3}Z$/, 'Z');
|
|
198
|
+
const dateStr = timeStr.slice(0, 10);
|
|
199
|
+
|
|
200
|
+
const benchmarkId = metadata.benchmarkId || `${ ID_PREFIX }_${ BENCHMARK_ID_SUFFIX }`;
|
|
201
|
+
const benchmarkTitle = metadata.title || `Kubernetes CIS Benchmark ${ benchmarkVersion }`;
|
|
202
|
+
|
|
203
|
+
const doc = create({ version: '1.0', encoding: 'UTF-8' });
|
|
204
|
+
const benchmark = doc.ele('Benchmark', {
|
|
205
|
+
xmlns: XCCDF_NS,
|
|
206
|
+
id: benchmarkId,
|
|
207
|
+
resolved: '1',
|
|
208
|
+
'xml:lang': 'en',
|
|
209
|
+
style: '',
|
|
210
|
+
});
|
|
211
|
+
|
|
212
|
+
benchmark.ele('status', { date: dateStr }).txt('complete');
|
|
213
|
+
benchmark.ele('title').txt(benchmarkTitle);
|
|
214
|
+
benchmark.ele('description').txt(na(metadata.description));
|
|
215
|
+
benchmark.ele('notice', { id: na(metadata.noticeId) }).txt(na(metadata.notice));
|
|
216
|
+
benchmark.ele('front-matter').txt(na(metadata.frontMatter));
|
|
217
|
+
benchmark.ele('rear-matter').txt(na(metadata.rearMatter));
|
|
218
|
+
|
|
219
|
+
const ref = benchmark.ele('reference', { href: na(metadata.referenceHref) });
|
|
220
|
+
|
|
221
|
+
ref.ele('publisher').txt(na(metadata.publisher));
|
|
222
|
+
ref.ele('source').txt(na(metadata.source));
|
|
223
|
+
|
|
224
|
+
benchmark.ele('plain-text', { id: na(metadata.plainTextId) }).txt(na(metadata.plainText));
|
|
225
|
+
benchmark.ele('platform', { idref: na(metadata.platform) });
|
|
226
|
+
benchmark.ele('version').txt(na(report.version));
|
|
227
|
+
|
|
228
|
+
const meta = benchmark.ele('metadata');
|
|
229
|
+
|
|
230
|
+
meta.ele('creator').txt(na(metadata.creator));
|
|
231
|
+
meta.ele('publisher').txt(na(metadata.publisher));
|
|
232
|
+
meta.ele('contributor').txt(na(metadata.contributor));
|
|
233
|
+
meta.ele('source').txt(na(metadata.source));
|
|
234
|
+
|
|
235
|
+
benchmark.ele('model', { system: SCORING_SYSTEM });
|
|
236
|
+
|
|
237
|
+
const profile = benchmark.ele('Profile', { id: profileIdFor(benchmarkVersion) });
|
|
238
|
+
|
|
239
|
+
profile.ele('title').txt(benchmarkTitle);
|
|
240
|
+
profile.ele('description').txt(na(metadata.description));
|
|
241
|
+
|
|
242
|
+
const ruleResults: { check: XccdfReportCheck; effectiveId: string; stig: StigCheckMetadata }[] = [];
|
|
243
|
+
const groups = report.results || [];
|
|
244
|
+
|
|
245
|
+
groups.forEach((group) => {
|
|
246
|
+
const g = benchmark.ele('Group', { id: na(group.id) });
|
|
247
|
+
|
|
248
|
+
g.ele('title').txt(na(group.description));
|
|
249
|
+
g.ele('description').txt(na(group.description));
|
|
250
|
+
|
|
251
|
+
(group.checks || []).forEach((check) => {
|
|
252
|
+
const checkId = check.id || '';
|
|
253
|
+
const stig = lookupStig(stigChecks, checkId);
|
|
254
|
+
const effectiveId = effectiveRuleId(stig, checkId);
|
|
255
|
+
const ruleFixId = stig.fixId || fixIdFor(checkId);
|
|
256
|
+
const ruleCheckSystem = stig.checkId || CHECK_SYSTEM;
|
|
257
|
+
const checkHref = na(metadata.checkHref);
|
|
258
|
+
const checkName = na(metadata.checkName);
|
|
259
|
+
|
|
260
|
+
const rule = g.ele('Rule', {
|
|
261
|
+
id: effectiveId,
|
|
262
|
+
selected: 'true',
|
|
263
|
+
weight: ruleWeight(check.scored),
|
|
264
|
+
role: ruleRole(check.scored),
|
|
265
|
+
severity: stigSeverity(stig.severity, check.scored),
|
|
266
|
+
});
|
|
267
|
+
|
|
268
|
+
rule.ele('version').txt(na(stig.version));
|
|
269
|
+
rule.ele('title').txt(na(`${ checkId } ${ check.description || '' }`));
|
|
270
|
+
rule.ele('description').txt(na(check.description));
|
|
271
|
+
|
|
272
|
+
const ruleRef = rule.ele('reference');
|
|
273
|
+
|
|
274
|
+
ruleRef.ele('title').txt(na(metadata.referenceTitle));
|
|
275
|
+
ruleRef.ele('subject').txt(na(metadata.referenceSubject));
|
|
276
|
+
ruleRef.ele('publisher').txt(na(metadata.publisher));
|
|
277
|
+
ruleRef.ele('type').txt(na(metadata.referenceType));
|
|
278
|
+
ruleRef.ele('identifier').txt(na(metadata.referenceIdentifier));
|
|
279
|
+
|
|
280
|
+
stigIdents(stig.cci).forEach((ident) => {
|
|
281
|
+
rule.ele('ident', { system: ident.system }).txt(ident.value);
|
|
282
|
+
});
|
|
283
|
+
|
|
284
|
+
rule.ele('fixtext', { fixref: ruleFixId }).txt(na(check.remediation));
|
|
285
|
+
rule.ele('fix', { id: ruleFixId });
|
|
286
|
+
|
|
287
|
+
const ruleCheck = rule.ele('check', { system: ruleCheckSystem });
|
|
288
|
+
|
|
289
|
+
ruleCheck.ele('check-content-ref', { name: checkName, href: checkHref });
|
|
290
|
+
ruleCheck.ele('check-content').txt(na(check.audit));
|
|
291
|
+
|
|
292
|
+
ruleResults.push({
|
|
293
|
+
check, effectiveId, stig
|
|
294
|
+
});
|
|
295
|
+
});
|
|
296
|
+
});
|
|
297
|
+
|
|
298
|
+
if (groups.length === 0) {
|
|
299
|
+
const g = benchmark.ele('Group', { id: NA });
|
|
300
|
+
|
|
301
|
+
g.ele('title').txt(NA);
|
|
302
|
+
g.ele('description').txt(NA);
|
|
303
|
+
}
|
|
304
|
+
|
|
305
|
+
const total = report.total || 0;
|
|
306
|
+
const pass = report.pass || 0;
|
|
307
|
+
const scoreStr = total > 0 ? ((pass / total) * 100).toFixed(1) : '0.0';
|
|
308
|
+
|
|
309
|
+
const targets = clusterName ? [clusterName] : metadata.clusterName ? [metadata.clusterName] : collectTargets(report);
|
|
310
|
+
|
|
311
|
+
const testResult = benchmark.ele('TestResult', {
|
|
312
|
+
id: testResultId || `${ ID_PREFIX }_${ TEST_RESULT_ID_SUFFIX }`,
|
|
313
|
+
'start-time': timeStr,
|
|
314
|
+
'end-time': timeStr,
|
|
315
|
+
version: benchmarkVersion,
|
|
316
|
+
'test-system': ID_PREFIX,
|
|
317
|
+
});
|
|
318
|
+
|
|
319
|
+
testResult.ele('benchmark', { href: `#${ benchmarkId }`, id: benchmarkId });
|
|
320
|
+
testResult.ele('title').txt(benchmarkTitle);
|
|
321
|
+
testResult.ele('identity', { authenticated: 'true', privileged: 'true' }).txt('compliance-scan-serviceaccount');
|
|
322
|
+
|
|
323
|
+
targets.forEach((t) => testResult.ele('target').txt(t));
|
|
324
|
+
collectTargetAddresses(targetAddresses).forEach((a) => testResult.ele('target-address').txt(a));
|
|
325
|
+
|
|
326
|
+
const facts = testResult.ele('target-facts');
|
|
327
|
+
|
|
328
|
+
collectTargetFacts(targetFacts).forEach((f) => {
|
|
329
|
+
facts.ele('fact', { name: f.name, type: f.type }).txt(f.value);
|
|
330
|
+
});
|
|
331
|
+
|
|
332
|
+
testResult.ele('platform', { idref: na(metadata.platform) });
|
|
333
|
+
|
|
334
|
+
if (ruleResults.length === 0) {
|
|
335
|
+
const rr = testResult.ele('rule-result', {
|
|
336
|
+
idref: NA,
|
|
337
|
+
role: NA,
|
|
338
|
+
time: timeStr,
|
|
339
|
+
severity: NA,
|
|
340
|
+
version: NA,
|
|
341
|
+
weight: NA,
|
|
342
|
+
});
|
|
343
|
+
|
|
344
|
+
rr.ele('ident', { system: NA }).txt(NA);
|
|
345
|
+
rr.ele('result').txt(NA);
|
|
346
|
+
const rrCheck = rr.ele('check', { system: NA });
|
|
347
|
+
|
|
348
|
+
rrCheck.ele('check-content-ref', { name: NA, href: NA });
|
|
349
|
+
rrCheck.ele('check-content').txt(NA);
|
|
350
|
+
} else {
|
|
351
|
+
ruleResults.forEach(({ check, effectiveId, stig }) => {
|
|
352
|
+
const ruleCheckSystem = stig.checkId || CHECK_SYSTEM;
|
|
353
|
+
const checkHref = na(metadata.checkHref);
|
|
354
|
+
const checkName = na(metadata.checkName);
|
|
355
|
+
|
|
356
|
+
const rr = testResult.ele('rule-result', {
|
|
357
|
+
idref: effectiveId,
|
|
358
|
+
role: ruleRole(check.scored),
|
|
359
|
+
time: timeStr,
|
|
360
|
+
severity: stigSeverity(stig.severity, check.scored),
|
|
361
|
+
version: na(stig.version),
|
|
362
|
+
weight: ruleWeight(check.scored),
|
|
363
|
+
});
|
|
364
|
+
|
|
365
|
+
stigIdents(stig.cci).forEach((ident) => {
|
|
366
|
+
rr.ele('ident', { system: ident.system }).txt(ident.value);
|
|
367
|
+
});
|
|
368
|
+
rr.ele('result').txt(mapResult(check.state));
|
|
369
|
+
const rrCheck = rr.ele('check', { system: ruleCheckSystem });
|
|
370
|
+
|
|
371
|
+
rrCheck.ele('check-content-ref', { name: checkName, href: checkHref });
|
|
372
|
+
rrCheck.ele('check-content').txt(na(check.audit));
|
|
373
|
+
});
|
|
374
|
+
}
|
|
375
|
+
|
|
376
|
+
testResult.ele('score', { system: SCORING_SYSTEM, maximum: '100.0' }).txt(scoreStr);
|
|
377
|
+
|
|
378
|
+
return doc.end({ prettyPrint: true });
|
|
379
|
+
}
|
|
380
|
+
|
|
381
|
+
export interface GenerateXccdfPerNodeArgs extends Omit<GenerateXccdfArgs, 'clusterName' | 'targetAddresses' | 'targetFacts'> {
|
|
382
|
+
hostname: string;
|
|
383
|
+
role: string;
|
|
384
|
+
}
|
|
385
|
+
|
|
386
|
+
const remapCheckForNode = (check: XccdfReportCheck, hostname: string): XccdfReportCheck => {
|
|
387
|
+
const isMixed = (check.state || '').toLowerCase() === 'mixed';
|
|
388
|
+
const state = isMixed ? ((check.nodes || []).includes(hostname) ? 'fail' : 'pass') : check.state;
|
|
389
|
+
|
|
390
|
+
return { ...check, state };
|
|
391
|
+
};
|
|
392
|
+
|
|
393
|
+
export function generateXCCDFPerNode(args: GenerateXccdfPerNodeArgs): string {
|
|
394
|
+
const {
|
|
395
|
+
report, hostname, role, ...rest
|
|
396
|
+
} = args;
|
|
397
|
+
|
|
398
|
+
const perNodeResults: XccdfReportGroup[] = (report.results || []).map((group) => ({
|
|
399
|
+
...group,
|
|
400
|
+
checks: (group.checks || []).map((c) => remapCheckForNode(c, hostname)),
|
|
401
|
+
}));
|
|
402
|
+
|
|
403
|
+
const passForNode = perNodeResults
|
|
404
|
+
.flatMap((g) => g.checks || [])
|
|
405
|
+
.filter((c) => (c.state || '').toLowerCase() === 'pass').length;
|
|
406
|
+
|
|
407
|
+
return generateXCCDF({
|
|
408
|
+
...rest,
|
|
409
|
+
report: {
|
|
410
|
+
...report,
|
|
411
|
+
results: perNodeResults,
|
|
412
|
+
pass: passForNode,
|
|
413
|
+
nodes: { [role]: [hostname] },
|
|
414
|
+
},
|
|
415
|
+
clusterName: hostname,
|
|
416
|
+
testResultId: `${ ID_PREFIX }_${ TEST_RESULT_ID_SUFFIX }_${ safeId(hostname) }`,
|
|
417
|
+
});
|
|
418
|
+
}
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|