Repository navigation
Bump org.json to 20260719 - #1635
Open
deepika-lalwani123 wants to merge 4 commits into
Open
deepika-lalwani123 wants to merge 4 commits into
deepika-lalwani123 wants to merge 4 commits into
Conversation
There was a problem hiding this comment.
Code Review
This pull request updates several dependency versions in pom.xml, including upgrades to Jackson, Protobuf, HTTPClient, and Snappy-Java, and introduces dependency management BOMs to align these libraries. It also adds exclusions for unused Avro IPC dependencies and introduces a new test class, TinkKeysetJsonTest, to verify the serialization and deserialization round-trip of Tink keyset JSON metadata. There are no review comments, and the changes look solid, so I have no additional feedback to provide.
This was referenced Nov 17, 2026
vishwasvaidya-cloudsufi
force-pushed
the
vuln/gc-3b-minor-org-json
branch
from
November 18, 2026 09:41
a6fc36e to
8349579
Compare
avro-mapred 1.11.4 pulls in avro-ipc and avro-ipc-jetty, which bring velocity-engine-core 2.3 (shaded commons-io 2.8.0, CVE-2024-47554) and org.tukaani:xz into lib/ of google-cloud-0.25.0-SNAPSHOT.jar, as seen in the image scan of gcr.io/cdapio/cdap (/opt/cdap/master/artifacts/google-cloud-*.jar/lib/velocity-engine-core-2.3.jar). The plugins only use org.apache.avro.mapred.AvroKey and org.apache.avro.mapreduce.* (BigQuery sink AvroOutputFormat / AvroRecordWriter, Dataplex tests). Avro RPC and tether jobs, the only users of avro-ipc, are not used. The Avro output codecs the plugins allow are snappy and deflate (FileSetUtil), so dropping xz is safe. Versions: - org.apache.avro:avro-ipc 1.11.4 -> removed (exclusion on avro-mapred) - org.apache.avro:avro-ipc-jetty 1.11.4 -> removed (exclusion on avro-mapred) - velocity-engine-core 2.3 and xz 1.9 no longer packaged Bugs: none closed alone. The other commons-io 2.8.0 copy (inside format-avro-2.13.0.jar) is removed by hydrator-plugins HP-1. Risk: very low. No plugin code path uses avro-ipc. Testing: JDK 8, Checkstyle on (0 violations). mvn clean verify: 647 tests, 0 failures, 5 errors, 8 skipped. The 5 errors are cloud ITs that pick up the Cloudtop's ambient GCP project and fail with PERMISSION_DENIED (GCSConnectorTest x2, SpannerConnectorTest x2, BigQueryConnectorTest); they fail the same way on develop. All other unit tests pass, including AvroRecordWriterTest and DataPlexOutputFormatProviderTest. mvn dependency:tree: avro-mapred:1.11.4 has no children; avro-ipc, avro-ipc-jetty, velocity-engine-core and xz are gone. unzip -l target/google-cloud-0.25.0-SNAPSHOT.jar: lib/ has no avro-ipc*, velocity-* or xz-* jar.
Patch-level alignment with the cross-track targets used by the Platform CLs. No row of the current gcr.io/cdapio/cdap image scan points at these top-level jars in google-cloud, but they are below the versions used everywhere else and would re-open on the next scan: snappy-java 1.1.10.5 is below the 1.1.10.12 target, and httpcore 4.4.14 (transitive) did not match httpclient. 4.5.14 / 4.4.16 are what google-http-client-apache-v2 already uses, so nothing is downgraded. Versions: - org.xerial.snappy:snappy-java 1.1.10.5 -> 1.1.10.12 (direct dependency) - org.apache.httpcomponents:httpclient 4.5.13 -> 4.5.14 (httpclient.version, now also in dependencyManagement) - org.apache.httpcomponents:httpcore 4.4.14 -> 4.4.16 (new httpcore.version property, managed in dependencyManagement) Bugs: none (no scanned rows; prevents a re-open). Risk: very low. Same-line patch releases. Testing: JDK 8, Checkstyle on (0 violations). mvn clean verify: 647 tests, 0 failures, 5 errors, 8 skipped; the 5 errors are the same cloud ITs as on develop (GCSConnectorTest x2, SpannerConnectorTest x2, BigQueryConnectorTest: PERMISSION_DENIED on the Cloudtop's ambient GCP project, no test credentials). mvn dependency:tree: snappy-java 1.1.10.12, httpclient 4.5.14 and httpcore 4.4.16 at compile scope; no other version of them on the runtime classpath (httpcore-nio 4.4.5 stays test-only via cdap-unit-test). unzip -l target/google-cloud-0.25.0-SNAPSHOT.jar: lib/httpclient-4.5.14.jar, lib/httpcore-4.4.16.jar, lib/snappy-java-1.1.10.12.jar.
The image scan of gcr.io/cdapio/cdap reports these top-level jars in lib/ of google-cloud-0.25.0-SNAPSHOT.jar: - jackson-core 2.12.3 (CVE-2025-49128, CVE-2025-52999, CVE-2026-68494, CVE-2026-89425), jackson-databind 2.13.4.2 (11 CVEs) and jackson-dataformat-cbor 2.9.9 (CVE-2020-28491) - protobuf-java 3.19.4 (CVE-2022-3171, CVE-2022-3509, CVE-2022-3510, CVE-2024-7254) - google-oauth-client 1.31.2 (CVE-2021-22573) Jackson is now aligned with an imported jackson-bom, so the cbor module that comes in through google-cloud-bigquery moves with core/databind. protobuf-bom aligns protobuf-java-util (3.17.3) with protobuf-java. No libraries-bom is imported here, so nothing brings a protobuf 4.x that could be downgraded. google-oauth-client 1.33.3 is built against google-http-client 1.41.x, so google-http-client-bom 1.41.8 is imported to keep the whole google-http-client family (core, jackson2, gson, apache-v2, appengine, protobuf) on one version instead of mixing 1.38.0 / 1.39.2 with 1.41. Versions: - jackson-core 2.12.3, jackson-databind / jackson-annotations 2.13.4.x, jackson-dataformat-cbor 2.9.9 -> 2.18.12 (jackson.core.version, now also used for the jackson-bom import) - protobuf-java 3.19.4 -> 3.25.5 (google.protobuf.java.version); protobuf-java-util 3.17.3 -> 3.25.5 (protobuf-bom import) - google-oauth-client 1.31.2 -> 1.33.3 (managed, new google.oauth.client.version) - google-http-client* 1.38.0 / 1.39.2 -> 1.41.8 (google-http-client-bom import, new google.http.client.version) The copies bundled inside bigtable-hbase-1.x-hadoop-1.17.1.jar (jackson-core 2.11.1, protobuf 3.12.2, oauth-client 1.31.0) are handled by GC-4; the Jackson copy inside format-avro-2.13.0.jar is handled in hydrator-plugins. Bugs: jackson-dataformat-cbor b/578686984 (closed by this change alone). Risk: medium. Minor-version jumps. Jackson 2.18 keeps the 2.x API but has stricter defaults (e.g. StreamReadConstraints limits on very large numbers / strings). protobuf 3.25 runtime is backward compatible with code generated by older 3.x protoc (grpc 1.39 / gax). Testing: JDK 8, Checkstyle on (0 violations). mvn clean verify: 647 tests, 0 failures, 5 errors, 8 skipped; the 5 errors are the same cloud ITs as on develop (GCSConnectorTest x2, SpannerConnectorTest x2, BigQueryConnectorTest: PERMISSION_DENIED on the Cloudtop's ambient GCP project, no test credentials). BigQuery, GCS, Spanner, Datastore, Pub/Sub, Dataplex unit tests pass. mvn dependency:tree: jackson-* 2.18.12, protobuf-java / protobuf-java-util 3.25.5, google-oauth-client 1.33.3, google-http-client* 1.41.8 at compile scope; 2.12.3 / 2.13.4.2 / 2.9.9 / 3.19.4 / 1.31.2 are gone. unzip -l target/google-cloud-0.25.0-SNAPSHOT.jar: lib/ has only the new versions (jackson-core-2.18.12, jackson-databind-2.18.12, jackson-dataformat-cbor-2.18.12, protobuf-java-3.25.5, google-oauth-client-1.33.3, google-http-client-1.41.8). Not run: e2e tests (need GCP credentials).
The image scan of gcr.io/cdapio/cdap reports org.json:json 20180813 (CVE-2022-45688, CVE-2023-5072, CVE-2026-59171) in lib/ of google-cloud-0.25.0-SNAPSHOT.jar. It comes in through tink 1.3.0-rc3 (and tink-gcpkms) and is used directly by GCSTinkTool and TinkDecryptor (JSONObject) to write and read the Tink encryption metadata of encrypted GCS files, and by Tink's JsonKeysetReader / JsonKeysetWriter. Kept separate from the other MINOR bumps because newer org.json releases change parsing behavior (stricter handling of malformed input, number conversion). A new unit test, TinkKeysetJsonTest, writes the metadata the same way GCSTinkTool does (JsonKeysetWriter -> JSONObject.toString(4)) and reads it back the same way TinkDecryptor does (new JSONObject -> getJSONObject("keyset") -> JsonKeysetReader), then decrypts a stream with the result, with a local AEAD key in place of Cloud KMS. It passes with both 20180813 and 20260719. Versions: - org.json:json 20180813 -> 20260719 (new org.json.version property, managed in dependencyManagement) Bugs: b/578504385, b/578575239, b/584531579 (closed once the hydrator-plugins HP-2b and wrangler WR-3b copies are also bumped). Risk: medium. org.json behavior changes; the Tink metadata round trip and Tink-encrypted read path are covered by the new test. Testing: JDK 8, Checkstyle on (0 violations). mvn clean verify: 648 tests, 0 failures, 5 errors, 8 skipped; the 5 errors are the same cloud ITs as on develop (GCSConnectorTest x2, SpannerConnectorTest x2, BigQueryConnectorTest: PERMISSION_DENIED on the Cloudtop's ambient GCP project, no test credentials). TinkKeysetJsonTest passes on this branch and with the old 20180813. mvn dependency:tree -Dincludes=org.json: tink:1.3.0-rc3 -> org.json:json:20260719 only. unzip -l target/google-cloud-0.25.0-SNAPSHOT.jar: lib/json-20260719.jar. Not run: GCS e2e with a real Cloud KMS key (needs GCP credentials).
vishwasvaidya-cloudsufi
force-pushed
the
vuln/gc-3b-minor-org-json
branch
from
November 19, 2026 09:34
8349579 to
d4b5af0
Compare
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Bump org.json to 20260719
Repo: data-integrations/google-cloud
Branch: vuln/gc-3b-minor-org-json → base develop (stacked)
Commit: a6fc36e
Part of the CVE fixes for the CDAP 6.11.2 patch release (container image scanning of gcr.io/cdapio/cdap).
The image scan of gcr.io/cdapio/cdap reports org.json:json 20180813
(CVE-2022-45688, CVE-2023-5072, CVE-2026-59171) in lib/ of
google-cloud-0.25.0-SNAPSHOT.jar. It comes in through tink 1.3.0-rc3
(and tink-gcpkms) and is used directly by GCSTinkTool and TinkDecryptor
(JSONObject) to write and read the Tink encryption metadata of
encrypted GCS files, and by Tink's JsonKeysetReader / JsonKeysetWriter.
Kept separate from the other MINOR bumps because newer org.json
releases change parsing behavior (stricter handling of malformed input,
number conversion). A new unit test, TinkKeysetJsonTest, writes the
metadata the same way GCSTinkTool does (JsonKeysetWriter ->
JSONObject.toString(4)) and reads it back the same way TinkDecryptor does
(new JSONObject -> getJSONObject("keyset") -> JsonKeysetReader), then
decrypts a stream with the result, with a local AEAD key in place of
Cloud KMS. It passes with both 20180813 and 20260719.
Versions:
managed in dependencyManagement)
The org.json:json findings will be resolved once the copies in
cdapio/hydrator-plugins#2015 and data-integrations/wrangler#1072 are also bumped.
Risk: medium. org.json behavior changes; the Tink metadata round trip
and Tink-encrypted read path are covered by the new test.
Testing: JDK 8, Checkstyle on (0 violations).
mvn clean verify: 648 tests, 0 failures, 5 errors, 8 skipped; the 5
errors are the same cloud ITs as on develop (GCSConnectorTest x2,
SpannerConnectorTest x2, BigQueryConnectorTest: PERMISSION_DENIED on a
Linux workstation's ambient GCP project, no test credentials).
TinkKeysetJsonTest passes on this branch and with the old 20180813.
mvn dependency:tree -Dincludes=org.json: tink:1.3.0-rc3 ->
org.json:json:20260719 only.
unzip -l target/google-cloud-0.25.0-SNAPSHOT.jar: lib/json-20260719.jar.
Not run: GCS e2e with a real Cloud KMS key (needs GCP credentials).