mirror of
https://github.com/open-policy-agent/opa.git
synced 2026-08-13 03:42:35 -06:00
docs: Update acorn to fix CVE with dev tooling
Fixing https://github.com/advisories/GHSA-7fhm-mqm4-2wp7 This also fixes the unit tests (not sure how long they've been borken) and makes them run as part of the netlify preview build, so any regressions should be seen in PR's. Signed-off-by: Patrick East <east.patrick@gmail.com>
This commit is contained in:
@@ -255,7 +255,7 @@ release-bugfix-travis: deploy-travis
|
||||
netlify-prod: clean docs-clean build docs-generate docs-production-build
|
||||
|
||||
.PHONY: netlify-preview
|
||||
netlify-preview: clean docs-clean build docs-generate docs-preview-build
|
||||
netlify-preview: clean docs-clean build docs-live-blocks-install-deps docs-live-blocks-test docs-generate docs-preview-build
|
||||
|
||||
######################################################
|
||||
#
|
||||
|
||||
+11
-3
@@ -921,9 +921,9 @@
|
||||
}
|
||||
},
|
||||
"acorn": {
|
||||
"version": "6.2.1",
|
||||
"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.1.tgz",
|
||||
"integrity": "sha512-JD0xT5FCRDNyjDda3Lrg/IxFscp9q4tiYtxE1/nOzlKCk7hIRuYjhq1kCNkbPjMRMZuFq20HNQn1I9k8Oj0E+Q==",
|
||||
"version": "7.1.1",
|
||||
"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz",
|
||||
"integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==",
|
||||
"dev": true
|
||||
},
|
||||
"alphanum-sort": {
|
||||
@@ -3510,6 +3510,14 @@
|
||||
"@types/estree": "0.0.39",
|
||||
"@types/node": "^12.6.2",
|
||||
"acorn": "^6.2.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"acorn": {
|
||||
"version": "6.4.1",
|
||||
"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
|
||||
"integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
|
||||
"dev": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"rollup-plugin-babel": {
|
||||
|
||||
@@ -46,6 +46,7 @@
|
||||
"rollup-plugin-terser": "^5.1.1",
|
||||
"sinon": "^7.4.1",
|
||||
"sort-package-json": "^1.22.1",
|
||||
"serialize-javascript": ">=2.1.1"
|
||||
"serialize-javascript": ">=2.1.1",
|
||||
"acorn": ">=6.4.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -80,7 +80,19 @@ export function getAllGroupModules(groups, groupName) {
|
||||
return out.reverse() // Correct the order
|
||||
}
|
||||
|
||||
// Returns an object of the form {module: string, package: string[, input: value][, query: string][, included: map[filename]string}, throws an error with a human-readable message if the specified or any included groups don't have modules, the group's package cannot be found, or if the input cannot be parsed.
|
||||
// Returns an object of the form
|
||||
//
|
||||
// {
|
||||
// module: string,
|
||||
// package: string
|
||||
// input: value
|
||||
// query: string,
|
||||
// included: map[filename]string
|
||||
// }
|
||||
//
|
||||
// Throws an error with a human-readable message if the specified or any
|
||||
// included groups don't have modules, the group's package cannot be found, or
|
||||
// if the input cannot be parsed.
|
||||
export function getGroupData(groups, groupName) {
|
||||
const queryBlock = getGroupField(groups, groupName, BLOCK_TYPES.QUERY)
|
||||
const inputBlock = getGroupField(groups, groupName, BLOCK_TYPES.INPUT)
|
||||
|
||||
@@ -247,18 +247,7 @@ describe('getGroupData', () => {
|
||||
'a': {module: {get: () => 'package foo\na'}},
|
||||
'a/b/c': {module: {get: () => 'c'}, output: {tags: ['include(d)']}},
|
||||
'd': {module: {get: () => 'd'}}
|
||||
}, 'a/b/c').included.d).to.equal('d')
|
||||
})
|
||||
|
||||
it('doesn\'t mutate groups', () => {
|
||||
const groups = {
|
||||
'a': {input: {get: () => '{}'}, module: {get: () => 'package foo\na'}}, // Will error if gets from this parent
|
||||
'a/b/c': {query: {get: () => 'foobar'}, module: {get: () => 'c'}}
|
||||
}
|
||||
const arg = Object.fromEntries(Object.entries(groups).map(([key, value]) => [key, Object.assign({}, value)])) // depth 2 object clone
|
||||
|
||||
getGroupData(arg, 'a/b/c/d')
|
||||
expect(arg).to.deep.equal(groups)
|
||||
}, 'a/b/c').included["d.rego"]).to.equal('d')
|
||||
})
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user