forked from CycloneDX/cyclonedx-javascript-library
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Switch to libxml2-wasm for XML validation
Due to libxmljs2 not being maintained and contained a vulnerability, a replacement needed to be found. This commit replaces it with libxml2-wasm, which is a new, but maintained library, which serves the purpose of validating XML. The implementation is as close the the previous library in regards to flags passed to libxml2, but only adapted to a different interface and the recommendation to dispose all objects. This is my first contribution to this project, and typescript isn't my usual language, so comments are welcome. Resolves: CycloneDX#1079 Signed-off-by: Leon Grave <[email protected]>
Showing
5 changed files
with
61 additions
and
51 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
/*! | ||
This file is part of CycloneDX JavaScript Library. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
SPDX-License-Identifier: Apache-2.0 | ||
Copyright (c) OWASP Foundation. All Rights Reserved. | ||
*/ | ||
|
||
import { readFile } from 'fs/promises'; | ||
import { ParseOption, XmlDocument, XsdValidator } from 'libxml2-wasm'; | ||
import { pathToFileURL } from 'url'; | ||
|
||
import type { ValidationError } from '../../validation/types'; | ||
import type { Functionality, Validator } from '../xmlValidator'; | ||
|
||
/** @internal */ | ||
export default (async function (schemaPath: string): Promise<Validator> { | ||
const schema = XmlDocument.fromString( | ||
await readFile(schemaPath, 'utf-8'), | ||
{ | ||
option: ParseOption.XML_PARSE_NONET | ParseOption.XML_PARSE_COMPACT, | ||
url: pathToFileURL(schemaPath).toString() | ||
}); | ||
const validator = XsdValidator.fromDoc(schema); | ||
|
||
return function (data: string): null | ValidationError { | ||
const doc = XmlDocument.fromString(data, { option: ParseOption.XML_PARSE_NONET | ParseOption.XML_PARSE_COMPACT }); | ||
let errors = null; | ||
try { | ||
validator.validate(doc); | ||
} | ||
catch (validationErrors) { | ||
errors = validationErrors; | ||
} | ||
|
||
doc.dispose(); | ||
validator.dispose(); | ||
schema.dispose(); | ||
|
||
return errors; | ||
} | ||
}) satisfies Functionality |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters