@mitre/inspec-objects 0.0.1 → 0.0.2
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/.github/workflows/e2e-test.yml +38 -0
- package/error.log +12 -0
- package/lib/objects/control.d.ts +7 -3
- package/lib/objects/control.js +8 -1
- package/lib/parsers/oval.d.ts +2 -0
- package/lib/parsers/oval.js +17 -0
- package/lib/parsers/xccdf.d.ts +7 -1
- package/lib/parsers/xccdf.js +198 -50
- package/lib/utilities/diff.d.ts +2 -0
- package/lib/utilities/diff.js +7 -3
- package/lib/utilities/global.d.ts +2 -0
- package/lib/utilities/global.js +24 -1
- package/lib/utilities/xccdf.d.ts +1 -1
- package/lib/utilities/xccdf.js +5 -2
- package/mitre-inspec-objects-v0.0.1.tgz +0 -0
- package/package-lock.json +219 -21
- package/package.json +2 -2
- package/src/objects/control.ts +15 -4
- package/src/parsers/oval.ts +18 -0
- package/src/parsers/xccdf.ts +200 -52
- package/src/types/oval.d.ts +609 -0
- package/src/types/xccdf.d.ts +830 -73
- package/src/utilities/diff.ts +9 -3
- package/src/utilities/global.ts +29 -0
- package/src/utilities/xccdf.ts +8 -3
- package/tsconfig.json +2 -1
- package/types/ionchannelAnalysis.d.ts +238 -0
- package/types/ionchannelProjects.d.ts +72 -0
- package/types/ionchannelTeams.d.ts +26 -0
- package/types/reverseMappedXCCDF.d.ts +67 -0
- package/types/splunk-sdk-no-env/index.d.ts +88 -0
package/package-lock.json
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
{
|
|
2
|
-
"name": "inspec-objects",
|
|
3
|
-
"version": "
|
|
2
|
+
"name": "@mitre/inspec-objects",
|
|
3
|
+
"version": "0.0.2",
|
|
4
4
|
"lockfileVersion": 2,
|
|
5
5
|
"requires": true,
|
|
6
6
|
"packages": {
|
|
7
7
|
"": {
|
|
8
|
-
"name": "inspec-objects",
|
|
9
|
-
"version": "
|
|
8
|
+
"name": "@mitre/inspec-objects",
|
|
9
|
+
"version": "0.0.2",
|
|
10
10
|
"license": "Apache-2.0",
|
|
11
11
|
"dependencies": {
|
|
12
|
-
"@mitre/hdf-converters": "
|
|
12
|
+
"@mitre/hdf-converters": "file:../heimdall2/libs/hdf-converters/mitre-hdf-converters-v2.6.27.tgz",
|
|
13
13
|
"@types/flat": "^5.0.2",
|
|
14
14
|
"@types/json-diff": "^0.7.0",
|
|
15
15
|
"@types/lodash": "^4.14.178",
|
|
@@ -1837,13 +1837,15 @@
|
|
|
1837
1837
|
}
|
|
1838
1838
|
},
|
|
1839
1839
|
"node_modules/@mitre/hdf-converters": {
|
|
1840
|
-
"version": "2.6.
|
|
1841
|
-
"resolved": "
|
|
1842
|
-
"integrity": "sha512-
|
|
1840
|
+
"version": "2.6.27",
|
|
1841
|
+
"resolved": "file:../heimdall2/libs/hdf-converters/mitre-hdf-converters-v2.6.27.tgz",
|
|
1842
|
+
"integrity": "sha512-N7BEiiQLesGITGUBkXMd68HNq0hBlwq7qDYZgykk8OTJpFQzGxWKQFNy4GeMgnMUxlkSk9zjPdDmuIlE0zCksg==",
|
|
1843
|
+
"license": "Apache-2.0",
|
|
1843
1844
|
"dependencies": {
|
|
1844
1845
|
"@aws-sdk/client-config-service": "^3.95.0",
|
|
1845
1846
|
"@mitre/splunk-sdk-no-env": "^1.10.0",
|
|
1846
1847
|
"@types/csv2json": "^1.4.2",
|
|
1848
|
+
"@types/ms": "^0.7.31",
|
|
1847
1849
|
"@types/mustache": "^4.1.2",
|
|
1848
1850
|
"@types/papaparse": "^5.3.2",
|
|
1849
1851
|
"@types/xml2js": "^0.4.9",
|
|
@@ -1853,13 +1855,29 @@
|
|
|
1853
1855
|
"fast-xml-parser": "^3.21.1",
|
|
1854
1856
|
"html-entities": "^2.3.2",
|
|
1855
1857
|
"htmlparser2": "^7.1.2",
|
|
1856
|
-
"inspecjs": "^2.6.
|
|
1858
|
+
"inspecjs": "^2.6.26",
|
|
1857
1859
|
"lodash": "^4.17.21",
|
|
1858
1860
|
"moment": "^2.29.1",
|
|
1861
|
+
"ms": "^2.1.3",
|
|
1859
1862
|
"mustache": "^4.2.0",
|
|
1860
1863
|
"papaparse": "^5.3.1",
|
|
1861
1864
|
"winston": "^3.6.0",
|
|
1862
|
-
"
|
|
1865
|
+
"xlsx": "^0.18.5",
|
|
1866
|
+
"xml2js": "^0.4.23",
|
|
1867
|
+
"yaml": "^2.1.1"
|
|
1868
|
+
}
|
|
1869
|
+
},
|
|
1870
|
+
"node_modules/@mitre/hdf-converters/node_modules/ms": {
|
|
1871
|
+
"version": "2.1.3",
|
|
1872
|
+
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
|
|
1873
|
+
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
|
|
1874
|
+
},
|
|
1875
|
+
"node_modules/@mitre/hdf-converters/node_modules/yaml": {
|
|
1876
|
+
"version": "2.1.1",
|
|
1877
|
+
"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz",
|
|
1878
|
+
"integrity": "sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==",
|
|
1879
|
+
"engines": {
|
|
1880
|
+
"node": ">= 14"
|
|
1863
1881
|
}
|
|
1864
1882
|
},
|
|
1865
1883
|
"node_modules/@mitre/splunk-sdk-no-env": {
|
|
@@ -2122,6 +2140,11 @@
|
|
|
2122
2140
|
"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz",
|
|
2123
2141
|
"integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q=="
|
|
2124
2142
|
},
|
|
2143
|
+
"node_modules/@types/ms": {
|
|
2144
|
+
"version": "0.7.31",
|
|
2145
|
+
"resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz",
|
|
2146
|
+
"integrity": "sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA=="
|
|
2147
|
+
},
|
|
2125
2148
|
"node_modules/@types/mustache": {
|
|
2126
2149
|
"version": "4.1.3",
|
|
2127
2150
|
"resolved": "https://registry.npmjs.org/@types/mustache/-/mustache-4.1.3.tgz",
|
|
@@ -2386,6 +2409,14 @@
|
|
|
2386
2409
|
"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
|
|
2387
2410
|
}
|
|
2388
2411
|
},
|
|
2412
|
+
"node_modules/adler-32": {
|
|
2413
|
+
"version": "1.3.1",
|
|
2414
|
+
"resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz",
|
|
2415
|
+
"integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==",
|
|
2416
|
+
"engines": {
|
|
2417
|
+
"node": ">=0.8"
|
|
2418
|
+
}
|
|
2419
|
+
},
|
|
2389
2420
|
"node_modules/ajv": {
|
|
2390
2421
|
"version": "6.12.6",
|
|
2391
2422
|
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
|
|
@@ -2767,6 +2798,18 @@
|
|
|
2767
2798
|
}
|
|
2768
2799
|
]
|
|
2769
2800
|
},
|
|
2801
|
+
"node_modules/cfb": {
|
|
2802
|
+
"version": "1.2.2",
|
|
2803
|
+
"resolved": "https://registry.npmjs.org/cfb/-/cfb-1.2.2.tgz",
|
|
2804
|
+
"integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==",
|
|
2805
|
+
"dependencies": {
|
|
2806
|
+
"adler-32": "~1.3.0",
|
|
2807
|
+
"crc-32": "~1.2.0"
|
|
2808
|
+
},
|
|
2809
|
+
"engines": {
|
|
2810
|
+
"node": ">=0.8"
|
|
2811
|
+
}
|
|
2812
|
+
},
|
|
2770
2813
|
"node_modules/chalk": {
|
|
2771
2814
|
"version": "4.1.2",
|
|
2772
2815
|
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
|
|
@@ -2834,6 +2877,14 @@
|
|
|
2834
2877
|
"node": ">= 0.12.0"
|
|
2835
2878
|
}
|
|
2836
2879
|
},
|
|
2880
|
+
"node_modules/codepage": {
|
|
2881
|
+
"version": "1.15.0",
|
|
2882
|
+
"resolved": "https://registry.npmjs.org/codepage/-/codepage-1.15.0.tgz",
|
|
2883
|
+
"integrity": "sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==",
|
|
2884
|
+
"engines": {
|
|
2885
|
+
"node": ">=0.8"
|
|
2886
|
+
}
|
|
2887
|
+
},
|
|
2837
2888
|
"node_modules/collect-v8-coverage": {
|
|
2838
2889
|
"version": "1.0.1",
|
|
2839
2890
|
"resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
|
|
@@ -2932,6 +2983,17 @@
|
|
|
2932
2983
|
"node": ">= 0.6"
|
|
2933
2984
|
}
|
|
2934
2985
|
},
|
|
2986
|
+
"node_modules/crc-32": {
|
|
2987
|
+
"version": "1.2.2",
|
|
2988
|
+
"resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
|
|
2989
|
+
"integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
|
|
2990
|
+
"bin": {
|
|
2991
|
+
"crc32": "bin/crc32.njs"
|
|
2992
|
+
},
|
|
2993
|
+
"engines": {
|
|
2994
|
+
"node": ">=0.8"
|
|
2995
|
+
}
|
|
2996
|
+
},
|
|
2935
2997
|
"node_modules/cross-spawn": {
|
|
2936
2998
|
"version": "7.0.3",
|
|
2937
2999
|
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
|
|
@@ -3778,6 +3840,14 @@
|
|
|
3778
3840
|
"node": ">= 6"
|
|
3779
3841
|
}
|
|
3780
3842
|
},
|
|
3843
|
+
"node_modules/frac": {
|
|
3844
|
+
"version": "1.1.2",
|
|
3845
|
+
"resolved": "https://registry.npmjs.org/frac/-/frac-1.1.2.tgz",
|
|
3846
|
+
"integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==",
|
|
3847
|
+
"engines": {
|
|
3848
|
+
"node": ">=0.8"
|
|
3849
|
+
}
|
|
3850
|
+
},
|
|
3781
3851
|
"node_modules/fs.realpath": {
|
|
3782
3852
|
"version": "1.0.0",
|
|
3783
3853
|
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
|
|
@@ -4085,9 +4155,9 @@
|
|
|
4085
4155
|
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
|
|
4086
4156
|
},
|
|
4087
4157
|
"node_modules/inspecjs": {
|
|
4088
|
-
"version": "2.6.
|
|
4089
|
-
"resolved": "https://registry.npmjs.org/inspecjs/-/inspecjs-2.6.
|
|
4090
|
-
"integrity": "sha512-
|
|
4158
|
+
"version": "2.6.26",
|
|
4159
|
+
"resolved": "https://registry.npmjs.org/inspecjs/-/inspecjs-2.6.26.tgz",
|
|
4160
|
+
"integrity": "sha512-qHfRVK9Vx2zFSikvOiV02hpDxpM9J6YCAKsH2dqk3zkgarVFY4WlWjYXuGmnCCrzGWf/gF2DUYOlVPPGvV5pgg=="
|
|
4091
4161
|
},
|
|
4092
4162
|
"node_modules/is-arrayish": {
|
|
4093
4163
|
"version": "0.3.2",
|
|
@@ -5787,6 +5857,17 @@
|
|
|
5787
5857
|
"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
|
|
5788
5858
|
"integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
|
|
5789
5859
|
},
|
|
5860
|
+
"node_modules/ssf": {
|
|
5861
|
+
"version": "0.11.2",
|
|
5862
|
+
"resolved": "https://registry.npmjs.org/ssf/-/ssf-0.11.2.tgz",
|
|
5863
|
+
"integrity": "sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==",
|
|
5864
|
+
"dependencies": {
|
|
5865
|
+
"frac": "~1.1.2"
|
|
5866
|
+
},
|
|
5867
|
+
"engines": {
|
|
5868
|
+
"node": ">=0.8"
|
|
5869
|
+
}
|
|
5870
|
+
},
|
|
5790
5871
|
"node_modules/stack-trace": {
|
|
5791
5872
|
"version": "0.0.10",
|
|
5792
5873
|
"resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
|
|
@@ -6274,6 +6355,22 @@
|
|
|
6274
6355
|
"node": ">= 6.4.0"
|
|
6275
6356
|
}
|
|
6276
6357
|
},
|
|
6358
|
+
"node_modules/wmf": {
|
|
6359
|
+
"version": "1.0.2",
|
|
6360
|
+
"resolved": "https://registry.npmjs.org/wmf/-/wmf-1.0.2.tgz",
|
|
6361
|
+
"integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==",
|
|
6362
|
+
"engines": {
|
|
6363
|
+
"node": ">=0.8"
|
|
6364
|
+
}
|
|
6365
|
+
},
|
|
6366
|
+
"node_modules/word": {
|
|
6367
|
+
"version": "0.3.0",
|
|
6368
|
+
"resolved": "https://registry.npmjs.org/word/-/word-0.3.0.tgz",
|
|
6369
|
+
"integrity": "sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==",
|
|
6370
|
+
"engines": {
|
|
6371
|
+
"node": ">=0.8"
|
|
6372
|
+
}
|
|
6373
|
+
},
|
|
6277
6374
|
"node_modules/word-wrap": {
|
|
6278
6375
|
"version": "1.2.3",
|
|
6279
6376
|
"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
|
|
@@ -6321,6 +6418,26 @@
|
|
|
6321
6418
|
"node": "^12.13.0 || ^14.15.0 || >=16"
|
|
6322
6419
|
}
|
|
6323
6420
|
},
|
|
6421
|
+
"node_modules/xlsx": {
|
|
6422
|
+
"version": "0.18.5",
|
|
6423
|
+
"resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.18.5.tgz",
|
|
6424
|
+
"integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==",
|
|
6425
|
+
"dependencies": {
|
|
6426
|
+
"adler-32": "~1.3.0",
|
|
6427
|
+
"cfb": "~1.2.1",
|
|
6428
|
+
"codepage": "~1.15.0",
|
|
6429
|
+
"crc-32": "~1.2.1",
|
|
6430
|
+
"ssf": "~0.11.2",
|
|
6431
|
+
"wmf": "~1.0.1",
|
|
6432
|
+
"word": "~0.3.0"
|
|
6433
|
+
},
|
|
6434
|
+
"bin": {
|
|
6435
|
+
"xlsx": "bin/xlsx.njs"
|
|
6436
|
+
},
|
|
6437
|
+
"engines": {
|
|
6438
|
+
"node": ">=0.8"
|
|
6439
|
+
}
|
|
6440
|
+
},
|
|
6324
6441
|
"node_modules/xml2js": {
|
|
6325
6442
|
"version": "0.4.23",
|
|
6326
6443
|
"resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
|
|
@@ -7835,13 +7952,13 @@
|
|
|
7835
7952
|
}
|
|
7836
7953
|
},
|
|
7837
7954
|
"@mitre/hdf-converters": {
|
|
7838
|
-
"version": "
|
|
7839
|
-
"
|
|
7840
|
-
"integrity": "sha512-oph9E6qNNifd6RTQ2Qt2eHM0Twmk6FqdAEAg+nQXmeBmUfnGb/poh4CNd1a4RCPF0MY77HbRZBjwN+sOYHFbcg==",
|
|
7955
|
+
"version": "file:../heimdall2/libs/hdf-converters/mitre-hdf-converters-v2.6.27.tgz",
|
|
7956
|
+
"integrity": "sha512-N7BEiiQLesGITGUBkXMd68HNq0hBlwq7qDYZgykk8OTJpFQzGxWKQFNy4GeMgnMUxlkSk9zjPdDmuIlE0zCksg==",
|
|
7841
7957
|
"requires": {
|
|
7842
7958
|
"@aws-sdk/client-config-service": "^3.95.0",
|
|
7843
7959
|
"@mitre/splunk-sdk-no-env": "^1.10.0",
|
|
7844
7960
|
"@types/csv2json": "^1.4.2",
|
|
7961
|
+
"@types/ms": "^0.7.31",
|
|
7845
7962
|
"@types/mustache": "^4.1.2",
|
|
7846
7963
|
"@types/papaparse": "^5.3.2",
|
|
7847
7964
|
"@types/xml2js": "^0.4.9",
|
|
@@ -7851,13 +7968,28 @@
|
|
|
7851
7968
|
"fast-xml-parser": "^3.21.1",
|
|
7852
7969
|
"html-entities": "^2.3.2",
|
|
7853
7970
|
"htmlparser2": "^7.1.2",
|
|
7854
|
-
"inspecjs": "^2.6.
|
|
7971
|
+
"inspecjs": "^2.6.26",
|
|
7855
7972
|
"lodash": "^4.17.21",
|
|
7856
7973
|
"moment": "^2.29.1",
|
|
7974
|
+
"ms": "^2.1.3",
|
|
7857
7975
|
"mustache": "^4.2.0",
|
|
7858
7976
|
"papaparse": "^5.3.1",
|
|
7859
7977
|
"winston": "^3.6.0",
|
|
7860
|
-
"
|
|
7978
|
+
"xlsx": "^0.18.5",
|
|
7979
|
+
"xml2js": "^0.4.23",
|
|
7980
|
+
"yaml": "^2.1.1"
|
|
7981
|
+
},
|
|
7982
|
+
"dependencies": {
|
|
7983
|
+
"ms": {
|
|
7984
|
+
"version": "2.1.3",
|
|
7985
|
+
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
|
|
7986
|
+
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
|
|
7987
|
+
},
|
|
7988
|
+
"yaml": {
|
|
7989
|
+
"version": "2.1.1",
|
|
7990
|
+
"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz",
|
|
7991
|
+
"integrity": "sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw=="
|
|
7992
|
+
}
|
|
7861
7993
|
}
|
|
7862
7994
|
},
|
|
7863
7995
|
"@mitre/splunk-sdk-no-env": {
|
|
@@ -8092,6 +8224,11 @@
|
|
|
8092
8224
|
"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz",
|
|
8093
8225
|
"integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q=="
|
|
8094
8226
|
},
|
|
8227
|
+
"@types/ms": {
|
|
8228
|
+
"version": "0.7.31",
|
|
8229
|
+
"resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz",
|
|
8230
|
+
"integrity": "sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA=="
|
|
8231
|
+
},
|
|
8095
8232
|
"@types/mustache": {
|
|
8096
8233
|
"version": "4.1.3",
|
|
8097
8234
|
"resolved": "https://registry.npmjs.org/@types/mustache/-/mustache-4.1.3.tgz",
|
|
@@ -8259,6 +8396,11 @@
|
|
|
8259
8396
|
"dev": true,
|
|
8260
8397
|
"requires": {}
|
|
8261
8398
|
},
|
|
8399
|
+
"adler-32": {
|
|
8400
|
+
"version": "1.3.1",
|
|
8401
|
+
"resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz",
|
|
8402
|
+
"integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A=="
|
|
8403
|
+
},
|
|
8262
8404
|
"ajv": {
|
|
8263
8405
|
"version": "6.12.6",
|
|
8264
8406
|
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
|
|
@@ -8531,6 +8673,15 @@
|
|
|
8531
8673
|
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001352.tgz",
|
|
8532
8674
|
"integrity": "sha512-GUgH8w6YergqPQDGWhJGt8GDRnY0L/iJVQcU3eJ46GYf52R8tk0Wxp0PymuFVZboJYXGiCqwozAYZNRjVj6IcA=="
|
|
8533
8675
|
},
|
|
8676
|
+
"cfb": {
|
|
8677
|
+
"version": "1.2.2",
|
|
8678
|
+
"resolved": "https://registry.npmjs.org/cfb/-/cfb-1.2.2.tgz",
|
|
8679
|
+
"integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==",
|
|
8680
|
+
"requires": {
|
|
8681
|
+
"adler-32": "~1.3.0",
|
|
8682
|
+
"crc-32": "~1.2.0"
|
|
8683
|
+
}
|
|
8684
|
+
},
|
|
8534
8685
|
"chalk": {
|
|
8535
8686
|
"version": "4.1.2",
|
|
8536
8687
|
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
|
|
@@ -8582,6 +8733,11 @@
|
|
|
8582
8733
|
"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
|
|
8583
8734
|
"integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ=="
|
|
8584
8735
|
},
|
|
8736
|
+
"codepage": {
|
|
8737
|
+
"version": "1.15.0",
|
|
8738
|
+
"resolved": "https://registry.npmjs.org/codepage/-/codepage-1.15.0.tgz",
|
|
8739
|
+
"integrity": "sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA=="
|
|
8740
|
+
},
|
|
8585
8741
|
"collect-v8-coverage": {
|
|
8586
8742
|
"version": "1.0.1",
|
|
8587
8743
|
"resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
|
|
@@ -8675,6 +8831,11 @@
|
|
|
8675
8831
|
"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz",
|
|
8676
8832
|
"integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="
|
|
8677
8833
|
},
|
|
8834
|
+
"crc-32": {
|
|
8835
|
+
"version": "1.2.2",
|
|
8836
|
+
"resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
|
|
8837
|
+
"integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ=="
|
|
8838
|
+
},
|
|
8678
8839
|
"cross-spawn": {
|
|
8679
8840
|
"version": "7.0.3",
|
|
8680
8841
|
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
|
|
@@ -9323,6 +9484,11 @@
|
|
|
9323
9484
|
"mime-types": "^2.1.12"
|
|
9324
9485
|
}
|
|
9325
9486
|
},
|
|
9487
|
+
"frac": {
|
|
9488
|
+
"version": "1.1.2",
|
|
9489
|
+
"resolved": "https://registry.npmjs.org/frac/-/frac-1.1.2.tgz",
|
|
9490
|
+
"integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA=="
|
|
9491
|
+
},
|
|
9326
9492
|
"fs.realpath": {
|
|
9327
9493
|
"version": "1.0.0",
|
|
9328
9494
|
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
|
|
@@ -9539,9 +9705,9 @@
|
|
|
9539
9705
|
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
|
|
9540
9706
|
},
|
|
9541
9707
|
"inspecjs": {
|
|
9542
|
-
"version": "2.6.
|
|
9543
|
-
"resolved": "https://registry.npmjs.org/inspecjs/-/inspecjs-2.6.
|
|
9544
|
-
"integrity": "sha512-
|
|
9708
|
+
"version": "2.6.26",
|
|
9709
|
+
"resolved": "https://registry.npmjs.org/inspecjs/-/inspecjs-2.6.26.tgz",
|
|
9710
|
+
"integrity": "sha512-qHfRVK9Vx2zFSikvOiV02hpDxpM9J6YCAKsH2dqk3zkgarVFY4WlWjYXuGmnCCrzGWf/gF2DUYOlVPPGvV5pgg=="
|
|
9545
9711
|
},
|
|
9546
9712
|
"is-arrayish": {
|
|
9547
9713
|
"version": "0.3.2",
|
|
@@ -10797,6 +10963,14 @@
|
|
|
10797
10963
|
"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
|
|
10798
10964
|
"integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
|
|
10799
10965
|
},
|
|
10966
|
+
"ssf": {
|
|
10967
|
+
"version": "0.11.2",
|
|
10968
|
+
"resolved": "https://registry.npmjs.org/ssf/-/ssf-0.11.2.tgz",
|
|
10969
|
+
"integrity": "sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==",
|
|
10970
|
+
"requires": {
|
|
10971
|
+
"frac": "~1.1.2"
|
|
10972
|
+
}
|
|
10973
|
+
},
|
|
10800
10974
|
"stack-trace": {
|
|
10801
10975
|
"version": "0.0.10",
|
|
10802
10976
|
"resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
|
|
@@ -11160,6 +11334,16 @@
|
|
|
11160
11334
|
"triple-beam": "^1.3.0"
|
|
11161
11335
|
}
|
|
11162
11336
|
},
|
|
11337
|
+
"wmf": {
|
|
11338
|
+
"version": "1.0.2",
|
|
11339
|
+
"resolved": "https://registry.npmjs.org/wmf/-/wmf-1.0.2.tgz",
|
|
11340
|
+
"integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw=="
|
|
11341
|
+
},
|
|
11342
|
+
"word": {
|
|
11343
|
+
"version": "0.3.0",
|
|
11344
|
+
"resolved": "https://registry.npmjs.org/word/-/word-0.3.0.tgz",
|
|
11345
|
+
"integrity": "sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA=="
|
|
11346
|
+
},
|
|
11163
11347
|
"word-wrap": {
|
|
11164
11348
|
"version": "1.2.3",
|
|
11165
11349
|
"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
|
|
@@ -11195,6 +11379,20 @@
|
|
|
11195
11379
|
"signal-exit": "^3.0.7"
|
|
11196
11380
|
}
|
|
11197
11381
|
},
|
|
11382
|
+
"xlsx": {
|
|
11383
|
+
"version": "0.18.5",
|
|
11384
|
+
"resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.18.5.tgz",
|
|
11385
|
+
"integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==",
|
|
11386
|
+
"requires": {
|
|
11387
|
+
"adler-32": "~1.3.0",
|
|
11388
|
+
"cfb": "~1.2.1",
|
|
11389
|
+
"codepage": "~1.15.0",
|
|
11390
|
+
"crc-32": "~1.2.1",
|
|
11391
|
+
"ssf": "~0.11.2",
|
|
11392
|
+
"wmf": "~1.0.1",
|
|
11393
|
+
"word": "~0.3.0"
|
|
11394
|
+
}
|
|
11395
|
+
},
|
|
11198
11396
|
"xml2js": {
|
|
11199
11397
|
"version": "0.4.23",
|
|
11200
11398
|
"resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mitre/inspec-objects",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.2",
|
|
4
4
|
"description": "Typescript objects for normalizing between InSpec profiles and XCCDF benchmarks",
|
|
5
5
|
"main": "index.ts",
|
|
6
6
|
"publishConfig": {
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
},
|
|
23
23
|
"homepage": "https://github.com/mitre/ts-inspec-objects#readme",
|
|
24
24
|
"dependencies": {
|
|
25
|
-
"@mitre/hdf-converters": "
|
|
25
|
+
"@mitre/hdf-converters": "file:../heimdall2/libs/hdf-converters/mitre-hdf-converters-v2.6.27.tgz",
|
|
26
26
|
"@types/flat": "^5.0.2",
|
|
27
27
|
"@types/json-diff": "^0.7.0",
|
|
28
28
|
"@types/lodash": "^4.14.178",
|
package/src/objects/control.ts
CHANGED
|
@@ -8,10 +8,14 @@ export default class Control {
|
|
|
8
8
|
title?: string | null;
|
|
9
9
|
code?: string | null;
|
|
10
10
|
desc?: string | null;
|
|
11
|
-
descs?: ExecJSON.ControlDescription[] | { [key: string]: string } | null;
|
|
11
|
+
descs?: ExecJSON.ControlDescription[] | { [key: string]: string | undefined } | null;
|
|
12
12
|
impact?: number;
|
|
13
13
|
ref?: string;
|
|
14
|
-
refs?: string
|
|
14
|
+
refs?: (string | {
|
|
15
|
+
ref?: string;
|
|
16
|
+
url?: string;
|
|
17
|
+
uri?: string;
|
|
18
|
+
})[];
|
|
15
19
|
tags: {
|
|
16
20
|
check?: string;
|
|
17
21
|
fix?: string;
|
|
@@ -21,7 +25,7 @@ export default class Control {
|
|
|
21
25
|
satisfies?: string[];
|
|
22
26
|
rid?: string;
|
|
23
27
|
stig_id?: string;
|
|
24
|
-
fix_id?: string;
|
|
28
|
+
fix_id?: string | null;
|
|
25
29
|
cci?: string[];
|
|
26
30
|
cis_controls?: Record<string, string[]>[];
|
|
27
31
|
nist?: string[];
|
|
@@ -46,6 +50,8 @@ export default class Control {
|
|
|
46
50
|
} = {};
|
|
47
51
|
|
|
48
52
|
constructor(data?: Partial<Control>) {
|
|
53
|
+
this.refs = []
|
|
54
|
+
this.tags = {}
|
|
49
55
|
if (data) {
|
|
50
56
|
Object.entries(data).forEach(([key, value]) => {
|
|
51
57
|
_.set(this, key, value);
|
|
@@ -102,7 +108,12 @@ export default class Control {
|
|
|
102
108
|
|
|
103
109
|
if (this.refs) {
|
|
104
110
|
this.refs.forEach((ref) => {
|
|
105
|
-
|
|
111
|
+
if (typeof ref === 'string') {
|
|
112
|
+
result += ` ref '${escapeQuotes(ref)}'\n`;
|
|
113
|
+
} else {
|
|
114
|
+
result += ` ref '${escapeQuotes(ref.ref || '')}', url: '${escapeQuotes(ref.url || '')}'`
|
|
115
|
+
}
|
|
116
|
+
|
|
106
117
|
});
|
|
107
118
|
}
|
|
108
119
|
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { convertEncodedXmlIntoJson } from "../utilities/xccdf"
|
|
2
|
+
import {OvalDefinitionValue, Oval} from '../types/oval'
|
|
3
|
+
|
|
4
|
+
export function processOVAL(oval: string): Record<string, OvalDefinitionValue> {
|
|
5
|
+
const parsed: Oval = convertEncodedXmlIntoJson(oval)
|
|
6
|
+
|
|
7
|
+
const extractedDefinitions: Record<string, OvalDefinitionValue> = {}
|
|
8
|
+
|
|
9
|
+
for (const ovalDefinitions of parsed.oval_definitions) {
|
|
10
|
+
for (const definitionList of ovalDefinitions.definitions) {
|
|
11
|
+
for (const definition of definitionList.definition) {
|
|
12
|
+
extractedDefinitions[definition["@_id"]] = definition
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
return extractedDefinitions
|
|
18
|
+
}
|