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

Update dependencies to address security vulnerabilities #314

Merged
merged 1 commit into from
Sep 7, 2023
+650 −474
Merged

Update dependencies to address security vulnerabilities #314

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 38 additions & 0 deletions dependency-suppression.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
<suppress>
<notes><![CDATA[
Core Fabric Go implementation vulnerability, not fabric-protos.
]]></notes>
<packageUrl regex="true">^pkg:maven/org\.hyperledger\.fabric/fabric\-protos@.*$</packageUrl>
<cve>CVE-2022-31121</cve>
</suppress>
<suppress>
<notes><![CDATA[
Core Fabric Go implementation vulnerability, not fabric-protos.
]]></notes>
<packageUrl regex="true">^pkg:maven/org\.hyperledger\.fabric/fabric\-protos@.*$</packageUrl>
<cve>CVE-2022-36023</cve>
</suppress>
<suppress>
<notes><![CDATA[
Vulnerability in C++ gRPC implementation.
]]></notes>
<packageUrl regex="true">^pkg:maven/io\.opentelemetry\.instrumentation/opentelemetry\-grpc\-1\.6@.*$</packageUrl>
<cve>CVE-2023-33953</cve>
</suppress>
<suppress>
<notes><![CDATA[
Vulnerability in C++ gRPC implementation.
]]></notes>
<packageUrl regex="true">^pkg:maven/io\.opentelemetry\.instrumentation/opentelemetry\-grpc\-1\.6@.*$</packageUrl>
<cve>CVE-2023-32732</cve>
</suppress>
<suppress>
<notes><![CDATA[
Vulnerability in hutool-json, which is not used.
]]></notes>
<packageUrl regex="true">^pkg:maven/org\.json/json@.*$</packageUrl>
<cve>CVE-2022-45688</cve>
</suppress>
</suppressions>
5 changes: 3 additions & 2 deletions examples/fabric-contract-example-as-service/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'com.github.johnrengelman.shadow' version '2.0.3'
id 'com.github.johnrengelman.shadow' version '7.1.2'
id 'java'
}

@@ -21,7 +21,7 @@ repositories {

dependencies {
compile group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.3.+'
compile group: 'org.json', name: 'json', version: '20180813'
compile 'org.json:json:20230618'
testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2'
testImplementation 'org.assertj:assertj-core:3.11.1'
testImplementation 'org.mockito:mockito-core:2.+'
@@ -31,6 +31,7 @@ shadowJar {
baseName = 'chaincode'
version = null
classifier = null
mergeServiceFiles()

manifest {
attributes 'Main-Class': 'org.example.Application'
5 changes: 3 additions & 2 deletions examples/fabric-contract-example-gradle-kotlin/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar


plugins {
id("com.github.johnrengelman.shadow") version "5.2.0"
id("com.github.johnrengelman.shadow") version "7.1.2"
id("org.jetbrains.kotlin.jvm") version "1.3.41"
}

@@ -20,7 +20,7 @@ java {

dependencies {
implementation("org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.5.0")
implementation("org.json:json:20180813")
implementation("org.json:json:20230618")
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")

testImplementation("org.junit.jupiter:junit-jupiter:5.4.2")
@@ -44,6 +44,7 @@ tasks {
baseName = "chaincode"
version = null
classifier = null
mergeServiceFiles()
manifest {
attributes(mapOf("Main-Class" to "org.hyperledger.fabric.contract.ContractRouter"))
}
Binary file modified examples/fabric-contract-example-gradle-kotlin/gradle/wrapper/gradle-wrapper.jar
View file
Binary file not shown.
3 changes: 2 additions & 1 deletion examples/fabric-contract-example-gradle-kotlin/gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading