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

Feature/parser jfrog xray binary scan #9015

Merged

Conversation

renejal
Copy link
Contributor

@renejal renejal commented Nov 16, 2023

I will create a new pull request from number #8852 because it had commits that shouldn't be there

From our organization we want to contribute with a new xray parser for https://jfrog.com/help/r/jfrog-cli/on-demand-binary-scan

image

@github-actions github-actions bot added settings_changes Needs changes to settings.py based on changes in settings.dist.py included in this PR docs unittests parser labels Nov 16, 2023
@mtesauro
Copy link
Contributor

@renejal So close. Just a minor Flake8 to fix.

Thanks for removing those couple of unrelated files from the previous PR 👍

@renejal renejal closed this Nov 17, 2023
@renejal renejal reopened this Nov 17, 2023
Copy link
Contributor

@mtesauro mtesauro left a comment

Choose a reason for hiding this comment

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

Approved

Copy link
Contributor

@cneill cneill left a comment

Choose a reason for hiding this comment

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

Just a few suggestions around capitalization here.

dojo/settings/settings.dist.py Outdated Show resolved Hide resolved
dojo/settings/settings.dist.py Outdated Show resolved Hide resolved
dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py Outdated Show resolved Hide resolved
dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py Outdated Show resolved Hide resolved
dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py Outdated Show resolved Hide resolved
dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py Outdated Show resolved Hide resolved
dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py Outdated Show resolved Hide resolved
Copy link
Contributor

@kiblik kiblik left a comment

Choose a reason for hiding this comment

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

I wanted to provide my feedback sooner. Unfortunately, we had different internal priorities.

I really like this PR. But I provided a couple of my comments and suggestions.

I could image even more unittests for multiple fields. @renejal, if you would merge my PR bancolombia#80, I'm willing to add them by myself.

dojo/fixtures/defect_dojo_sample_data.json Show resolved Hide resolved
dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py Outdated Show resolved Hide resolved
dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py Outdated Show resolved Hide resolved
dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py Outdated Show resolved Hide resolved
dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py Outdated Show resolved Hide resolved
dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py Outdated Show resolved Hide resolved
dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py Outdated Show resolved Hide resolved
dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py Outdated Show resolved Hide resolved
dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py Outdated Show resolved Hide resolved
Copy link

dryrunsecurity bot commented Nov 21, 2023

Contextual Security Analysis

As DryRun Security performs checks, we’ll summarize them here. You can always dive into the results in the section below for checks.

Status DryRun Security Check
Configured Sensitive Files Check
AI-powered Sensitive Files Check

Chat with your AI-powered Security Buddy by typing /dryrunsec: (or /drs:) followed by your question. Example: /dryrunsec: From a security perspective, what are some sensitive files in an Express application?

Install and configure more repositories at DryRun Security

@kiblik
Copy link
Contributor

kiblik commented Nov 22, 2023

@renejal, now it is ready bancolombia#82 :)

Xray on demand: Last Improvements and tests
@renejal renejal requested a review from cneill November 24, 2023 13:05
@renejal renejal requested a review from kiblik November 27, 2023 14:52
@renejal renejal requested a review from kiblik November 29, 2023 20:57
@mtesauro mtesauro merged commit b42c374 into DefectDojo:dev Dec 2, 2023
118 checks passed
tpat13 pushed a commit to tpat13/django-DefectDojo that referenced this pull request Dec 4, 2023
* new parser Jfrog Xray on Demand Binary Scan

* new parser Jfrog Xray on Demand Binary Scan

* delete blank line at end of file

* rename function

* More sample reports

* Update docs/content/en/integrations/parsers/file/jfrog_xray_on_demand_binary_scan.md

Co-authored-by: Charles Neill <[email protected]>

* Update docs/content/en/integrations/parsers/file/jfrog_xray_on_demand_binary_scan.md

Co-authored-by: Charles Neill <[email protected]>

* Update docs/content/en/integrations/parsers/file/jfrog_xray_on_demand_binary_scan.md

Co-authored-by: Charles Neill <[email protected]>

* Update dojo/settings/settings.dist.py

Co-authored-by: Charles Neill <[email protected]>

* Update dojo/settings/settings.dist.py

