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

read aliases from dependencytrack FPF format #7583

Merged
merged 2 commits into from
Feb 16, 2023

Conversation

lme-nca
Copy link
Contributor

@lme-nca lme-nca commented Feb 8, 2023

Description
this enhances the dependencytrack parser to add the vulnerability alias information into the vulnerability_id variable of defectdojo.

Fixes issue: #7582

Test results

Documentation

Checklist

This checklist is for your information.

  • Make sure to rebase your PR against the very latest dev.
  • Features/Changes should be submitted against the dev.
  • Bugfixes should be submitted against the bugfix branch.
  • Give a meaningful name to your PR, as it may end up being used in the release notes.
  • Your code is flake8 compliant.
  • Your code is python 3.11 compliant.
  • If this is a new feature and not a bug fix, you've included the proper documentation in the docs at https://github.com/DefectDojo/django-DefectDojo/tree/dev/docs as part of this PR.
  • Model changes must include the necessary migrations in the dojo/db_migrations folder.
  • Add applicable tests to the unit tests.
  • Add the proper label to categorize your PR.

Extra information

Please clear everything below when submitting your pull request, it's here purely for your information.

Moderators: Labels currently accepted for PRs:

  • Import Scans (for new scanners/importers)
  • enhancement
  • performance
  • feature
  • bugfix
  • maintenance (a.k.a chores)
  • dependencies
  • New Migration (when the PR introduces a DB migration)
  • settings_changes (when the PR introduces changes or new settings in settings.dist.py)

Contributors: Git Tips

Rebase on dev branch

If the dev branch has changed since you started working on it, please rebase your work after the current dev.

On your working branch mybranch:

git rebase dev mybranch

In case of conflict:

 git mergetool
 git rebase --continue

When everything's fine on your local branch, force push to your myOrigin remote:

git push myOrigin --force-with-lease

To cancel everything:

git rebase --abort

Squashing commits

git rebase -i origin/dev
  • Replace pick by fixup on the commits you want squashed out
  • Replace pick by reword on the first commit if you want to change the commit message
  • Save the file and quit your editor

Force push to your myOrigin remote:

git push myOrigin --force-with-lease

@github-actions github-actions bot added the parser label Feb 8, 2023
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.

We need new checks in the unit tests

@lme-nca lme-nca force-pushed the add_alias_info_to_vulnerability branch from 6bebec0 to a26f2c3 Compare February 15, 2023 10:10
@lme-nca lme-nca force-pushed the add_alias_info_to_vulnerability branch from a26f2c3 to 6641b09 Compare February 15, 2023 11:13
@lme-nca
Copy link
Contributor Author

lme-nca commented Feb 16, 2023

Checks have passed, ready to merge @damiencarol @Maffooch

@Maffooch Maffooch merged commit 4905f20 into DefectDojo:bugfix Feb 16, 2023
@lme-nca lme-nca deleted the add_alias_info_to_vulnerability branch February 16, 2023 15:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants