Skip to content

Commit 9291ea2

Browse files
authored
Gradle update (#214)
* Upgrade gradle to 8.5 * update * Removed suppress for - CVE-2023-4586 * undoing last commit * CVE-2023-44487 Suppress Fixed * removed suppression * removed suppression
1 parent 817bea8 commit 9291ea2

File tree

4 files changed

+8
-29
lines changed

4 files changed

+8
-29
lines changed

gradle/wrapper/gradle-wrapper.jar

-19.8 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
145145
case $MAX_FD in #(
146146
max*)
147147
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
148-
# shellcheck disable=SC3045
148+
# shellcheck disable=SC2039,SC3045
149149
MAX_FD=$( ulimit -H -n ) ||
150150
warn "Could not query maximum file descriptor limit"
151151
esac
152152
case $MAX_FD in #(
153153
'' | soft) :;; #(
154154
*)
155155
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
156-
# shellcheck disable=SC3045
156+
# shellcheck disable=SC2039,SC3045
157157
ulimit -n "$MAX_FD" ||
158158
warn "Could not set maximum file descriptor limit to $MAX_FD"
159159
esac
@@ -202,11 +202,11 @@ fi
202202
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
203203
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204204

205-
# Collect all arguments for the java command;
206-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
207-
# shell script including quotes and variable substitutions, so put them in
208-
# double quotes to make sure that they get re-expanded; and
209-
# * put everything else in single quotes, so that it's not re-expanded.
205+
# Collect all arguments for the java command:
206+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207+
# and any embedded shellness will be escaped.
208+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209+
# treated as '${Hostname}' itself on the command line.
210210

211211
set -- \
212212
"-Dorg.gradle.appname=$APP_BASE_NAME" \

owasp-suppressions.xml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,4 @@
88
<cpe>cpe:/a:grpc:grpc</cpe>
99
<cpe>cpe:/a:utils_project:utils</cpe>
1010
</suppress>
11-
<suppress until="2023-12-31Z">
12-
<notes><![CDATA[
13-
This vulnerability is disputed, with the argument that SSL configuration is the responsibility of the client rather
14-
than the transport. The change in default is under consideration for the next major Netty release, revisit then.
15-
Regardless, our client (which is what brings in this dependency) enables the concerned feature, hostname verification
16-
Ref:
17-
https://github.com/grpc/grpc-java/issues/10033
18-
https://github.com/netty/netty/issues/8537#issuecomment-1527896917
19-
]]></notes>
20-
<packageUrl regex="true">^pkg:maven/io\.netty/netty.*@.*$</packageUrl>
21-
<vulnerabilityName>CVE-2023-4586</vulnerabilityName>
22-
</suppress>
23-
<suppress until="2023-12-31Z">
24-
<notes><![CDATA[
25-
This CVE (rapid RST) is already mitigated as our servers aren't directly exposed, but it's also
26-
addressed in 1.59.1, which the CVE doesn't reflect (not all grpc impls versions are exactly aligned).
27-
Ref: https://github.com/grpc/grpc-java/pull/10675
28-
]]></notes>
29-
<packageUrl regex="true">^pkg:maven/io\.grpc/grpc\-.*@.*$</packageUrl>
30-
<cve>CVE-2023-44487</cve>
31-
</suppress>
3211
</suppressions>

0 commit comments

Comments
 (0)