Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unified vt solution #849

Merged
merged 19 commits into from
Nov 30, 2019
Merged

Conversation

janowagner
Copy link
Member

@janowagner janowagner commented Oct 31, 2019

Add parsing of solution method from OSP and store into database.
Extend GMP API for nvt object to carry a explicit solution element.

The same solution element as in the tags is not yet removed by this
pull request and will be done in a separate pull request after all
other modules adapted to the new API (new location of solution
information).

All internal consumers of the solution information (report formats)
are already adapted to the new solution element. The CSV report
format does not use the newly introduced solution method because
it would require a change about the columns.

Requires
greenbone/gvm-libs#283

Checklist:

@janowagner janowagner force-pushed the unified_vt_solution branch 3 times, most recently from a42c09e to e183d95 Compare November 8, 2019 19:09
@janowagner janowagner marked this pull request as ready for review November 8, 2019 20:07
@janowagner janowagner added the work in progress This pull request should not be merged yet, more commits are expected label Nov 8, 2019
@mattmundell
Copy link
Contributor

Just to be sure, you added "work in progress" so this is not ready for review anymore?

@janowagner
Copy link
Member Author

janowagner commented Nov 11, 2019

Just to be sure, you added "work in progress" so this is not ready for review anymore?

Indeed. I thought it is and changed the status, but I found no way back to the previous status after
I realized that the GMP documentation update is still missing. So I used the tag.

@janowagner janowagner removed the work in progress This pull request should not be merged yet, more commits are expected label Nov 19, 2019
@janowagner janowagner force-pushed the unified_vt_solution branch 2 times, most recently from 13c0a20 to ad5ce6f Compare November 26, 2019 07:00
@bjoernricks
Copy link
Contributor

@mattmundell could you review this PR?

Copy link
Contributor

@mattmundell mattmundell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Just a few small formatting issues.

src/manage_migrators.c Outdated Show resolved Hide resolved
src/manage_migrators.c Outdated Show resolved Hide resolved
src/manage_migrators.c Show resolved Hide resolved
src/manage_migrators.c Show resolved Hide resolved
src/manage_migrators.c Outdated Show resolved Hide resolved
src/gmp.c Show resolved Hide resolved
src/manage.c Outdated Show resolved Hide resolved
src/report_formats/Verinice_ISM/Verinice_ISM.xsl Outdated Show resolved Hide resolved
src/schema_formats/XML/GMP.xml.in Outdated Show resolved Hide resolved
Use the solution text and the solution type.
This keeps the same data the tag string for the
time being.
This adds the solution method to the solution element
in the results nvt object.
In case only a solution type and/or method is present,
still create the solution element.
This adds the solution element. The solution and solution_type
are still in the tag and need to be removed later.
Also considers the optional solution method
and print it on a extra line.
Also considers the optional solution method
and print it on a extra line.
Also considers the optional solution method
and print it on a extra line.
Also considers the optional solution method
and print it on a extra line.
The optional solution method is not considered
because it was change the column structure and thus
change the CSV API.
This boiled down to just the change note since the nvt
element is not detailed anywhere in the GMP documentation.
The column is mandatory for correct function.
So we need to enfore the migration.
src/schema_formats/XML/GMP.xml.in Outdated Show resolved Hide resolved
This section is meant to document changes, no additions.
So, reverting it.
@mattmundell mattmundell merged commit 8b40af5 into greenbone:master Nov 30, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants