Skip to content

Fix NPE #437

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

Merged
mihirgt merged 2 commits into from
Nov 6, 2023
Merged

Fix NPE #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a1f8c8
Fix NPE
Nov 6, 2023
42da9eb
Fix Vuln
Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .trivyignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@

4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
hypertrace-entity-service = "0.8.78"
hypertrace-config-service = "0.1.54"
hypertrace-grpc-utils = "0.12.4"
hypertrace-serviceFramework = "0.1.60"
hypertrace-serviceFramework = "0.1.62"
hypertrace-kafkaStreams = "0.4.3"
hypertrace-view-generator = "0.4.19"
hypertrace-view-generator = "0.4.20"
grpc = "1.57.2"

[libraries]
Expand Down
5 changes: 5 additions & 0 deletions owasp-suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
]]></notes>
<packageUrl regex="true">^pkg:maven/org\.json/json@.*$</packageUrl>
<cve>CVE-2022-45688</cve>
<cve>CVE-2023-5072</cve>
Copy link
Copy Markdown
Contributor

@aaron-steinfeld aaron-steinfeld Nov 7, 2023

Choose a reason for hiding this comment

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

Now that I look a bit more closely, this one (and its sibling 45688 above it) is also incorrectly suppressed. Both have released. fixes that should be used. They historically had a FP on older versions of the dependency check plugin, but those were resolved last month. Try removing it, upgrading the dep check plugin to latest and rerun.

</suppress>
<suppress>
<notes><![CDATA[
Expand All @@ -101,4 +102,8 @@
<packageUrl regex="true">^pkg:maven/io\.netty/netty.*@.*$</packageUrl>
<vulnerabilityName>CVE-2023-4586</vulnerabilityName>
</suppress>
<suppress until="2023-12-30Z">
Copy link
Copy Markdown
Contributor

@aaron-steinfeld aaron-steinfeld Nov 6, 2023

Choose a reason for hiding this comment

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

Please fix this rather than suppressing

Copy link
Copy Markdown
Contributor Author

@mihirgt mihirgt Nov 7, 2023

Choose a reason for hiding this comment

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

Was suppressed because there is no mitigation currently available.
https://access.redhat.com/security/cve/CVE-2023-4586

Copy link
Copy Markdown
Contributor

@aaron-steinfeld aaron-steinfeld Nov 7, 2023

Choose a reason for hiding this comment

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

4586 is the suppression above this one. You're correct that one can be suppressed as described in https://github.com/hypertrace/hypertrace-bom/blob/6e9d9aa4f9a9631c281df4b4c8916490d5cd39d9/owasp-suppressions.xml#L29-L40

The issue here is the newly added one, 44487 - that is the HTTP2 Rapid RST vuln and should not be suppressed. Netty*.100 contains the fix, and our latest framework libs should already include that if upgraded.

<packageUrl regex="true">^pkg:maven/io\.netty/netty.*@.*$</packageUrl>
<vulnerabilityName>CVE-2023-44487</vulnerabilityName>
</suppress>
</suppressions>
2 changes: 1 addition & 1 deletion .../main/java/org/hypertrace/semantic/convention/utils/http/HttpSemanticConventionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ public static Optional<String> getHttpHost(Event event) {
Optional<String> url = getHttpUrlFromRawAttributes(event);
if (url.isPresent() && isAbsoluteUrl(url.get())) {
try {
return Optional.of(getNormalizedUrl(url.get()).getAuthority());
return Optional.ofNullable(getNormalizedUrl(url.get()).getAuthority());
} catch (MalformedURLException | URISyntaxException e) {
LOGGER.warn(
"On extracting httpHost, received an invalid URL: {}, {}", url.get(), e.getMessage());
Expand Down