You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by ha...@apache.org on 2026/06/03 15:18:13 UTC
(superset) branch master updated: chore: guard recursive merge keys and invoke subprocess without a shell (#40558)
This is an automated email from the ASF dual-hosted git repository.
hainenber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git
The following commit(s) were added to refs/heads/master by this push:
new cb2a56d16e0 chore: guard recursive merge keys and invoke subprocess without a shell (#40558)
cb2a56d16e0 is described below
commit cb2a56d16e0bccf0e6d8cb878b90ca3474b1a7b4
Author: Evan Rusackas <ev...@preset.io>
AuthorDate: Wed Jun 3 08:18:05 2026 -0700
chore: guard recursive merge keys and invoke subprocess without a shell (#40558)
Co-authored-by: Claude Code <no...@anthropic.com>
---
.../plugins/legacy-plugin-chart-calendar/src/vendor/cal-heatmap.ts | 4 ++++
superset/mcp_service/bin/superset-mcp.js | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/superset-frontend/plugins/legacy-plugin-chart-calendar/src/vendor/cal-heatmap.ts b/superset-frontend/plugins/legacy-plugin-chart-calendar/src/vendor/cal-heatmap.ts
index 61f74e0d3ac..519f95b7103 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-calendar/src/vendor/cal-heatmap.ts
+++ b/superset-frontend/plugins/legacy-plugin-chart-calendar/src/vendor/cal-heatmap.ts
@@ -4005,6 +4005,10 @@ function mergeRecursive(obj1, obj2) {
/*jshint forin:false */
for (var p in obj2) {
+ // Skip keys that could pollute the object prototype.
+ if (p === '__proto__' || p === 'constructor' || p === 'prototype') {
+ continue;
+ }
try {
// Property in destination object set; update its value.
if (obj2[p].constructor === Object) {
diff --git a/superset/mcp_service/bin/superset-mcp.js b/superset/mcp_service/bin/superset-mcp.js
index b9eb7c68780..4d190651998 100755
--- a/superset/mcp_service/bin/superset-mcp.js
+++ b/superset/mcp_service/bin/superset-mcp.js
@@ -59,7 +59,7 @@
* 4. Run npm publish with appropriate access rights
*/
-const { spawn, execSync } = require('child_process');
+const { spawn, execSync, execFileSync } = require('child_process');
const path = require('path');
const fs = require('fs');
@@ -176,7 +176,7 @@ function checkEnvironment() {
// Check if Superset is installed
try {
- execSync(`${python} -c "import superset"`, {
+ execFileSync(python, ['-c', 'import superset'], {
env: { ...process.env, PYTHONPATH: supersetRoot },
stdio: 'ignore'
});