diff --git a/0014-resolve-dompurify-CVE.patch b/0014-resolve-dompurify-CVE.patch new file mode 100644 index 0000000..450c9fd --- /dev/null +++ b/0014-resolve-dompurify-CVE.patch @@ -0,0 +1,58 @@ +diff --git a/package.json b/package.json +index e26f95d855a..14b3826a64d 100644 +--- a/package.json ++++ b/package.json +@@ -316,7 +316,7 @@ + "dangerously-set-html-content": "1.0.9", + "date-fns": "2.29.1", + "debounce-promise": "3.1.2", +- "dompurify": "^2.4.1", ++ "dompurify": "^2.5.0", + "emotion": "11.0.0", + "eventemitter3": "4.0.7", + "fast-deep-equal": "^3.1.3", +@@ -422,7 +422,8 @@ + "@storybook/react/webpack": "5.74.0", + "ngtemplate-loader/loader-utils": "^2.0.0", + "node-fetch": "2.6.7", +- "slate-dev-environment@^0.2.2": "patch:slate-dev-environment@npm:0.2.5#.yarn/patches/slate-dev-environment-npm-0.2.5-9aeb7da7b5.patch" ++ "slate-dev-environment@^0.2.2": "patch:slate-dev-environment@npm:0.2.5#.yarn/patches/slate-dev-environment-npm-0.2.5-9aeb7da7b5.patch", ++ "dompurify": "^2.5.0" + }, + "workspaces": { + "packages": [ +diff --git a/yarn.lock b/yarn.lock +index f374e10e333..834cfee2642 100644 +--- a/yarn.lock ++++ b/yarn.lock +@@ -18739,17 +18739,10 @@ __metadata: + languageName: node + linkType: hard + +-"dompurify@npm:^2.2.0": +- version: 2.3.8 +- resolution: "dompurify@npm:2.3.8" +- checksum: dc7b32ee57a03fe5166a850071200897cc13fa069287a709e3b2138052d73ec09a87026b9e28c8d2f254a74eaa52ef30644e98e54294c30acbca2a53f1bbc5f4 +- languageName: node +- linkType: hard +- +-"dompurify@npm:^2.4.1": +- version: 2.4.1 +- resolution: "dompurify@npm:2.4.1" +- checksum: 1169177465b3cbb25a44322937fba549f6c4e1a91b83245d144471be26619c835cccf0f8e20aa78c25ac11a06efd17cc1b9db9cacadceb78a4c08a1029eafee5 ++"dompurify@npm:^2.5.0": ++ version: 2.5.7 ++ resolution: "dompurify@npm:2.5.7" ++ checksum: 9652139743130b5ebaf5278fadec06d9b3920019b80c205565b9b8d52cd0cea90ff690c1994c5c0da5bc9d57a94dc19236cdf1ccabdc1c6cff7c255e1e597031 + languageName: node + linkType: hard + +@@ -21953,7 +21946,7 @@ __metadata: + dangerously-set-html-content: 1.0.9 + date-fns: 2.29.1 + debounce-promise: 3.1.2 +- dompurify: ^2.4.1 ++ dompurify: ^2.5.0 + emotion: 11.0.0 + enzyme: 3.11.0 + enzyme-to-json: 3.6.2 diff --git a/create_bundles.sh b/create_bundles.sh index 647ad5c..94171aa 100755 --- a/create_bundles.sh +++ b/create_bundles.sh @@ -40,6 +40,7 @@ awk '$2 ~ /^v/ && $4 != "indirect" {print "Provides: bundled(golang(" $1 ")) = " # Vendor Node.js dependencies patch -p1 --fuzz=0 < ../0005-remove-unused-frontend-crypto.patch +patch -p1 --fuzz=0 < ../0014-resolve-dompurify-CVE.patch export HUSKY=0 yarn install --frozen-lockfile diff --git a/create_bundles_in_container.sh b/create_bundles_in_container.sh index bbed4ca..4640068 100755 --- a/create_bundles_in_container.sh +++ b/create_bundles_in_container.sh @@ -6,7 +6,7 @@ # cat < 9.2.10-20 +- Resolves RHEL-62307: CVE-2024-47875 + * Thu Oct 10 2024 Sam Feifer 9.2.10-19 - Resolves RHEL-61779: CVE-2024-9355 diff --git a/sources b/sources index 22cebe5..cda8bf7 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (grafana-9.2.10.tar.gz) = 5eadfcd8ed8822c4a05b4b486baa50402d989049071256d933fe7a7249a22b68e039ad6445a8a6d4a9f0754661882ab8ece1af308aad9c148f31d2cdb320c8c0 -SHA512 (grafana-webpack-9.2.10-2.tar.gz) = 4ca5c3ce0ca695ad4e5cd8c5d9f130cf5b0f47e75e224237955212557db572891c8b8a48a303892ef7c04859047229956ece63015c7704f2730b9d7fd43e09ea -SHA512 (grafana-vendor-9.2.10-2.tar.xz) = 70967b7e8ace2146f0abf6aab03e9533d3653f567f737874377d5bfb48c572859e7776d547a8faf8d38ccf07eb5f54ee84d138c8f7b5e82144d8edc6f3f9e5c0 +SHA512 (grafana-webpack-9.2.10-20.tar.gz) = 5469b2fe57a4a3f6987f9eab621782d4acda385dbbb0784a5fa9ffe57111c2d31a3ffed7993732a90c29fe230eec831515543d8489e6ae6942970d54625ada2a +SHA512 (grafana-vendor-9.2.10-20.tar.xz) = be2b54eba969983780eaa6b2e8759dd434db11c14dfadef27b44d6fe2a38e672e733783bd08922a8218b5d008895ecf924391c21545950128e06e1297f0cd56f