IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Sandbox: Patch array vector prototype methods inside the sandbox (#75835)

Browse Source
This commit is contained in:
Esteban Beltran 2023-10-03 09:02:55 +02:00 committed by GitHub
parent 0c404a4cd9
commit 677a2ad4d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 47 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/grafana-data/src/types/vector.ts
View File

@ -13,7 +13,8 @@ declare global {
// JS original sin
// this if condition is because Jest will re-exec this block multiple times (in a browser this only runs once)
if (!Object.getOwnPropertyDescriptor(Array.prototype, 'toArray')) {
export function patchArrayVectorProrotypeMethods() {
if (!Object.getOwnPropertyDescriptor(Array.prototype, 'toArray')) {
Object.defineProperties(Array.prototype, {
get: {
value: function (idx: number) {
@ -48,7 +49,10 @@ if (!Object.getOwnPropertyDescriptor(Array.prototype, 'toArray')) {
configurable: true,
},
});
}
}
//this function call is intentional
patchArrayVectorProrotypeMethods();
/** @deprecated use a simple Array<T> */
export interface Vector<T = any> extends Array<T> {

10
public/app/features/plugins/sandbox/code_loader.ts
View File

@ -1,4 +1,4 @@
import { PluginMeta } from '@grafana/data';
import { PluginMeta, patchArrayVectorProrotypeMethods } from '@grafana/data';
import { transformPluginSourceForCDN } from '../cdn/utils';
import { resolveWithCache } from '../loader/cache';
@ -91,3 +91,11 @@ function patchPluginSourceMap(meta: PluginMeta, pluginCode: string): string {
}
return pluginCode;
}
export function patchSandboxEnvironmentPrototype(sandboxEnvironment: SandboxEnvironment) {
// same as https://github.com/grafana/grafana/blob/main/packages/grafana-data/src/types/vector.ts#L16
// Array is a "reflective" type in Near-membrane and doesn't get an identify continuity
sandboxEnvironment.evaluate(
`${patchArrayVectorProrotypeMethods.toString()};${patchArrayVectorProrotypeMethods.name}()`
);
}

4
public/app/features/plugins/sandbox/sandbox_plugin_loader.ts
View File

@ -7,7 +7,7 @@ import { defaultTrustedTypesPolicy } from 'app/core/trustedTypePolicies';
import { getPluginSettings } from '../pluginSettings';
import { getPluginCode } from './code_loader';
import { getPluginCode, patchSandboxEnvironmentPrototype } from './code_loader';
import { getGeneralSandboxDistortionMap, distortLiveApis } from './distortion_map';
import {
getSafeSandboxDomElement,
@ -179,6 +179,8 @@ async function doImportPluginModuleInSandbox(meta: PluginMeta): Promise<System.M
},
});
patchSandboxEnvironmentPrototype(sandboxEnvironment);
// fetch plugin's code
let pluginCode = '';
try {