From 98fe50a6342ab20dbd6b25ca8c1883c5995b96fb Mon Sep 17 00:00:00 2001 From: Sid Date: Tue, 11 Mar 2025 11:53:00 +0100 Subject: [PATCH 1/5] Update Platform Security modules --- package.json | 12 +++---- yarn.lock | 90 ++++++++++++++++++++++++++++------------------------ 2 files changed, 55 insertions(+), 47 deletions(-) diff --git a/package.json b/package.json index 5a87328b7d61c..65fe0b7f2abaa 100644 --- a/package.json +++ b/package.json @@ -1258,7 +1258,7 @@ "remark-gfm": "1.0.0", "remark-parse-no-trim": "^8.0.4", "remark-stringify": "^8.0.3", - "require-in-the-middle": "^7.4.0", + "require-in-the-middle": "^7.5.2", "reselect": "^4.1.8", "resize-observer-polyfill": "1.5.1", "rison-node": "1.0.2", @@ -1290,7 +1290,7 @@ "use-resize-observer": "^9.1.0", "usng.js": "^0.4.5", "utility-types": "^3.10.0", - "uuid": "10.0.0", + "uuid": "11.1.0", "vega": "^5.26.0", "vega-interpreter": "^1.0.4", "vega-lite": "^5.5.0", @@ -1350,7 +1350,7 @@ "@jest/reporters": "^29.7.0", "@jest/transform": "^29.6.1", "@jest/types": "^29.6.3", - "@kayahr/text-encoding": "^1.3.0", + "@kayahr/text-encoding": "^2.0.0", "@kbn/alerting-api-integration-helpers": "link:x-pack/test/alerting_api_integration/packages/helpers", "@kbn/ambient-common-types": "link:src/platform/packages/private/kbn-ambient-common-types", "@kbn/ambient-ftr-types": "link:src/platform/packages/private/kbn-ambient-ftr-types", @@ -1624,7 +1624,7 @@ "@types/jsonwebtoken": "^9.0.0", "@types/license-checker": "15.0.0", "@types/loader-utils": "^2.0.3", - "@types/lodash": "^4.17.14", + "@types/lodash": "^4.17.16", "@types/lru-cache": "^5.1.0", "@types/lz-string": "^1.3.34", "@types/mapbox__vector-tile": "1.3.0", @@ -1735,7 +1735,7 @@ "cypress-real-events": "^1.11.0", "cypress-recurse": "^1.35.2", "dependency-check": "^4.1.0", - "dependency-cruiser": "^16.8.0", + "dependency-cruiser": "^16.10.0", "ejs": "^3.1.10", "elasticsearch-8.x": "npm:@elastic/elasticsearch@8", "enzyme": "^3.11.0", @@ -1858,7 +1858,7 @@ "tape": "^5.9.0", "terser": "^5.36.0", "terser-webpack-plugin": "^5.3.10", - "tough-cookie": "^5.0.0", + "tough-cookie": "^5.1.2", "trace": "^3.2.0", "tree-kill": "^1.2.2", "ts-morph": "^15.1.0", diff --git a/yarn.lock b/yarn.lock index 9421307af5561..3c27bfd8c5626 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3848,12 +3848,10 @@ resolved "https://registry.yarnpkg.com/@juggle/resize-observer/-/resize-observer-3.4.0.tgz#08d6c5e20cf7e4cc02fd181c4b0c225cd31dbb60" integrity sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA== -"@kayahr/text-encoding@^1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@kayahr/text-encoding/-/text-encoding-1.3.0.tgz#90ae1007dc86d35a977cd709dfa9fe21cc2bc8c6" - integrity sha512-JjQVFXnN/ynXN+GDgpwNM+PJ4NwDFZwRolgSu4bYG1JKuRreVFY5uss5K/lsH6qY38+WgU7M40M2SHoiWQHKgQ== - dependencies: - tslib "^2.6.2" +"@kayahr/text-encoding@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@kayahr/text-encoding/-/text-encoding-2.0.0.tgz#637361c318048c4e7419364990d59b155eaa98bc" + integrity sha512-BCKXxcPHXJhgisp+SohA3MvoOQ/Kec1QEjo3LVH0lh4eFPEF9kGsGsn3GYaTdgFBRc2YkgDhND/39t+3oqU7Yw== "@kbn/aad-fixtures-plugin@link:x-pack/test/alerting_api_integration/common/plugins/aad": version "0.0.0" @@ -12132,11 +12130,16 @@ resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.0.tgz#d774355e41f372d5350a4d0714abb48194a489c3" integrity sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA== -"@types/lodash@^4.17.0", "@types/lodash@^4.17.14": +"@types/lodash@^4.17.0": version "4.17.14" resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.14.tgz#bafc053533f4cdc5fcc9635af46a963c1f3deaff" integrity sha512-jsxagdikDiDBeIRaPYtArcT8my4tN1og7MtMRquFT3XNA6axxyHDRUemqDz/taRDdOUn0GnGHRCuff4q48sW9A== +"@types/lodash@^4.17.16": + version "4.17.16" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.16.tgz#94ae78fab4a38d73086e962d0b65c30d816bfb0a" + integrity sha512-HX7Em5NYQAXKW+1T+FiuG27NGwzJfCX3s1GjOa7ujxZa52kjJLOr4FUxT+giF6Tgxv1e+/czV/iTtBw27WTU9g== + "@types/long@^4.0.1": version "4.0.2" resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a" @@ -16054,10 +16057,10 @@ commander@^12.1.0: resolved "https://registry.yarnpkg.com/commander/-/commander-12.1.0.tgz#01423b36f501259fdaac4d0e4d60c96c991585d3" integrity sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA== -commander@^13.0.0: - version "13.0.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-13.0.0.tgz#1b161f60ee3ceb8074583a0f95359a4f8701845c" - integrity sha512-oPYleIY8wmTVzkvQq10AEok6YcTC4sRUBl8F9gVuwchGVUCTbl/vhLTaQqutuuySYOsu8YTgV+OxKc/8Yvx+mQ== +commander@^13.1.0: + version "13.1.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-13.1.0.tgz#776167db68c78f38dcce1f9b8d7b8b9a488abf46" + integrity sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw== commander@^4.1.1: version "4.1.1" @@ -17585,10 +17588,10 @@ dependency-check@^4.1.0: read-package-json "^2.0.10" resolve "^1.1.7" -dependency-cruiser@^16.8.0: - version "16.9.0" - resolved "https://registry.yarnpkg.com/dependency-cruiser/-/dependency-cruiser-16.9.0.tgz#3273881daa3613fe8a00639f26a044ec6004afa0" - integrity sha512-Gc/xHNOBq1nk5i7FPCuexCD0m2OXB/WEfiSHfNYQaQaHZiZltnl5Ixp/ZG38Jvi8aEhKBQTHV4Aw6gmR7rWlOw== +dependency-cruiser@^16.10.0: + version "16.10.0" + resolved "https://registry.yarnpkg.com/dependency-cruiser/-/dependency-cruiser-16.10.0.tgz#6438f9256f0dde95f5ba5dcdab983bd57e12dd38" + integrity sha512-o6pEB8X/XS0AjpQBhPJW3pSY7HIviRM7+G601T9ruV63NVJC4DxLMA+a1VzZlKOzO2fO6JKRHjRmGjzZZHEFYA== dependencies: acorn "^8.14.0" acorn-jsx "^5.3.2" @@ -17596,9 +17599,9 @@ dependency-cruiser@^16.8.0: acorn-loose "^8.4.0" acorn-walk "^8.3.4" ajv "^8.17.1" - commander "^13.0.0" - enhanced-resolve "^5.18.0" - ignore "^7.0.0" + commander "^13.1.0" + enhanced-resolve "^5.18.1" + ignore "^7.0.3" interpret "^3.1.1" is-installed-globally "^1.0.0" json5 "^2.2.3" @@ -17608,10 +17611,10 @@ dependency-cruiser@^16.8.0: prompts "^2.4.2" rechoir "^0.8.0" safe-regex "^2.1.1" - semver "^7.6.3" + semver "^7.7.1" teamcity-service-messages "^0.1.14" tsconfig-paths-webpack-plugin "^4.2.0" - watskeburt "^4.2.2" + watskeburt "^4.2.3" dependency-tree@^10.0.9: version "10.0.9" @@ -18264,10 +18267,10 @@ enhanced-resolve@^4.5.0: memory-fs "^0.5.0" tapable "^1.0.0" -enhanced-resolve@^5.14.1, enhanced-resolve@^5.17.1, enhanced-resolve@^5.18.0, enhanced-resolve@^5.7.0: - version "5.18.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.0.tgz#91eb1db193896b9801251eeff1c6980278b1e404" - integrity sha512-0/r0MySGYG8YqlayBZ6MuCfECmHFdJ5qyPh8s8wa5Hnm6SaFLSK1VYCbj+NKp090Nm1caZhD+QTnmxO7esYGyQ== +enhanced-resolve@^5.14.1, enhanced-resolve@^5.17.1, enhanced-resolve@^5.18.1, enhanced-resolve@^5.7.0: + version "5.18.1" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz#728ab082f8b7b6836de51f1637aab5d3b9568faf" + integrity sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" @@ -21513,10 +21516,10 @@ ignore@^5.0.5, ignore@^5.1.1, ignore@^5.2.0, ignore@^5.2.1, ignore@^5.3.0: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5" integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g== -ignore@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-7.0.0.tgz#52da780b009bd0845d1f9dd4d8ae6a7569ae73c4" - integrity sha512-lcX8PNQygAa22u/0BysEY8VhaFRzlOkvdlKczDPnJvrkJD1EuqzEky5VYYKM2iySIuaVIDv9N190DfSreSLw2A== +ignore@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-7.0.3.tgz#397ef9315dfe0595671eefe8b633fec6943ab733" + integrity sha512-bAH5jbK/F3T3Jls4I0SO1hmPR0dKU0a7+SY6n1yzRtG54FLO8d6w/nxLFX2Nb7dBu6cCWXPaAME6cYqFUMmuCA== immediate@~3.0.5: version "3.0.6" @@ -29312,10 +29315,10 @@ require-from-string@^2.0.2: resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== -require-in-the-middle@^7.1.1, require-in-the-middle@^7.4.0: - version "7.4.0" - resolved "https://registry.yarnpkg.com/require-in-the-middle/-/require-in-the-middle-7.4.0.tgz#606977820d4b5f9be75e5a108ce34cfed25b3bb4" - integrity sha512-X34iHADNbNDfr6OTStIAHWSAvvKQRYgLO6duASaVf7J2VA3lvmNYboAHOuLC2huav1IwgZJtyEcJCKVzFxOSMQ== +require-in-the-middle@^7.1.1, require-in-the-middle@^7.5.2: + version "7.5.2" + resolved "https://registry.yarnpkg.com/require-in-the-middle/-/require-in-the-middle-7.5.2.tgz#dc25b148affad42e570cf0e41ba30dc00f1703ec" + integrity sha512-gAZ+kLqBdHarXB64XpAe2VCjB7rIRv+mU8tfRWziHRJ5umKsIHN2tLLv6EtMw7WCdP19S0ERVMldNvxYCHnhSQ== dependencies: debug "^4.3.5" module-details-from-path "^1.0.3" @@ -32126,10 +32129,10 @@ tough-cookie@^4.1.2, tough-cookie@^4.1.4: universalify "^0.2.0" url-parse "^1.5.3" -tough-cookie@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-5.0.0.tgz#6b6518e2b5c070cf742d872ee0f4f92d69eac1af" - integrity sha512-FRKsF7cz96xIIeMZ82ehjC3xW2E+O2+v11udrDYewUbszngYhsGa8z6YUMMzO9QJZzzyd0nGGXnML/TReX6W8Q== +tough-cookie@^5.0.0, tough-cookie@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-5.1.2.tgz#66d774b4a1d9e12dc75089725af3ac75ec31bed7" + integrity sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A== dependencies: tldts "^6.1.32" @@ -33019,7 +33022,12 @@ uuid-browser@^3.1.0: resolved "https://registry.yarnpkg.com/uuid-browser/-/uuid-browser-3.1.0.tgz#0f05a40aef74f9e5951e20efbf44b11871e56410" integrity sha1-DwWkCu90+eWVHiDvv0SxGHHlZBA= -uuid@10.0.0, uuid@^10.0.0: +uuid@11.1.0: + version "11.1.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-11.1.0.tgz#9549028be1753bb934fc96e2bca09bb4105ae912" + integrity sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A== + +uuid@^10.0.0: version "10.0.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-10.0.0.tgz#5a95aa454e6e002725c79055fd42aaba30ca6294" integrity sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ== @@ -33686,10 +33694,10 @@ watchpack@^2.2.0, watchpack@^2.4.1: glob-to-regexp "^0.4.1" graceful-fs "^4.1.2" -watskeburt@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/watskeburt/-/watskeburt-4.2.2.tgz#e24f0afc40b7ecf511bf24c285b91dee2df4f4a5" - integrity sha512-AOCg1UYxWpiHW1tUwqpJau8vzarZYTtzl2uu99UptBmbzx6kOzCGMfRLF6KIRX4PYekmryn89MzxlRNkL66YyA== +watskeburt@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/watskeburt/-/watskeburt-4.2.3.tgz#fc830280f466e201b55c517024aaf3aad2f5121e" + integrity sha512-uG9qtQYoHqAsnT711nG5iZc/8M5inSmkGCOp7pFaytKG2aTfIca7p//CjiVzAE4P7hzaYuCozMjNNaLgmhbK5g== wbuf@^1.1.0, wbuf@^1.7.3: version "1.7.3" From 478df69bac3bff0af8eeb6f8289ebef776ae2536 Mon Sep 17 00:00:00 2001 From: Sid Date: Tue, 11 Mar 2025 12:03:58 +0100 Subject: [PATCH 2/5] Update usage of UUID --- .../common/endpoint/data_generators/base_data_generator.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/solutions/security/plugins/security_solution/common/endpoint/data_generators/base_data_generator.ts b/x-pack/solutions/security/plugins/security_solution/common/endpoint/data_generators/base_data_generator.ts index 3949a4e69ca98..08d89927b95ca 100644 --- a/x-pack/solutions/security/plugins/security_solution/common/endpoint/data_generators/base_data_generator.ts +++ b/x-pack/solutions/security/plugins/security_solution/common/endpoint/data_generators/base_data_generator.ts @@ -166,7 +166,7 @@ export class BaseDataGenerator { /** generate a seeded random UUID v4 */ protected seededUUIDv4(): string { - return uuidv4({ random: [...this.randomNGenerator(255, 16)] }); + return uuidv4({ random: new Uint8Array([...this.randomNGenerator(255, 16)]) }); } /** Generate a random number up to the max provided */ From 16d863a78bc342e72dba2187b85067b63d6eb8ff Mon Sep 17 00:00:00 2001 From: Sid Date: Tue, 11 Mar 2025 12:41:24 +0100 Subject: [PATCH 3/5] update require for kayahr/text-encoding --- .../packages/shared/kbn-test/src/jest/setup/polyfills.jsdom.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platform/packages/shared/kbn-test/src/jest/setup/polyfills.jsdom.js b/src/platform/packages/shared/kbn-test/src/jest/setup/polyfills.jsdom.js index e0163f28a1889..757589a43bb7f 100644 --- a/src/platform/packages/shared/kbn-test/src/jest/setup/polyfills.jsdom.js +++ b/src/platform/packages/shared/kbn-test/src/jest/setup/polyfills.jsdom.js @@ -18,7 +18,7 @@ if (!Object.hasOwn(global.URL, 'createObjectURL')) { // https://github.com/jsdom/jsdom/issues/2524 if (!Object.hasOwn(global, 'TextEncoder')) { - const customTextEncoding = require('@kayahr/text-encoding'); + const customTextEncoding = require('@kayahr/text-encoding/lib/main'); global.TextEncoder = customTextEncoding.TextEncoder; global.TextDecoder = customTextEncoding.TextDecoder; } From 19ed95dc02718e7c8b4ade46ce9666f0dc4df03f Mon Sep 17 00:00:00 2001 From: Sid Date: Tue, 11 Mar 2025 15:52:30 +0100 Subject: [PATCH 4/5] revert text encoding changes --- package.json | 2 +- .../shared/kbn-test/src/jest/setup/polyfills.jsdom.js | 2 +- yarn.lock | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 65fe0b7f2abaa..d6f342d48fd2b 100644 --- a/package.json +++ b/package.json @@ -1350,7 +1350,7 @@ "@jest/reporters": "^29.7.0", "@jest/transform": "^29.6.1", "@jest/types": "^29.6.3", - "@kayahr/text-encoding": "^2.0.0", + "@kayahr/text-encoding": "^1.3.0", "@kbn/alerting-api-integration-helpers": "link:x-pack/test/alerting_api_integration/packages/helpers", "@kbn/ambient-common-types": "link:src/platform/packages/private/kbn-ambient-common-types", "@kbn/ambient-ftr-types": "link:src/platform/packages/private/kbn-ambient-ftr-types", diff --git a/src/platform/packages/shared/kbn-test/src/jest/setup/polyfills.jsdom.js b/src/platform/packages/shared/kbn-test/src/jest/setup/polyfills.jsdom.js index 757589a43bb7f..e0163f28a1889 100644 --- a/src/platform/packages/shared/kbn-test/src/jest/setup/polyfills.jsdom.js +++ b/src/platform/packages/shared/kbn-test/src/jest/setup/polyfills.jsdom.js @@ -18,7 +18,7 @@ if (!Object.hasOwn(global.URL, 'createObjectURL')) { // https://github.com/jsdom/jsdom/issues/2524 if (!Object.hasOwn(global, 'TextEncoder')) { - const customTextEncoding = require('@kayahr/text-encoding/lib/main'); + const customTextEncoding = require('@kayahr/text-encoding'); global.TextEncoder = customTextEncoding.TextEncoder; global.TextDecoder = customTextEncoding.TextDecoder; } diff --git a/yarn.lock b/yarn.lock index 3c27bfd8c5626..4c952baaf09ed 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3848,10 +3848,12 @@ resolved "https://registry.yarnpkg.com/@juggle/resize-observer/-/resize-observer-3.4.0.tgz#08d6c5e20cf7e4cc02fd181c4b0c225cd31dbb60" integrity sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA== -"@kayahr/text-encoding@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@kayahr/text-encoding/-/text-encoding-2.0.0.tgz#637361c318048c4e7419364990d59b155eaa98bc" - integrity sha512-BCKXxcPHXJhgisp+SohA3MvoOQ/Kec1QEjo3LVH0lh4eFPEF9kGsGsn3GYaTdgFBRc2YkgDhND/39t+3oqU7Yw== +"@kayahr/text-encoding@^1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@kayahr/text-encoding/-/text-encoding-1.3.0.tgz#90ae1007dc86d35a977cd709dfa9fe21cc2bc8c6" + integrity sha512-JjQVFXnN/ynXN+GDgpwNM+PJ4NwDFZwRolgSu4bYG1JKuRreVFY5uss5K/lsH6qY38+WgU7M40M2SHoiWQHKgQ== + dependencies: + tslib "^2.6.2" "@kbn/aad-fixtures-plugin@link:x-pack/test/alerting_api_integration/common/plugins/aad": version "0.0.0" From 0b0a7d53ff7752396812a304d75f4bfeb3d39649 Mon Sep 17 00:00:00 2001 From: Sid Date: Wed, 12 Mar 2025 12:53:13 +0100 Subject: [PATCH 5/5] remove bad merge dep --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 3a39775cb1548..76fbc61a8beeb 100644 --- a/package.json +++ b/package.json @@ -1626,7 +1626,6 @@ "@types/license-checker": "15.0.0", "@types/loader-utils": "^2.0.3", "@types/lodash": "^4.17.16", - "@types/lru-cache": "^5.1.0", "@types/lz-string": "^1.3.34", "@types/mapbox__vector-tile": "1.3.0", "@types/markdown-it": "^12.2.3",