IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-26 16:27:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix xss in Graphite functions tooltip (#64925)" (#64933)

Browse Source 
This reverts commit a896feb346.
This commit is contained in:
Ludovic Viaud 2023-03-16 21:37:48 +01:00 committed by GitHub
parent a896feb346
commit e22e12455d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 280 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.yarn/cache/rst2html-https-e87da7ea2f-63d5ff3068.zip vendored Normal file
View File

Binary file not shown.

1
package.json
View File

@ -399,6 +399,7 @@
"redux-thunk": "2.4.2",
"regenerator-runtime": "0.13.11",
"reselect": "4.1.7",
"rst2html": "github:thoward/rst2html#990cb89f2a300cdd9151790be377c4c0840df809",
"rxjs": "7.8.0",
"sass": "link:./public/sass",
"selecto": "1.22.0",

4
public/app/plugins/datasource/graphite/components/FunctionEditorControls.tsx
View File

@ -11,9 +11,11 @@ export interface FunctionEditorControlsProps {
}
const FunctionDescription = React.lazy(async () => {
// @ts-ignore
const { default: rst2html } = await import(/* webpackChunkName: "rst2html" */ 'rst2html');
return {
default(props: { description?: string }) {
return <div>{props.description}</div>;
return <div dangerouslySetInnerHTML={{ __html: rst2html(props.description ?? '') }} />;
},
};
});

282
yarn.lock
View File

@ -13318,6 +13318,13 @@ __metadata:
languageName: node
linkType: hard
"acorn-es7-plugin@npm:^1.0.12":
version: 1.1.7
resolution: "acorn-es7-plugin@npm:1.1.7"
checksum: f7e0fc6e1500f28936a25934c269ac541ef374eec6ce3e3e665b3f7fbaaeb04d89467fa860ff4a8949cecfa692cf79b29d76e50e1f2c549367cb9865f2e0280c
languageName: node
linkType: hard
"acorn-globals@npm:^6.0.0":
version: 6.0.0
resolution: "acorn-globals@npm:6.0.0"
@ -13370,6 +13377,15 @@ __metadata:
languageName: node
linkType: hard
"acorn@npm:^5.0.0":
version: 5.7.4
resolution: "acorn@npm:5.7.4"
bin:
acorn: bin/acorn
checksum: f51392a4d25c7705fadb890f784c59cde4ac1c5452ccd569fa59bd2191b7951b4a6398348ab7ea08a54f0bc0a56c13776710f4e1bae9de441e4d33e2015ad1e0
languageName: node
linkType: hard
"acorn@npm:^7.1.1, acorn@npm:^7.4.1":
version: 7.4.1
resolution: "acorn@npm:7.4.1"
@ -13890,6 +13906,13 @@ __metadata:
languageName: node
linkType: hard
"array-filter@npm:^1.0.0":
version: 1.0.0
resolution: "array-filter@npm:1.0.0"
checksum: 467054291f522d7f633b1f5e79aac9008ade50a7354e0178d9ec8f0091ec03bc19a41d4eb22985daf2279a5c27be6d7cf410733539e7fccb0742145b89aca438
languageName: node
linkType: hard
"array-find-index@npm:^1.0.1":
version: 1.0.2
resolution: "array-find-index@npm:1.0.2"
@ -15419,6 +15442,13 @@ __metadata:
languageName: node
linkType: hard
"call-signature@npm:0.0.2":
version: 0.0.2
resolution: "call-signature@npm:0.0.2"
checksum: 084a55a6218346e492464ab59f123fd3672625586ad183a538984baafba2ba6f3277ed6f66b10b44d4f267a780227134a31f46e8de3932bd2d83f2ed11234a5e
languageName: node
linkType: hard
"callsite@npm:^1.0.0":
version: 1.0.0
resolution: "callsite@npm:1.0.0"
@ -16303,7 +16333,7 @@ __metadata:
languageName: node
linkType: hard
"commander@npm:^2.19.0, commander@npm:^2.20.0, commander@npm:^2.20.3":
"commander@npm:^2.19.0, commander@npm:^2.20.0, commander@npm:^2.20.3, commander@npm:^2.9.0":
version: 2.20.3
resolution: "commander@npm:2.20.3"
checksum: ab8c07884e42c3a8dbc5dd9592c606176c7eb5c1ca5ff274bcf907039b2c41de3626f684ea75ccf4d361ba004bbaff1f577d5384c155f3871e456bdf27becf9e
@ -16744,7 +16774,7 @@ __metadata:
languageName: node
linkType: hard
"core-js@npm:^2.4.0, core-js@npm:^2.6.5":
"core-js@npm:^2.0.0, core-js@npm:^2.4.0, core-js@npm:^2.6.5":
version: 2.6.12
resolution: "core-js@npm:2.6.12"
checksum: 44fa9934a85f8c78d61e0c8b7b22436330471ffe59ec5076fe7f324d6e8cf7f824b14b1c81ca73608b13bdb0fef035bd820989bf059767ad6fa13123bb8bd016
@ -18085,7 +18115,7 @@ __metadata:
languageName: node
linkType: hard
"define-properties@npm:^1.1.3":
"define-properties@npm:^1.1.2, define-properties@npm:^1.1.3":
version: 1.1.3
resolution: "define-properties@npm:1.1.3"
dependencies:
@ -18293,6 +18323,13 @@ __metadata:
languageName: node
linkType: hard
"diff-match-patch@npm:^1.0.0":
version: 1.0.5
resolution: "diff-match-patch@npm:1.0.5"
checksum: 841522d01b09cccbc4e4402cf61514a81b906349a7d97b67222390f2d35cf5df277cb23959eeed212d5e46afb5629cebab41b87918672c5a05c11c73688630e3
languageName: node
linkType: hard
"diff-sequences@npm:^26.6.2":
version: 26.6.2
resolution: "diff-sequences@npm:26.6.2"
@ -18644,6 +18681,13 @@ __metadata:
languageName: node
linkType: hard
"eastasianwidth@npm:^0.2.0":
version: 0.2.0
resolution: "eastasianwidth@npm:0.2.0"
checksum: 7d00d7cd8e49b9afa762a813faac332dee781932d6f2c848dc348939c4253f1d4564341b7af1d041853bc3f32c2ef141b58e0a4d9862c17a7f08f68df1e0f1ed
languageName: node
linkType: hard
"ecc-jsbn@npm:~0.1.1":
version: 0.1.2
resolution: "ecc-jsbn@npm:0.1.2"
@ -18764,6 +18808,26 @@ __metadata:
languageName: node
linkType: hard
"empower-core@npm:^1.2.0":
version: 1.2.0
resolution: "empower-core@npm:1.2.0"
dependencies:
call-signature: 0.0.2
core-js: ^2.0.0
checksum: 64f9c3d4db0c8a22a34484dce6143918e8c337f7d5268c5b93e9f34113bfc1a962a6d10df7d62760db40e0e7259cd84b2b381ac96b053a9e1ec83d4bc91a4546
languageName: node
linkType: hard
"empower@npm:^1.3.1":
version: 1.3.1
resolution: "empower@npm:1.3.1"
dependencies:
core-js: ^2.0.0
empower-core: ^1.2.0
checksum: cfcd40cba8a90d63826292f9857f774f7d3bc4d0d35afd85080a0db062b0e0a6afd1aee3a832b4c3c474cf4a7224772f9a70fe79fc963d8367f1e790cfc2d4cb
languageName: node
linkType: hard
"encodeurl@npm:~1.0.2":
version: 1.0.2
resolution: "encodeurl@npm:1.0.2"
@ -20074,6 +20138,15 @@ __metadata:
languageName: node
linkType: hard
"espurify@npm:^1.6.0":
version: 1.8.1
resolution: "espurify@npm:1.8.1"
dependencies:
core-js: ^2.0.0
checksum: 1be1e73f2a0e23b5c5b8b661bd6fd62b9d89d9cc1140ca4b98c364358b11a123e4a973df2a4c0e7ad6bfed2ca71f04d5b8797daa9a7d36b3c77207b1749ec3b5
languageName: node
linkType: hard
"esquery@npm:^1.0.1, esquery@npm:^1.3.1, esquery@npm:^1.4.0":
version: 1.4.0
resolution: "esquery@npm:1.4.0"
@ -20101,7 +20174,7 @@ __metadata:
languageName: node
linkType: hard
"estraverse@npm:^4.1.1":
"estraverse@npm:^4.1.0, estraverse@npm:^4.1.1, estraverse@npm:^4.2.0":
version: 4.3.0
resolution: "estraverse@npm:4.3.0"
checksum: a6299491f9940bb246124a8d44b7b7a413a8336f5436f9837aaa9330209bd9ee8af7e91a654a3545aee9c54b3308e78ee360cef1d777d37cfef77d2fa33b5827
@ -22304,6 +22377,7 @@ __metadata:
regenerator-runtime: 0.13.11
reselect: 4.1.7
rimraf: 4.4.0
rst2html: "github:thoward/rst2html#990cb89f2a300cdd9151790be377c4c0840df809"
rudder-sdk-js: 2.25.0
rxjs: 7.8.0
sass: 1.58.3
@ -23441,6 +23515,13 @@ __metadata:
languageName: node
linkType: hard
"indexof@npm:0.0.1":
version: 0.0.1
resolution: "indexof@npm:0.0.1"
checksum: 0fb04e8b147b8585d981a6df1564f25bb3678d6fa74e33e5cecc1464b10f78e15e8ef6bb688f135fe5c2844a128fac8a7831cbe5adc81fdcf12681b093dfcc25
languageName: node
linkType: hard
"infer-owner@npm:^1.0.4":
version: 1.0.4
resolution: "infer-owner@npm:1.0.4"
@ -26937,7 +27018,7 @@ __metadata:
languageName: node
linkType: hard
"lodash@npm:4.17.21, lodash@npm:^4, lodash@npm:^4.1.1, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.17.4, lodash@npm:^4.7.0":
"lodash@npm:4.17.21, lodash@npm:^4, lodash@npm:^4.0.0, lodash@npm:^4.1.1, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.17.4, lodash@npm:^4.7.0":
version: 4.17.21
resolution: "lodash@npm:4.17.21"
checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7
@ -29373,7 +29454,7 @@ __metadata:
languageName: node
linkType: hard
"object-keys@npm:^1.0.12, object-keys@npm:^1.1.1":
"object-keys@npm:^1.0.0, object-keys@npm:^1.0.12, object-keys@npm:^1.1.1":
version: 1.1.1
resolution: "object-keys@npm:1.1.1"
checksum: b363c5e7644b1e1b04aa507e88dcb8e3a2f52b6ffd0ea801e4c7a62d5aa559affe21c55a07fd4b1fd55fc03a33c610d73426664b20032405d7b92a1414c34d6a
@ -31513,6 +31594,127 @@ __metadata:
languageName: node
linkType: hard
"power-assert-context-formatter@npm:^1.0.7":
version: 1.2.0
resolution: "power-assert-context-formatter@npm:1.2.0"
dependencies:
core-js: ^2.0.0
power-assert-context-traversal: ^1.2.0
checksum: b3610277a92b26de58d68af19f0835b683afe472463e8fc136c1787f3d5c7cd05a1aeb070d878af9db9e7ef9c92ea30417b24802da6cb118de2c615f7a63277a
languageName: node
linkType: hard
"power-assert-context-reducer-ast@npm:^1.0.7":
version: 1.2.0
resolution: "power-assert-context-reducer-ast@npm:1.2.0"
dependencies:
acorn: ^5.0.0
acorn-es7-plugin: ^1.0.12
core-js: ^2.0.0
espurify: ^1.6.0
estraverse: ^4.2.0
checksum: 4066f738b3932ec11d0a1aac857205d2482d1f5a1fe42fef0eb09ae049e363fc08f9edfdf0808a4dac4591dc36d8b42158c342494769b51af98fd08cd5d364a9
languageName: node
linkType: hard
"power-assert-context-traversal@npm:^1.2.0":
version: 1.2.0
resolution: "power-assert-context-traversal@npm:1.2.0"
dependencies:
core-js: ^2.0.0
estraverse: ^4.1.0
checksum: cf93ab5e5728e92975f2a66344a64ad72b93572f1a11050a404e4bdfb335d14b5027f687b717dfd39f56c35861e41325b71a46e121891874c456c3d1ba68713c
languageName: node
linkType: hard
"power-assert-formatter@npm:^1.4.1":
version: 1.4.1
resolution: "power-assert-formatter@npm:1.4.1"
dependencies:
core-js: ^2.0.0
power-assert-context-formatter: ^1.0.7
power-assert-context-reducer-ast: ^1.0.7
power-assert-renderer-assertion: ^1.0.7
power-assert-renderer-comparison: ^1.0.7
power-assert-renderer-diagram: ^1.0.7
power-assert-renderer-file: ^1.0.7
checksum: 16d6cda572f43d81b795515328cafb01aab97041eb3b7e08fe3d95bdb4dcfb240a0df68740b68cf185a8a1be38783ac9d20ac8a2c914d888bc2a610fb7da1ee5
languageName: node
linkType: hard
"power-assert-renderer-assertion@npm:^1.0.7":
version: 1.2.0
resolution: "power-assert-renderer-assertion@npm:1.2.0"
dependencies:
power-assert-renderer-base: ^1.1.1
power-assert-util-string-width: ^1.2.0
checksum: d900d9e39cf7aa77915c37d850cb728b2a89d9e4dda9eae85ebca6ecbaea87a4cf00a36633d329d6b52d1ba06b173bdb10fdca168db9ebfc8372930973dce7e5
languageName: node
linkType: hard
"power-assert-renderer-base@npm:^1.1.1":
version: 1.1.1
resolution: "power-assert-renderer-base@npm:1.1.1"
checksum: cbffc10c278bd94676679ab615f77526615d2d97f6e1197376f551a88bed8e0dd22e2dda519f84e27db3266760ef012cf8b3a3c9f20d809e49b3d6bb2b7904e8
languageName: node
linkType: hard
"power-assert-renderer-comparison@npm:^1.0.7":
version: 1.2.0
resolution: "power-assert-renderer-comparison@npm:1.2.0"
dependencies:
core-js: ^2.0.0
diff-match-patch: ^1.0.0
power-assert-renderer-base: ^1.1.1
stringifier: ^1.3.0
type-name: ^2.0.1
checksum: 14b2b1f2479e78cc08f5628a05cf90fa7f60fadde443d86c3e5c7810727dc206ca663d31f5feb364f0827a64a8cf6081f80ab275b1befd3256146ed60b80fb5f
languageName: node
linkType: hard
"power-assert-renderer-diagram@npm:^1.0.7":
version: 1.2.0
resolution: "power-assert-renderer-diagram@npm:1.2.0"
dependencies:
core-js: ^2.0.0
power-assert-renderer-base: ^1.1.1
power-assert-util-string-width: ^1.2.0
stringifier: ^1.3.0
checksum: e8c9073d1d116c0db500b07bdff9a3341c2637e96f36998184fc4a61b8e83ac7074e43f44a609acb521519be71bb5100a35963271d1e9a9bde89bcef730d224e
languageName: node
linkType: hard
"power-assert-renderer-file@npm:^1.0.7":
version: 1.2.0
resolution: "power-assert-renderer-file@npm:1.2.0"
dependencies:
power-assert-renderer-base: ^1.1.1
checksum: d9678b934900a6edc0f2f34f87326f54b62949aed60ffe73fda6072eaf6fd5d5eca2f008528b3656022c570e5e5cfaf0437c9598271afd74a7daa97439d3ab7b
languageName: node
linkType: hard
"power-assert-util-string-width@npm:^1.2.0":
version: 1.2.0
resolution: "power-assert-util-string-width@npm:1.2.0"
dependencies:
eastasianwidth: ^0.2.0
checksum: 66465a41d8a0c9c5cd633d77c9ac44cbf785c6b0896617c47a05686afebfb313dbd48822e8f1f6a35a74c5af270fa2e72408cc371d2d4e7701ab5507efe883d7
languageName: node
linkType: hard
"power-assert@npm:^1.2.0":
version: 1.6.1
resolution: "power-assert@npm:1.6.1"
dependencies:
define-properties: ^1.1.2
empower: ^1.3.1
power-assert-formatter: ^1.4.1
universal-deep-strict-equal: ^1.2.1
xtend: ^4.0.0
checksum: 351e9f9a642ec47ba1853fccd97583c1a30c947778ec5b6004a4b6bb2f57e047563a3585131ffec3da810e61fbdc008f96510718d32ddb741ded3c148ae90384
languageName: node
linkType: hard
"preceptor-core@npm:~0.10.0":
version: 0.10.1
resolution: "preceptor-core@npm:0.10.1"
@ -34320,6 +34522,20 @@ __metadata:
languageName: node
linkType: hard
"restructured@npm:0.0.11":
version: 0.0.11
resolution: "restructured@npm:0.0.11"
dependencies:
commander: ^2.9.0
lodash: ^4.0.0
power-assert: ^1.2.0
unist-util-map: ^1.0.2
bin:
restructured: bin/restructured.js
checksum: 98039dc69eb5beb9d1d9fe61898e75408919b841c618a7fae7e19400d8e675e50a5d82f81958f62bd08b8c0a794de1885bc68698f49b6dd045aa942a3eebbb1c
languageName: node
linkType: hard
"ret@npm:~0.1.10":
version: 0.1.15
resolution: "ret@npm:0.1.15"
@ -34498,6 +34714,15 @@ __metadata:
languageName: node
linkType: hard
"rst2html@github:thoward/rst2html#990cb89f2a300cdd9151790be377c4c0840df809":
version: 1.0.4
resolution: "rst2html@https://github.com/thoward/rst2html.git#commit=990cb89f2a300cdd9151790be377c4c0840df809"
dependencies:
restructured: 0.0.11
checksum: 63d5ff30687046d510ebf90968aec1cc878a689ad3c464434e131be12fee822a5d57d224d960908eafa5c7543da3b6f0b49b8ea1f0061597a66c553717957e8c
languageName: node
linkType: hard
"rsvp@npm:^4.8.2, rsvp@npm:^4.8.4":
version: 4.8.5
resolution: "rsvp@npm:4.8.5"
@ -36284,6 +36509,17 @@ __metadata:
languageName: node
linkType: hard
"stringifier@npm:^1.3.0":
version: 1.4.0
resolution: "stringifier@npm:1.4.0"
dependencies:
core-js: ^2.0.0
traverse: ^0.6.6
type-name: ^2.0.1
checksum: ec991c47a70778ebcf0aab13205f2fcdca4d019a4d4a7e2f67597e98027b01daa2c625278bd719bbddab9a6cf978dbee94c935b26f264a5e47e00c7f64ecab50
languageName: node
linkType: hard
"stringify-entities@npm:^4.0.0":
version: 4.0.3
resolution: "stringify-entities@npm:4.0.3"
@ -37328,6 +37564,13 @@ __metadata:
languageName: node
linkType: hard
"traverse@npm:^0.6.6":
version: 0.6.6
resolution: "traverse@npm:0.6.6"
checksum: e2afa72f11efa9ba31ed763d2d9d2aa244612f22015d16c0ea3ba5f6ca8bf071de87f8108b721885cce06ea4a36ef4605d9228c67e431d9015ea4685cb364420
languageName: node
linkType: hard
"treeverse@npm:^2.0.0":
version: 2.0.0
resolution: "treeverse@npm:2.0.0"
@ -37784,6 +38027,13 @@ __metadata:
languageName: node
linkType: hard
"type-name@npm:^2.0.1":
version: 2.0.2
resolution: "type-name@npm:2.0.2"
checksum: 747a8503393ae19590f7658965b40970fd515ca4c581b28707d1436bd7e31311e5016ee5729be2cc4b8ab83717a9b3eaf2241ed351ef8aed773ed926429a1301
languageName: node
linkType: hard
"type-of@npm:^2.0.1":
version: 2.0.1
resolution: "type-of@npm:2.0.1"
@ -38132,6 +38382,15 @@ __metadata:
languageName: node
linkType: hard
"unist-util-map@npm:^1.0.2":
version: 1.0.5
resolution: "unist-util-map@npm:1.0.5"
dependencies:
object-assign: ^4.0.1
checksum: 9f8880e65a4d5482d74f90d7c2b76a3aa7388c57be68eff71fe76ebe1bcf50dfb8788225c8c38aa1e0c19f46eb06685eaac10da1008f6f33f44e9944d453faa9
languageName: node
linkType: hard
"unist-util-position-from-estree@npm:^1.0.0, unist-util-position-from-estree@npm:^1.1.0":
version: 1.1.1
resolution: "unist-util-position-from-estree@npm:1.1.1"
@ -38245,6 +38504,17 @@ __metadata:
languageName: node
linkType: hard
"universal-deep-strict-equal@npm:^1.2.1":
version: 1.2.2
resolution: "universal-deep-strict-equal@npm:1.2.2"
dependencies:
array-filter: ^1.0.0
indexof: 0.0.1
object-keys: ^1.0.0
checksum: 0ad6b318e4e2f62a9a0cb814be327eaf28e6067c952d150901d9de6ca2736154cc7c782c61840ab5a50ba1872cfe2e6ccafafdb9be971a53c8dcee1e5f33cbb8
languageName: node
linkType: hard
"universal-user-agent@npm:^6.0.0":
version: 6.0.0
resolution: "universal-user-agent@npm:6.0.0"