Backport: Fix failing JSON BOM validation when specVersion is not one of the first fields
#3698
Conversation
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
…first fields Problem was that the search for `specVersion` was aborted upon encountering a `}` token. It should be `EOF` (or `null` in case of `JsonParser#nextToken`) instead. Fixes DependencyTrack#3696 Signed-off-by: nscuro <nscuro@protonmail.com>
Coverage summary from CodacySee diff coverage on Codacy
Coverage variation details
Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: Diff coverage details
Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: See your quality gate settings Change summary preferencesCodacy will stop sending the deprecated coverage status from June 5th, 2024. Learn more Footnotes
|
2 tasks
nscuro
added a commit
to DependencyTrack/hyades-apiserver
that referenced
this pull request
Jun 11, 2024
Ports the following PRs from Dependency-Track v4.11.x: * DependencyTrack/dependency-track#3522 * DependencyTrack/dependency-track#3621 * DependencyTrack/dependency-track#3698 The following parts were **not** ported: * `ConfigKey.BOM_PROCESSING_TASK_V2_ENABLED` / `ConfigPropertyConstants.BOM_PROCESSING_TASK_V2_ENABLED`: Hyades does not have two separate versions of the task, it's already on V2 exclusively. Signed-off-by: nscuro <nscuro@protonmail.com>
2 tasks
nscuro
added a commit
to DependencyTrack/hyades-apiserver
that referenced
this pull request
Jun 11, 2024
Ports the following PRs from Dependency-Track v4.11.x: * DependencyTrack/dependency-track#3522 * DependencyTrack/dependency-track#3621 * DependencyTrack/dependency-track#3698 The following parts were **not** ported: * `ConfigKey.BOM_PROCESSING_TASK_V2_ENABLED` / `ConfigPropertyConstants.BOM_PROCESSING_TASK_V2_ENABLED`: Hyades does not have two separate versions of the task, it's already on V2 exclusively. Co-authored-by: Marlon Pina Tojal <marlont@backbase.com> Signed-off-by: nscuro <nscuro@protonmail.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Fixes failing JSON BOM validation when
specVersionis not one of the first fields.Problem was that the search for
specVersionwas aborted upon encountering a}token. It should beEOF(ornullin case ofJsonParser#nextToken) instead.Addressed Issue
Fixes #3696
Backports #3697
Additional Details
N/A
Checklist
This PR implements an enhancement, and I have provided tests to verify that it works as intendedThis PR introduces changes to the database model, and I have added corresponding update logicThis PR introduces new or alters existing behavior, and I have updated the documentation accordingly