Skip to content

Commit

Permalink
Merge pull request #91 from Dwolla/CVE-2024-7254
Browse files Browse the repository at this point in the history
Update protobuf-java to 3.25.5 if otherwise present in the project dependencies
  • Loading branch information
bpholt authored Sep 26, 2024
2 parents 515baab + 6b11709 commit 6be954f
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 0 deletions.
25 changes: 25 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -187,3 +187,28 @@ jobs:
with:
modules-ignore: smithy4s-preprocessors_2.12
configs-ignore: test scala-tool scala-doc-tool test-internal

validate-steward:
name: Validate Steward Config
strategy:
matrix:
os: [ubuntu-latest]
java: [temurin@11]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (fast)
uses: actions/checkout@v4

- name: Setup Java (temurin@11)
id: setup-java-temurin-11
if: matrix.java == 'temurin@11'
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 11

- uses: coursier/setup-action@v1
with:
apps: scala-steward

- run: scala-steward validate-repo-config .scala-steward.conf
1 change: 1 addition & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ pull_request_rules:
- body~=labels:.*early-semver-minor
- status-success=Build and Test (ubuntu-latest, 2.13, temurin@8)
- status-success=Build and Test (ubuntu-latest, 3, temurin@8)
- status-success=Validate Steward Config (ubuntu-latest, temurin@11)
actions:
merge: {}
- name: Label rules PRs
Expand Down
3 changes: 3 additions & 0 deletions .scala-steward.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
updates.pin = [
{ groupId = "com.google.protobuf", artifactId = "protobuf-java", version = "3." } # used transitively by ScalaMeta; CVE-2024-7254
]
4 changes: 4 additions & 0 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ ThisBuild / tlJdkRelease := Some(8)
ThisBuild / githubWorkflowBuild := List(Sbt(List("compile", "test")))
ThisBuild / tlCiReleaseBranches := Seq("main")
ThisBuild / sonatypeCredentialHost := xerial.sbt.Sonatype.sonatypeLegacy
ThisBuild / mergifyRequiredJobs ++= Seq("validate-steward")
ThisBuild / mergifyStewardConfig ~= { _.map {
_.withAuthor("dwolla-oss-scala-steward[bot]")
.withMergeMinors(true)
Expand Down Expand Up @@ -63,6 +64,9 @@ lazy val `scalafix-rules` = project.in(file("scalafix/rules"))
"org.scalameta" %% "munit" % "1.0.0" % Test,
"com.eed3si9n.expecty" %% "expecty" % "0.16.0" % Test,
),
dependencyOverrides ++= Seq(
"com.google.protobuf" % "protobuf-java" % "3.25.5", // CVE-2024-7254
),
scalacOptions ~= {
_.filterNot(_ == "-Xfatal-warnings")
},
Expand Down

0 comments on commit 6be954f

Please sign in to comment.