Skip to content

cleanup already resolved CVEs#15447

Merged
abhishekagarwal87 merged 9 commits intoapache:masterfrom
janjwerner-confluent:cleanup-cve-suppression
Dec 5, 2023
Merged

cleanup already resolved CVEs#15447
abhishekagarwal87 merged 9 commits intoapache:masterfrom
janjwerner-confluent:cleanup-cve-suppression

Conversation

@janjwerner-confluent
Copy link
Copy Markdown
Contributor

Description

Remove the crud from the dependency-check suppression file

This PR has:

  • been self-reviewed.
  • added documentation for new or modified features or behaviors.
  • a release note entry in the PR description.
  • added Javadocs for most classes and all non-trivial methods. Linked related entities via Javadoc links.
  • added or updated version, license, or notice information in licenses.yaml
  • added comments explaining the "why" and the intent of the code wherever would not be obvious for an unfamiliar reader.
  • added unit tests or modified existing tests to cover new code paths, ensuring the threshold for code coverage is met.
  • added integration tests.
  • been tested in a test Druid cluster.

@abhishekagarwal87
Copy link
Copy Markdown
Contributor

In this PR, we had removed the dependency check on contrib extensions. Can you run the check manually to ensure that you are not removing genuine suppressions for contrib extensions?

Copy link
Copy Markdown
Contributor

@abhishekagarwal87 abhishekagarwal87 left a comment

Choose a reason for hiding this comment

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

left some comments. thanks for cleaning this up.

Comment thread owasp-dependency-check-suppressions.xml Outdated
<notes><![CDATA[
file name: hadoop-*-3.3.1.jar
]]></notes>
<cve>CVE-2015-7430</cve>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The justification is lost during refactoring

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Added a bit of context.

<cve>CVE-2023-31419</cve>
</suppress>

<suppress>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

can you add justifications for the suppressions?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Added a bit of context.

@janjwerner-confluent
Copy link
Copy Markdown
Contributor Author

In this PR, we had removed the dependency check on contrib extensions. Can you run the check manually to ensure that you are not removing genuine suppressions for contrib extensions?

@abhishekagarwal87
Which PR do you refer to?

In this PR, we had removed the dependency check on contrib extensions. Can you run the check manually to ensure that you are not removing genuine suppressions for contrib extensions?

It seems I have removed suppressions for some of the contrib extensions, however as I started re-adding them, there is even more issues in them (re-enabled scans for all the contrib repos and oh my!)
How would you like to proceed given that those extensions are not scanned anyways?

@abhishekagarwal87
Copy link
Copy Markdown
Contributor

oops. I missed to post the link - #15026

@abhishekagarwal87
Copy link
Copy Markdown
Contributor

I was initially thinking that we keep the old suppressions anyway but it's probably better to get rid of those if we are not doing a scan anyway.

@janjwerner-confluent
Copy link
Copy Markdown
Contributor Author

I'm almost done adding suppressions for the remaining modules - there are plenty missing from pre-pruning. I have not added reasoning to those.
Just checked the other PR and the discussion - are there criteria of removing an extension from Druid contrib? there are some pieces of code that were not touched for ~ 5 years.

@abhishekagarwal87
Copy link
Copy Markdown
Contributor

To remove an extension that is not being maintained, you can start a thread on dev@druid.apache.org. If there is consensus, we can remove the extension.

<cve>CVE-2021-33813</cve>
</suppress>
<notes><![CDATA[
file name: hadoop-*-3.3.1.jar
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think they are because of hadoop-shaded-guava which has a version of 1.1.1

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

do we need additional justification for those?

Comment thread owasp-dependency-check-suppressions.xml Outdated
Comment thread owasp-dependency-check-suppressions.xml Outdated
@janjwerner-confluent
Copy link
Copy Markdown
Contributor Author

the last run seems to be mis-reporting for a spurious failure in the run, end result is OK

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants