Skip to content

Unified output #410

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 65 commits into from
Feb 29, 2020
Merged

Unified output #410

merged 65 commits into from
Feb 29, 2020

Conversation

SinghHrmn
Copy link
Contributor

@SinghHrmn SinghHrmn commented Feb 26, 2020 •
edited
Loading

Fixes #409

This PR unify the output generation and also adds the functionality to generate a CSV file as the output.

Currently, we can only generate single type at once and that also CSV.
In Future, we can add functionality to drop a list or tuple of output types. Unification will also help in maintaining and upgrading the code faster and easier.

@terriko I've implemented this approach. But I'm a little nervous and need your guidance to know that is this a right approach?

SinghHrmn and others added 30 commits January 28, 2020 09:29
@SinghHrmn
file test added for gnutls
c50dcfa
@SinghHrmn
comment out bluez test
fbd59da
@SinghHrmn
formatted test_scanner with black
3e15d7b
@SinghHrmn
gnutls file test 2.3.11
26b5f5d
@SinghHrmn
Merge pull request #1 from intel/master
8fcb64d 
uptodate with intel cve-bin-tool
@SinghHrmn
checkers printing twice #317 solved
8bcd84e
@SinghHrmn
updated clipy
1478120
@SinghHrmn
Merge branch 'master' of git://github.com/intel/cve-bin-tool
bf5a596
@SinghHrmn
updated cli.py
ec95f46
@SinghHrmn
formatted cli.py BLACK
fdc4db5
@SinghHrmn
updated cli.py
4b6a401
@SinghHrmn
cli.py updated
e4cbf57
@SinghHrmn
added modifications for empty versions
e535cb9
@SinghHrmn
black formatted cli kerberos
79e8cc4
@SinghHrmn
regex_find now return UNKNOWN
dfa7b3d
@SinghHrmn
Updated cli.py -- added waring for UNKNOWN
a2ff873
@SinghHrmn
removed bluez.py from PR
ff06a3b
@SinghHrmn
removed gnutls from PR
07fda55
@SinghHrmn
black formatted bluez
31b67bc
@SinghHrmn
updated cli.py,warning and error in if, elif,else
0a84fbc
@SinghHrmn
kerberos, libjpeg returns Unknown on Failure
32b24e6
@SinghHrmn
Merge branch 'master' of git://github.com/intel/cve-bin-tool
7f99728
@SinghHrmn
Also updated icu.py
5f40676
@SinghHrmn
Merged upstream
66f7600
@PrajwalM2212 @SinghHrmn
Add test for skips arg (#327)
30a3b10
@terriko @SinghHrmn
Fix final_log to check only the skip line, switch to scanning only a …
9708cdc 
…single binary for test speed
@terriko @SinghHrmn
Make test more robust to output changes
14127fd
@terriko @SinghHrmn
Make build status badge link to /actions page (#333)
4028f27
@terriko @SinghHrmn
Mention csv2cve earlier in the readme (#335)
090696d
@terriko @SinghHrmn
Improve csv2cve tests
442432e
terriko and others added 12 commits February 21, 2020 17:00
@terriko @SinghHrmn
Test some overly long version strings
95d6dec
@terriko @SinghHrmn
Mark the json schema test as a long test (because it really is) (#341)
9765481 
Also updated icu.py
@shreyamalviya @SinghHrmn
Fix deprecation warning in test_csv2cve (#343)
6adf998 
Fixes #342

Updated regex_find in utils.py and all the checkers using it (#331)

* Updated regex_find to return UNKNOWN
* modified cli.py to handle UNKNOWN results appropriately by not calling get_cves on an unknown, and instead printing a warning to the user.
* fixed icu.py, kerberos.py and libjpeg.py to also return unknown (since they weren't returning regex_find results directly)
@terriko @SinghHrmn
Systemd checker improvements
8c0ca28 
* Sort lines in systemd to improve matching, add additional systemd test using ubuntu package
* Add systemd 242, 243 tests and new signatures
* Additional systemd signatures
@SinghHrmn
Merge branch 'master' of https://github.com/SinghHrmn/cve-bin-tool
0509abb
@SinghHrmn
unified string formatting
905362f
@SinghHrmn
Merge branch 'master' of https://github.com/intel/cve-bin-tool
e0b8b73
@SinghHrmn
updated python checker
87590be
@SinghHrmn
updated python checker
75c8a7d
@SinghHrmn
Revert "updated python checker"
f93693a 
This reverts commit 75c8a7d.
@SinghHrmn
Unified OutputTypes
29ce47b
@SinghHrmn
Merge branch 'master' of https://github.com/intel/cve-bin-tool
6f32f92
@terriko
Copy link
Contributor

terriko commented Feb 26, 2020

It'll probably be late late this afternoon before I can review this in more detail, but at a glance it looks like you're going in a good direction.

terriko
terriko requested changes Feb 27, 2020
View reviewed changes
@terriko
Copy link
Contributor

terriko commented Feb 27, 2020

Those are long comments, but it looks like a good direction with some fiddly bits around names that we can improve. Thanks for this; it looks really promising!

@SinghHrmn
Copy link
Contributor Author

@terriko thanks for giving your precious time and thanks for the explanation. You are really a great mentor. But I'd not be able to work on this till 28th Evening as I'm having my exam on 28th. I'll work on this on 28th evening. Thanks You !

@SinghHrmn
Copy link
Contributor Author

SinghHrmn commented Feb 28, 2020 •
edited
Loading

@terriko I've updated some features of OutputEngines.py now it also checks if the filename that user is providing doesn't pre-exist. If the filename matches with another file we can switch to our randomly generated filename. Also, we check that the filename provided by the user can be opened. If we can't open then also we will switch to randomly generated filename.

Example Output:

cve_bin_tool.OutputEngine - WARNING - Failed to write at 'Myfilename.csv'. File already exists
cve_bin_tool.OutputEngine - INFO - Generating a new filename with Default Naming Convention
cve_bin_tool.OutputEngine - INFO - CSV output stored at /home/mastervulcan/gsoc-cve-bin-tool/cve-bin-tool/output.cve-bin-tool.2020-02-29.01:02:29.csv

Although I have one doubt. Should we print the whole path to the file? or switch to something less and only print the filename only.

@SinghHrmn SinghHrmn requested a review from terriko February 28, 2020 20:15
@terriko terriko mentioned this pull request Feb 28, 2020
Merged
@terriko
Copy link
Contributor

terriko commented Feb 28, 2020

I don't feel strongly one way or another about the full path, so let's leave it as it is for now and if people hate it maybe we'll revisit?

@terriko
Copy link
Contributor

terriko commented Feb 29, 2020

Okay, I think this is ready for merging. Thank you! This is definitely a good basis towards getting better output.

@terriko terriko merged commit f2652c2 into intel:master Feb 29, 2020
This was referenced Feb 29, 2020
Closed
Closed
@SinghHrmn
Copy link
Contributor Author

SinghHrmn commented Feb 29, 2020 •
edited
Loading

@terriko It was never possible without your guidance. Thank you so much !

@mariuszskon mariuszskon mentioned this pull request Mar 1, 2020
Merged
@SinghHrmn SinghHrmn deleted the unified_output branch March 4, 2020 18:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@terriko terriko terriko approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Unification Of Output Generation. Output types like CSV, JSON, etc.
8 participants
@SinghHrmn @terriko @PrajwalM2212 @pdxjohnny @SaurabhK122 @param211 @Niraj-Kamdar @shreyamalviya