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

@grafana/data: Update xss dependency (#43423)

Browse Source
This commit is contained in:
Todd Treece 2021-12-21 10:55:36 -05:00 committed by GitHub
parent 5db03cf91a
commit dd884dbfd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/grafana-data/package.json
View File

@ -39,7 +39,7 @@
"rxjs": "7.3.0", "rxjs": "7.3.0",
"tslib": "2.3.1", "tslib": "2.3.1",
"uplot": "1.6.16", "uplot": "1.6.16",
"xss": "1.0.6" "xss": "1.0.10"
}, },
"devDependencies": { "devDependencies": {
"@grafana/tsconfig": "^1.0.0-rc1", "@grafana/tsconfig": "^1.0.0-rc1",

11
packages/grafana-data/src/text/sanitize.ts
View File

@ -1,13 +1,12 @@
import xss from 'xss'; import { FilterXSS, whiteList, IWhiteList } from 'xss';
import { sanitizeUrl as braintreeSanitizeUrl } from '@braintree/sanitize-url'; import { sanitizeUrl as braintreeSanitizeUrl } from '@braintree/sanitize-url';
const XSSWL = Object.keys(xss.whiteList).reduce((acc, element) => { const XSSWL = Object.keys(whiteList).reduce((acc, element) => {
// @ts-ignore acc[element] = whiteList[element]?.concat(['class', 'style']);
acc[element] = xss.whiteList[element].concat(['class', 'style']);
return acc; return acc;
}, {}); }, {} as IWhiteList);
const sanitizeXSS = new xss.FilterXSS({ const sanitizeXSS = new FilterXSS({
whiteList: XSSWL, whiteList: XSSWL,
}); });

16
yarn.lock
View File

@ -3472,7 +3472,7 @@ __metadata:
tslib: 2.3.1 tslib: 2.3.1
typescript: 4.4.3 typescript: 4.4.3
uplot: 1.6.16 uplot: 1.6.16
xss: 1.0.6 xss: 1.0.10
languageName: unknown languageName: unknown
linkType: soft linkType: soft
@ -14181,7 +14181,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"commander@npm:2, commander@npm:^2.19.0, commander@npm:^2.20.0, commander@npm:^2.7.1, commander@npm:^2.9.0": "commander@npm:2, commander@npm:^2.19.0, commander@npm:^2.20.0, commander@npm:^2.20.3, commander@npm:^2.7.1, commander@npm:^2.9.0":
version: 2.20.3 version: 2.20.3
resolution: "commander@npm:2.20.3" resolution: "commander@npm:2.20.3"
checksum: ab8c07884e42c3a8dbc5dd9592c606176c7eb5c1ca5ff274bcf907039b2c41de3626f684ea75ccf4d361ba004bbaff1f577d5384c155f3871e456bdf27becf9e checksum: ab8c07884e42c3a8dbc5dd9592c606176c7eb5c1ca5ff274bcf907039b2c41de3626f684ea75ccf4d361ba004bbaff1f577d5384c155f3871e456bdf27becf9e
@ -36112,15 +36112,15 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"xss@npm:1.0.6": "xss@npm:1.0.10":
version: 1.0.6 version: 1.0.10
resolution: "xss@npm:1.0.6" resolution: "xss@npm:1.0.10"
dependencies: dependencies:
commander: ^2.9.0 commander: ^2.20.3
cssfilter: 0.0.10 cssfilter: 0.0.10
bin: bin:
xss: ./bin/xss xss: bin/xss
checksum: 529baa20ee4cd82e45e0aca26d0069e2b80ae82c9eaff06b39cd2e3d1320031e53b8f001e5024e880796927e0bb450bc36d47607d44e25aa0c86f2ee049b76db checksum: 0dbc70a716020d854569610d5bc949ba9d3b7f530b7af5508ffe84edaea228c34a4e1227f71cb3a4741373b1c49c3cb691f69dddefda45a594a31f112ae6a738
languageName: node languageName: node
linkType: hard linkType: hard