Fixes path problem for InputEngine and reduce complexity of CVEScanner #860
Conversation
This file contains hidden or 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
Niraj-Kamdar
force-pushed
the
cve_scanner
branch
from
8bf645e to
deb8273
Compare
Codecov Report
@@ Coverage Diff @@
## master #860 +/- ##
==========================================
- Coverage 87.85% 87.31% -0.55%
==========================================
Files 164 164
Lines 2710 2705 -5
Branches 295 295
==========================================
- Hits 2381 2362 -19
- Misses 258 272 +14
Partials 71 71
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
Niraj-Kamdar
force-pushed
the
cve_scanner
branch
from
626fef6 to
96f059f
Compare
Niraj-Kamdar
commented
Aug 10, 2020
| from collections import defaultdict | ||
| from enum import Enum | ||
| from typing import NamedTuple | ||
|
|
Contributor
Author
There was a problem hiding this comment.
Put datastructures for triage and cve_scanner at one place to avoid circular import.
Comment on lines
+56
to
+70
| class ProductInfo(NamedTuple): | ||
| vendor: str | ||
| product: str | ||
| version: str | ||
|
|
||
|
|
||
| class CVEData(defaultdict): | ||
| def __missing__(self, key): | ||
| if key == "cves": | ||
| self[key] = [] | ||
| elif key == "paths": | ||
| self[key] = set() | ||
| else: | ||
| return NotImplemented | ||
| return self[key] |
Contributor
Author
There was a problem hiding this comment.
Issues with old structure:
- Old CVEData was NamedTuple and since newly added path attribute was mutable it can create hard to find bugs.
- To update path we need to scan all_cve_data to find product for which we want to append paths.
Time Complexity: O(n**2)which can be reduced toO(n)using better structure. - Throwing vendor, product, version in different function was decreasing readability. So, ProductInfo would be nice to pack this data together since we don't actually need that alone.
- TriageData structure wasn't syncing with old CVEData. So, csv2cve was breaking.
New structure is addressing all these issues.
| product_info, file_path = scan_info | ||
| list_products.add(product_info.product) | ||
| list_versions.add(product_info.version) | ||
| assert file_path == expected_path |
Contributor
Author
There was a problem hiding this comment.
Test for filepath :)
johnandersen777
left a comment
johnandersen777
left a comment
There was a problem hiding this comment.
Please try fetching master and merging in latest HTML report changes. Then run the report and just double check that everything works
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Depends on #861
Fixes: #859