From b779b9d8550f633500760eeb408a124333f162b0 Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Fri, 27 Mar 2026 14:24:43 +0100
Subject: [PATCH] [CB] Fix high CVE-2026-33671 in picomatch (#4244)

* dbeaver/pro#8836 fixes picomatch CVE

* fixes happy-dom CVE
---
 webapp/common-react/package.json |  3 +++
 webapp/package.json              |  4 +++-
 webapp/yarn.lock                 | 23 ++++++++---------------
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/webapp/common-react/package.json b/webapp/common-react/package.json
index 3bbab6148d..56740aaaf1 100644
--- a/webapp/common-react/package.json
+++ b/webapp/common-react/package.json
@@ -11,6 +11,9 @@
     "clear": "rimraf -g '@dbeaver/*/{dist,lib}'",
     "test": "dbeaver-test"
   },
+  "resolutions": {
+    "happy-dom": ">=20.8.8"
+  },
   "devDependencies": {
     "@dbeaver/cli": "workspace:^",
     "@dbeaver/prettier-config": "workspace:^",
diff --git a/webapp/package.json b/webapp/package.json
index cd3c47d47e..59f95ce006 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -24,7 +24,9 @@
     "koa": ">=2.16.4",
     "immutable": ">=4.3.8",
     "serialize-javascript": ">=7.0.3",
-    "flatted": ">=3.4.2"
+    "flatted": ">=3.4.2",
+    "picomatch": ">=2.3.2",
+    "happy-dom": ">=20.8.8"
   },
   "scripts": {
     "test": "dbeaver-test",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index b2d82bef4e..eba0f28e25 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -13122,9 +13122,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"happy-dom@npm:^20":
-  version: 20.8.3
-  resolution: "happy-dom@npm:20.8.3"
+"happy-dom@npm:>=20.8.8":
+  version: 20.8.9
+  resolution: "happy-dom@npm:20.8.9"
   dependencies:
     "@types/node": "npm:>=20.0.0"
     "@types/whatwg-mimetype": "npm:^3.0.2"
@@ -13132,7 +13132,7 @@ __metadata:
     entities: "npm:^7.0.1"
     whatwg-mimetype: "npm:^3.0.0"
     ws: "npm:^8.18.3"
-  checksum: 10c0/79a2b6d32e2f778b015511c9d2de7f7859954cbd27a30720736e60552a88e0345ffc8b2c5e77140c5f2f7fef95c563aea7ab0b2edba5d8c7edd5676b43ecef55
+  checksum: 10c0/12fe9b85891b1289935b2a4f726e2839e7c92e3f55401bd20cb5500763dd994364645acaab20a754fd90d5e1b2ffdf734b39a32ea02704c3e3ee0c4d30cf958e
   languageName: node
   linkType: hard
 
@@ -16559,17 +16559,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"picomatch@npm:^2.2.2, picomatch@npm:^2.3.1":
-  version: 2.3.1
-  resolution: "picomatch@npm:2.3.1"
-  checksum: 10c0/26c02b8d06f03206fc2ab8d16f19960f2ff9e81a658f831ecb656d8f17d9edc799e8364b1f4a7873e89d9702dff96204be0fa26fe4181f6843f040f819dac4be
-  languageName: node
-  linkType: hard
-
-"picomatch@npm:^4.0.2, picomatch@npm:^4.0.3":
-  version: 4.0.3
-  resolution: "picomatch@npm:4.0.3"
-  checksum: 10c0/9582c951e95eebee5434f59e426cddd228a7b97a0161a375aed4be244bd3fe8e3a31b846808ea14ef2c8a2527a6eeab7b3946a67d5979e81694654f939473ae2
+"picomatch@npm:>=2.3.2":
+  version: 4.0.4
+  resolution: "picomatch@npm:4.0.4"
+  checksum: 10c0/e2c6023372cc7b5764719a5ffb9da0f8e781212fa7ca4bd0562db929df8e117460f00dff3cb7509dacfc06b86de924b247f504d0ce1806a37fac4633081466b0
   languageName: node
   linkType: hard