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.

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

Add Intsights Parser #4298

Merged
merged 23 commits into from
May 3, 2021
Merged

Add Intsights Parser #4298

merged 23 commits into from
May 3, 2021

Conversation

37b
Copy link
Contributor

@37b 37b commented Apr 16, 2021 •
edited by valentijnscholten
Loading

Added IntSights threat intel parser: https://intsights.com/products

@37b 37b closed this Apr 16, 2021
@37b 37b reopened this Apr 16, 2021
@Maffooch Maffooch changed the base branch from master to dev April 17, 2021 05:39
@Maffooch
Copy link
Contributor

There is a few extra commits in here that shouldn't belong. Please base against dev rather than master next time

@valentijnscholten
Copy link
Member

can you update the title to be more descriptive? can you add some info the docs i.e. what scanner is this / where can we find more info.

@37b 37b changed the title Intsights Intsights Parser Apr 17, 2021
damiencarol
damiencarol requested changes Apr 17, 2021
View reviewed changes
Copy link
Contributor

@damiencarol damiencarol left a comment

Choose a reason for hiding this comment

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

Made a lot of comments.

dojo/fixtures/test_type.json Show resolved Hide resolved
dojo/tools/intsights/parser.py Outdated Show resolved Hide resolved
dojo/tools/intsights/parser.py Outdated Show resolved Hide resolved
dojo/tools/intsights/parser.py Outdated Show resolved Hide resolved
dojo/unittests/tools/test_intsights_parser.py Outdated Show resolved Hide resolved
dojo/unittests/tools/test_intsights_parser.py Show resolved Hide resolved
dojo/unittests/tools/test_intsights_parser.py Outdated Show resolved Hide resolved
dojo/tools/intsights/parser.py Outdated Show resolved Hide resolved
dojo/tools/intsights/parser.py Outdated Show resolved Hide resolved
docs/content/integrations/import.md Outdated Show resolved Hide resolved
@damiencarol
Copy link
Contributor

@37b I pushed some PR to the cookie cutter. Hope it will help future contributions. ;)

@valentijnscholten valentijnscholten changed the title Intsights Parser Add Intsights Parser Apr 18, 2021
@37b 37b requested a review from damiencarol April 19, 2021 20:09
@37b
Copy link
Contributor Author

37b commented Apr 21, 2021

@damiencarol Made some updates. Please provide feedback as you have time.

damiencarol
damiencarol reviewed Apr 24, 2021
View reviewed changes
dojo/tools/intsights/parser.py Outdated Show resolved Hide resolved
dojo/tools/intsights/parser.py Outdated Show resolved Hide resolved
dojo/tools/intsights/parser.py Outdated Show resolved Hide resolved
damiencarol
damiencarol requested changes Apr 25, 2021
View reviewed changes
Copy link
Contributor

@damiencarol damiencarol left a comment

Choose a reason for hiding this comment

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

The pull request in almost done.
There is just the use cases of empty reports that generate ValueError that are not aligned with orther parsers

dojo/unittests/tools/test_intsights_parser.py Outdated Show resolved Hide resolved
@damiencarol
Copy link
Contributor

damiencarol commented Apr 26, 2021 •
edited
Loading

Accepting as @37b made a lot of improvements, seems ready to review.
Good work 👍 @37b ! Thanks a lot for contributing!

Maffooch
Maffooch approved these changes Apr 27, 2021
View reviewed changes
Copy link
Contributor

@Maffooch Maffooch left a comment

Choose a reason for hiding this comment

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

@damiencarol Whenever you're ready to merge

@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@damiencarol
Copy link
Contributor

damiencarol commented Apr 30, 2021 •
edited
Loading

@37b @Maffooch rebased on last dev as there where conflicts. Removed docker-compose.yml.original also.
Please take a look at the modifications and ping me if you want to change something.

@damiencarol damiencarol merged commit 4210445 into DefectDojo:dev May 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@valentijnscholten valentijnscholten valentijnscholten left review comments

@damiencarol damiencarol damiencarol approved these changes

@Maffooch Maffooch Maffooch approved these changes

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

Successfully merging this pull request may close these issues.

None yet
5 participants
@37b @Maffooch @valentijnscholten @damiencarol @madchap