systemausfall.org/hugo-theme-hilfe
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: replace ajv to avoid unsafe-eval (#269)

Browse source
This commit is contained in:
Robert Kaussow 2022-01-08 21:29:28 +01:00 • committed by GitHub
parent a78a8afb57
commit d89f0246ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/js/search.js
View file

@ -1,10 +1,8 @@
const { groupBy } = require("./groupBy")
const { FlexSearch } = require("flexsearch/dist/flexsearch.compact")
const Ajv = require("ajv")
const { Validator } = require("@cfworker/json-schema")
document.addEventListener("DOMContentLoaded", function (event) {
const ajv = new Ajv()
const input = document.querySelector("#gdoc-search-input")
const results = document.querySelector("#gdoc-search-results")
@ -23,17 +21,14 @@ document.addEventListener("DOMContentLoaded", function (event) {
},
additionalProperties: false
}
const validator = new Validator(configSchema)
getJson("/search/config.min.json", function (searchConfig) {
const configValidate = ajv.compile(configSchema)
const valid = configValidate(searchConfig)
const validationResult = validator.validate(searchConfig)
if (!valid)
if (!validationResult.valid)
throw AggregateError(
configValidate.errors.map(
(err) =>
new Error(["Validation error:", err.instancePath, err.keyword, err.message].join(" "))
),
validationResult.errors.map((err) => new Error("Validation error: " + err.error)),
"Schema validation failed"
)