Co-authored-by: Charles Neill <[email protected]>

* Update dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py

Co-authored-by: Charles Neill <[email protected]>

* Update dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py

Co-authored-by: Charles Neill <[email protected]>

* Update dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py

Co-authored-by: Charles Neill <[email protected]>

* Update dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py

Co-authored-by: Charles Neill <[email protected]>

* Update dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py

Co-authored-by: Charles Neill <[email protected]>

* Update dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py

Co-authored-by: kiblik <[email protected]>

* Update dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py

Co-authored-by: kiblik <[email protected]>

* First round of Improvements

* Drop duplicates in component_id and full_path

* Process per component

* Visual improvements

* Use+clean summary in Title, fix dedup, parse version, drop useless functions

* Update dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py

Co-authored-by: Charles Neill <[email protected]>

* Update dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py

Co-authored-by: kiblik <[email protected]>

* Update dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py

Co-authored-by: kiblik <[email protected]>

* Update dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py

Co-authored-by: kiblik <[email protected]>

* Update dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py

Co-authored-by: kiblik <[email protected]>

* Update dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py

Co-authored-by: kiblik <[email protected]>

* fix test rename class

* Last Improvements and tests

* capitalization skills

---------

Co-authored-by: Tomas Kubla <[email protected]>
Co-authored-by: Charles Neill <[email protected]>
Co-authored-by: kiblik <[email protected]>
@renejal renejal deleted the feature/parser_jfrog_xray_binary_scan branch December 5, 2023 13:11
blakeaowens pushed a commit that referenced this pull request Feb 28, 2024
* Created _init_.py

* Created parser.py

* Update README.md (#9048)

* Fixing README links and formatting (#9022)

* fixing up some links/etc

* formatting

* more formatting, links, etc

* formatting table HTML

* Fixing links

* typo

* formatting, links

* typo; adding Aaron Weaver to hall of fame

* reorganizing

* Bump python-gitlab from 3.15.0 to 4.2.0 (#9064)

Bumps [python-gitlab](https://github.com/python-gitlab/python-gitlab) from 3.15.0 to 4.2.0.
- [Release notes](https://github.com/python-gitlab/python-gitlab/releases)
- [Changelog](https://github.com/python-gitlab/python-gitlab/blob/main/CHANGELOG.md)
- [Commits](python-gitlab/python-gitlab@v3.15.0...v4.2.0)

---
updated-dependencies:
- dependency-name: python-gitlab
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump fontawesomefree from 6.4.2 to 6.5.0 (#9074)

Bumps [fontawesomefree](https://github.com/FortAwesome/Font-Awesome) from 6.4.2 to 6.5.0.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/6.x/CHANGELOG.md)
- [Commits](FortAwesome/Font-Awesome@6.4.2...6.5.0)

---
updated-dependencies:
- dependency-name: fontawesomefree
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* 🎉 added humble #8988 (#8989)

* 🎉 added humble

* fixed humble

* added endpoints

* fix according to comment

* fix according to review

* update

* added deduplication setting

* fix

* Bump social-auth-core from 4.5.0 to 4.5.1 (#9073)

Bumps [social-auth-core](https://github.com/python-social-auth/social-core) from 4.5.0 to 4.5.1.
- [Release notes](https://github.com/python-social-auth/social-core/releases)
- [Changelog](https://github.com/python-social-auth/social-core/blob/master/CHANGELOG.md)
- [Commits](python-social-auth/social-core@4.5.0...4.5.1)

---
updated-dependencies:
- dependency-name: social-auth-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Adding subcomponent labels for celery beat and worker (#9078)

* Update rabbitmq Docker tag from 3.12.9 to v3.12.10 (docker-compose.yml) (#9075)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update postgres:16.1-alpine Docker digest from 16.1 to 16.1-alpine (docker-compose.yml) (#9082)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update redis:7.2.3-alpine Docker digest from 7.2.3 to 7.2.3-alpine (docker-compose.yml) (#9083)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Bump boto3 from 1.29.7 to 1.33.5 (#9085)

Bumps [boto3](https://github.com/boto/boto3) from 1.29.7 to 1.33.5.
- [Release notes](https://github.com/boto/boto3/releases)
- [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst)
- [Commits](boto/boto3@1.29.7...1.33.5)

---
updated-dependencies:
- dependency-name: boto3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump fontawesomefree from 6.5.0 to 6.5.1 (#9086)

Bumps [fontawesomefree](https://github.com/FortAwesome/Font-Awesome) from 6.5.0 to 6.5.1.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/6.x/CHANGELOG.md)
- [Commits](FortAwesome/Font-Awesome@6.5.0...6.5.1)

---
updated-dependencies:
- dependency-name: fontawesomefree
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Add logging statement for failed password reset validation logic (#9087)

* Finding Template: Correct save ordering (#9088)

* Feature/parser jfrog xray binary scan (#9015)

* new parser Jfrog Xray on Demand Binary Scan

* new parser Jfrog Xray on Demand Binary Scan

* delete blank line at end of file

* rename function

* More sample reports

* Update docs/content/en/integrations/parsers/file/jfrog_xray_on_demand_binary_scan.md

Co-authored-by: Charles Neill <[email protected]>

* Update docs/content/en/integrations/parsers/file/jfrog_xray_on_demand_binary_scan.md

Co-authored-by: Charles Neill <[email protected]>

* Update docs/content/en/integrations/parsers/file/jfrog_xray_on_demand_binary_scan.md

Co-authored-by: Charles Neill <[email protected]>

* Update dojo/settings/settings.dist.py

Co-authored-by: Charles Neill <[email protected]>

* Update dojo/settings/settings.dist.py

Co-authored-by: Charles Neill <[email protected]>

* Update dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py

Co-authored-by: Charles Neill <[email protected]>

* Update dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py

Co-authored-by: Charles Neill <[email protected]>

* Update dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py

Co-authored-by: Charles Neill <[email protected]>

* Update dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py

Co-authored-by: Charles Neill <[email protected]>

* Update dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py

Co-authored-by: Charles Neill <[email protected]>

* Update dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py

Co-authored-by: kiblik <[email protected]>

* Update dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py

Co-authored-by: kiblik <[email protected]>

* First round of Improvements

* Drop duplicates in component_id and full_path

* Process per component

* Visual improvements

* Use+clean summary in Title, fix dedup, parse version, drop useless functions

* Update dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py

Co-authored-by: Charles Neill <[email protected]>

* Update dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py

Co-authored-by: kiblik <[email protected]>

* Update dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py

Co-authored-by: kiblik <[email protected]>

* Update dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py

Co-authored-by: kiblik <[email protected]>

* Update dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py

Co-authored-by: kiblik <[email protected]>

* Update dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py

Co-authored-by: kiblik <[email protected]>

* fix test rename class

* Last Improvements and tests

* capitalization skills

---------

Co-authored-by: Tomas Kubla <[email protected]>
Co-authored-by: Charles Neill <[email protected]>
Co-authored-by: kiblik <[email protected]>

* Update postgres:16.1-alpine Docker digest from 16.1 to 16.1-alpine (docker-compose.yml) (#9089)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Nosey Parker Test Cases

* Updated Parser

* Bump cryptography from 41.0.5 to 41.0.7 (#9065)

Bumps [cryptography](https://github.com/pyca/cryptography) from 41.0.5 to 41.0.7.
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](pyca/cryptography@41.0.5...41.0.7)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* NoseyParker Parser Flake8 compliance

* NoseyParker fix for 0.16

* JSON lines fix

* Nosey Parker Parser: v0.16 fix

* Comma for consistency

* Flake8 requirements

* Update docs/content/en/integrations/parsers/file/noseyparker.md

* Update dojo/tools/noseyparker/parser.py

* Update docs/content/en/integrations/parsers/file/noseyparker.md

* Removed example JSONL file

* Add link to 0.16.0 Release

* Spacing

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Greg Anderson <[email protected]>
Co-authored-by: Charles Neill <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: manuelsommer <[email protected]>
Co-authored-by: Manuel Venega <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Cody Maffucci <[email protected]>
Co-authored-by: renejal <[email protected]>
Co-authored-by: Tomas Kubla <[email protected]>
Co-authored-by: kiblik <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs parser settings_changes Needs changes to settings.py based on changes in settings.dist.py included in this PR unittests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants